From f3855ac7e927bc09aeb73f5dc5bcd84363c6c24b Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 25 Jan 2018 13:14:21 +0100
Subject: [PATCH 001/146] Added flot.time plugin

---
 .../include/graphs/flot/jquery.flot.time.js   | 432 ++++++++++++++++++
 .../include/graphs/flot/pandora.flot.js       |  18 +-
 .../include/graphs/functions_flot.php         |   2 +
 3 files changed, 451 insertions(+), 1 deletion(-)
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.time.js

diff --git a/pandora_console/include/graphs/flot/jquery.flot.time.js b/pandora_console/include/graphs/flot/jquery.flot.time.js
new file mode 100644
index 0000000000..34c1d12125
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.time.js
@@ -0,0 +1,432 @@
+/* Pretty handling of time axes.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+Set axis.mode to "time" to enable. See the section "Time series data" in
+API.txt for details.
+
+*/
+
+(function($) {
+
+	var options = {
+		xaxis: {
+			timezone: null,		// "browser" for local to the client or timezone for timezone-js
+			timeformat: null,	// format string to use
+			twelveHourClock: false,	// 12 or 24 time in time mode
+			monthNames: null	// list of names of months
+		}
+	};
+
+	// round to nearby lower multiple of base
+
+	function floorInBase(n, base) {
+		return base * Math.floor(n / base);
+	}
+
+	// Returns a string with the date d formatted according to fmt.
+	// A subset of the Open Group's strftime format is supported.
+
+	function formatDate(d, fmt, monthNames, dayNames) {
+
+		if (typeof d.strftime == "function") {
+			return d.strftime(fmt);
+		}
+
+		var leftPad = function(n, pad) {
+			n = "" + n;
+			pad = "" + (pad == null ? "0" : pad);
+			return n.length == 1 ? pad + n : n;
+		};
+
+		var r = [];
+		var escape = false;
+		var hours = d.getHours();
+		var isAM = hours < 12;
+
+		if (monthNames == null) {
+			monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+		}
+
+		if (dayNames == null) {
+			dayNames = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+		}
+
+		var hours12;
+
+		if (hours > 12) {
+			hours12 = hours - 12;
+		} else if (hours == 0) {
+			hours12 = 12;
+		} else {
+			hours12 = hours;
+		}
+
+		for (var i = 0; i < fmt.length; ++i) {
+
+			var c = fmt.charAt(i);
+
+			if (escape) {
+				switch (c) {
+					case 'a': c = "" + dayNames[d.getDay()]; break;
+					case 'b': c = "" + monthNames[d.getMonth()]; break;
+					case 'd': c = leftPad(d.getDate()); break;
+					case 'e': c = leftPad(d.getDate(), " "); break;
+					case 'h':	// For back-compat with 0.7; remove in 1.0
+					case 'H': c = leftPad(hours); break;
+					case 'I': c = leftPad(hours12); break;
+					case 'l': c = leftPad(hours12, " "); break;
+					case 'm': c = leftPad(d.getMonth() + 1); break;
+					case 'M': c = leftPad(d.getMinutes()); break;
+					// quarters not in Open Group's strftime specification
+					case 'q':
+						c = "" + (Math.floor(d.getMonth() / 3) + 1); break;
+					case 'S': c = leftPad(d.getSeconds()); break;
+					case 'y': c = leftPad(d.getFullYear() % 100); break;
+					case 'Y': c = "" + d.getFullYear(); break;
+					case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break;
+					case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break;
+					case 'w': c = "" + d.getDay(); break;
+				}
+				r.push(c);
+				escape = false;
+			} else {
+				if (c == "%") {
+					escape = true;
+				} else {
+					r.push(c);
+				}
+			}
+		}
+
+		return r.join("");
+	}
+
+	// To have a consistent view of time-based data independent of which time
+	// zone the client happens to be in we need a date-like object independent
+	// of time zones.  This is done through a wrapper that only calls the UTC
+	// versions of the accessor methods.
+
+	function makeUtcWrapper(d) {
+
+		function addProxyMethod(sourceObj, sourceMethod, targetObj, targetMethod) {
+			sourceObj[sourceMethod] = function() {
+				return targetObj[targetMethod].apply(targetObj, arguments);
+			};
+		};
+
+		var utc = {
+			date: d
+		};
+
+		// support strftime, if found
+
+		if (d.strftime != undefined) {
+			addProxyMethod(utc, "strftime", d, "strftime");
+		}
+
+		addProxyMethod(utc, "getTime", d, "getTime");
+		addProxyMethod(utc, "setTime", d, "setTime");
+
+		var props = ["Date", "Day", "FullYear", "Hours", "Milliseconds", "Minutes", "Month", "Seconds"];
+
+		for (var p = 0; p < props.length; p++) {
+			addProxyMethod(utc, "get" + props[p], d, "getUTC" + props[p]);
+			addProxyMethod(utc, "set" + props[p], d, "setUTC" + props[p]);
+		}
+
+		return utc;
+	};
+
+	// select time zone strategy.  This returns a date-like object tied to the
+	// desired timezone
+
+	function dateGenerator(ts, opts) {
+		if (opts.timezone == "browser") {
+			return new Date(ts);
+		} else if (!opts.timezone || opts.timezone == "utc") {
+			return makeUtcWrapper(new Date(ts));
+		} else if (typeof timezoneJS != "undefined" && typeof timezoneJS.Date != "undefined") {
+			var d = new timezoneJS.Date();
+			// timezone-js is fickle, so be sure to set the time zone before
+			// setting the time.
+			d.setTimezone(opts.timezone);
+			d.setTime(ts);
+			return d;
+		} else {
+			return makeUtcWrapper(new Date(ts));
+		}
+	}
+	
+	// map of app. size of time units in milliseconds
+
+	var timeUnitSize = {
+		"second": 1000,
+		"minute": 60 * 1000,
+		"hour": 60 * 60 * 1000,
+		"day": 24 * 60 * 60 * 1000,
+		"month": 30 * 24 * 60 * 60 * 1000,
+		"quarter": 3 * 30 * 24 * 60 * 60 * 1000,
+		"year": 365.2425 * 24 * 60 * 60 * 1000
+	};
+
+	// the allowed tick sizes, after 1 year we use
+	// an integer algorithm
+
+	var baseSpec = [
+		[1, "second"], [2, "second"], [5, "second"], [10, "second"],
+		[30, "second"], 
+		[1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"],
+		[30, "minute"], 
+		[1, "hour"], [2, "hour"], [4, "hour"],
+		[8, "hour"], [12, "hour"],
+		[1, "day"], [2, "day"], [3, "day"],
+		[0.25, "month"], [0.5, "month"], [1, "month"],
+		[2, "month"]
+	];
+
+	// we don't know which variant(s) we'll need yet, but generating both is
+	// cheap
+
+	var specMonths = baseSpec.concat([[3, "month"], [6, "month"],
+		[1, "year"]]);
+	var specQuarters = baseSpec.concat([[1, "quarter"], [2, "quarter"],
+		[1, "year"]]);
+
+	function init(plot) {
+		plot.hooks.processOptions.push(function (plot, options) {
+			$.each(plot.getAxes(), function(axisName, axis) {
+
+				var opts = axis.options;
+
+				if (opts.mode == "time") {
+					axis.tickGenerator = function(axis) {
+
+						var ticks = [];
+						var d = dateGenerator(axis.min, opts);
+						var minSize = 0;
+
+						// make quarter use a possibility if quarters are
+						// mentioned in either of these options
+
+						var spec = (opts.tickSize && opts.tickSize[1] ===
+							"quarter") ||
+							(opts.minTickSize && opts.minTickSize[1] ===
+							"quarter") ? specQuarters : specMonths;
+
+						if (opts.minTickSize != null) {
+							if (typeof opts.tickSize == "number") {
+								minSize = opts.tickSize;
+							} else {
+								minSize = opts.minTickSize[0] * timeUnitSize[opts.minTickSize[1]];
+							}
+						}
+
+						for (var i = 0; i < spec.length - 1; ++i) {
+							if (axis.delta < (spec[i][0] * timeUnitSize[spec[i][1]]
+											  + spec[i + 1][0] * timeUnitSize[spec[i + 1][1]]) / 2
+								&& spec[i][0] * timeUnitSize[spec[i][1]] >= minSize) {
+								break;
+							}
+						}
+
+						var size = spec[i][0];
+						var unit = spec[i][1];
+
+						// special-case the possibility of several years
+
+						if (unit == "year") {
+
+							// if given a minTickSize in years, just use it,
+							// ensuring that it's an integer
+
+							if (opts.minTickSize != null && opts.minTickSize[1] == "year") {
+								size = Math.floor(opts.minTickSize[0]);
+							} else {
+
+								var magn = Math.pow(10, Math.floor(Math.log(axis.delta / timeUnitSize.year) / Math.LN10));
+								var norm = (axis.delta / timeUnitSize.year) / magn;
+
+								if (norm < 1.5) {
+									size = 1;
+								} else if (norm < 3) {
+									size = 2;
+								} else if (norm < 7.5) {
+									size = 5;
+								} else {
+									size = 10;
+								}
+
+								size *= magn;
+							}
+
+							// minimum size for years is 1
+
+							if (size < 1) {
+								size = 1;
+							}
+						}
+
+						axis.tickSize = opts.tickSize || [size, unit];
+						var tickSize = axis.tickSize[0];
+						unit = axis.tickSize[1];
+
+						var step = tickSize * timeUnitSize[unit];
+
+						if (unit == "second") {
+							d.setSeconds(floorInBase(d.getSeconds(), tickSize));
+						} else if (unit == "minute") {
+							d.setMinutes(floorInBase(d.getMinutes(), tickSize));
+						} else if (unit == "hour") {
+							d.setHours(floorInBase(d.getHours(), tickSize));
+						} else if (unit == "month") {
+							d.setMonth(floorInBase(d.getMonth(), tickSize));
+						} else if (unit == "quarter") {
+							d.setMonth(3 * floorInBase(d.getMonth() / 3,
+								tickSize));
+						} else if (unit == "year") {
+							d.setFullYear(floorInBase(d.getFullYear(), tickSize));
+						}
+
+						// reset smaller components
+
+						d.setMilliseconds(0);
+
+						if (step >= timeUnitSize.minute) {
+							d.setSeconds(0);
+						}
+						if (step >= timeUnitSize.hour) {
+							d.setMinutes(0);
+						}
+						if (step >= timeUnitSize.day) {
+							d.setHours(0);
+						}
+						if (step >= timeUnitSize.day * 4) {
+							d.setDate(1);
+						}
+						if (step >= timeUnitSize.month * 2) {
+							d.setMonth(floorInBase(d.getMonth(), 3));
+						}
+						if (step >= timeUnitSize.quarter * 2) {
+							d.setMonth(floorInBase(d.getMonth(), 6));
+						}
+						if (step >= timeUnitSize.year) {
+							d.setMonth(0);
+						}
+
+						var carry = 0;
+						var v = Number.NaN;
+						var prev;
+
+						do {
+
+							prev = v;
+							v = d.getTime();
+							ticks.push(v);
+
+							if (unit == "month" || unit == "quarter") {
+								if (tickSize < 1) {
+
+									// a bit complicated - we'll divide the
+									// month/quarter up but we need to take
+									// care of fractions so we don't end up in
+									// the middle of a day
+
+									d.setDate(1);
+									var start = d.getTime();
+									d.setMonth(d.getMonth() +
+										(unit == "quarter" ? 3 : 1));
+									var end = d.getTime();
+									d.setTime(v + carry * timeUnitSize.hour + (end - start) * tickSize);
+									carry = d.getHours();
+									d.setHours(0);
+								} else {
+									d.setMonth(d.getMonth() +
+										tickSize * (unit == "quarter" ? 3 : 1));
+								}
+							} else if (unit == "year") {
+								d.setFullYear(d.getFullYear() + tickSize);
+							} else {
+								d.setTime(v + step);
+							}
+						} while (v < axis.max && v != prev);
+
+						return ticks;
+					};
+
+					axis.tickFormatter = function (v, axis) {
+
+						var d = dateGenerator(v, axis.options);
+
+						// first check global format
+
+						if (opts.timeformat != null) {
+							return formatDate(d, opts.timeformat, opts.monthNames, opts.dayNames);
+						}
+
+						// possibly use quarters if quarters are mentioned in
+						// any of these places
+
+						var useQuarters = (axis.options.tickSize &&
+								axis.options.tickSize[1] == "quarter") ||
+							(axis.options.minTickSize &&
+								axis.options.minTickSize[1] == "quarter");
+
+						var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]];
+						var span = axis.max - axis.min;
+						var suffix = (opts.twelveHourClock) ? " %p" : "";
+						var hourCode = (opts.twelveHourClock) ? "%I" : "%H";
+						var fmt;
+
+						if (t < timeUnitSize.minute) {
+							fmt = hourCode + ":%M:%S" + suffix;
+						} else if (t < timeUnitSize.day) {
+							if (span < 2 * timeUnitSize.day) {
+								fmt = hourCode + ":%M" + suffix;
+							} else {
+								fmt = "%b %d " + hourCode + ":%M" + suffix;
+							}
+						} else if (t < timeUnitSize.month) {
+							fmt = "%b %d";
+						} else if ((useQuarters && t < timeUnitSize.quarter) ||
+							(!useQuarters && t < timeUnitSize.year)) {
+							if (span < timeUnitSize.year) {
+								fmt = "%b";
+							} else {
+								fmt = "%b %Y";
+							}
+						} else if (useQuarters && t < timeUnitSize.year) {
+							if (span < timeUnitSize.year) {
+								fmt = "Q%q";
+							} else {
+								fmt = "Q%q %Y";
+							}
+						} else {
+							fmt = "%Y";
+						}
+
+						var rt = formatDate(d, fmt, opts.monthNames, opts.dayNames);
+
+						return rt;
+					};
+				}
+			});
+		});
+	}
+
+	$.plot.plugins.push({
+		init: init,
+		options: options,
+		name: 'time',
+		version: '1.0'
+	});
+
+	// Time-axis support used to be in Flot core, which exposed the
+	// formatDate function on the plot object.  Various plugins depend
+	// on the function, so we need to re-expose it here.
+
+	$.plot.formatDate = formatDate;
+	$.plot.dateGenerator = dateGenerator;
+
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index cc172f82a3..4cc6f9414e 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -863,6 +863,12 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 	serie_types = serie_types.split(separator);
 	labels_long = labels_long.split(separator);
 	labels = labels.split(separator);
+	// XXX 1827
+	/* Translate datetime to utimestamp -> avoid convert datetime in server better...
+	$.each(labels, function (i,v) {
+		labels[i] = new Date(labels[i]).getTime();
+	});
+	*/
 	legend = legend.split(separator);
 	events = events.split(separator);
 	event_ids = event_ids.split(separator);
@@ -920,6 +926,11 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 			}
 
 			aux.push([i, v]);
+
+			// XXX 1827
+			/*
+			aux.push([labels[i], v]);
+			*/
 		});
 
 		switch (serie_types[i]) {
@@ -1559,7 +1570,12 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 				tickFormatter: xFormatter,
 				labelHeight: 50,
 				color: '',
-				font: font
+				font: font,
+			// XXX 1827
+			/*
+				mode: "time",
+				timeformat: "%Y/%m/%d %H:%M:%S",
+			*/
 			}],
 			yaxes: [{
 				tickFormatter: yFormatter,
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 2c77fdd812..8c27ba90a3 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -36,6 +36,8 @@ function include_javascript_dependencies_flot_graph($return = false) {
 			<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="' . ui_get_full_url($metaconsole_hack . '/include/graphs/flot/excanvas.js') . '"></script><![endif]-->
 			<script language="javascript" type="text/javascript" src="'.
 				ui_get_full_url($metaconsole_hack . '/include/graphs/flot/jquery.flot.min.js') .'"></script>
+			<script language="javascript" type="text/javascript" src="'.
+				ui_get_full_url($metaconsole_hack . '/include/graphs/flot/jquery.flot.time.js') .'"></script>
 			<script language="javascript" type="text/javascript" src="'.
 				ui_get_full_url($metaconsole_hack  . '/include/graphs/flot/jquery.flot.pie.js') .'"></script>
 			<script language="javascript" type="text/javascript" src="'.

From 63e5d23288ad5346f0bd9b4a966d5bec3cc52ad5 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 2 Feb 2018 12:25:23 +0100
Subject: [PATCH 002/146] change xasis to time

---
 .../include/graphs/flot/pandora.flot.js       | 95 ++++++++++++++-----
 1 file changed, 73 insertions(+), 22 deletions(-)

diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 15ee05e56d..c7731e4616 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -868,7 +868,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 	yellow_up, red_up, yellow_inverse, red_inverse,
 	series_suffix_str, dashboard, vconsole, xaxisname,background_color,legend_color,
 	short_data) {
-	
+
 	var threshold = true;
 	var thresholded = false;
 	font = font.split("/").pop().split(".").shift();
@@ -877,12 +877,12 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 	serie_types = serie_types.split(separator);
 	labels_long = labels_long.split(separator);
 	labels = labels.split(separator);
-	// XXX 1827
-	/* Translate datetime to utimestamp -> avoid convert datetime in server better...
+	//XXX 1827
+	//Translate datetime to utimestamp -> avoid convert datetime in server better...
 	$.each(labels, function (i,v) {
 		labels[i] = new Date(labels[i]).getTime();
 	});
-	*/
+
 	legend = legend.split(separator);
 	events = events.split(separator);
 	event_ids = event_ids.split(separator);
@@ -932,21 +932,20 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 	for (i = 0; i < values.length; i++) {
 		var serie = values[i].split(separator);
 		var aux = new Array();
+
 		$.each(serie, function(i, v) {
 			if(v < 0){
 				if(min_check > parseFloat(v)){
 					min_check = v;
 				}
 			}
-
-			aux.push([i, v]);
-
 			// XXX 1827
-			/*
+			//aux.push([i, v]);
 			aux.push([labels[i], v]);
-			*/
 		});
-
+		
+		//XXX
+		var time_format_y = labels[labels.length - 1] - labels[0];
 		switch (serie_types[i]) {
 			case 'area':
 				line_show = true;
@@ -1028,6 +1027,8 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		// Prepared to turn series with a checkbox
 		// showed[i] = true;
 	}
+console.log(data_base);
+	max_x = data_base[0]['data'][data_base[0]['data'].length -1][0];
 
 	if(min_check != 0){
 		min_check = min_check -5;
@@ -1579,17 +1580,19 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 				color: legend_color
 			},
 			xaxes: [{
+				/*
 				axisLabelFontSizePixels: font_size,
 				axisLabelUseCanvas: false,
 				tickFormatter: xFormatter,
 				labelHeight: 50,
 				color: '',
 				font: font,
+				*/
 			// XXX 1827
-			/*
+				axisLabelUseCanvas: false,
+				axisLabelFontSizePixels: font_size,
 				mode: "time",
-				timeformat: "%Y/%m/%d %H:%M:%S",
-			*/
+				tickFormatter: xFormatter,
 			}],
 			yaxes: [{
 				tickFormatter: yFormatter,
@@ -1674,7 +1677,10 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		if (menu == 0) {
 			return;
 		}
+		
+		//XXX
 		dataInSelection = ranges.xaxis.to - ranges.xaxis.from;
+		//time_format_y = dataInSelection;
 		dataInPlot = plot.getData()[0].data.length;
 
 		factor = dataInSelection / dataInPlot;
@@ -1686,7 +1692,8 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 				xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to},
 				xaxes: [ {
 						tickFormatter: xFormatter,
-						minTickSize: new_steps,
+						//XXX
+						//minTickSize: new_steps,
 						color: ''
 						} ],
 				legend: { show: false }
@@ -1931,11 +1938,50 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 
 	// Format functions
 	function xFormatter(v, axis) {
-		if (labels[v] == undefined) {
-			return '';
+		//XXX
+		/*
+			if ($period <= SECONDS_6HOURS) {
+				$time_format = 'H:i:s';
+			}
+			elseif ($period < SECONDS_1DAY) {
+				$time_format = 'H:i';
+			}
+			elseif ($period < SECONDS_15DAYS) {
+				$time_format = "M \nd H:i";
+			}
+			elseif ($period < SECONDS_1MONTH) {
+				$time_format = "M \nd H\h";
+			} 
+			elseif ($period < SECONDS_6MONTHS) {
+				$time_format = "M \nd H\h";
+			}
+			else {
+				$time_format = "Y M \nd H\h";
+			}	
+		*/
+
+		var d = new Date(v);
+		var result_date_format = 0;
+		
+		if(time_format_y > 86400000){ //DAY
+
+			result_date_format = 
+								d.getDate() + "/" +
+								(d.getMonth() + 1) + "/" + 
+								d.getFullYear() + "\n" + 
+								d.getHours() + ":" + 
+								d.getMinutes() + ":" + 
+								d.getSeconds(); //+  ":" + d.getMilliseconds();
 		}
-		extra_css = '';
-		return '<div class='+font+' style="font-size:'+font_size+'pt; margin-top:15px;'+extra_css+'">'+labels[v]+'</div>';
+		else{
+			result_date_format = 	
+								d.getHours() + ":" + 
+								d.getMinutes() + ":" + 
+								d.getSeconds(); //+  ":" + d.getMilliseconds();
+		}
+
+		//extra_css = '';
+		return '<div class='+font+' style="transform: rotate(-15deg); -ms-transform:rotate(-15deg); -moz-transform:rotate(-15deg); -webkit-transform:rotate(-15deg); -o-transform:rotate(-15deg); font-size:'+font_size+'pt; margin-top:15px;">'+result_date_format+'</div>';
 	}
 
 	function yFormatter(v, axis) {
@@ -2005,11 +2051,11 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 				thresholded = false;
 			}
 			else {
-				
 				var max_draw = plot.getAxes().yaxis.datamax;
 				// Recalculate the y axis
 				var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
 										red_threshold, extremes, red_up);
+
 				plot = $.plot($('#' + graph_id), data_base,
 				$.extend(true, {}, options, {
 					yaxis: {
@@ -2017,16 +2063,19 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 						min: y_recal.min
 					},
 					xaxis: {
+						mode:"time",
 						min: plot.getAxes().xaxis.min,
 						max: plot.getAxes().xaxis.max
 					}
 				}));
+
 				datas = add_threshold (data_base, threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
 										red_threshold, extremes, red_up);
+
 				thresholded = true;
 				
 			}
-			
+						
 			plot.setData(datas);
 			plot.draw();
 
@@ -2037,10 +2086,11 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 			// cancel the zooming
 			plot = $.plot($('#' + graph_id), data_base,
 				$.extend(true, {}, options, {
+					//XXX
 					xaxis: {max: max_x },
 					legend: { show: false }
 				}));
-
+			
 			$('#menu_cancelzoom_' + graph_id)
 				.attr('src', homeurl + '/images/zoom_cross.disabled.png');
 			overview.clearSelection();
@@ -2300,7 +2350,7 @@ function add_threshold (data_base, threshold_data, y_min, y_max,
 		if (/_down/.test(this.id)){
 			var end;
 			if (/critical/.test(this.id)) {
-				 end = red_threshold;
+				end = red_threshold;
 			} else {
 				end = extremes[this.id];
 			}
@@ -2327,6 +2377,7 @@ function add_threshold (data_base, threshold_data, y_min, y_max,
 	});
 	
 	return datas;
+	
 }
 
 function reduceText (text, maxLength) {

From af9e11ffca943c3117ea50fb9e91b0dc1f9e5a13 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 8 Feb 2018 15:47:12 +0100
Subject: [PATCH 003/146] reconfigure charts

---
 pandora_console/include/functions_db.php      |   4 +-
 pandora_console/include/functions_graph.php   | 104 ++++++++++++++++--
 .../include/graphs/flot/pandora.flot.js       |  57 +++++-----
 3 files changed, 124 insertions(+), 41 deletions(-)

diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 357835d822..e5d507a11b 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -777,6 +777,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 				$tmp_data["datos"]  =  $last_inserted_value;
 				// debug purpose
 				//$tmp_data["obs"] = "virtual data (raw)";
+				$tmp_data["type"] = ($current_timestamp == $tstart || ($current_timestamp == $tend)?0:1); // virtual data
 
 				//Add order to avoid usort missorder in same utimestamp data cells
 				$tmp_data["order"] = 1;
@@ -785,6 +786,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 
 			$tmp_data["utimestamp"] = $current_raw_data["utimestamp"];
 			$tmp_data["datos"]      = $current_raw_data["datos"];
+			$tmp_data["type"] = 0; // real data
 			// debug purpose
 			//$tmp_data["obs"] = "real data";
 			//Add order to avoid usort missorder in same utimestamp data cells
@@ -883,7 +885,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 		if (count($return[$pool_id]['data']) == 0) {
 			//insert first slice data
 			$tmp_data["utimestamp"] = $current_timestamp;
-			$tmp_data["datos"]  =  $last_inserted_value;
+			$tmp_data["datos"] =  $last_inserted_value;
 			// debug purpose
 			//$tmp_data["obs"] = "virtual data (empty)";
 			array_push($return[$pool_id]["data"], $tmp_data);
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 7265712868..4156dca4ed 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -915,15 +915,77 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	$dashboard = false, $vconsole = false, $type_graph = 'area', $fullscale = false,
 	$id_widget_dashboard = false,$force_interval = 0,$time_interval = 300,
 	$max_only = 0, $min_only = 0) {
-				
-				
+	
 	global $config;
 	global $graphic_type;
 
 	$flash_chart = $config['flash_charts'];
 	
-	enterprise_include_once("include/functions_reporting.php");
+	//XXX aqui empieza la obtencion de datos:
+	//Es infernal la cantidad de parametros que se le mandan pasamos a un array para simplificar este proceso:
 	
+	//date start final period
+	$date_array = array();
+	$date_array["start_date"] = $date - $period;
+	$date_array["final_date"] = $date;
+	$date_array["period"]     = $period;
+
+	//show elements in the graph
+	$show_elements_graph = array();
+	$show_elements_graph['show_events']  = $show_events;
+	$show_elements_graph['show_alerts']  = $show_alerts;
+	$show_elements_graph['show_unknown'] = $show_unknown;
+	$show_elements_graph['avg_only']     = $avg_only;
+	$show_elements_graph['show_title']   = $show_title;
+	$show_elements_graph['menu']         = $menu;
+	$show_elements_graph['percentil']    = $percentil;
+	$show_elements_graph['projection']   = $projection;
+	$show_elements_graph['adapt_key']    = $adapt_key;
+	$show_elements_graph['compare']      = $compare;
+	$show_elements_graph['dashboard']    = $dashboard;
+	$show_elements_graph['vconsole']     = $vconsole;
+	$show_elements_graph['pure']         = $pure;
+	$show_elements_graph['baseline']     = $baseline;
+	$show_elements_graph['only_image']   = $only_image;
+	$show_elements_graph['return_data']  = $return_data;
+	$show_elements_graph['id_widget']    = $id_widget_dashboard;
+
+	//format of the graph
+	$format_graph = array();
+	$format_graph['width']      = $width;
+	$format_graph['height']     = $height;
+	$format_graph['type_graph'] = $type_graph;
+	$format_graph['fullscale']  = $fullscale;
+	$format_graph['unit_name']  = $unit_name;
+	$format_graph['unit']       = $unit;
+	$format_graph['title']      = $title;
+	$format_graph['homeurl']    = $homeurl;
+	$format_graph['ttl']        = $ttl;
+	$format_graph['background'] = $backgroundColor;
+
+	//exception to change the interval of the graph and show media min max @enriquecd
+	$exception_interval_graph['force_interval'] = $force_interval;
+	$exception_interval_graph['time_interval']  = $time_interval;
+	$exception_interval_graph['max_only']       = $max_only;
+	$exception_interval_graph['min_only']       = $min_only;
+	
+	/*
+	html_debug_print('+++++++++++++++++Parámetros Que recibe la funcion++++++++++++++++++++++');
+	html_debug_print('id_agente_modulo: ' . $agent_module_id);
+	html_debug_print($date_array);
+	html_debug_print($show_elements_graph);
+	html_debug_print($format_graph);
+	html_debug_print($exception_interval_graph);
+	html_debug_print('+++++++++++++FIN Parámetros Que recibe la funcion++++++++++++++++++++++');
+	*/
+
+
+
+
+
+
+	enterprise_include_once("include/functions_reporting.php");
+
 	global $chart;
 	global $color;
 	global $color_prev;
@@ -960,7 +1022,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 			case 'overlapped':
 				// Store the chart calculated deleting index,
 				// because will be over the current period
-				$chart_prev = array_values($chart);
+				$chart_prev = $chart;
 				$legend_prev = $legend;
 				$series_type_prev = $series_type;
 				$color_prev = $color;
@@ -986,6 +1048,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 		return $data_returned;
 	}
 	if ($compare === 'overlapped') {
+		/*
 		$i = 0;
 		foreach ($chart as $k=>$v) {
 			if (!isset($chart_prev[$i])) {
@@ -994,7 +1057,23 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 			$chart[$k] = array_merge($v,$chart_prev[$i]);
 			$i++;
 		}
+		*/
+		foreach ($chart_prev as $k => $v) {
+			$chart[$k+$period]['sum2'] = $v['sum2'];
+			//unset($chart[$k]);
+		}
 		
+		/*
+		$chart["1517834070"]["sum2"] = "5";
+		$chart["1517834075"]["sum2"] = "6";
+		$chart["1517834080"]["sum2"] = "7";
+		$chart["1517834085"]["sum2"] = "8";
+		
+		$chart["1517834088"]["sum2"] = "3";
+		*/
+		ksort($chart);
+
+		//html_debug_print($chart);
 		$legend = array_merge($legend, $legend_prev);
 		$color = array_merge($color, $color_prev);
 	}
@@ -4592,6 +4671,7 @@ function fullscale_data ( &$chart_data, &$chart_extra_data, &$long_index,
 	$data_uncompress = db_uncompress_module_data($agent_module_id, $datelimit, $date);
 
 	$chart_data = array();
+	$flag_unknown = 0;
 	
 	$min_value = PHP_INT_MAX-1;
 	$max_value = PHP_INT_MIN+1;
@@ -4600,10 +4680,13 @@ function fullscale_data ( &$chart_data, &$chart_extra_data, &$long_index,
 	
 	$i=0;
 	$current_event = $events[0];
-	$prueba = array();
+	
 	foreach ($data_uncompress as $k) {
 		foreach ($k["data"] as $v) {
-			$real_date = date("Y M d H:i:s", $v['utimestamp']);
+			if (isset($v["type"]) && $v["type"] == 1) { # skip unnecesary virtual data
+				continue;
+			}
+			$real_date = $v['utimestamp'];
 
 			if(!$flash_chart){
 				$real_date = date("Y/M/d", $v['utimestamp']);
@@ -4614,7 +4697,7 @@ function fullscale_data ( &$chart_data, &$chart_extra_data, &$long_index,
 			$event_ids = array();
 			$alert_ids = array();
 			while (isset($current_event) && ($v['utimestamp'] >= $current_event["utimestamp"]) ) {
-				$event_date = date("Y M d H:i:s", $current_event['utimestamp']);
+				$event_date = $current_event['utimestamp'];
 				if(!$flash_chart){
 					$event_date = date("Y/M/d", $current_event['utimestamp']);
 					$event_date .= "\n";
@@ -4716,12 +4799,17 @@ function fullscale_data ( &$chart_data, &$chart_extra_data, &$long_index,
 					$chart_data[$real_date]["unknown" . $series_suffix] = NULL;
 					$previous_unknown = NULL;
 				}
-			}	
+			}
+			$last_data = $v["datos"];
 		}
 	}
 	$series_type['event'.$series_suffix] = 'points';
 	$series_type['alert'.$series_suffix] = 'points';
 	$series_type['unknown'.$series_suffix] = 'unknown';
+
+	// Add missed last data
+	$chart_data[$date]["sum" . $series_suffix] = $last_data;
+
 	if($boolean_graph){
 		$series_type['sum'.$series_suffix] = 'boolean';
 	}
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index c7731e4616..072f07167a 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -880,7 +880,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 	//XXX 1827
 	//Translate datetime to utimestamp -> avoid convert datetime in server better...
 	$.each(labels, function (i,v) {
-		labels[i] = new Date(labels[i]).getTime();
+		labels[i] = labels[i] * 1000;
 	});
 
 	legend = legend.split(separator);
@@ -949,8 +949,8 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		switch (serie_types[i]) {
 			case 'area':
 				line_show = true;
-				points_show = false;
-				filled = true;
+				points_show = false; // XXX - false
+				filled = 0.2;
 				steps_chart = false;
 				break;
 			case 'line':
@@ -989,20 +989,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		var normal = '#0f0';
 		var warning = '#ff0';
 		var critical = '#f00';
-
-		// setup background areas
-		//vnormal_max = vwarning_min - 1;
-
-		var markings = null;
-
-		// Fill the grid background with weak threshold colors
-		//~ markings = [
-			//~ { color: normalw, yaxis: { from: -1,to: vnormal_max } },
-			//~ { color: warningw, yaxis: { from: vwarning_min, to: vwarning_max } },
-			//~ { color: criticalw, yaxis: { from: vcritical_min } },
-			//~ { color: criticalw, yaxis: { to: -1 } }
-		//~ ];
-		
+	
 		var lineWidth = $('#hidden-line_width_graph').val() || 1;
 
 		// Data
@@ -1015,9 +1002,6 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 			lines: {
 				show: line_show,
 				fill: filled,
-				fillColor: {
-					colors: [ { opacity: 0.5 }, { opacity: 1 } ]
-				},
 				lineWidth: lineWidth,
 				steps: steps_chart
 			},
@@ -1027,7 +1011,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		// Prepared to turn series with a checkbox
 		// showed[i] = true;
 	}
-console.log(data_base);
+//console.log(data_base);
 	max_x = data_base[0]['data'][data_base[0]['data'].length -1][0];
 
 	if(min_check != 0){
@@ -1576,7 +1560,6 @@ console.log(data_base);
 				borderWidth:1,
 				borderColor: '#C1C1C1',
 				tickColor: background_color,
-				markings: markings,
 				color: legend_color
 			},
 			xaxes: [{
@@ -1593,6 +1576,7 @@ console.log(data_base);
 				axisLabelFontSizePixels: font_size,
 				mode: "time",
 				tickFormatter: xFormatter,
+				// timeformat: "%Y/%m/%d %H:%M:%S",
 			}],
 			yaxes: [{
 				tickFormatter: yFormatter,
@@ -1799,9 +1783,18 @@ console.log(data_base);
 					$('#timestamp_'+graph_id).text(labels[j] + ' (' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + ')');
 				}
 				else {
-					$('#timestamp_'+graph_id).text(labels_long[j]);
-				}
+					var date_format = new Date(labels_long[j]*1000);
 
+					date_format = 
+								date_format.getDate() + "/" +
+								(date_format.getMonth() + 1) + "/" + 
+								date_format.getFullYear() + "\n" + 
+								date_format.getHours() + ":" + 
+								date_format.getMinutes() + ":" + 
+								date_format.getSeconds();
+
+					$('#timestamp_'+graph_id).text(date_format);
+				}
 				//$('#timestamp_'+graph_id).css('top', plot.offset().top-$('#timestamp_'+graph_id).height()*1.5);
 
 				var timesize = $('#timestamp_'+graph_id).width();
@@ -1963,23 +1956,23 @@ console.log(data_base);
 		var d = new Date(v);
 		var result_date_format = 0;
 		
-		if(time_format_y > 86400000){ //DAY
+	//	if(time_format_y > 86400000){ //DAY
 
 			result_date_format = 
-								d.getDate() + "/" +
-								(d.getMonth() + 1) + "/" + 
+								(d.getDate() <10?'0':'') + d.getDate() + "/" +
+								(d.getMonth()<9?'0':'') + (d.getMonth() + 1) + "/" + 
 								d.getFullYear() + "\n" + 
-								d.getHours() + ":" + 
-								d.getMinutes() + ":" + 
-								d.getSeconds(); //+  ":" + d.getMilliseconds();
-		}
+								(d.getHours()<10?'0':'') + d.getHours() + ":" + 
+								(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + 
+								(d.getSeconds()<10?'0':'') + d.getSeconds(); //+  ":" + d.getMilliseconds();
+	/*	}
 		else{
 			result_date_format = 	
 								d.getHours() + ":" + 
 								d.getMinutes() + ":" + 
 								d.getSeconds(); //+  ":" + d.getMilliseconds();
 		}
-
+	*/
 		//extra_css = '';
 		return '<div class='+font+' style="transform: rotate(-15deg); -ms-transform:rotate(-15deg); -moz-transform:rotate(-15deg); -webkit-transform:rotate(-15deg); -o-transform:rotate(-15deg); font-size:'+font_size+'pt; margin-top:15px;">'+result_date_format+'</div>';
 	}

From 7bc9a6cfb5829df33d4bcd1a38d5f976b7e14d40 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 12 Feb 2018 13:29:25 +0100
Subject: [PATCH 004/146] graph

---
 pandora_console/include/functions_graph.php | 27 +++++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 3eac34d8b1..f76cb47079 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -533,6 +533,15 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
 }
 
 
+function grafico_modulo_sparse_data_new($agent_module_id, $date_array,
+										$show_elements_graph, $format_graph,
+										$exception_interval_graph ) {
+	global $config;
+	if($date_array){
+
+	}
+}
+
 function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
 	$width, $height , $title = '', $unit_name = null,
 	$show_alerts = false, $avg_only = 0, $date = 0, $unit = '',
@@ -920,10 +929,11 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	global $graphic_type;
 
 	$flash_chart = $config['flash_charts'];
-	
+
+if($flash_chart){
 	//XXX aqui empieza la obtencion de datos:
 	//Es infernal la cantidad de parametros que se le mandan pasamos a un array para simplificar este proceso:
-	
+
 	//date start final period
 	$date_array = array();
 	$date_array["start_date"] = $date - $period;
@@ -969,7 +979,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	$exception_interval_graph['max_only']       = $max_only;
 	$exception_interval_graph['min_only']       = $min_only;
 	
-	/*
+	
 	html_debug_print('+++++++++++++++++Parámetros Que recibe la funcion++++++++++++++++++++++');
 	html_debug_print('id_agente_modulo: ' . $agent_module_id);
 	html_debug_print($date_array);
@@ -977,11 +987,12 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	html_debug_print($format_graph);
 	html_debug_print($exception_interval_graph);
 	html_debug_print('+++++++++++++FIN Parámetros Que recibe la funcion++++++++++++++++++++++');
-	*/
-
-
-
+	
+	grafico_modulo_sparse_data_new( $agent_module_id, $date_array,
+									$show_elements_graph, $format_graph,
+									$exception_interval_graph );
 
+}
 
 
 	enterprise_include_once("include/functions_reporting.php");
@@ -1077,7 +1088,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 		$legend = array_merge($legend, $legend_prev);
 		$color = array_merge($color, $color_prev);
 	}
-	
+
 	if ($only_image) {
 		$flash_chart = false;
 	}

From b6798bf31c9d65f64d68ded5c36b1f1a6deb9890 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 16 Feb 2018 13:41:31 +0100
Subject: [PATCH 005/146] update flot.js

---
 pandora_console/include/functions.php         |  291 +
 pandora_console/include/functions_db.php      |    2 +-
 pandora_console/include/functions_graph.php   |  418 +-
 pandora_console/include/graphs/fgraph.php     |    1 -
 .../include/graphs/flot/excanvas.js           |  920 +-
 .../include/graphs/flot/excanvas.min.js       |    1 +
 .../graphs/flot/jquery.colorhelpers.js        |  180 +
 .../graphs/flot/jquery.colorhelpers.min.js    |    1 +
 .../graphs/flot/jquery.flot.axislabels.js     |  538 +-
 .../include/graphs/flot/jquery.flot.canvas.js |  345 +
 .../graphs/flot/jquery.flot.canvas.min.js     |    7 +
 .../graphs/flot/jquery.flot.categories.js     |  190 +
 .../graphs/flot/jquery.flot.categories.min.js |    7 +
 .../graphs/flot/jquery.flot.crosshair.js      |  176 +
 .../graphs/flot/jquery.flot.crosshair.min.js  |    8 +-
 .../graphs/flot/jquery.flot.errorbars.js      |  353 +
 .../graphs/flot/jquery.flot.errorbars.min.js  |    7 +
 .../graphs/flot/jquery.flot.fillbetween.js    |  226 +
 .../flot/jquery.flot.fillbetween.min.js       |    7 +
 .../include/graphs/flot/jquery.flot.image.js  |  241 +
 .../graphs/flot/jquery.flot.image.min.js      |    7 +
 .../include/graphs/flot/jquery.flot.js        | 3168 ++++++
 .../include/graphs/flot/jquery.flot.min.js    |   14 +-
 .../graphs/flot/jquery.flot.navigate.js       |  346 +
 .../graphs/flot/jquery.flot.navigate.min.js   |    7 +
 .../include/graphs/flot/jquery.flot.pie.js    | 1576 +--
 .../graphs/flot/jquery.flot.pie.min.js        |    7 +
 .../include/graphs/flot/jquery.flot.resize.js |   59 +
 .../graphs/flot/jquery.flot.resize.min.js     |    8 +-
 .../graphs/flot/jquery.flot.selection.js      |  360 +
 .../graphs/flot/jquery.flot.selection.min.js  |    8 +-
 .../include/graphs/flot/jquery.flot.stack.js  |  188 +
 .../graphs/flot/jquery.flot.stack.min.js      |    8 +-
 .../include/graphs/flot/jquery.flot.symbol.js |   71 +
 .../graphs/flot/jquery.flot.symbol.min.js     |    8 +-
 .../graphs/flot/jquery.flot.threshold.js      |  106 +-
 .../graphs/flot/jquery.flot.threshold.min.js  |    7 +
 .../graphs/flot/jquery.flot.time.min.js       |    7 +
 pandora_console/include/graphs/flot/jquery.js | 9472 +++++++++++++++++
 .../include/graphs/flot/jquery.min.js         |    5 +
 .../include/graphs/flot/pandora.flot.js       | 1220 ++-
 .../include/graphs/functions_flot.php         |  306 +-
 42 files changed, 19679 insertions(+), 1198 deletions(-)
 create mode 100644 pandora_console/include/graphs/flot/excanvas.min.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.colorhelpers.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.colorhelpers.min.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.canvas.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.canvas.min.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.categories.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.categories.min.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.crosshair.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.errorbars.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.errorbars.min.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.fillbetween.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.fillbetween.min.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.image.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.image.min.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.navigate.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.navigate.min.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.pie.min.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.resize.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.selection.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.stack.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.symbol.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.threshold.min.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.time.min.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.js
 create mode 100644 pandora_console/include/graphs/flot/jquery.min.js

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 2557ae3db2..7f70444ec3 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2791,4 +2791,295 @@ function validate_address($address){
 	}
 	return true;
 }
+
+function color_graph_array($series_suffix){
+	global $config;
+
+	//////////////////////////////////////////////////
+	// Color commented not to restrict serie colors //
+	//////////////////////////////////////////////////
+	$color['event' . $series_suffix] =
+		array(	'border' => '#ff0000',
+				'color' => '#ff0000',
+				'alpha' => CHART_DEFAULT_ALPHA
+		);
+	
+	$color['alert' . $series_suffix] =
+		array(	'border' => '#ff7f00',
+				'color' => '#ff7f00',
+				'alpha' => CHART_DEFAULT_ALPHA
+		);
+
+	$color['unknown' . $series_suffix] =
+		array(	'border' => '#999999',
+				'color' => '#999999',
+				'alpha' => CHART_DEFAULT_ALPHA
+		);
+	
+	$color['no_data'.$series_suffix] =
+		array(	'border' => '#000000',
+				'color' => '#f2c40e',
+				'alpha' => CHART_DEFAULT_ALPHA
+			);
+	
+	$color['max'.$series_suffix] =
+		array(	'border' => '#000000',
+				'color' => $config['graph_color3'],
+				'alpha' => CHART_DEFAULT_ALPHA
+			);
+	
+	$color['sum'.$series_suffix] =
+		array(	'border' => '#000000',
+				'color' => $config['graph_color2'],
+				'alpha' => CHART_DEFAULT_ALPHA
+			);
+	
+	$color['min'.$series_suffix] =
+		array(	'border' => '#000000',
+				'color' => $config['graph_color1'],
+				'alpha' => CHART_DEFAULT_ALPHA
+			);
+
+	$color['unit'.$series_suffix] =
+		array(	'border' => null,
+				'color' => '#0097BC',
+				'alpha' => 10
+			);
+	
+	$color['percentil'.$series_suffix] =
+		array(	'border' => '#000000',
+				'color' => '#0097BC',
+				'alpha' => CHART_DEFAULT_ALPHA
+			);
+	
+	return $color;
+}
+
+function legend_graph_array(
+	$max, $min, $avg,
+	$series_suffix,
+	$series_suffix_str,
+	$format_graph,
+	$show_elements_graph,
+	$percentil_value){
+
+	$unit = $format_graph['unit'];
+
+	if ($show_elements_graph['show_events']) {
+		$legend['event'.$series_suffix_str] = __('Events').$series_suffix_str;
+	}
+	if ($show_elements_graph['show_alerts']) {
+		$legend['alert'.$series_suffix] = __('Alerts').$series_suffix_str;
+	}
+
+	if ($show_elements_graph['vconsole']) {
+		$legend['sum'.$series_suffix] = 
+			__('Last') . ': ' . 
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['last'], 
+					$config['graph_precision']
+				)
+			) . ($unit ? ' ' . $unit : '') . ' ; '. 
+			__('Avg') . ': ' . 
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['avg'],
+					$config['graph_precision']
+					)
+				) . ($unit ? ' ' . $unit : ''
+			);
+	}
+	else if (	$show_elements_graph['dashboard'] && 
+				!$show_elements_graph['avg_only']	) {
+		
+		$legend['max'.$series_suffix] = 
+			__('Max').$series_suffix_str.': '.__('Avg').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['max']['avg'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Max').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['max']['max'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Min').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['max']['min'],
+					$config['graph_precision']
+				)
+			).' '.$unit;
+			
+		$legend['sum'.$series_suffix] = 
+			__('Avg').$series_suffix_str.': '.__('Avg').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['avg'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Max').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['max'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Min').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['min'],
+					$config['graph_precision']
+				)
+			).' '.$unit;
+
+		$legend['min'.$series_suffix] = 
+			__('Min').$series_suffix_str.': '.__('Avg').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['min']['avg'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Max').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['min']['max'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Min').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['min']['min'],
+					$config['graph_precision']
+				)
+			).' '.$unit;
+	}
+	else if ($show_elements_graph['dashboard']) {
+		$legend['sum'.$series_suffix] =
+			__('Last') . ': ' .
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['last'],
+					$config['graph_precision']
+				)
+			) . ($unit ? ' ' . $unit : '') . ' ; '.
+			__('Avg') . ': ' . 
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['avg'],
+					$config['graph_precision']
+				)
+			) . ($unit ? ' ' . $unit : '');
+	}
+	else if (!$show_elements_graph['avg_only'] && 
+			!$show_elements_graph['fullscale']) {
+		
+		$legend['max'.$series_suffix] = 
+			__('Max').$series_suffix_str.': '.__('Avg').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['max']['avg'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Max').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['max']['max'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Min').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['max']['min'],
+					$config['graph_precision']
+				)
+			).' '.$unit;
+		
+		$legend['sum'.$series_suffix] = 
+			__('Avg').$series_suffix_str.': '.
+			__('Avg').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['avg'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Max').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['max'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Min').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['min'],
+					$config['graph_precision']
+				)
+			).' '.$unit;
+		
+		$legend['min'.$series_suffix] =
+			__('Min').$series_suffix_str.': '.
+			__('Avg').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['min']['avg'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Max').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['min']['max'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Min').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['min']['min'],
+					$config['graph_precision']
+				)
+			).' '.$unit;
+	}
+	else if ($show_elements_graph['fullscale']){
+		$legend['sum'.$series_suffix] = 
+			__('Data').$series_suffix_str.': ';
+	}
+	else {
+		$legend['sum'.$series_suffix] = 
+			__('Avg').$series_suffix_str.': '.
+			__('Avg').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['avg'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.
+			__('Max').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['max'],
+					$config['graph_precision']
+				)
+			).' '.$unit.' ; '.__('Min').': '.
+			remove_right_zeros(
+				number_format(
+					$graph_stats['sum']['min'],
+					$config['graph_precision']
+				)
+			).' '.$unit;
+	}
+
+	if ($show_elements_graph['show_unknown']) {
+		$legend['unknown'.$series_suffix] = 
+			__('Unknown').$series_suffix_str;	
+	}
+
+	if (!is_null($show_elements_graph['percentil']) && 
+		$show_elements_graph['percentil']) {
+		$legend['percentil'.$series_suffix] =
+			__('Percentile %dº', $percentil) . $series_suffix_str . " (" . $percentil_value . " " . $unit . ") ";
+	}
+	return $legend;
+}
 ?>
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index e5d507a11b..b92a9fbcc5 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -853,7 +853,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 					$tmp_data["utimestamp"] = $current_unknown["time_to"];
 					//Add order to avoid usort missorder in same utimestamp data cells
 					$tmp_data["order"] = 2;
-					$i = count($data_slices) - 1;
+					$i = count($data_slices);
 					while ($i >= 0) {
 						if($data_slices[$i]['utimestamp'] <= $current_unknown["time_to"]){
 							$tmp_data["datos"] = 
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index f76cb47079..fb80f34ec8 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -395,7 +395,8 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
 			html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
 		if (!$projection) {
 			if (!$fullscale) {
-				$timestamp = $timestamp_short;
+				//XXXXXX
+				//$timestamp = $timestamp_short;
 			}
 		}
 		
@@ -533,13 +534,162 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
 }
 
 
-function grafico_modulo_sparse_data_new($agent_module_id, $date_array,
-										$show_elements_graph, $format_graph,
-										$exception_interval_graph ) {
+function grafico_modulo_sparse_data_new(
+	$agent_module_id, $date_array, 
+	$data_module_graph, $show_elements_graph, 
+	$format_graph, $exception_interval_graph ) {
+
 	global $config;
-	if($date_array){
+	global $array_data;
+	global $caption;
+	global $color;
+	global $legend;
+	global $series_type;
+
+	$series_suffix = 1;
+	
+	if($show_elements_graph['fullscale']){
+		$array_data = fullscale_data_new(
+			$agent_module_id, 
+			$date_array, 
+			$show_elements_graph['show_unknown'],
+			$show_elements_graph['percentil']
+		);
+	}
+	else{
 
 	}
+
+	if($show_elements_graph['percentil']){
+		$percentil_value = $array_data['percentil' . $series_suffix]['data'][0][0];
+	}
+	else{
+		$percentil_value = 0;
+	}
+
+	$events = array();
+	if(isset($array_data['sum' . $series_suffix]['max'])){
+		$max = $array_data['sum'. $series_suffix]['max'];
+		$min = $array_data['sum'. $series_suffix]['min'];
+		$avg = $array_data['sum'. $series_suffix]['avg'];
+	}
+
+	if(	$show_elements_graph['show_unknown'] &&
+		isset($array_data['unknown' . $series_suffix]) &&
+		is_array($array_data['unknown' . $series_suffix]['data']) ){
+		foreach ($array_data['unknown' . $series_suffix]['data'] as $key => $s_date) {
+			if ($s_date[1] == 1) {
+				$array_data['unknown' . $series_suffix]['data'][$key] = array($s_date[0], $max * 1.05);
+			}
+		}
+	}
+
+	if ($show_elements_graph['show_events']  || 
+		$show_elements_graph['show_alerts'] ) {
+		
+		$events = db_get_all_rows_filter (
+			'tevento',
+			array ('id_agentmodule' => $agent_module_id,
+					"utimestamp > " . $date_array['start_date'],
+					"utimestamp < " . $date_array['final_date'],
+					'order' => 'utimestamp ASC'
+				),
+			false, 
+			'AND',
+			$data_module_graph['history_db']
+		);
+
+		$alerts_array = array();
+		$events_array = array();
+
+		if($events && is_array($events)){
+			$i=0;
+			foreach ($events as $k => $v) {
+				if (strpos($v["event_type"], "alert") !== false){
+					$alerts_array['data'][$i] = array( ($v['utimestamp']*1000) , $max * 1.10);
+				}
+				else{
+					$events_array['data'][$i] = array( ($v['utimestamp']*1000) , $max * 1.2);
+				}
+				$i++;
+			}
+		}
+
+
+		/*
+		// Get the last event after inverval to know if graph start on unknown
+		$prev_event = db_get_row_filter (
+			'tevento',
+			array ('id_agentmodule' => $agent_module_id,
+				"utimestamp <= $datelimit",
+				'order' => 'utimestamp DESC'
+			),
+			false,
+			'AND',
+			$search_in_history_db	
+		);
+		*/
+	}
+
+	
+	
+	if($show_elements_graph['show_events']){
+		$array_data['event' . $series_suffix] = $events_array;
+	}
+
+	if($show_elements_graph['show_alerts']){
+		$array_data['alert' . $series_suffix] = $alerts_array;
+	}
+
+	if ($show_elements_graph['return_data'] == 1) {
+		return $array_data;
+	}
+	
+	// Only show caption if graph is not small
+	if ($width > MIN_WIDTH_CAPTION && $height > MIN_HEIGHT){
+		//Flash chart
+		$caption =
+			__('Max. Value')   . $series_suffix_str . ': ' . $max . '    ' .
+			__('Avg. Value')   . $series_suffix_str . ': ' . $avg . '    ' .
+			__('Min. Value')   . $series_suffix_str . ': ' . $min . '    ' .
+			__('Units. Value') . $series_suffix_str . ': ' . $format_graph['unit'];
+	}
+	else{
+		$caption = array();
+	}
+
+	//$graph_stats = get_statwin_graph_statistics($chart, $series_suffix);
+
+
+
+	$color = color_graph_array($series_suffix);
+
+	foreach ($color as $k => $v) {
+		if(is_array($array_data[$k])){
+			$array_data[$k]['color'] = $v['color'];
+		}
+	}
+
+	$legend = legend_graph_array(
+		$max, $min, $avg,
+		$series_suffix,
+		$series_suffix_str,
+		$format_graph,
+		$show_elements_graph,
+		$percentil_value
+	);
+
+	$series_type['event'.$series_suffix] = 'points';
+	$series_type['alert'.$series_suffix] = 'points';
+	$series_type['unknown'.$series_suffix] = 'unknown';
+	if($boolean_graph){
+		$series_type['sum'.$series_suffix] = 'boolean';
+	}
+	else{
+		$series_type['sum'.$series_suffix] = 'area';
+	}
+	$series_type['percentil' . $series_suffix] = 'line';
+	
 }
 
 function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
@@ -780,6 +930,7 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
 	}
 	
 	$graph_stats = get_statwin_graph_statistics($chart, $series_suffix);
+	
 	// Fix event and alert scale
 	if ($max_value > 0) {
 		$event_max = 2 + (float)$max_value * 1.05;
@@ -817,40 +968,8 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
 	else
 		$caption = array();
 	
-	///////
-	// Color commented not to restrict serie colors
-	if ($show_events) {
-		$color['event' . $series_suffix] =
-			array('border' => '#ff0000', 'color' => '#ff0000',
-				'alpha' => CHART_DEFAULT_ALPHA);
-	}
-	if ($show_alerts) {
-		$color['alert' . $series_suffix] =
-			array('border' => '#ff7f00', 'color' => '#ff7f00',
-				'alpha' => CHART_DEFAULT_ALPHA);
-	}
-	$color['no_data'.$series_suffix] = array(
-		'border' => '#000000', 'color' => '#f2c40e',
-		'alpha' => CHART_DEFAULT_ALPHA);
-	if ($show_unknown) {
-		$color['unknown' . $series_suffix] =
-			array('border' => '#999999', 'color' => '#999999',
-				'alpha' => CHART_DEFAULT_ALPHA);
-	}
-	$color['max'.$series_suffix] = array(
-		'border' => '#000000', 'color' => $config['graph_color3'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color['sum'.$series_suffix] = array(
-		'border' => '#000000', 'color' => $config['graph_color2'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color['min'.$series_suffix] = array(
-		'border' => '#000000', 'color' => $config['graph_color1'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-
-	$color['unit'.$series_suffix] = array('border' => null, 'color' => '#0097BC', 'alpha' => 10);		
-	if(modules_is_unit_macro($unit)){
-		$unit = "";		
-	}
+	$color = color_graph_array($series_suffix);
+	
 	if ($show_events) {
 		$legend['event'.$series_suffix_str] = __('Events').$series_suffix_str;
 		$chart_extra_data['legend_events'] = $legend['event'.$series_suffix_str];
@@ -899,7 +1018,7 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
 		$legend['percentil'.$series_suffix] = __('Percentile %dº', $percentil)  .$series_suffix_str . " (" . $percentil_value . " " . $unit . ") ";
 		$chart_extra_data['legend_percentil'] = $legend['percentil'.$series_suffix_str];
 	}
-	
+
 	if($force_interval){
 		$legend = array();
 		if($avg_only){
@@ -927,25 +1046,67 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	
 	global $config;
 	global $graphic_type;
-
+	
 	$flash_chart = $config['flash_charts'];
 
-if($flash_chart){
+//XXXX
+$entra_por = 1;
+if($flash_chart && $entra_por){
+	
+	global $array_data;
+	global $caption;
+	global $color;
+	global $legend;
+	global $series_type;
+
+	$array_data = array();
+	$caption = array();
+	$color = array();
+	$legend = array();
+	$series_type = array();
+	
 	//XXX aqui empieza la obtencion de datos:
 	//Es infernal la cantidad de parametros que se le mandan pasamos a un array para simplificar este proceso:
 
 	//date start final period
+	if($date == 0){
+		$date = get_system_time();
+	}
+
 	$date_array = array();
-	$date_array["start_date"] = $date - $period;
-	$date_array["final_date"] = $date;
 	$date_array["period"]     = $period;
+	$date_array["final_date"] = $date;
+	$date_array["start_date"] = $date - $period;
+
+
+	$module_data = db_get_row_sql ('SELECT * FROM tagente_modulo WHERE id_agente_modulo = ' . $agent_module_id);
+
+	$data_module_graph = array();
+	$data_module_graph['history_db']     = db_search_in_history_db($date_array["start_date"]);
+	$data_module_graph['agent_name']     = modules_get_agentmodule_agent_name ($agent_module_id);
+	$data_module_graph['agent_id']       = $module_data['id_agente']; 
+	$data_module_graph['module_name']    = $module_data['nombre'];
+	$data_module_graph['id_module_type'] = $module_data['id_tipo_modulo']; 
+	$data_module_graph['module_type']    = modules_get_moduletype_name ($data_module_graph['id_module_type']);
+	$data_module_graph['uncompressed']   = is_module_uncompressed ($data_module_graph['module_type']);
+	$data_module_graph['w_min']    		 = $module_data['min_warning']; 
+	$data_module_graph['w_max']   		 = $module_data['max_warning'];
+	$data_module_graph['w_inv']    		 = $module_data['warning_inverse'];
+	$data_module_graph['c_min']    		 = $module_data['min_critical'];
+	$data_module_graph['c_max']    		 = $module_data['max_critical'];
+	$data_module_graph['c_inv']    		 = $module_data['critical_inverse'];
 
 	//show elements in the graph
+	if ($vconsole){
+		$menu = false;
+	}
+
 	$show_elements_graph = array();
 	$show_elements_graph['show_events']  = $show_events;
 	$show_elements_graph['show_alerts']  = $show_alerts;
 	$show_elements_graph['show_unknown'] = $show_unknown;
 	$show_elements_graph['avg_only']     = $avg_only;
+	$show_elements_graph['fullscale']    = $fullscale;
 	$show_elements_graph['show_title']   = $show_title;
 	$show_elements_graph['menu']         = $menu;
 	$show_elements_graph['percentil']    = $percentil;
@@ -961,17 +1122,34 @@ if($flash_chart){
 	$show_elements_graph['id_widget']    = $id_widget_dashboard;
 
 	//format of the graph
+	if (empty($unit)) {
+		$unit = $module_data['unit'];
+		if(modules_is_unit_macro($unit)){
+			$unit = "";
+		}
+	}
+
+	// ATTENTION: The min size is in constants.php
+	// It's not the same minsize for all graphs, but we are choosed a prudent minsize for all
+	if ($height <= CHART_DEFAULT_HEIGHT) {
+		$height = CHART_DEFAULT_HEIGHT;
+	}
+	if ($width < CHART_DEFAULT_WIDTH) {
+		$width = CHART_DEFAULT_WIDTH;
+	}
+
 	$format_graph = array();
 	$format_graph['width']      = $width;
 	$format_graph['height']     = $height;
 	$format_graph['type_graph'] = $type_graph;
-	$format_graph['fullscale']  = $fullscale;
 	$format_graph['unit_name']  = $unit_name;
 	$format_graph['unit']       = $unit;
 	$format_graph['title']      = $title;
 	$format_graph['homeurl']    = $homeurl;
 	$format_graph['ttl']        = $ttl;
 	$format_graph['background'] = $backgroundColor;
+	$format_graph['font']       = $config['fontpath'];
+	$format_graph['font-size']  = $config['font_size'];
 
 	//exception to change the interval of the graph and show media min max @enriquecd
 	$exception_interval_graph['force_interval'] = $force_interval;
@@ -979,19 +1157,38 @@ if($flash_chart){
 	$exception_interval_graph['max_only']       = $max_only;
 	$exception_interval_graph['min_only']       = $min_only;
 	
-	
-	html_debug_print('+++++++++++++++++Parámetros Que recibe la funcion++++++++++++++++++++++');
-	html_debug_print('id_agente_modulo: ' . $agent_module_id);
-	html_debug_print($date_array);
-	html_debug_print($show_elements_graph);
-	html_debug_print($format_graph);
-	html_debug_print($exception_interval_graph);
-	html_debug_print('+++++++++++++FIN Parámetros Que recibe la funcion++++++++++++++++++++++');
-	
-	grafico_modulo_sparse_data_new( $agent_module_id, $date_array,
-									$show_elements_graph, $format_graph,
-									$exception_interval_graph );
+	$series_suffix =1;
+	$$series_suffix_str = '';
 
+	grafico_modulo_sparse_data_new(	
+		$agent_module_id, $date_array, $data_module_graph,
+		$show_elements_graph, $format_graph,
+		$exception_interval_graph 
+	);
+	
+	if (empty($array_data)) {
+		return graph_nodata_image($width, $height);
+		return '<img src="' . $no_data_image . '" />';
+	}
+
+	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
+
+	return 	flot_area_graph_new(
+				$agent_module_id,
+				$array_data,
+				$color,
+				$legend,
+				$series_type,
+				$date_array,
+				$data_module_graph,
+				$show_elements_graph,
+				$format_graph,
+				$water_mark,
+				$series_suffix_str
+			);
+
+	
+die();
 }
 
 
@@ -1084,7 +1281,6 @@ if($flash_chart){
 		*/
 		ksort($chart);
 
-		//html_debug_print($chart);
 		$legend = array_merge($legend, $legend_prev);
 		$color = array_merge($color, $color_prev);
 	}
@@ -1127,7 +1323,7 @@ if($flash_chart){
 				$color['sum']['color'] = $opcion['avg'];
 				$color['max']['color'] = $opcion['max'];
 			}
-			
+
 			return
 				area_graph($flash_chart, $chart, $width, $height, $color,
 					$legend, $long_index,
@@ -1466,7 +1662,6 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 				// }
 			// }
 			
-			// html_debug($aux_array);
 			if (!empty($name_list) && $names_number == $module_number && isset($name_list[$i])) {
 				if ($labels[$agent_module_id] != '')
 					$module_name_list[$i] = $labels[$agent_module_id];
@@ -4701,11 +4896,104 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 	}
 }
 
-function fullscale_data ( &$chart_data, &$chart_extra_data, &$long_index, 
-						$series_type, $agent_module_id, $datelimit, $date, 
-						$events = false, $show_events = false, 
-						$show_unknown = false, $show_alerts = false, 
-						$series_suffix = '', $percentil = false, 
+function fullscale_data_new (
+	$agent_module_id, $date_array, 
+	$show_unknown = 0, $show_percentil = 0 ){
+	
+	global $config;
+	$data_uncompress = 
+		db_uncompress_module_data(
+			$agent_module_id, 
+			$date_array['start_date'], 
+			$date_array['final_date']
+		);
+
+	$data = array();
+	$previous_data = 0;
+	$series_suffix = 1;
+	$min_value = PHP_INT_MAX-1;
+	$max_value = PHP_INT_MIN+1;
+	$flag_unknown  = 0;
+	$array_percentil = array();
+	foreach ($data_uncompress as $k) {
+		foreach ($k["data"] as $v) {
+			if (isset($v["type"]) && $v["type"] == 1) { # skip unnecesary virtual data
+				continue;
+			}
+			$real_date = $v['utimestamp'] * 1000; // * 1000 need js utimestam mlsecond
+
+			if ($v["datos"] === NULL) {
+				// Unknown
+				if($flag_unknown){
+					$data["unknown" . $series_suffix]['data'][] = array($real_date , 1);
+				}
+				else{
+					$data["unknown" . $series_suffix]['data'][] = array( ($real_date - 1) , 0);
+					$data["unknown" . $series_suffix]['data'][] = array($real_date , 1);
+					$flag_unknown = 1;
+				}
+
+				$data["sum" . $series_suffix]['data'][] = array($real_date , $previous_data);
+			}
+			/*
+			elseif($v["datos"] === false) {
+				// Not Init
+				$previous_data = $v["datos"];
+				$data[$real_date]["sum" . $series_suffix] = $v["datos"];
+			}
+			*/
+			else {
+				//normal
+				$previous_data = $v["datos"];
+				$data["sum" . $series_suffix]['data'][] = array($real_date , $v["datos"]);
+				if($flag_unknown){
+					$data["unknown" . $series_suffix]['data'][] = array($real_date , 0);
+					$flag_unknown = 0;
+				}
+			}
+
+			if(isset($v["datos"]) && $v["datos"]){
+				//max
+				if($v['datos'] >= $max_value){
+					$max_value = $v['datos'];
+				}
+				//min
+				if($v['datos'] <= $min_value){
+					$min_value = $v['datos'];
+				}
+				//avg sum
+				$sum_data += $v["datos"];
+			}
+			//avg count
+			$count_data++;
+
+			if($show_percentil){
+				$array_percentil[] = $v["datos"]; 
+			}
+
+			$last_data = $v["datos"];
+		}
+	}
+
+	if($show_percentil){
+		$percentil_result = get_percentile($show_percentil, $array_percentil);
+		$data["percentil" . $series_suffix]['data'][] = array($date_array['start_date'] * 1000 , $percentil_result);
+		$data["percentil" . $series_suffix]['data'][] = array($date_array['final_date'] * 1000 , $percentil_result);
+	}
+	// Add missed last data
+	$data["sum" . $series_suffix]['data'][] = array($date_array['final_date'] * 1000 , $last_data);
+	$data["sum" . $series_suffix]['min'] = $min_value;
+	$data["sum" . $series_suffix]['max'] = $max_value;
+	$data["sum" . $series_suffix]['avg'] = $sum_data/$count_data;
+
+	return $data;
+}
+
+function fullscale_data ( &$chart_data, &$chart_extra_data, &$long_index,
+						$series_type, $agent_module_id, $datelimit, $date,
+						$events = false, $show_events = false,
+						$show_unknown = false, $show_alerts = false,
+						$series_suffix = '', $percentil = false,
 						$flash_chart = true, $boolean_graph = false){
 
 	global $config;
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 591397d7e9..e4a2d672af 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -227,7 +227,6 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color,
 	$threshold_data = array()) {
 	
 	include_once('functions_flot.php');
-	
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
 	
 	// ATTENTION: The min size is in constants.php
diff --git a/pandora_console/include/graphs/flot/excanvas.js b/pandora_console/include/graphs/flot/excanvas.js
index 367764b4d6..70a8f25ca8 100755
--- a/pandora_console/include/graphs/flot/excanvas.js
+++ b/pandora_console/include/graphs/flot/excanvas.js
@@ -15,7 +15,7 @@
 
 // Known Issues:
 //
-// * Patterns are not implemented.
+// * Patterns only support repeat.
 // * Radial gradient are not implemented. The VML version of these look very
 //   different from the canvas one.
 // * Clipping paths are not implemented.
@@ -29,6 +29,7 @@
 //   or use Box Sizing Behavior from WebFX
 //   (http://webfx.eae.net/dhtml/boxsizing/boxsizing.html)
 // * Non uniform scaling does not correctly scale strokes.
+// * Filling very large shapes (above 5000 points) is buggy.
 // * Optimize. There is always room for speed improvements.
 
 // Only add this code if we do not already have a canvas implementation
@@ -48,6 +49,8 @@ if (!document.createElement('canvas').getContext) {
   var Z = 10;
   var Z2 = Z / 2;
 
+  var IE_VERSION = +navigator.userAgent.match(/MSIE ([\d.]+)?/)[1];
+
   /**
    * This funtion is assigned to the <canvas> elements as element.getContext().
    * @this {HTMLElement}
@@ -83,41 +86,43 @@ if (!document.createElement('canvas').getContext) {
     };
   }
 
+  function encodeHtmlAttribute(s) {
+    return String(s).replace(/&/g, '&amp;').replace(/"/g, '&quot;');
+  }
+
+  function addNamespace(doc, prefix, urn) {
+    if (!doc.namespaces[prefix]) {
+      doc.namespaces.add(prefix, urn, '#default#VML');
+    }
+  }
+
+  function addNamespacesAndStylesheet(doc) {
+    addNamespace(doc, 'g_vml_', 'urn:schemas-microsoft-com:vml');
+    addNamespace(doc, 'g_o_', 'urn:schemas-microsoft-com:office:office');
+
+    // Setup default CSS.  Only add one style sheet per document
+    if (!doc.styleSheets['ex_canvas_']) {
+      var ss = doc.createStyleSheet();
+      ss.owningElement.id = 'ex_canvas_';
+      ss.cssText = 'canvas{display:inline-block;overflow:hidden;' +
+          // default size is 300x150 in Gecko and Opera
+          'text-align:left;width:300px;height:150px}';
+    }
+  }
+
+  // Add namespaces and stylesheet at startup.
+  addNamespacesAndStylesheet(document);
+
   var G_vmlCanvasManager_ = {
     init: function(opt_doc) {
-      if (/MSIE/.test(navigator.userAgent) && !window.opera) {
-        var doc = opt_doc || document;
-        // Create a dummy element so that IE will allow canvas elements to be
-        // recognized.
-        doc.createElement('canvas');
-        doc.attachEvent('onreadystatechange', bind(this.init_, this, doc));
-      }
+      var doc = opt_doc || document;
+      // Create a dummy element so that IE will allow canvas elements to be
+      // recognized.
+      doc.createElement('canvas');
+      doc.attachEvent('onreadystatechange', bind(this.init_, this, doc));
     },
 
     init_: function(doc) {
-      // create xmlns
-      if (!doc.namespaces['g_vml_']) {
-        doc.namespaces.add('g_vml_', 'urn:schemas-microsoft-com:vml',
-                           '#default#VML');
-
-      }
-      if (!doc.namespaces['g_o_']) {
-        doc.namespaces.add('g_o_', 'urn:schemas-microsoft-com:office:office',
-                           '#default#VML');
-      }
-
-      // Setup default CSS.  Only add one style sheet per document
-      if (!doc.styleSheets['ex_canvas_']) {
-        var ss = doc.createStyleSheet();
-        ss.owningElement.id = 'ex_canvas_';
-        ss.cssText = 'canvas{display:inline-block;overflow:hidden;' +
-            // default size is 300x150 in Gecko and Opera
-            'text-align:left;width:300px;height:150px}' +
-            'g_vml_\\:*{behavior:url(#default#VML)}' +
-            'g_o_\\:*{behavior:url(#default#VML)}';
-
-      }
-
       // find all canvas elements
       var els = doc.getElementsByTagName('canvas');
       for (var i = 0; i < els.length; i++) {
@@ -135,9 +140,11 @@ if (!document.createElement('canvas').getContext) {
      */
     initElement: function(el) {
       if (!el.getContext) {
-
         el.getContext = getContext;
 
+        // Add namespaces and stylesheet to document of the element.
+        addNamespacesAndStylesheet(el.ownerDocument);
+
         // Remove fallback content. There is no way to hide text nodes so we
         // just remove all childNodes. We could hide all elements and remove
         // text nodes but who really cares about the fallback content.
@@ -173,12 +180,15 @@ if (!document.createElement('canvas').getContext) {
 
     switch (e.propertyName) {
       case 'width':
-        el.style.width = el.attributes.width.nodeValue + 'px';
         el.getContext().clearRect();
+        el.style.width = el.attributes.width.nodeValue + 'px';
+        // In IE8 this does not trigger onresize.
+        el.firstChild.style.width =  el.clientWidth + 'px';
         break;
       case 'height':
-        el.style.height = el.attributes.height.nodeValue + 'px';
         el.getContext().clearRect();
+        el.style.height = el.attributes.height.nodeValue + 'px';
+        el.firstChild.style.height = el.clientHeight + 'px';
         break;
     }
   }
@@ -194,10 +204,10 @@ if (!document.createElement('canvas').getContext) {
   G_vmlCanvasManager_.init();
 
   // precompute "00" to "FF"
-  var dec2hex = [];
+  var decToHex = [];
   for (var i = 0; i < 16; i++) {
     for (var j = 0; j < 16; j++) {
-      dec2hex[i * 16 + j] = i.toString(16) + j.toString(16);
+      decToHex[i * 16 + j] = i.toString(16) + j.toString(16);
     }
   }
 
@@ -238,54 +248,326 @@ if (!document.createElement('canvas').getContext) {
     o2.shadowOffsetY = o1.shadowOffsetY;
     o2.strokeStyle   = o1.strokeStyle;
     o2.globalAlpha   = o1.globalAlpha;
+    o2.font          = o1.font;
+    o2.textAlign     = o1.textAlign;
+    o2.textBaseline  = o1.textBaseline;
     o2.arcScaleX_    = o1.arcScaleX_;
     o2.arcScaleY_    = o1.arcScaleY_;
     o2.lineScale_    = o1.lineScale_;
   }
 
+  var colorData = {
+    aliceblue: '#F0F8FF',
+    antiquewhite: '#FAEBD7',
+    aquamarine: '#7FFFD4',
+    azure: '#F0FFFF',
+    beige: '#F5F5DC',
+    bisque: '#FFE4C4',
+    black: '#000000',
+    blanchedalmond: '#FFEBCD',
+    blueviolet: '#8A2BE2',
+    brown: '#A52A2A',
+    burlywood: '#DEB887',
+    cadetblue: '#5F9EA0',
+    chartreuse: '#7FFF00',
+    chocolate: '#D2691E',
+    coral: '#FF7F50',
+    cornflowerblue: '#6495ED',
+    cornsilk: '#FFF8DC',
+    crimson: '#DC143C',
+    cyan: '#00FFFF',
+    darkblue: '#00008B',
+    darkcyan: '#008B8B',
+    darkgoldenrod: '#B8860B',
+    darkgray: '#A9A9A9',
+    darkgreen: '#006400',
+    darkgrey: '#A9A9A9',
+    darkkhaki: '#BDB76B',
+    darkmagenta: '#8B008B',
+    darkolivegreen: '#556B2F',
+    darkorange: '#FF8C00',
+    darkorchid: '#9932CC',
+    darkred: '#8B0000',
+    darksalmon: '#E9967A',
+    darkseagreen: '#8FBC8F',
+    darkslateblue: '#483D8B',
+    darkslategray: '#2F4F4F',
+    darkslategrey: '#2F4F4F',
+    darkturquoise: '#00CED1',
+    darkviolet: '#9400D3',
+    deeppink: '#FF1493',
+    deepskyblue: '#00BFFF',
+    dimgray: '#696969',
+    dimgrey: '#696969',
+    dodgerblue: '#1E90FF',
+    firebrick: '#B22222',
+    floralwhite: '#FFFAF0',
+    forestgreen: '#228B22',
+    gainsboro: '#DCDCDC',
+    ghostwhite: '#F8F8FF',
+    gold: '#FFD700',
+    goldenrod: '#DAA520',
+    grey: '#808080',
+    greenyellow: '#ADFF2F',
+    honeydew: '#F0FFF0',
+    hotpink: '#FF69B4',
+    indianred: '#CD5C5C',
+    indigo: '#4B0082',
+    ivory: '#FFFFF0',
+    khaki: '#F0E68C',
+    lavender: '#E6E6FA',
+    lavenderblush: '#FFF0F5',
+    lawngreen: '#7CFC00',
+    lemonchiffon: '#FFFACD',
+    lightblue: '#ADD8E6',
+    lightcoral: '#F08080',
+    lightcyan: '#E0FFFF',
+    lightgoldenrodyellow: '#FAFAD2',
+    lightgreen: '#90EE90',
+    lightgrey: '#D3D3D3',
+    lightpink: '#FFB6C1',
+    lightsalmon: '#FFA07A',
+    lightseagreen: '#20B2AA',
+    lightskyblue: '#87CEFA',
+    lightslategray: '#778899',
+    lightslategrey: '#778899',
+    lightsteelblue: '#B0C4DE',
+    lightyellow: '#FFFFE0',
+    limegreen: '#32CD32',
+    linen: '#FAF0E6',
+    magenta: '#FF00FF',
+    mediumaquamarine: '#66CDAA',
+    mediumblue: '#0000CD',
+    mediumorchid: '#BA55D3',
+    mediumpurple: '#9370DB',
+    mediumseagreen: '#3CB371',
+    mediumslateblue: '#7B68EE',
+    mediumspringgreen: '#00FA9A',
+    mediumturquoise: '#48D1CC',
+    mediumvioletred: '#C71585',
+    midnightblue: '#191970',
+    mintcream: '#F5FFFA',
+    mistyrose: '#FFE4E1',
+    moccasin: '#FFE4B5',
+    navajowhite: '#FFDEAD',
+    oldlace: '#FDF5E6',
+    olivedrab: '#6B8E23',
+    orange: '#FFA500',
+    orangered: '#FF4500',
+    orchid: '#DA70D6',
+    palegoldenrod: '#EEE8AA',
+    palegreen: '#98FB98',
+    paleturquoise: '#AFEEEE',
+    palevioletred: '#DB7093',
+    papayawhip: '#FFEFD5',
+    peachpuff: '#FFDAB9',
+    peru: '#CD853F',
+    pink: '#FFC0CB',
+    plum: '#DDA0DD',
+    powderblue: '#B0E0E6',
+    rosybrown: '#BC8F8F',
+    royalblue: '#4169E1',
+    saddlebrown: '#8B4513',
+    salmon: '#FA8072',
+    sandybrown: '#F4A460',
+    seagreen: '#2E8B57',
+    seashell: '#FFF5EE',
+    sienna: '#A0522D',
+    skyblue: '#87CEEB',
+    slateblue: '#6A5ACD',
+    slategray: '#708090',
+    slategrey: '#708090',
+    snow: '#FFFAFA',
+    springgreen: '#00FF7F',
+    steelblue: '#4682B4',
+    tan: '#D2B48C',
+    thistle: '#D8BFD8',
+    tomato: '#FF6347',
+    turquoise: '#40E0D0',
+    violet: '#EE82EE',
+    wheat: '#F5DEB3',
+    whitesmoke: '#F5F5F5',
+    yellowgreen: '#9ACD32'
+  };
+
+
+  function getRgbHslContent(styleString) {
+    var start = styleString.indexOf('(', 3);
+    var end = styleString.indexOf(')', start + 1);
+    var parts = styleString.substring(start + 1, end).split(',');
+    // add alpha if needed
+    if (parts.length != 4 || styleString.charAt(3) != 'a') {
+      parts[3] = 1;
+    }
+    return parts;
+  }
+
+  function percent(s) {
+    return parseFloat(s) / 100;
+  }
+
+  function clamp(v, min, max) {
+    return Math.min(max, Math.max(min, v));
+  }
+
+  function hslToRgb(parts){
+    var r, g, b, h, s, l;
+    h = parseFloat(parts[0]) / 360 % 360;
+    if (h < 0)
+      h++;
+    s = clamp(percent(parts[1]), 0, 1);
+    l = clamp(percent(parts[2]), 0, 1);
+    if (s == 0) {
+      r = g = b = l; // achromatic
+    } else {
+      var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+      var p = 2 * l - q;
+      r = hueToRgb(p, q, h + 1 / 3);
+      g = hueToRgb(p, q, h);
+      b = hueToRgb(p, q, h - 1 / 3);
+    }
+
+    return '#' + decToHex[Math.floor(r * 255)] +
+        decToHex[Math.floor(g * 255)] +
+        decToHex[Math.floor(b * 255)];
+  }
+
+  function hueToRgb(m1, m2, h) {
+    if (h < 0)
+      h++;
+    if (h > 1)
+      h--;
+
+    if (6 * h < 1)
+      return m1 + (m2 - m1) * 6 * h;
+    else if (2 * h < 1)
+      return m2;
+    else if (3 * h < 2)
+      return m1 + (m2 - m1) * (2 / 3 - h) * 6;
+    else
+      return m1;
+  }
+
+  var processStyleCache = {};
+
   function processStyle(styleString) {
+    if (styleString in processStyleCache) {
+      return processStyleCache[styleString];
+    }
+
     var str, alpha = 1;
 
     styleString = String(styleString);
-    if (styleString.substring(0, 3) == 'rgb') {
-      var start = styleString.indexOf('(', 3);
-      var end = styleString.indexOf(')', start + 1);
-      var guts = styleString.substring(start + 1, end).split(',');
-
-      str = '#';
-      for (var i = 0; i < 3; i++) {
-        str += dec2hex[Number(guts[i])];
-      }
-
-      if (guts.length == 4 && styleString.substr(3, 1) == 'a') {
-        alpha = guts[3];
-      }
-    } else {
+    if (styleString.charAt(0) == '#') {
       str = styleString;
+    } else if (/^rgb/.test(styleString)) {
+      var parts = getRgbHslContent(styleString);
+      var str = '#', n;
+      for (var i = 0; i < 3; i++) {
+        if (parts[i].indexOf('%') != -1) {
+          n = Math.floor(percent(parts[i]) * 255);
+        } else {
+          n = +parts[i];
+        }
+        str += decToHex[clamp(n, 0, 255)];
+      }
+      alpha = +parts[3];
+    } else if (/^hsl/.test(styleString)) {
+      var parts = getRgbHslContent(styleString);
+      str = hslToRgb(parts);
+      alpha = parts[3];
+    } else {
+      str = colorData[styleString] || styleString;
     }
-
-    return {color: str, alpha: alpha};
+    return processStyleCache[styleString] = {color: str, alpha: alpha};
   }
 
-  function processLineCap(lineCap) {
-    switch (lineCap) {
-      case 'butt':
-        return 'flat';
-      case 'round':
-        return 'round';
-      case 'square':
-      default:
-        return 'square';
+  var DEFAULT_STYLE = {
+    style: 'normal',
+    variant: 'normal',
+    weight: 'normal',
+    size: 10,
+    family: 'sans-serif'
+  };
+
+  // Internal text style cache
+  var fontStyleCache = {};
+
+  function processFontStyle(styleString) {
+    if (fontStyleCache[styleString]) {
+      return fontStyleCache[styleString];
     }
+
+    var el = document.createElement('div');
+    var style = el.style;
+    try {
+      style.font = styleString;
+    } catch (ex) {
+      // Ignore failures to set to invalid font.
+    }
+
+    return fontStyleCache[styleString] = {
+      style: style.fontStyle || DEFAULT_STYLE.style,
+      variant: style.fontVariant || DEFAULT_STYLE.variant,
+      weight: style.fontWeight || DEFAULT_STYLE.weight,
+      size: style.fontSize || DEFAULT_STYLE.size,
+      family: style.fontFamily || DEFAULT_STYLE.family
+    };
+  }
+
+  function getComputedStyle(style, element) {
+    var computedStyle = {};
+
+    for (var p in style) {
+      computedStyle[p] = style[p];
+    }
+
+    // Compute the size
+    var canvasFontSize = parseFloat(element.currentStyle.fontSize),
+        fontSize = parseFloat(style.size);
+
+    if (typeof style.size == 'number') {
+      computedStyle.size = style.size;
+    } else if (style.size.indexOf('px') != -1) {
+      computedStyle.size = fontSize;
+    } else if (style.size.indexOf('em') != -1) {
+      computedStyle.size = canvasFontSize * fontSize;
+    } else if(style.size.indexOf('%') != -1) {
+      computedStyle.size = (canvasFontSize / 100) * fontSize;
+    } else if (style.size.indexOf('pt') != -1) {
+      computedStyle.size = fontSize / .75;
+    } else {
+      computedStyle.size = canvasFontSize;
+    }
+
+    // Different scaling between normal text and VML text. This was found using
+    // trial and error to get the same size as non VML text.
+    computedStyle.size *= 0.981;
+
+    return computedStyle;
+  }
+
+  function buildStyle(style) {
+    return style.style + ' ' + style.variant + ' ' + style.weight + ' ' +
+        style.size + 'px ' + style.family;
+  }
+
+  var lineCapMap = {
+    'butt': 'flat',
+    'round': 'round'
+  };
+
+  function processLineCap(lineCap) {
+    return lineCapMap[lineCap] || 'square';
   }
 
   /**
    * This class implements CanvasRenderingContext2D interface as described by
    * the WHATWG.
-   * @param {HTMLElement} surfaceElement The element that the 2D context should
+   * @param {HTMLElement} canvasElement The element that the 2D context should
    * be associated with
    */
-  function CanvasRenderingContext2D_(surfaceElement) {
+  function CanvasRenderingContext2D_(canvasElement) {
     this.m_ = createMatrixIdentity();
 
     this.mStack_ = [];
@@ -301,14 +583,22 @@ if (!document.createElement('canvas').getContext) {
     this.lineCap = 'butt';
     this.miterLimit = Z * 1;
     this.globalAlpha = 1;
-    this.canvas = surfaceElement;
+    this.font = '10px sans-serif';
+    this.textAlign = 'left';
+    this.textBaseline = 'alphabetic';
+    this.canvas = canvasElement;
 
-    var el = surfaceElement.ownerDocument.createElement('div');
-    el.style.width =  surfaceElement.clientWidth + 'px';
-    el.style.height = surfaceElement.clientHeight + 'px';
-    el.style.overflow = 'hidden';
-    el.style.position = 'absolute';
-    surfaceElement.appendChild(el);
+    var cssText = 'width:' + canvasElement.clientWidth + 'px;height:' +
+        canvasElement.clientHeight + 'px;overflow:hidden;position:absolute';
+    var el = canvasElement.ownerDocument.createElement('div');
+    el.style.cssText = cssText;
+    canvasElement.appendChild(el);
+
+    var overlayEl = el.cloneNode(false);
+    // Use a non transparent background.
+    overlayEl.style.backgroundColor = 'red';
+    overlayEl.style.filter = 'alpha(opacity=0)';
+    canvasElement.appendChild(overlayEl);
 
     this.element_ = el;
     this.arcScaleX_ = 1;
@@ -318,6 +608,10 @@ if (!document.createElement('canvas').getContext) {
 
   var contextPrototype = CanvasRenderingContext2D_.prototype;
   contextPrototype.clearRect = function() {
+    if (this.textMeasureEl_) {
+      this.textMeasureEl_.removeNode(true);
+      this.textMeasureEl_ = null;
+    }
     this.element_.innerHTML = '';
   };
 
@@ -328,14 +622,14 @@ if (!document.createElement('canvas').getContext) {
   };
 
   contextPrototype.moveTo = function(aX, aY) {
-    var p = this.getCoords_(aX, aY);
+    var p = getCoords(this, aX, aY);
     this.currentPath_.push({type: 'moveTo', x: p.x, y: p.y});
     this.currentX_ = p.x;
     this.currentY_ = p.y;
   };
 
   contextPrototype.lineTo = function(aX, aY) {
-    var p = this.getCoords_(aX, aY);
+    var p = getCoords(this, aX, aY);
     this.currentPath_.push({type: 'lineTo', x: p.x, y: p.y});
 
     this.currentX_ = p.x;
@@ -345,9 +639,9 @@ if (!document.createElement('canvas').getContext) {
   contextPrototype.bezierCurveTo = function(aCP1x, aCP1y,
                                             aCP2x, aCP2y,
                                             aX, aY) {
-    var p = this.getCoords_(aX, aY);
-    var cp1 = this.getCoords_(aCP1x, aCP1y);
-    var cp2 = this.getCoords_(aCP2x, aCP2y);
+    var p = getCoords(this, aX, aY);
+    var cp1 = getCoords(this, aCP1x, aCP1y);
+    var cp2 = getCoords(this, aCP2x, aCP2y);
     bezierCurveTo(this, cp1, cp2, p);
   };
 
@@ -370,8 +664,8 @@ if (!document.createElement('canvas').getContext) {
     // the following is lifted almost directly from
     // http://developer.mozilla.org/en/docs/Canvas_tutorial:Drawing_shapes
 
-    var cp = this.getCoords_(aCPx, aCPy);
-    var p = this.getCoords_(aX, aY);
+    var cp = getCoords(this, aCPx, aCPy);
+    var p = getCoords(this, aX, aY);
 
     var cp1 = {
       x: this.currentX_ + 2.0 / 3.0 * (cp.x - this.currentX_),
@@ -402,9 +696,9 @@ if (!document.createElement('canvas').getContext) {
                        // that can be represented in binary
     }
 
-    var p = this.getCoords_(aX, aY);
-    var pStart = this.getCoords_(xStart, yStart);
-    var pEnd = this.getCoords_(xEnd, yEnd);
+    var p = getCoords(this, aX, aY);
+    var pStart = getCoords(this, xStart, yStart);
+    var pEnd = getCoords(this, xEnd, yEnd);
 
     this.currentPath_.push({type: arcType,
                            x: p.x,
@@ -518,7 +812,7 @@ if (!document.createElement('canvas').getContext) {
       throw Error('Invalid number of arguments');
     }
 
-    var d = this.getCoords_(dx, dy);
+    var d = getCoords(this, dx, dy);
 
     var w2 = sw / 2;
     var h2 = sh / 2;
@@ -539,7 +833,8 @@ if (!document.createElement('canvas').getContext) {
     // The following check doesn't account for skews (which don't exist
     // in the canvas spec (yet) anyway.
 
-    if (this.m_[0][0] != 1 || this.m_[0][1]) {
+    if (this.m_[0][0] != 1 || this.m_[0][1] ||
+        this.m_[1][1] != 1 || this.m_[1][0]) {
       var filter = [];
 
       // Note the 12/21 reversal
@@ -553,16 +848,17 @@ if (!document.createElement('canvas').getContext) {
       // Bounding box calculation (need to minimize displayed area so that
       // filters don't waste time on unused pixels.
       var max = d;
-      var c2 = this.getCoords_(dx + dw, dy);
-      var c3 = this.getCoords_(dx, dy + dh);
-      var c4 = this.getCoords_(dx + dw, dy + dh);
+      var c2 = getCoords(this, dx + dw, dy);
+      var c3 = getCoords(this, dx, dy + dh);
+      var c4 = getCoords(this, dx + dw, dy + dh);
 
       max.x = m.max(max.x, c2.x, c3.x, c4.x);
       max.y = m.max(max.y, c2.y, c3.y, c4.y);
 
       vmlStr.push('padding:0 ', mr(max.x / Z), 'px ', mr(max.y / Z),
                   'px 0;filter:progid:DXImageTransform.Microsoft.Matrix(',
-                  filter.join(''), ", sizingmethod='clip');")
+                  filter.join(''), ", sizingmethod='clip');");
+
     } else {
       vmlStr.push('top:', mr(d.y / Z), 'px;left:', mr(d.x / Z), 'px;');
     }
@@ -570,7 +866,7 @@ if (!document.createElement('canvas').getContext) {
     vmlStr.push(' ">' ,
                 '<g_vml_:image src="', image.src, '"',
                 ' style="width:', Z * dw, 'px;',
-                ' height:', Z * dh, 'px;"',
+                ' height:', Z * dh, 'px"',
                 ' cropleft="', sx / w, '"',
                 ' croptop="', sy / h, '"',
                 ' cropright="', (w - sx - sw) / w, '"',
@@ -578,108 +874,138 @@ if (!document.createElement('canvas').getContext) {
                 ' />',
                 '</g_vml_:group>');
 
-    this.element_.insertAdjacentHTML('BeforeEnd',
-                                    vmlStr.join(''));
+    this.element_.insertAdjacentHTML('BeforeEnd', vmlStr.join(''));
   };
 
   contextPrototype.stroke = function(aFill) {
-    var lineStr = [];
-    var lineOpen = false;
-    var a = processStyle(aFill ? this.fillStyle : this.strokeStyle);
-    var color = a.color;
-    var opacity = a.alpha * this.globalAlpha;
-
     var W = 10;
     var H = 10;
+    // Divide the shape into chunks if it's too long because IE has a limit
+    // somewhere for how long a VML shape can be. This simple division does
+    // not work with fills, only strokes, unfortunately.
+    var chunkSize = 5000;
 
-    lineStr.push('<g_vml_:shape',
-                 ' filled="', !!aFill, '"',
-                 ' style="position:absolute;width:', W, 'px;height:', H, 'px;"',
-                 ' coordorigin="0 0" coordsize="', Z * W, ' ', Z * H, '"',
-                 ' stroked="', !aFill, '"',
-                 ' path="');
-
-    var newSeq = false;
     var min = {x: null, y: null};
     var max = {x: null, y: null};
 
-    for (var i = 0; i < this.currentPath_.length; i++) {
-      var p = this.currentPath_[i];
-      var c;
+    for (var j = 0; j < this.currentPath_.length; j += chunkSize) {
+      var lineStr = [];
+      var lineOpen = false;
 
-      switch (p.type) {
-        case 'moveTo':
-          c = p;
-          lineStr.push(' m ', mr(p.x), ',', mr(p.y));
-          break;
-        case 'lineTo':
-          lineStr.push(' l ', mr(p.x), ',', mr(p.y));
-          break;
-        case 'close':
-          lineStr.push(' x ');
-          p = null;
-          break;
-        case 'bezierCurveTo':
-          lineStr.push(' c ',
-                       mr(p.cp1x), ',', mr(p.cp1y), ',',
-                       mr(p.cp2x), ',', mr(p.cp2y), ',',
-                       mr(p.x), ',', mr(p.y));
-          break;
-        case 'at':
-        case 'wa':
-          lineStr.push(' ', p.type, ' ',
-                       mr(p.x - this.arcScaleX_ * p.radius), ',',
-                       mr(p.y - this.arcScaleY_ * p.radius), ' ',
-                       mr(p.x + this.arcScaleX_ * p.radius), ',',
-                       mr(p.y + this.arcScaleY_ * p.radius), ' ',
-                       mr(p.xStart), ',', mr(p.yStart), ' ',
-                       mr(p.xEnd), ',', mr(p.yEnd));
-          break;
-      }
+      lineStr.push('<g_vml_:shape',
+                   ' filled="', !!aFill, '"',
+                   ' style="position:absolute;width:', W, 'px;height:', H, 'px;"',
+                   ' coordorigin="0,0"',
+                   ' coordsize="', Z * W, ',', Z * H, '"',
+                   ' stroked="', !aFill, '"',
+                   ' path="');
 
+      var newSeq = false;
 
-      // TODO: Following is broken for curves due to
-      //       move to proper paths.
-
-      // Figure out dimensions so we can do gradient fills
-      // properly
-      if (p) {
-        if (min.x == null || p.x < min.x) {
-          min.x = p.x;
+      for (var i = j; i < Math.min(j + chunkSize, this.currentPath_.length); i++) {
+        if (i % chunkSize == 0 && i > 0) { // move into position for next chunk
+          lineStr.push(' m ', mr(this.currentPath_[i-1].x), ',', mr(this.currentPath_[i-1].y));
         }
-        if (max.x == null || p.x > max.x) {
-          max.x = p.x;
+
+        var p = this.currentPath_[i];
+        var c;
+
+        switch (p.type) {
+          case 'moveTo':
+            c = p;
+            lineStr.push(' m ', mr(p.x), ',', mr(p.y));
+            break;
+          case 'lineTo':
+            lineStr.push(' l ', mr(p.x), ',', mr(p.y));
+            break;
+          case 'close':
+            lineStr.push(' x ');
+            p = null;
+            break;
+          case 'bezierCurveTo':
+            lineStr.push(' c ',
+                         mr(p.cp1x), ',', mr(p.cp1y), ',',
+                         mr(p.cp2x), ',', mr(p.cp2y), ',',
+                         mr(p.x), ',', mr(p.y));
+            break;
+          case 'at':
+          case 'wa':
+            lineStr.push(' ', p.type, ' ',
+                         mr(p.x - this.arcScaleX_ * p.radius), ',',
+                         mr(p.y - this.arcScaleY_ * p.radius), ' ',
+                         mr(p.x + this.arcScaleX_ * p.radius), ',',
+                         mr(p.y + this.arcScaleY_ * p.radius), ' ',
+                         mr(p.xStart), ',', mr(p.yStart), ' ',
+                         mr(p.xEnd), ',', mr(p.yEnd));
+            break;
         }
-        if (min.y == null || p.y < min.y) {
-          min.y = p.y;
-        }
-        if (max.y == null || p.y > max.y) {
-          max.y = p.y;
+  
+  
+        // TODO: Following is broken for curves due to
+        //       move to proper paths.
+  
+        // Figure out dimensions so we can do gradient fills
+        // properly
+        if (p) {
+          if (min.x == null || p.x < min.x) {
+            min.x = p.x;
+          }
+          if (max.x == null || p.x > max.x) {
+            max.x = p.x;
+          }
+          if (min.y == null || p.y < min.y) {
+            min.y = p.y;
+          }
+          if (max.y == null || p.y > max.y) {
+            max.y = p.y;
+          }
         }
       }
+      lineStr.push(' ">');
+  
+      if (!aFill) {
+        appendStroke(this, lineStr);
+      } else {
+        appendFill(this, lineStr, min, max);
+      }
+  
+      lineStr.push('</g_vml_:shape>');
+  
+      this.element_.insertAdjacentHTML('beforeEnd', lineStr.join(''));
     }
-    lineStr.push(' ">');
+  };
 
-    if (!aFill) {
-      var lineWidth = this.lineScale_ * this.lineWidth;
+  function appendStroke(ctx, lineStr) {
+    var a = processStyle(ctx.strokeStyle);
+    var color = a.color;
+    var opacity = a.alpha * ctx.globalAlpha;
+    var lineWidth = ctx.lineScale_ * ctx.lineWidth;
 
-      // VML cannot correctly render a line if the width is less than 1px.
-      // In that case, we dilute the color to make the line look thinner.
-      if (lineWidth < 1) {
-        opacity *= lineWidth;
-      }
+    // VML cannot correctly render a line if the width is less than 1px.
+    // In that case, we dilute the color to make the line look thinner.
+    if (lineWidth < 1) {
+      opacity *= lineWidth;
+    }
 
-      lineStr.push(
-        '<g_vml_:stroke',
-        ' opacity="', opacity, '"',
-        ' joinstyle="', this.lineJoin, '"',
-        ' miterlimit="', this.miterLimit, '"',
-        ' endcap="', processLineCap(this.lineCap), '"',
-        ' weight="', lineWidth, 'px"',
-        ' color="', color, '" />'
-      );
-    } else if (typeof this.fillStyle == 'object') {
-      var fillStyle = this.fillStyle;
+    lineStr.push(
+      '<g_vml_:stroke',
+      ' opacity="', opacity, '"',
+      ' joinstyle="', ctx.lineJoin, '"',
+      ' miterlimit="', ctx.miterLimit, '"',
+      ' endcap="', processLineCap(ctx.lineCap), '"',
+      ' weight="', lineWidth, 'px"',
+      ' color="', color, '" />'
+    );
+  }
+
+  function appendFill(ctx, lineStr, min, max) {
+    var fillStyle = ctx.fillStyle;
+    var arcScaleX = ctx.arcScaleX_;
+    var arcScaleY = ctx.arcScaleY_;
+    var width = max.x - min.x;
+    var height = max.y - min.y;
+    if (fillStyle instanceof CanvasGradient_) {
+      // TODO: Gradients transformed with the transformation matrix.
       var angle = 0;
       var focus = {x: 0, y: 0};
 
@@ -689,12 +1015,12 @@ if (!document.createElement('canvas').getContext) {
       var expansion = 1;
 
       if (fillStyle.type_ == 'gradient') {
-        var x0 = fillStyle.x0_ / this.arcScaleX_;
-        var y0 = fillStyle.y0_ / this.arcScaleY_;
-        var x1 = fillStyle.x1_ / this.arcScaleX_;
-        var y1 = fillStyle.y1_ / this.arcScaleY_;
-        var p0 = this.getCoords_(x0, y0);
-        var p1 = this.getCoords_(x1, y1);
+        var x0 = fillStyle.x0_ / arcScaleX;
+        var y0 = fillStyle.y0_ / arcScaleY;
+        var x1 = fillStyle.x1_ / arcScaleX;
+        var y1 = fillStyle.y1_ / arcScaleY;
+        var p0 = getCoords(ctx, x0, y0);
+        var p1 = getCoords(ctx, x1, y1);
         var dx = p1.x - p0.x;
         var dy = p1.y - p0.y;
         angle = Math.atan2(dx, dy) * 180 / Math.PI;
@@ -710,16 +1036,14 @@ if (!document.createElement('canvas').getContext) {
           angle = 0;
         }
       } else {
-        var p0 = this.getCoords_(fillStyle.x0_, fillStyle.y0_);
-        var width  = max.x - min.x;
-        var height = max.y - min.y;
+        var p0 = getCoords(ctx, fillStyle.x0_, fillStyle.y0_);
         focus = {
           x: (p0.x - min.x) / width,
           y: (p0.y - min.y) / height
         };
 
-        width  /= this.arcScaleX_ * Z;
-        height /= this.arcScaleY_ * Z;
+        width  /= arcScaleX * Z;
+        height /= arcScaleY * Z;
         var dimension = m.max(width, height);
         shift = 2 * fillStyle.r0_ / dimension;
         expansion = 2 * fillStyle.r1_ / dimension - shift;
@@ -735,8 +1059,8 @@ if (!document.createElement('canvas').getContext) {
       var length = stops.length;
       var color1 = stops[0].color;
       var color2 = stops[length - 1].color;
-      var opacity1 = stops[0].alpha * this.globalAlpha;
-      var opacity2 = stops[length - 1].alpha * this.globalAlpha;
+      var opacity1 = stops[0].alpha * ctx.globalAlpha;
+      var opacity2 = stops[length - 1].alpha * ctx.globalAlpha;
 
       var colors = [];
       for (var i = 0; i < length; i++) {
@@ -755,33 +1079,42 @@ if (!document.createElement('canvas').getContext) {
                    ' g_o_:opacity2="', opacity1, '"',
                    ' angle="', angle, '"',
                    ' focusposition="', focus.x, ',', focus.y, '" />');
+    } else if (fillStyle instanceof CanvasPattern_) {
+      if (width && height) {
+        var deltaLeft = -min.x;
+        var deltaTop = -min.y;
+        lineStr.push('<g_vml_:fill',
+                     ' position="',
+                     deltaLeft / width * arcScaleX * arcScaleX, ',',
+                     deltaTop / height * arcScaleY * arcScaleY, '"',
+                     ' type="tile"',
+                     // TODO: Figure out the correct size to fit the scale.
+                     //' size="', w, 'px ', h, 'px"',
+                     ' src="', fillStyle.src_, '" />');
+       }
     } else {
+      var a = processStyle(ctx.fillStyle);
+      var color = a.color;
+      var opacity = a.alpha * ctx.globalAlpha;
       lineStr.push('<g_vml_:fill color="', color, '" opacity="', opacity,
                    '" />');
     }
-
-    lineStr.push('</g_vml_:shape>');
-
-    this.element_.insertAdjacentHTML('beforeEnd', lineStr.join(''));
-  };
+  }
 
   contextPrototype.fill = function() {
     this.stroke(true);
-  }
+  };
 
   contextPrototype.closePath = function() {
     this.currentPath_.push({type: 'close'});
   };
 
-  /**
-   * @private
-   */
-  contextPrototype.getCoords_ = function(aX, aY) {
-    var m = this.m_;
+  function getCoords(ctx, aX, aY) {
+    var m = ctx.m_;
     return {
       x: Z * (aX * m[0][0] + aY * m[1][0] + m[2][0]) - Z2,
       y: Z * (aX * m[0][1] + aY * m[1][1] + m[2][1]) - Z2
-    }
+    };
   };
 
   contextPrototype.save = function() {
@@ -793,19 +1126,16 @@ if (!document.createElement('canvas').getContext) {
   };
 
   contextPrototype.restore = function() {
-    copyState(this.aStack_.pop(), this);
-    this.m_ = this.mStack_.pop();
+    if (this.aStack_.length) {
+      copyState(this.aStack_.pop(), this);
+      this.m_ = this.mStack_.pop();
+    }
   };
 
   function matrixIsFinite(m) {
-    for (var j = 0; j < 3; j++) {
-      for (var k = 0; k < 2; k++) {
-        if (!isFinite(m[j][k]) || isNaN(m[j][k])) {
-          return false;
-        }
-      }
-    }
-    return true;
+    return isFinite(m[0][0]) && isFinite(m[0][1]) &&
+        isFinite(m[1][0]) && isFinite(m[1][1]) &&
+        isFinite(m[2][0]) && isFinite(m[2][1]);
   }
 
   function setM(ctx, m, updateLineScale) {
@@ -879,6 +1209,124 @@ if (!document.createElement('canvas').getContext) {
     setM(this, m, true);
   };
 
+  /**
+   * The text drawing function.
+   * The maxWidth argument isn't taken in account, since no browser supports
+   * it yet.
+   */
+  contextPrototype.drawText_ = function(text, x, y, maxWidth, stroke) {
+    var m = this.m_,
+        delta = 1000,
+        left = 0,
+        right = delta,
+        offset = {x: 0, y: 0},
+        lineStr = [];
+
+    var fontStyle = getComputedStyle(processFontStyle(this.font),
+                                     this.element_);
+
+    var fontStyleString = buildStyle(fontStyle);
+
+    var elementStyle = this.element_.currentStyle;
+    var textAlign = this.textAlign.toLowerCase();
+    switch (textAlign) {
+      case 'left':
+      case 'center':
+      case 'right':
+        break;
+      case 'end':
+        textAlign = elementStyle.direction == 'ltr' ? 'right' : 'left';
+        break;
+      case 'start':
+        textAlign = elementStyle.direction == 'rtl' ? 'right' : 'left';
+        break;
+      default:
+        textAlign = 'left';
+    }
+
+    // 1.75 is an arbitrary number, as there is no info about the text baseline
+    switch (this.textBaseline) {
+      case 'hanging':
+      case 'top':
+        offset.y = fontStyle.size / 1.75;
+        break;
+      case 'middle':
+        break;
+      default:
+      case null:
+      case 'alphabetic':
+      case 'ideographic':
+      case 'bottom':
+        offset.y = -fontStyle.size / 2.25;
+        break;
+    }
+
+    switch(textAlign) {
+      case 'right':
+        left = delta;
+        right = 0.05;
+        break;
+      case 'center':
+        left = right = delta / 2;
+        break;
+    }
+
+    var d = getCoords(this, x + offset.x, y + offset.y);
+
+    lineStr.push('<g_vml_:line from="', -left ,' 0" to="', right ,' 0.05" ',
+                 ' coordsize="100 100" coordorigin="0 0"',
+                 ' filled="', !stroke, '" stroked="', !!stroke,
+                 '" style="position:absolute;width:1px;height:1px;">');
+
+    if (stroke) {
+      appendStroke(this, lineStr);
+    } else {
+      // TODO: Fix the min and max params.
+      appendFill(this, lineStr, {x: -left, y: 0},
+                 {x: right, y: fontStyle.size});
+    }
+
+    var skewM = m[0][0].toFixed(3) + ',' + m[1][0].toFixed(3) + ',' +
+                m[0][1].toFixed(3) + ',' + m[1][1].toFixed(3) + ',0,0';
+
+    var skewOffset = mr(d.x / Z) + ',' + mr(d.y / Z);
+
+    lineStr.push('<g_vml_:skew on="t" matrix="', skewM ,'" ',
+                 ' offset="', skewOffset, '" origin="', left ,' 0" />',
+                 '<g_vml_:path textpathok="true" />',
+                 '<g_vml_:textpath on="true" string="',
+                 encodeHtmlAttribute(text),
+                 '" style="v-text-align:', textAlign,
+                 ';font:', encodeHtmlAttribute(fontStyleString),
+                 '" /></g_vml_:line>');
+
+    this.element_.insertAdjacentHTML('beforeEnd', lineStr.join(''));
+  };
+
+  contextPrototype.fillText = function(text, x, y, maxWidth) {
+    this.drawText_(text, x, y, maxWidth, false);
+  };
+
+  contextPrototype.strokeText = function(text, x, y, maxWidth) {
+    this.drawText_(text, x, y, maxWidth, true);
+  };
+
+  contextPrototype.measureText = function(text) {
+    if (!this.textMeasureEl_) {
+      var s = '<span style="position:absolute;' +
+          'top:-20000px;left:0;padding:0;margin:0;border:none;' +
+          'white-space:pre;"></span>';
+      this.element_.insertAdjacentHTML('beforeEnd', s);
+      this.textMeasureEl_ = this.element_.lastChild;
+    }
+    var doc = this.element_.ownerDocument;
+    this.textMeasureEl_.innerHTML = '';
+    this.textMeasureEl_.style.font = this.font;
+    // Don't use innerHTML or innerText because they allow markup/whitespace.
+    this.textMeasureEl_.appendChild(doc.createTextNode(text));
+    return {width: this.textMeasureEl_.offsetWidth};
+  };
+
   /******** STUBS ********/
   contextPrototype.clip = function() {
     // TODO: Implement
@@ -888,8 +1336,8 @@ if (!document.createElement('canvas').getContext) {
     // TODO: Implement
   };
 
-  contextPrototype.createPattern = function() {
-    return new CanvasPattern_;
+  contextPrototype.createPattern = function(image, repetition) {
+    return new CanvasPattern_(image, repetition);
   };
 
   // Gradient / Pattern Stubs
@@ -911,14 +1359,70 @@ if (!document.createElement('canvas').getContext) {
                        alpha: aColor.alpha});
   };
 
-  function CanvasPattern_() {}
+  function CanvasPattern_(image, repetition) {
+    assertImageIsValid(image);
+    switch (repetition) {
+      case 'repeat':
+      case null:
+      case '':
+        this.repetition_ = 'repeat';
+        break
+      case 'repeat-x':
+      case 'repeat-y':
+      case 'no-repeat':
+        this.repetition_ = repetition;
+        break;
+      default:
+        throwException('SYNTAX_ERR');
+    }
+
+    this.src_ = image.src;
+    this.width_ = image.width;
+    this.height_ = image.height;
+  }
+
+  function throwException(s) {
+    throw new DOMException_(s);
+  }
+
+  function assertImageIsValid(img) {
+    if (!img || img.nodeType != 1 || img.tagName != 'IMG') {
+      throwException('TYPE_MISMATCH_ERR');
+    }
+    if (img.readyState != 'complete') {
+      throwException('INVALID_STATE_ERR');
+    }
+  }
+
+  function DOMException_(s) {
+    this.code = this[s];
+    this.message = s +': DOM Exception ' + this.code;
+  }
+  var p = DOMException_.prototype = new Error;
+  p.INDEX_SIZE_ERR = 1;
+  p.DOMSTRING_SIZE_ERR = 2;
+  p.HIERARCHY_REQUEST_ERR = 3;
+  p.WRONG_DOCUMENT_ERR = 4;
+  p.INVALID_CHARACTER_ERR = 5;
+  p.NO_DATA_ALLOWED_ERR = 6;
+  p.NO_MODIFICATION_ALLOWED_ERR = 7;
+  p.NOT_FOUND_ERR = 8;
+  p.NOT_SUPPORTED_ERR = 9;
+  p.INUSE_ATTRIBUTE_ERR = 10;
+  p.INVALID_STATE_ERR = 11;
+  p.SYNTAX_ERR = 12;
+  p.INVALID_MODIFICATION_ERR = 13;
+  p.NAMESPACE_ERR = 14;
+  p.INVALID_ACCESS_ERR = 15;
+  p.VALIDATION_ERR = 16;
+  p.TYPE_MISMATCH_ERR = 17;
 
   // set up externs
   G_vmlCanvasManager = G_vmlCanvasManager_;
   CanvasRenderingContext2D = CanvasRenderingContext2D_;
   CanvasGradient = CanvasGradient_;
   CanvasPattern = CanvasPattern_;
-
+  DOMException = DOMException_;
 })();
 
 } // if
diff --git a/pandora_console/include/graphs/flot/excanvas.min.js b/pandora_console/include/graphs/flot/excanvas.min.js
new file mode 100644
index 0000000000..fcf876c749
--- /dev/null
+++ b/pandora_console/include/graphs/flot/excanvas.min.js
@@ -0,0 +1 @@
+if(!document.createElement("canvas").getContext){(function(){var ab=Math;var n=ab.round;var l=ab.sin;var A=ab.cos;var H=ab.abs;var N=ab.sqrt;var d=10;var f=d/2;var z=+navigator.userAgent.match(/MSIE ([\d.]+)?/)[1];function y(){return this.context_||(this.context_=new D(this))}var t=Array.prototype.slice;function g(j,m,p){var i=t.call(arguments,2);return function(){return j.apply(m,i.concat(t.call(arguments)))}}function af(i){return String(i).replace(/&/g,"&amp;").replace(/"/g,"&quot;")}function Y(m,j,i){if(!m.namespaces[j]){m.namespaces.add(j,i,"#default#VML")}}function R(j){Y(j,"g_vml_","urn:schemas-microsoft-com:vml");Y(j,"g_o_","urn:schemas-microsoft-com:office:office");if(!j.styleSheets.ex_canvas_){var i=j.createStyleSheet();i.owningElement.id="ex_canvas_";i.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}R(document);var e={init:function(i){var j=i||document;j.createElement("canvas");j.attachEvent("onreadystatechange",g(this.init_,this,j))},init_:function(p){var m=p.getElementsByTagName("canvas");for(var j=0;j<m.length;j++){this.initElement(m[j])}},initElement:function(j){if(!j.getContext){j.getContext=y;R(j.ownerDocument);j.innerHTML="";j.attachEvent("onpropertychange",x);j.attachEvent("onresize",W);var i=j.attributes;if(i.width&&i.width.specified){j.style.width=i.width.nodeValue+"px"}else{j.width=j.clientWidth}if(i.height&&i.height.specified){j.style.height=i.height.nodeValue+"px"}else{j.height=j.clientHeight}}return j}};function x(j){var i=j.srcElement;switch(j.propertyName){case"width":i.getContext().clearRect();i.style.width=i.attributes.width.nodeValue+"px";i.firstChild.style.width=i.clientWidth+"px";break;case"height":i.getContext().clearRect();i.style.height=i.attributes.height.nodeValue+"px";i.firstChild.style.height=i.clientHeight+"px";break}}function W(j){var i=j.srcElement;if(i.firstChild){i.firstChild.style.width=i.clientWidth+"px";i.firstChild.style.height=i.clientHeight+"px"}}e.init();var k=[];for(var ae=0;ae<16;ae++){for(var ad=0;ad<16;ad++){k[ae*16+ad]=ae.toString(16)+ad.toString(16)}}function B(){return[[1,0,0],[0,1,0],[0,0,1]]}function J(p,m){var j=B();for(var i=0;i<3;i++){for(var ah=0;ah<3;ah++){var Z=0;for(var ag=0;ag<3;ag++){Z+=p[i][ag]*m[ag][ah]}j[i][ah]=Z}}return j}function v(j,i){i.fillStyle=j.fillStyle;i.lineCap=j.lineCap;i.lineJoin=j.lineJoin;i.lineWidth=j.lineWidth;i.miterLimit=j.miterLimit;i.shadowBlur=j.shadowBlur;i.shadowColor=j.shadowColor;i.shadowOffsetX=j.shadowOffsetX;i.shadowOffsetY=j.shadowOffsetY;i.strokeStyle=j.strokeStyle;i.globalAlpha=j.globalAlpha;i.font=j.font;i.textAlign=j.textAlign;i.textBaseline=j.textBaseline;i.arcScaleX_=j.arcScaleX_;i.arcScaleY_=j.arcScaleY_;i.lineScale_=j.lineScale_}var b={aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aquamarine:"#7FFFD4",azure:"#F0FFFF",beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",grey:"#808080",greenyellow:"#ADFF2F",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",lightyellow:"#FFFFE0",limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",oldlace:"#FDF5E6",olivedrab:"#6B8E23",orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",skyblue:"#87CEEB",slateblue:"#6A5ACD",slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",wheat:"#F5DEB3",whitesmoke:"#F5F5F5",yellowgreen:"#9ACD32"};function M(j){var p=j.indexOf("(",3);var i=j.indexOf(")",p+1);var m=j.substring(p+1,i).split(",");if(m.length!=4||j.charAt(3)!="a"){m[3]=1}return m}function c(i){return parseFloat(i)/100}function r(j,m,i){return Math.min(i,Math.max(m,j))}function I(ag){var i,ai,aj,ah,ak,Z;ah=parseFloat(ag[0])/360%360;if(ah<0){ah++}ak=r(c(ag[1]),0,1);Z=r(c(ag[2]),0,1);if(ak==0){i=ai=aj=Z}else{var j=Z<0.5?Z*(1+ak):Z+ak-Z*ak;var m=2*Z-j;i=a(m,j,ah+1/3);ai=a(m,j,ah);aj=a(m,j,ah-1/3)}return"#"+k[Math.floor(i*255)]+k[Math.floor(ai*255)]+k[Math.floor(aj*255)]}function a(j,i,m){if(m<0){m++}if(m>1){m--}if(6*m<1){return j+(i-j)*6*m}else{if(2*m<1){return i}else{if(3*m<2){return j+(i-j)*(2/3-m)*6}else{return j}}}}var C={};function F(j){if(j in C){return C[j]}var ag,Z=1;j=String(j);if(j.charAt(0)=="#"){ag=j}else{if(/^rgb/.test(j)){var p=M(j);var ag="#",ah;for(var m=0;m<3;m++){if(p[m].indexOf("%")!=-1){ah=Math.floor(c(p[m])*255)}else{ah=+p[m]}ag+=k[r(ah,0,255)]}Z=+p[3]}else{if(/^hsl/.test(j)){var p=M(j);ag=I(p);Z=p[3]}else{ag=b[j]||j}}}return C[j]={color:ag,alpha:Z}}var o={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"};var L={};function E(i){if(L[i]){return L[i]}var p=document.createElement("div");var m=p.style;try{m.font=i}catch(j){}return L[i]={style:m.fontStyle||o.style,variant:m.fontVariant||o.variant,weight:m.fontWeight||o.weight,size:m.fontSize||o.size,family:m.fontFamily||o.family}}function u(m,j){var i={};for(var ah in m){i[ah]=m[ah]}var ag=parseFloat(j.currentStyle.fontSize),Z=parseFloat(m.size);if(typeof m.size=="number"){i.size=m.size}else{if(m.size.indexOf("px")!=-1){i.size=Z}else{if(m.size.indexOf("em")!=-1){i.size=ag*Z}else{if(m.size.indexOf("%")!=-1){i.size=(ag/100)*Z}else{if(m.size.indexOf("pt")!=-1){i.size=Z/0.75}else{i.size=ag}}}}}i.size*=0.981;return i}function ac(i){return i.style+" "+i.variant+" "+i.weight+" "+i.size+"px "+i.family}var s={butt:"flat",round:"round"};function S(i){return s[i]||"square"}function D(i){this.m_=B();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=d*1;this.globalAlpha=1;this.font="10px sans-serif";this.textAlign="left";this.textBaseline="alphabetic";this.canvas=i;var m="width:"+i.clientWidth+"px;height:"+i.clientHeight+"px;overflow:hidden;position:absolute";var j=i.ownerDocument.createElement("div");j.style.cssText=m;i.appendChild(j);var p=j.cloneNode(false);p.style.backgroundColor="red";p.style.filter="alpha(opacity=0)";i.appendChild(p);this.element_=j;this.arcScaleX_=1;this.arcScaleY_=1;this.lineScale_=1}var q=D.prototype;q.clearRect=function(){if(this.textMeasureEl_){this.textMeasureEl_.removeNode(true);this.textMeasureEl_=null}this.element_.innerHTML=""};q.beginPath=function(){this.currentPath_=[]};q.moveTo=function(j,i){var m=V(this,j,i);this.currentPath_.push({type:"moveTo",x:m.x,y:m.y});this.currentX_=m.x;this.currentY_=m.y};q.lineTo=function(j,i){var m=V(this,j,i);this.currentPath_.push({type:"lineTo",x:m.x,y:m.y});this.currentX_=m.x;this.currentY_=m.y};q.bezierCurveTo=function(m,j,ak,aj,ai,ag){var i=V(this,ai,ag);var ah=V(this,m,j);var Z=V(this,ak,aj);K(this,ah,Z,i)};function K(i,Z,m,j){i.currentPath_.push({type:"bezierCurveTo",cp1x:Z.x,cp1y:Z.y,cp2x:m.x,cp2y:m.y,x:j.x,y:j.y});i.currentX_=j.x;i.currentY_=j.y}q.quadraticCurveTo=function(ai,m,j,i){var ah=V(this,ai,m);var ag=V(this,j,i);var aj={x:this.currentX_+2/3*(ah.x-this.currentX_),y:this.currentY_+2/3*(ah.y-this.currentY_)};var Z={x:aj.x+(ag.x-this.currentX_)/3,y:aj.y+(ag.y-this.currentY_)/3};K(this,aj,Z,ag)};q.arc=function(al,aj,ak,ag,j,m){ak*=d;var ap=m?"at":"wa";var am=al+A(ag)*ak-f;var ao=aj+l(ag)*ak-f;var i=al+A(j)*ak-f;var an=aj+l(j)*ak-f;if(am==i&&!m){am+=0.125}var Z=V(this,al,aj);var ai=V(this,am,ao);var ah=V(this,i,an);this.currentPath_.push({type:ap,x:Z.x,y:Z.y,radius:ak,xStart:ai.x,yStart:ai.y,xEnd:ah.x,yEnd:ah.y})};q.rect=function(m,j,i,p){this.moveTo(m,j);this.lineTo(m+i,j);this.lineTo(m+i,j+p);this.lineTo(m,j+p);this.closePath()};q.strokeRect=function(m,j,i,p){var Z=this.currentPath_;this.beginPath();this.moveTo(m,j);this.lineTo(m+i,j);this.lineTo(m+i,j+p);this.lineTo(m,j+p);this.closePath();this.stroke();this.currentPath_=Z};q.fillRect=function(m,j,i,p){var Z=this.currentPath_;this.beginPath();this.moveTo(m,j);this.lineTo(m+i,j);this.lineTo(m+i,j+p);this.lineTo(m,j+p);this.closePath();this.fill();this.currentPath_=Z};q.createLinearGradient=function(j,p,i,m){var Z=new U("gradient");Z.x0_=j;Z.y0_=p;Z.x1_=i;Z.y1_=m;return Z};q.createRadialGradient=function(p,ag,m,j,Z,i){var ah=new U("gradientradial");ah.x0_=p;ah.y0_=ag;ah.r0_=m;ah.x1_=j;ah.y1_=Z;ah.r1_=i;return ah};q.drawImage=function(aq,m){var aj,ah,al,ay,ao,am,at,aA;var ak=aq.runtimeStyle.width;var ap=aq.runtimeStyle.height;aq.runtimeStyle.width="auto";aq.runtimeStyle.height="auto";var ai=aq.width;var aw=aq.height;aq.runtimeStyle.width=ak;aq.runtimeStyle.height=ap;if(arguments.length==3){aj=arguments[1];ah=arguments[2];ao=am=0;at=al=ai;aA=ay=aw}else{if(arguments.length==5){aj=arguments[1];ah=arguments[2];al=arguments[3];ay=arguments[4];ao=am=0;at=ai;aA=aw}else{if(arguments.length==9){ao=arguments[1];am=arguments[2];at=arguments[3];aA=arguments[4];aj=arguments[5];ah=arguments[6];al=arguments[7];ay=arguments[8]}else{throw Error("Invalid number of arguments")}}}var az=V(this,aj,ah);var p=at/2;var j=aA/2;var ax=[];var i=10;var ag=10;ax.push(" <g_vml_:group",' coordsize="',d*i,",",d*ag,'"',' coordorigin="0,0"',' style="width:',i,"px;height:",ag,"px;position:absolute;");if(this.m_[0][0]!=1||this.m_[0][1]||this.m_[1][1]!=1||this.m_[1][0]){var Z=[];Z.push("M11=",this.m_[0][0],",","M12=",this.m_[1][0],",","M21=",this.m_[0][1],",","M22=",this.m_[1][1],",","Dx=",n(az.x/d),",","Dy=",n(az.y/d),"");var av=az;var au=V(this,aj+al,ah);var ar=V(this,aj,ah+ay);var an=V(this,aj+al,ah+ay);av.x=ab.max(av.x,au.x,ar.x,an.x);av.y=ab.max(av.y,au.y,ar.y,an.y);ax.push("padding:0 ",n(av.x/d),"px ",n(av.y/d),"px 0;filter:progid:DXImageTransform.Microsoft.Matrix(",Z.join(""),", sizingmethod='clip');")}else{ax.push("top:",n(az.y/d),"px;left:",n(az.x/d),"px;")}ax.push(' ">','<g_vml_:image src="',aq.src,'"',' style="width:',d*al,"px;"," height:",d*ay,'px"',' cropleft="',ao/ai,'"',' croptop="',am/aw,'"',' cropright="',(ai-ao-at)/ai,'"',' cropbottom="',(aw-am-aA)/aw,'"'," />","</g_vml_:group>");this.element_.insertAdjacentHTML("BeforeEnd",ax.join(""))};q.stroke=function(ao){var Z=10;var ap=10;var ag=5000;var ai={x:null,y:null};var an={x:null,y:null};for(var aj=0;aj<this.currentPath_.length;aj+=ag){var am=[];var ah=false;am.push("<g_vml_:shape",' filled="',!!ao,'"',' style="position:absolute;width:',Z,"px;height:",ap,'px;"',' coordorigin="0,0"',' coordsize="',d*Z,",",d*ap,'"',' stroked="',!ao,'"',' path="');var aq=false;for(var ak=aj;ak<Math.min(aj+ag,this.currentPath_.length);ak++){if(ak%ag==0&&ak>0){am.push(" m ",n(this.currentPath_[ak-1].x),",",n(this.currentPath_[ak-1].y))}var m=this.currentPath_[ak];var al;switch(m.type){case"moveTo":al=m;am.push(" m ",n(m.x),",",n(m.y));break;case"lineTo":am.push(" l ",n(m.x),",",n(m.y));break;case"close":am.push(" x ");m=null;break;case"bezierCurveTo":am.push(" c ",n(m.cp1x),",",n(m.cp1y),",",n(m.cp2x),",",n(m.cp2y),",",n(m.x),",",n(m.y));break;case"at":case"wa":am.push(" ",m.type," ",n(m.x-this.arcScaleX_*m.radius),",",n(m.y-this.arcScaleY_*m.radius)," ",n(m.x+this.arcScaleX_*m.radius),",",n(m.y+this.arcScaleY_*m.radius)," ",n(m.xStart),",",n(m.yStart)," ",n(m.xEnd),",",n(m.yEnd));break}if(m){if(ai.x==null||m.x<ai.x){ai.x=m.x}if(an.x==null||m.x>an.x){an.x=m.x}if(ai.y==null||m.y<ai.y){ai.y=m.y}if(an.y==null||m.y>an.y){an.y=m.y}}}am.push(' ">');if(!ao){w(this,am)}else{G(this,am,ai,an)}am.push("</g_vml_:shape>");this.element_.insertAdjacentHTML("beforeEnd",am.join(""))}};function w(m,ag){var j=F(m.strokeStyle);var p=j.color;var Z=j.alpha*m.globalAlpha;var i=m.lineScale_*m.lineWidth;if(i<1){Z*=i}ag.push("<g_vml_:stroke",' opacity="',Z,'"',' joinstyle="',m.lineJoin,'"',' miterlimit="',m.miterLimit,'"',' endcap="',S(m.lineCap),'"',' weight="',i,'px"',' color="',p,'" />')}function G(aq,ai,aK,ar){var aj=aq.fillStyle;var aB=aq.arcScaleX_;var aA=aq.arcScaleY_;var j=ar.x-aK.x;var p=ar.y-aK.y;if(aj instanceof U){var an=0;var aF={x:0,y:0};var ax=0;var am=1;if(aj.type_=="gradient"){var al=aj.x0_/aB;var m=aj.y0_/aA;var ak=aj.x1_/aB;var aM=aj.y1_/aA;var aJ=V(aq,al,m);var aI=V(aq,ak,aM);var ag=aI.x-aJ.x;var Z=aI.y-aJ.y;an=Math.atan2(ag,Z)*180/Math.PI;if(an<0){an+=360}if(an<0.000001){an=0}}else{var aJ=V(aq,aj.x0_,aj.y0_);aF={x:(aJ.x-aK.x)/j,y:(aJ.y-aK.y)/p};j/=aB*d;p/=aA*d;var aD=ab.max(j,p);ax=2*aj.r0_/aD;am=2*aj.r1_/aD-ax}var av=aj.colors_;av.sort(function(aN,i){return aN.offset-i.offset});var ap=av.length;var au=av[0].color;var at=av[ap-1].color;var az=av[0].alpha*aq.globalAlpha;var ay=av[ap-1].alpha*aq.globalAlpha;var aE=[];for(var aH=0;aH<ap;aH++){var ao=av[aH];aE.push(ao.offset*am+ax+" "+ao.color)}ai.push('<g_vml_:fill type="',aj.type_,'"',' method="none" focus="100%"',' color="',au,'"',' color2="',at,'"',' colors="',aE.join(","),'"',' opacity="',ay,'"',' g_o_:opacity2="',az,'"',' angle="',an,'"',' focusposition="',aF.x,",",aF.y,'" />')}else{if(aj instanceof T){if(j&&p){var ah=-aK.x;var aC=-aK.y;ai.push("<g_vml_:fill",' position="',ah/j*aB*aB,",",aC/p*aA*aA,'"',' type="tile"',' src="',aj.src_,'" />')}}else{var aL=F(aq.fillStyle);var aw=aL.color;var aG=aL.alpha*aq.globalAlpha;ai.push('<g_vml_:fill color="',aw,'" opacity="',aG,'" />')}}}q.fill=function(){this.stroke(true)};q.closePath=function(){this.currentPath_.push({type:"close"})};function V(j,Z,p){var i=j.m_;return{x:d*(Z*i[0][0]+p*i[1][0]+i[2][0])-f,y:d*(Z*i[0][1]+p*i[1][1]+i[2][1])-f}}q.save=function(){var i={};v(this,i);this.aStack_.push(i);this.mStack_.push(this.m_);this.m_=J(B(),this.m_)};q.restore=function(){if(this.aStack_.length){v(this.aStack_.pop(),this);this.m_=this.mStack_.pop()}};function h(i){return isFinite(i[0][0])&&isFinite(i[0][1])&&isFinite(i[1][0])&&isFinite(i[1][1])&&isFinite(i[2][0])&&isFinite(i[2][1])}function aa(j,i,p){if(!h(i)){return}j.m_=i;if(p){var Z=i[0][0]*i[1][1]-i[0][1]*i[1][0];j.lineScale_=N(H(Z))}}q.translate=function(m,j){var i=[[1,0,0],[0,1,0],[m,j,1]];aa(this,J(i,this.m_),false)};q.rotate=function(j){var p=A(j);var m=l(j);var i=[[p,m,0],[-m,p,0],[0,0,1]];aa(this,J(i,this.m_),false)};q.scale=function(m,j){this.arcScaleX_*=m;this.arcScaleY_*=j;var i=[[m,0,0],[0,j,0],[0,0,1]];aa(this,J(i,this.m_),true)};q.transform=function(Z,p,ah,ag,j,i){var m=[[Z,p,0],[ah,ag,0],[j,i,1]];aa(this,J(m,this.m_),true)};q.setTransform=function(ag,Z,ai,ah,p,j){var i=[[ag,Z,0],[ai,ah,0],[p,j,1]];aa(this,i,true)};q.drawText_=function(am,ak,aj,ap,ai){var ao=this.m_,at=1000,j=0,ar=at,ah={x:0,y:0},ag=[];var i=u(E(this.font),this.element_);var p=ac(i);var au=this.element_.currentStyle;var Z=this.textAlign.toLowerCase();switch(Z){case"left":case"center":case"right":break;case"end":Z=au.direction=="ltr"?"right":"left";break;case"start":Z=au.direction=="rtl"?"right":"left";break;default:Z="left"}switch(this.textBaseline){case"hanging":case"top":ah.y=i.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":ah.y=-i.size/2.25;break}switch(Z){case"right":j=at;ar=0.05;break;case"center":j=ar=at/2;break}var aq=V(this,ak+ah.x,aj+ah.y);ag.push('<g_vml_:line from="',-j,' 0" to="',ar,' 0.05" ',' coordsize="100 100" coordorigin="0 0"',' filled="',!ai,'" stroked="',!!ai,'" style="position:absolute;width:1px;height:1px;">');if(ai){w(this,ag)}else{G(this,ag,{x:-j,y:0},{x:ar,y:i.size})}var an=ao[0][0].toFixed(3)+","+ao[1][0].toFixed(3)+","+ao[0][1].toFixed(3)+","+ao[1][1].toFixed(3)+",0,0";var al=n(aq.x/d)+","+n(aq.y/d);ag.push('<g_vml_:skew on="t" matrix="',an,'" ',' offset="',al,'" origin="',j,' 0" />','<g_vml_:path textpathok="true" />','<g_vml_:textpath on="true" string="',af(am),'" style="v-text-align:',Z,";font:",af(p),'" /></g_vml_:line>');this.element_.insertAdjacentHTML("beforeEnd",ag.join(""))};q.fillText=function(m,i,p,j){this.drawText_(m,i,p,j,false)};q.strokeText=function(m,i,p,j){this.drawText_(m,i,p,j,true)};q.measureText=function(m){if(!this.textMeasureEl_){var i='<span style="position:absolute;top:-20000px;left:0;padding:0;margin:0;border:none;white-space:pre;"></span>';this.element_.insertAdjacentHTML("beforeEnd",i);this.textMeasureEl_=this.element_.lastChild}var j=this.element_.ownerDocument;this.textMeasureEl_.innerHTML="";this.textMeasureEl_.style.font=this.font;this.textMeasureEl_.appendChild(j.createTextNode(m));return{width:this.textMeasureEl_.offsetWidth}};q.clip=function(){};q.arcTo=function(){};q.createPattern=function(j,i){return new T(j,i)};function U(i){this.type_=i;this.x0_=0;this.y0_=0;this.r0_=0;this.x1_=0;this.y1_=0;this.r1_=0;this.colors_=[]}U.prototype.addColorStop=function(j,i){i=F(i);this.colors_.push({offset:j,color:i.color,alpha:i.alpha})};function T(j,i){Q(j);switch(i){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=i;break;default:O("SYNTAX_ERR")}this.src_=j.src;this.width_=j.width;this.height_=j.height}function O(i){throw new P(i)}function Q(i){if(!i||i.nodeType!=1||i.tagName!="IMG"){O("TYPE_MISMATCH_ERR")}if(i.readyState!="complete"){O("INVALID_STATE_ERR")}}function P(i){this.code=this[i];this.message=i+": DOM Exception "+this.code}var X=P.prototype=new Error;X.INDEX_SIZE_ERR=1;X.DOMSTRING_SIZE_ERR=2;X.HIERARCHY_REQUEST_ERR=3;X.WRONG_DOCUMENT_ERR=4;X.INVALID_CHARACTER_ERR=5;X.NO_DATA_ALLOWED_ERR=6;X.NO_MODIFICATION_ALLOWED_ERR=7;X.NOT_FOUND_ERR=8;X.NOT_SUPPORTED_ERR=9;X.INUSE_ATTRIBUTE_ERR=10;X.INVALID_STATE_ERR=11;X.SYNTAX_ERR=12;X.INVALID_MODIFICATION_ERR=13;X.NAMESPACE_ERR=14;X.INVALID_ACCESS_ERR=15;X.VALIDATION_ERR=16;X.TYPE_MISMATCH_ERR=17;G_vmlCanvasManager=e;CanvasRenderingContext2D=D;CanvasGradient=U;CanvasPattern=T;DOMException=P})()};
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.colorhelpers.js b/pandora_console/include/graphs/flot/jquery.colorhelpers.js
new file mode 100644
index 0000000000..b2f6dc4e43
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.colorhelpers.js
@@ -0,0 +1,180 @@
+/* Plugin for jQuery for working with colors.
+ * 
+ * Version 1.1.
+ * 
+ * Inspiration from jQuery color animation plugin by John Resig.
+ *
+ * Released under the MIT license by Ole Laursen, October 2009.
+ *
+ * Examples:
+ *
+ *   $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString()
+ *   var c = $.color.extract($("#mydiv"), 'background-color');
+ *   console.log(c.r, c.g, c.b, c.a);
+ *   $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
+ *
+ * Note that .scale() and .add() return the same modified object
+ * instead of making a new one.
+ *
+ * V. 1.1: Fix error handling so e.g. parsing an empty string does
+ * produce a color rather than just crashing.
+ */ 
+
+(function($) {
+    $.color = {};
+
+    // construct color object with some convenient chainable helpers
+    $.color.make = function (r, g, b, a) {
+        var o = {};
+        o.r = r || 0;
+        o.g = g || 0;
+        o.b = b || 0;
+        o.a = a != null ? a : 1;
+
+        o.add = function (c, d) {
+            for (var i = 0; i < c.length; ++i)
+                o[c.charAt(i)] += d;
+            return o.normalize();
+        };
+        
+        o.scale = function (c, f) {
+            for (var i = 0; i < c.length; ++i)
+                o[c.charAt(i)] *= f;
+            return o.normalize();
+        };
+        
+        o.toString = function () {
+            if (o.a >= 1.0) {
+                return "rgb("+[o.r, o.g, o.b].join(",")+")";
+            } else {
+                return "rgba("+[o.r, o.g, o.b, o.a].join(",")+")";
+            }
+        };
+
+        o.normalize = function () {
+            function clamp(min, value, max) {
+                return value < min ? min: (value > max ? max: value);
+            }
+            
+            o.r = clamp(0, parseInt(o.r), 255);
+            o.g = clamp(0, parseInt(o.g), 255);
+            o.b = clamp(0, parseInt(o.b), 255);
+            o.a = clamp(0, o.a, 1);
+            return o;
+        };
+
+        o.clone = function () {
+            return $.color.make(o.r, o.b, o.g, o.a);
+        };
+
+        return o.normalize();
+    }
+
+    // extract CSS color property from element, going up in the DOM
+    // if it's "transparent"
+    $.color.extract = function (elem, css) {
+        var c;
+
+        do {
+            c = elem.css(css).toLowerCase();
+            // keep going until we find an element that has color, or
+            // we hit the body or root (have no parent)
+            if (c != '' && c != 'transparent')
+                break;
+            elem = elem.parent();
+        } while (elem.length && !$.nodeName(elem.get(0), "body"));
+
+        // catch Safari's way of signalling transparent
+        if (c == "rgba(0, 0, 0, 0)")
+            c = "transparent";
+        
+        return $.color.parse(c);
+    }
+    
+    // parse CSS color string (like "rgb(10, 32, 43)" or "#fff"),
+    // returns color object, if parsing failed, you get black (0, 0,
+    // 0) out
+    $.color.parse = function (str) {
+        var res, m = $.color.make;
+
+        // Look for rgb(num,num,num)
+        if (res = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))
+            return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10));
+        
+        // Look for rgba(num,num,num,num)
+        if (res = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))
+            return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10), parseFloat(res[4]));
+            
+        // Look for rgb(num%,num%,num%)
+        if (res = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))
+            return m(parseFloat(res[1])*2.55, parseFloat(res[2])*2.55, parseFloat(res[3])*2.55);
+
+        // Look for rgba(num%,num%,num%,num)
+        if (res = /rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))
+            return m(parseFloat(res[1])*2.55, parseFloat(res[2])*2.55, parseFloat(res[3])*2.55, parseFloat(res[4]));
+        
+        // Look for #a0b1c2
+        if (res = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))
+            return m(parseInt(res[1], 16), parseInt(res[2], 16), parseInt(res[3], 16));
+
+        // Look for #fff
+        if (res = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))
+            return m(parseInt(res[1]+res[1], 16), parseInt(res[2]+res[2], 16), parseInt(res[3]+res[3], 16));
+
+        // Otherwise, we're most likely dealing with a named color
+        var name = $.trim(str).toLowerCase();
+        if (name == "transparent")
+            return m(255, 255, 255, 0);
+        else {
+            // default to black
+            res = lookupColors[name] || [0, 0, 0];
+            return m(res[0], res[1], res[2]);
+        }
+    }
+    
+    var lookupColors = {
+        aqua:[0,255,255],
+        azure:[240,255,255],
+        beige:[245,245,220],
+        black:[0,0,0],
+        blue:[0,0,255],
+        brown:[165,42,42],
+        cyan:[0,255,255],
+        darkblue:[0,0,139],
+        darkcyan:[0,139,139],
+        darkgrey:[169,169,169],
+        darkgreen:[0,100,0],
+        darkkhaki:[189,183,107],
+        darkmagenta:[139,0,139],
+        darkolivegreen:[85,107,47],
+        darkorange:[255,140,0],
+        darkorchid:[153,50,204],
+        darkred:[139,0,0],
+        darksalmon:[233,150,122],
+        darkviolet:[148,0,211],
+        fuchsia:[255,0,255],
+        gold:[255,215,0],
+        green:[0,128,0],
+        indigo:[75,0,130],
+        khaki:[240,230,140],
+        lightblue:[173,216,230],
+        lightcyan:[224,255,255],
+        lightgreen:[144,238,144],
+        lightgrey:[211,211,211],
+        lightpink:[255,182,193],
+        lightyellow:[255,255,224],
+        lime:[0,255,0],
+        magenta:[255,0,255],
+        maroon:[128,0,0],
+        navy:[0,0,128],
+        olive:[128,128,0],
+        orange:[255,165,0],
+        pink:[255,192,203],
+        purple:[128,0,128],
+        violet:[128,0,128],
+        red:[255,0,0],
+        silver:[192,192,192],
+        white:[255,255,255],
+        yellow:[255,255,0]
+    };
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.colorhelpers.min.js b/pandora_console/include/graphs/flot/jquery.colorhelpers.min.js
new file mode 100644
index 0000000000..7f42659643
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.colorhelpers.min.js
@@ -0,0 +1 @@
+(function($){$.color={};$.color.make=function(r,g,b,a){var o={};o.r=r||0;o.g=g||0;o.b=b||0;o.a=a!=null?a:1;o.add=function(c,d){for(var i=0;i<c.length;++i)o[c.charAt(i)]+=d;return o.normalize()};o.scale=function(c,f){for(var i=0;i<c.length;++i)o[c.charAt(i)]*=f;return o.normalize()};o.toString=function(){if(o.a>=1){return"rgb("+[o.r,o.g,o.b].join(",")+")"}else{return"rgba("+[o.r,o.g,o.b,o.a].join(",")+")"}};o.normalize=function(){function clamp(min,value,max){return value<min?min:value>max?max:value}o.r=clamp(0,parseInt(o.r),255);o.g=clamp(0,parseInt(o.g),255);o.b=clamp(0,parseInt(o.b),255);o.a=clamp(0,o.a,1);return o};o.clone=function(){return $.color.make(o.r,o.b,o.g,o.a)};return o.normalize()};$.color.extract=function(elem,css){var c;do{c=elem.css(css).toLowerCase();if(c!=""&&c!="transparent")break;elem=elem.parent()}while(elem.length&&!$.nodeName(elem.get(0),"body"));if(c=="rgba(0, 0, 0, 0)")c="transparent";return $.color.parse(c)};$.color.parse=function(str){var res,m=$.color.make;if(res=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10));if(res=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10),parseFloat(res[4]));if(res=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55);if(res=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55,parseFloat(res[4]));if(res=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))return m(parseInt(res[1],16),parseInt(res[2],16),parseInt(res[3],16));if(res=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))return m(parseInt(res[1]+res[1],16),parseInt(res[2]+res[2],16),parseInt(res[3]+res[3],16));var name=$.trim(str).toLowerCase();if(name=="transparent")return m(255,255,255,0);else{res=lookupColors[name]||[0,0,0];return m(res[0],res[1],res[2])}};var lookupColors={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.axislabels.js b/pandora_console/include/graphs/flot/jquery.flot.axislabels.js
index a89dddc2a8..39f92cc227 100755
--- a/pandora_console/include/graphs/flot/jquery.flot.axislabels.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.axislabels.js
@@ -1,6 +1,11 @@
 /*
-CAxis Labels Plugin for flot. :P
-Copyright (c) 2010 Xuan Luo
+Axis Labels Plugin for flot.
+http://github.com/markrcote/flot-axislabels
+
+Original code is Copyright (c) 2010 Xuan Luo.
+Original code was released under the GPLv3 license by Xuan Luo, September 2010.
+Original code was rereleased under the MIT license by Xuan Luo, April 2012.
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including
@@ -8,8 +13,10 @@ without limitation the rights to use, copy, modify, merge, publish,
 distribute, sublicense, and/or sell copies of the Software, and to
 permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
+
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -18,120 +25,441 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+
 (function ($) {
-    var options = { };
+    var options = {
+      axisLabels: {
+        show: true
+      }
+    };
 
-    function init(plot) {
-        // This is kind of a hack. There are no hooks in Flot between
-        // the creation and measuring of the ticks (setTicks, measureTickLabels
-        // in setupGrid() ) and the drawing of the ticks and plot box
-        // (insertAxisLabels in setupGrid() ).
-        //
-        // Therefore, we use a trick where we run the draw routine twice:
-        // the first time to get the tick measurements, so that we can change
-        // them, and then have it draw it again.
-        var secondPass = false;
-        plot.hooks.draw.push(function (plot, ctx) {
-            if (!secondPass) {
-                // MEASURE AND SET OPTIONS
-                $.each(plot.getAxes(), function(axisName, axis) {
-                    var opts = axis.options // Flot 0.7
-                        || plot.getOptions()[axisName]; // Flot 0.6
-                    if (!opts || !opts.axisLabel)
-                        return;
+    function canvasSupported() {
+        return !!document.createElement('canvas').getContext;
+    }
 
-                    var w, h;
-                    if (opts.axisLabelUseCanvas != false)
-                        opts.axisLabelUseCanvas = true;
+    function canvasTextSupported() {
+        if (!canvasSupported()) {
+            return false;
+        }
+        var dummy_canvas = document.createElement('canvas');
+        var context = dummy_canvas.getContext('2d');
+        return typeof context.fillText == 'function';
+    }
 
-                    if (opts.axisLabelUseCanvas) {
-                        // canvas text
-                        if (!opts.axisLabelFontSizePixels)
-                            opts.axisLabelFontSizePixels = 14;
-                        if (!opts.axisLabelFontFamily)
-                            opts.axisLabelFontFamily = 'sans-serif';
-                        // since we currently always display x as horiz.
-                        // and y as vertical, we only care about the height
-                        w = opts.axisLabelFontSizePixels;
-                        h = opts.axisLabelFontSizePixels;
-
-                    } else {
-                        // HTML text
-                        var elem = $('<div class="axisLabels" style="position:absolute;">' + opts.axisLabel + '</div>');
-                        plot.getPlaceholder().append(elem);
-                        w = elem.outerWidth(true);
-                        h = elem.outerHeight(true);
-                        elem.remove();
-                    }
-
-                    if (axisName.charAt(0) == 'x')
-                        axis.labelHeight += h;
-                    else
-                        axis.labelWidth += w;
-                    opts.labelHeight = axis.labelHeight;
-                    opts.labelWidth = axis.labelWidth;
-                });
-                // re-draw with new label widths and heights
-                secondPass = true;
-                plot.setupGrid();
-                plot.draw();
-
-
-            } else {
-                // DRAW
-                $.each(plot.getAxes(), function(axisName, axis) {
-                    var opts = axis.options // Flot 0.7
-                        || plot.getOptions()[axisName]; // Flot 0.6
-                    if (!opts || !opts.axisLabel)
-                        return;
-
-                    if (opts.axisLabelUseCanvas) {
-                        // canvas text
-                        var ctx = plot.getCanvas().getContext('2d');
-                        ctx.save();
-                        ctx.font = opts.axisLabelFontSizePixels + 'px ' +
-                                opts.axisLabelFontFamily;
-                        var width = ctx.measureText(opts.axisLabel).width;
-                        var height = opts.axisLabelFontSizePixels;
-                        var x, y;
-                        if (axisName.charAt(0) == 'x') {
-                            x = plot.getPlotOffset().left + plot.width()/2 - width/2;
-                            y = plot.getCanvas().height;
-                        } else {
-                            x = height * 0.72;
-                            y = plot.getPlotOffset().top + plot.height()/2 - width/2;
-                        }
-                        ctx.translate(x, y);
-                        ctx.rotate((axisName.charAt(0) == 'x') ? 0 : -Math.PI/2);
-                        ctx.fillText(opts.axisLabel, 0, 0);
-                        ctx.restore();
-
-                    } else {
-                        // HTML text
-                        plot.getPlaceholder().find('#' + axisName + 'Label').remove();
-                        var elem = $('<div id="' + axisName + 'Label" class="axisLabels" style="position:absolute;">' + opts.axisLabel + '</div>');
-                        if (axisName.charAt(0) == 'x') {
-                            //~ elem.css('left', plot.getPlotOffset().left + plot.width()/4 - elem.outerWidth()/2 + 'px');
-                            elem.css('bottom', '0px');
-                            elem.css('width', '100%');
-                        } else {
-                            elem.css('top', plot.getPlotOffset().top + plot.height()/2 - elem.outerHeight()/2 + 'px');
-                            elem.css('left', '0px');
-                        }
-                        plot.getPlaceholder().append(elem);
-                    }
-                });
-                secondPass = false;
-            }
-        });
+    function css3TransitionSupported() {
+        var div = document.createElement('div');
+        return typeof div.style.MozTransition != 'undefined'    // Gecko
+            || typeof div.style.OTransition != 'undefined'      // Opera
+            || typeof div.style.webkitTransition != 'undefined' // WebKit
+            || typeof div.style.transition != 'undefined';
     }
 
 
+    function AxisLabel(axisName, position, padding, plot, opts) {
+        this.axisName = axisName;
+        this.position = position;
+        this.padding = padding;
+        this.plot = plot;
+        this.opts = opts;
+        this.width = 0;
+        this.height = 0;
+    }
+
+    AxisLabel.prototype.cleanup = function() {
+    };
+
+
+    CanvasAxisLabel.prototype = new AxisLabel();
+    CanvasAxisLabel.prototype.constructor = CanvasAxisLabel;
+    function CanvasAxisLabel(axisName, position, padding, plot, opts) {
+        AxisLabel.prototype.constructor.call(this, axisName, position, padding,
+                                             plot, opts);
+    }
+
+    CanvasAxisLabel.prototype.calculateSize = function() {
+        if (!this.opts.axisLabelFontSizePixels)
+            this.opts.axisLabelFontSizePixels = 14;
+        if (!this.opts.axisLabelFontFamily)
+            this.opts.axisLabelFontFamily = 'sans-serif';
+
+        var textWidth = this.opts.axisLabelFontSizePixels + this.padding;
+        var textHeight = this.opts.axisLabelFontSizePixels + this.padding;
+        if (this.position == 'left' || this.position == 'right') {
+            this.width = this.opts.axisLabelFontSizePixels + this.padding;
+            this.height = 0;
+        } else {
+            this.width = 0;
+            this.height = this.opts.axisLabelFontSizePixels + this.padding;
+        }
+    };
+
+    CanvasAxisLabel.prototype.draw = function(box) {
+        if (!this.opts.axisLabelColour)
+            this.opts.axisLabelColour = 'black';
+        var ctx = this.plot.getCanvas().getContext('2d');
+        ctx.save();
+        ctx.font = this.opts.axisLabelFontSizePixels + 'px ' +
+            this.opts.axisLabelFontFamily;
+        ctx.fillStyle = this.opts.axisLabelColour;
+        var width = ctx.measureText(this.opts.axisLabel).width;
+        var height = this.opts.axisLabelFontSizePixels;
+        var x, y, angle = 0;
+        if (this.position == 'top') {
+            x = box.left + box.width/2 - width/2;
+            y = box.top + height*0.72;
+        } else if (this.position == 'bottom') {
+            x = box.left + box.width/2 - width/2;
+            y = box.top + box.height - height*0.72;
+        } else if (this.position == 'left') {
+            x = box.left + height*0.72;
+            y = box.height/2 + box.top + width/2;
+            angle = -Math.PI/2;
+        } else if (this.position == 'right') {
+            x = box.left + box.width - height*0.72;
+            y = box.height/2 + box.top - width/2;
+            angle = Math.PI/2;
+        }
+        ctx.translate(x, y);
+        ctx.rotate(angle);
+        ctx.fillText(this.opts.axisLabel, 0, 0);
+        ctx.restore();
+    };
+
+
+    HtmlAxisLabel.prototype = new AxisLabel();
+    HtmlAxisLabel.prototype.constructor = HtmlAxisLabel;
+    function HtmlAxisLabel(axisName, position, padding, plot, opts) {
+        AxisLabel.prototype.constructor.call(this, axisName, position,
+                                             padding, plot, opts);
+        this.elem = null;
+    }
+
+    HtmlAxisLabel.prototype.calculateSize = function() {
+        var elem = $('<div class="axisLabels" style="position:absolute;">' +
+                     this.opts.axisLabel + '</div>');
+        this.plot.getPlaceholder().append(elem);
+        // store height and width of label itself, for use in draw()
+        this.labelWidth = elem.outerWidth(true);
+        this.labelHeight = elem.outerHeight(true);
+        elem.remove();
+
+        this.width = this.height = 0;
+        if (this.position == 'left' || this.position == 'right') {
+            this.width = this.labelWidth + this.padding;
+        } else {
+            this.height = this.labelHeight + this.padding;
+        }
+    };
+
+    HtmlAxisLabel.prototype.cleanup = function() {
+        if (this.elem) {
+            this.elem.remove();
+        }
+    };
+
+    HtmlAxisLabel.prototype.draw = function(box) {
+        this.plot.getPlaceholder().find('#' + this.axisName + 'Label').remove();
+        this.elem = $('<div id="' + this.axisName +
+                      'Label" " class="axisLabels" style="position:absolute;">'
+                      + this.opts.axisLabel + '</div>');
+        this.plot.getPlaceholder().append(this.elem);
+        if (this.position == 'top') {
+            this.elem.css('left', box.left + box.width/2 - this.labelWidth/2 +
+                          'px');
+            this.elem.css('top', box.top + 'px');
+        } else if (this.position == 'bottom') {
+            this.elem.css('left', box.left + box.width/2 - this.labelWidth/2 +
+                          'px');
+            this.elem.css('top', box.top + box.height - this.labelHeight +
+                          'px');
+        } else if (this.position == 'left') {
+            this.elem.css('top', box.top + box.height/2 - this.labelHeight/2 +
+                          'px');
+            this.elem.css('left', box.left + 'px');
+        } else if (this.position == 'right') {
+            this.elem.css('top', box.top + box.height/2 - this.labelHeight/2 +
+                          'px');
+            this.elem.css('left', box.left + box.width - this.labelWidth +
+                          'px');
+        }
+    };
+
+
+    CssTransformAxisLabel.prototype = new HtmlAxisLabel();
+    CssTransformAxisLabel.prototype.constructor = CssTransformAxisLabel;
+    function CssTransformAxisLabel(axisName, position, padding, plot, opts) {
+        HtmlAxisLabel.prototype.constructor.call(this, axisName, position,
+                                                 padding, plot, opts);
+    }
+
+    CssTransformAxisLabel.prototype.calculateSize = function() {
+        HtmlAxisLabel.prototype.calculateSize.call(this);
+        this.width = this.height = 0;
+        if (this.position == 'left' || this.position == 'right') {
+            this.width = this.labelHeight + this.padding;
+        } else {
+            this.height = this.labelHeight + this.padding;
+        }
+    };
+
+    CssTransformAxisLabel.prototype.transforms = function(degrees, x, y) {
+        var stransforms = {
+            '-moz-transform': '',
+            '-webkit-transform': '',
+            '-o-transform': '',
+            '-ms-transform': ''
+        };
+        if (x != 0 || y != 0) {
+            var stdTranslate = ' translate(' + x + 'px, ' + y + 'px)';
+            stransforms['-moz-transform'] += stdTranslate;
+            stransforms['-webkit-transform'] += stdTranslate;
+            stransforms['-o-transform'] += stdTranslate;
+            stransforms['-ms-transform'] += stdTranslate;
+        }
+        if (degrees != 0) {
+            var rotation = degrees / 90;
+            var stdRotate = ' rotate(' + degrees + 'deg)';
+            stransforms['-moz-transform'] += stdRotate;
+            stransforms['-webkit-transform'] += stdRotate;
+            stransforms['-o-transform'] += stdRotate;
+            stransforms['-ms-transform'] += stdRotate;
+        }
+        var s = 'top: 0; left: 0; ';
+        for (var prop in stransforms) {
+            if (stransforms[prop]) {
+                s += prop + ':' + stransforms[prop] + ';';
+            }
+        }
+        s += ';';
+        return s;
+    };
+
+    CssTransformAxisLabel.prototype.calculateOffsets = function(box) {
+        var offsets = { x: 0, y: 0, degrees: 0 };
+        if (this.position == 'bottom') {
+            offsets.x = box.left + box.width/2 - this.labelWidth/2;
+            offsets.y = box.top + box.height - this.labelHeight;
+        } else if (this.position == 'top') {
+            offsets.x = box.left + box.width/2 - this.labelWidth/2;
+            offsets.y = box.top;
+        } else if (this.position == 'left') {
+            offsets.degrees = -90;
+            offsets.x = box.left - this.labelWidth/2 + this.labelHeight/2;
+            offsets.y = box.height/2 + box.top;
+        } else if (this.position == 'right') {
+            offsets.degrees = 90;
+            offsets.x = box.left + box.width - this.labelWidth/2
+                        - this.labelHeight/2;
+            offsets.y = box.height/2 + box.top;
+        }
+        offsets.x = Math.round(offsets.x);
+        offsets.y = Math.round(offsets.y);
+
+        return offsets;
+    };
+
+    CssTransformAxisLabel.prototype.draw = function(box) {
+        this.plot.getPlaceholder().find("." + this.axisName + "Label").remove();
+        var offsets = this.calculateOffsets(box);
+        this.elem = $('<div class="axisLabels ' + this.axisName +
+                      'Label" style="position:absolute; ' +
+                      this.transforms(offsets.degrees, offsets.x, offsets.y) +
+                      '">' + this.opts.axisLabel + '</div>');
+        this.plot.getPlaceholder().append(this.elem);
+    };
+
+
+    IeTransformAxisLabel.prototype = new CssTransformAxisLabel();
+    IeTransformAxisLabel.prototype.constructor = IeTransformAxisLabel;
+    function IeTransformAxisLabel(axisName, position, padding, plot, opts) {
+        CssTransformAxisLabel.prototype.constructor.call(this, axisName,
+                                                         position, padding,
+                                                         plot, opts);
+        this.requiresResize = false;
+    }
+
+    IeTransformAxisLabel.prototype.transforms = function(degrees, x, y) {
+        // I didn't feel like learning the crazy Matrix stuff, so this uses
+        // a combination of the rotation transform and CSS positioning.
+        var s = '';
+        if (degrees != 0) {
+            var rotation = degrees/90;
+            while (rotation < 0) {
+                rotation += 4;
+            }
+            s += ' filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=' + rotation + '); ';
+            // see below
+            this.requiresResize = (this.position == 'right');
+        }
+        if (x != 0) {
+            s += 'left: ' + x + 'px; ';
+        }
+        if (y != 0) {
+            s += 'top: ' + y + 'px; ';
+        }
+        return s;
+    };
+
+    IeTransformAxisLabel.prototype.calculateOffsets = function(box) {
+        var offsets = CssTransformAxisLabel.prototype.calculateOffsets.call(
+                          this, box);
+        // adjust some values to take into account differences between
+        // CSS and IE rotations.
+        if (this.position == 'top') {
+            // FIXME: not sure why, but placing this exactly at the top causes
+            // the top axis label to flip to the bottom...
+            offsets.y = box.top + 1;
+        } else if (this.position == 'left') {
+            offsets.x = box.left;
+            offsets.y = box.height/2 + box.top - this.labelWidth/2;
+        } else if (this.position == 'right') {
+            offsets.x = box.left + box.width - this.labelHeight;
+            offsets.y = box.height/2 + box.top - this.labelWidth/2;
+        }
+        return offsets;
+    };
+
+    IeTransformAxisLabel.prototype.draw = function(box) {
+        CssTransformAxisLabel.prototype.draw.call(this, box);
+        if (this.requiresResize) {
+            this.elem = this.plot.getPlaceholder().find("." + this.axisName +
+                                                        "Label");
+            // Since we used CSS positioning instead of transforms for
+            // translating the element, and since the positioning is done
+            // before any rotations, we have to reset the width and height
+            // in case the browser wrapped the text (specifically for the
+            // y2axis).
+            this.elem.css('width', this.labelWidth);
+            this.elem.css('height', this.labelHeight);
+        }
+    };
+
+
+    function init(plot) {
+        plot.hooks.processOptions.push(function (plot, options) {
+
+            if (!options.axisLabels.show)
+                return;
+
+            // This is kind of a hack. There are no hooks in Flot between
+            // the creation and measuring of the ticks (setTicks, measureTickLabels
+            // in setupGrid() ) and the drawing of the ticks and plot box
+            // (insertAxisLabels in setupGrid() ).
+            //
+            // Therefore, we use a trick where we run the draw routine twice:
+            // the first time to get the tick measurements, so that we can change
+            // them, and then have it draw it again.
+            var secondPass = false;
+
+            var axisLabels = {};
+            var axisOffsetCounts = { left: 0, right: 0, top: 0, bottom: 0 };
+
+            var defaultPadding = 2;  // padding between axis and tick labels
+            plot.hooks.draw.push(function (plot, ctx) {
+                var hasAxisLabels = false;
+                if (!secondPass) {
+                    // MEASURE AND SET OPTIONS
+                    $.each(plot.getAxes(), function(axisName, axis) {
+                        var opts = axis.options // Flot 0.7
+                            || plot.getOptions()[axisName]; // Flot 0.6
+
+                        // Handle redraws initiated outside of this plug-in.
+                        if (axisName in axisLabels) {
+                            axis.labelHeight = axis.labelHeight -
+                                axisLabels[axisName].height;
+                            axis.labelWidth = axis.labelWidth -
+                                axisLabels[axisName].width;
+                            opts.labelHeight = axis.labelHeight;
+                            opts.labelWidth = axis.labelWidth;
+                            axisLabels[axisName].cleanup();
+                            delete axisLabels[axisName];
+                        }
+
+                        if (!opts || !opts.axisLabel || !axis.show)
+                            return;
+
+                        hasAxisLabels = true;
+                        var renderer = null;
+
+                        if (!opts.axisLabelUseHtml &&
+                            navigator.appName == 'Microsoft Internet Explorer') {
+                            var ua = navigator.userAgent;
+                            var re  = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})");
+                            if (re.exec(ua) != null) {
+                                rv = parseFloat(RegExp.$1);
+                            }
+                            if (rv >= 9 && !opts.axisLabelUseCanvas && !opts.axisLabelUseHtml) {
+                                renderer = CssTransformAxisLabel;
+                            } else if (!opts.axisLabelUseCanvas && !opts.axisLabelUseHtml) {
+                                renderer = IeTransformAxisLabel;
+                            } else if (opts.axisLabelUseCanvas) {
+                                renderer = CanvasAxisLabel;
+                            } else {
+                                renderer = HtmlAxisLabel;
+                            }
+                        } else {
+                            if (opts.axisLabelUseHtml || (!css3TransitionSupported() && !canvasTextSupported()) && !opts.axisLabelUseCanvas) {
+                                renderer = HtmlAxisLabel;
+                            } else if (opts.axisLabelUseCanvas || !css3TransitionSupported()) {
+                                renderer = CanvasAxisLabel;
+                            } else {
+                                renderer = CssTransformAxisLabel;
+                            }
+                        }
+
+                        var padding = opts.axisLabelPadding === undefined ?
+                                      defaultPadding : opts.axisLabelPadding;
+
+                        axisLabels[axisName] = new renderer(axisName,
+                                                            axis.position, padding,
+                                                            plot, opts);
+
+                        // flot interprets axis.labelHeight and .labelWidth as
+                        // the height and width of the tick labels. We increase
+                        // these values to make room for the axis label and
+                        // padding.
+
+                        axisLabels[axisName].calculateSize();
+
+                        // AxisLabel.height and .width are the size of the
+                        // axis label and padding.
+                        // Just set opts here because axis will be sorted out on
+                        // the redraw.
+
+                        opts.labelHeight = axis.labelHeight +
+                            axisLabels[axisName].height;
+                        opts.labelWidth = axis.labelWidth +
+                            axisLabels[axisName].width;
+                    });
+
+                    // If there are axis labels, re-draw with new label widths and
+                    // heights.
+
+                    if (hasAxisLabels) {
+                        secondPass = true;
+                        plot.setupGrid();
+                        plot.draw();
+                    }
+                } else {
+                    secondPass = false;
+                    // DRAW
+                    $.each(plot.getAxes(), function(axisName, axis) {
+                        var opts = axis.options // Flot 0.7
+                            || plot.getOptions()[axisName]; // Flot 0.6
+                        if (!opts || !opts.axisLabel || !axis.show)
+                            return;
+
+                        axisLabels[axisName].draw(axis.box);
+                    });
+                }
+            });
+        });
+    }
 
     $.plot.plugins.push({
         init: init,
         options: options,
         name: 'axisLabels',
-        version: '1.0'
+        version: '2.0'
     });
 })(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.canvas.js b/pandora_console/include/graphs/flot/jquery.flot.canvas.js
new file mode 100644
index 0000000000..29328d5812
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.canvas.js
@@ -0,0 +1,345 @@
+/* Flot plugin for drawing all elements of a plot on the canvas.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+Flot normally produces certain elements, like axis labels and the legend, using
+HTML elements. This permits greater interactivity and customization, and often
+looks better, due to cross-browser canvas text inconsistencies and limitations.
+
+It can also be desirable to render the plot entirely in canvas, particularly
+if the goal is to save it as an image, or if Flot is being used in a context
+where the HTML DOM does not exist, as is the case within Node.js. This plugin
+switches out Flot's standard drawing operations for canvas-only replacements.
+
+Currently the plugin supports only axis labels, but it will eventually allow
+every element of the plot to be rendered directly to canvas.
+
+The plugin supports these options:
+
+{
+    canvas: boolean
+}
+
+The "canvas" option controls whether full canvas drawing is enabled, making it
+possible to toggle on and off. This is useful when a plot uses HTML text in the
+browser, but needs to redraw with canvas text when exporting as an image.
+
+*/
+
+(function($) {
+
+	var options = {
+		canvas: true
+	};
+
+	var render, getTextInfo, addText;
+
+	// Cache the prototype hasOwnProperty for faster access
+
+	var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+	function init(plot, classes) {
+
+		var Canvas = classes.Canvas;
+
+		// We only want to replace the functions once; the second time around
+		// we would just get our new function back.  This whole replacing of
+		// prototype functions is a disaster, and needs to be changed ASAP.
+
+		if (render == null) {
+			getTextInfo = Canvas.prototype.getTextInfo,
+			addText = Canvas.prototype.addText,
+			render = Canvas.prototype.render;
+		}
+
+		// Finishes rendering the canvas, including overlaid text
+
+		Canvas.prototype.render = function() {
+
+			if (!plot.getOptions().canvas) {
+				return render.call(this);
+			}
+
+			var context = this.context,
+				cache = this._textCache;
+
+			// For each text layer, render elements marked as active
+
+			context.save();
+			context.textBaseline = "middle";
+
+			for (var layerKey in cache) {
+				if (hasOwnProperty.call(cache, layerKey)) {
+					var layerCache = cache[layerKey];
+					for (var styleKey in layerCache) {
+						if (hasOwnProperty.call(layerCache, styleKey)) {
+							var styleCache = layerCache[styleKey],
+								updateStyles = true;
+							for (var key in styleCache) {
+								if (hasOwnProperty.call(styleCache, key)) {
+
+									var info = styleCache[key],
+										positions = info.positions,
+										lines = info.lines;
+
+									// Since every element at this level of the cache have the
+									// same font and fill styles, we can just change them once
+									// using the values from the first element.
+
+									if (updateStyles) {
+										context.fillStyle = info.font.color;
+										context.font = info.font.definition;
+										updateStyles = false;
+									}
+
+									for (var i = 0, position; position = positions[i]; i++) {
+										if (position.active) {
+											for (var j = 0, line; line = position.lines[j]; j++) {
+												context.fillText(lines[j].text, line[0], line[1]);
+											}
+										} else {
+											positions.splice(i--, 1);
+										}
+									}
+
+									if (positions.length == 0) {
+										delete styleCache[key];
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+
+			context.restore();
+		};
+
+		// Creates (if necessary) and returns a text info object.
+		//
+		// When the canvas option is set, the object looks like this:
+		//
+		// {
+		//     width: Width of the text's bounding box.
+		//     height: Height of the text's bounding box.
+		//     positions: Array of positions at which this text is drawn.
+		//     lines: [{
+		//         height: Height of this line.
+		//         widths: Width of this line.
+		//         text: Text on this line.
+		//     }],
+		//     font: {
+		//         definition: Canvas font property string.
+		//         color: Color of the text.
+		//     },
+		// }
+		//
+		// The positions array contains objects that look like this:
+		//
+		// {
+		//     active: Flag indicating whether the text should be visible.
+		//     lines: Array of [x, y] coordinates at which to draw the line.
+		//     x: X coordinate at which to draw the text.
+		//     y: Y coordinate at which to draw the text.
+		// }
+
+		Canvas.prototype.getTextInfo = function(layer, text, font, angle, width) {
+
+			if (!plot.getOptions().canvas) {
+				return getTextInfo.call(this, layer, text, font, angle, width);
+			}
+
+			var textStyle, layerCache, styleCache, info;
+
+			// Cast the value to a string, in case we were given a number
+
+			text = "" + text;
+
+			// If the font is a font-spec object, generate a CSS definition
+
+			if (typeof font === "object") {
+				textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px " + font.family;
+			} else {
+				textStyle = font;
+			}
+
+			// Retrieve (or create) the cache for the text's layer and styles
+
+			layerCache = this._textCache[layer];
+
+			if (layerCache == null) {
+				layerCache = this._textCache[layer] = {};
+			}
+
+			styleCache = layerCache[textStyle];
+
+			if (styleCache == null) {
+				styleCache = layerCache[textStyle] = {};
+			}
+
+			info = styleCache[text];
+
+			if (info == null) {
+
+				var context = this.context;
+
+				// If the font was provided as CSS, create a div with those
+				// classes and examine it to generate a canvas font spec.
+
+				if (typeof font !== "object") {
+
+					var element = $("<div>&nbsp;</div>")
+						.css("position", "absolute")
+						.addClass(typeof font === "string" ? font : null)
+						.appendTo(this.getTextLayer(layer));
+
+					font = {
+						lineHeight: element.height(),
+						style: element.css("font-style"),
+						variant: element.css("font-variant"),
+						weight: element.css("font-weight"),
+						family: element.css("font-family"),
+						color: element.css("color")
+					};
+
+					// Setting line-height to 1, without units, sets it equal
+					// to the font-size, even if the font-size is abstract,
+					// like 'smaller'.  This enables us to read the real size
+					// via the element's height, working around browsers that
+					// return the literal 'smaller' value.
+
+					font.size = element.css("line-height", 1).height();
+
+					element.remove();
+				}
+
+				textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px " + font.family;
+
+				// Create a new info object, initializing the dimensions to
+				// zero so we can count them up line-by-line.
+
+				info = styleCache[text] = {
+					width: 0,
+					height: 0,
+					positions: [],
+					lines: [],
+					font: {
+						definition: textStyle,
+						color: font.color
+					}
+				};
+
+				context.save();
+				context.font = textStyle;
+
+				// Canvas can't handle multi-line strings; break on various
+				// newlines, including HTML brs, to build a list of lines.
+				// Note that we could split directly on regexps, but IE < 9 is
+				// broken; revisit when we drop IE 7/8 support.
+
+				var lines = (text + "").replace(/<br ?\/?>|\r\n|\r/g, "\n").split("\n");
+
+				for (var i = 0; i < lines.length; ++i) {
+
+					var lineText = lines[i],
+						measured = context.measureText(lineText);
+
+					info.width = Math.max(measured.width, info.width);
+					info.height += font.lineHeight;
+
+					info.lines.push({
+						text: lineText,
+						width: measured.width,
+						height: font.lineHeight
+					});
+				}
+
+				context.restore();
+			}
+
+			return info;
+		};
+
+		// Adds a text string to the canvas text overlay.
+
+		Canvas.prototype.addText = function(layer, x, y, text, font, angle, width, halign, valign) {
+
+			if (!plot.getOptions().canvas) {
+				return addText.call(this, layer, x, y, text, font, angle, width, halign, valign);
+			}
+
+			var info = this.getTextInfo(layer, text, font, angle, width),
+				positions = info.positions,
+				lines = info.lines;
+
+			// Text is drawn with baseline 'middle', which we need to account
+			// for by adding half a line's height to the y position.
+
+			y += info.height / lines.length / 2;
+
+			// Tweak the initial y-position to match vertical alignment
+
+			if (valign == "middle") {
+				y = Math.round(y - info.height / 2);
+			} else if (valign == "bottom") {
+				y = Math.round(y - info.height);
+			} else {
+				y = Math.round(y);
+			}
+
+			// FIXME: LEGACY BROWSER FIX
+			// AFFECTS: Opera < 12.00
+
+			// Offset the y coordinate, since Opera is off pretty
+			// consistently compared to the other browsers.
+
+			if (!!(window.opera && window.opera.version().split(".")[0] < 12)) {
+				y -= 2;
+			}
+
+			// Determine whether this text already exists at this position.
+			// If so, mark it for inclusion in the next render pass.
+
+			for (var i = 0, position; position = positions[i]; i++) {
+				if (position.x == x && position.y == y) {
+					position.active = true;
+					return;
+				}
+			}
+
+			// If the text doesn't exist at this position, create a new entry
+
+			position = {
+				active: true,
+				lines: [],
+				x: x,
+				y: y
+			};
+
+			positions.push(position);
+
+			// Fill in the x & y positions of each line, adjusting them
+			// individually for horizontal alignment.
+
+			for (var i = 0, line; line = lines[i]; i++) {
+				if (halign == "center") {
+					position.lines.push([Math.round(x - line.width / 2), y]);
+				} else if (halign == "right") {
+					position.lines.push([Math.round(x - line.width), y]);
+				} else {
+					position.lines.push([Math.round(x), y]);
+				}
+				y += line.height;
+			}
+		};
+	}
+
+	$.plot.plugins.push({
+		init: init,
+		options: options,
+		name: "canvas",
+		version: "1.0"
+	});
+
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.canvas.min.js b/pandora_console/include/graphs/flot/jquery.flot.canvas.min.js
new file mode 100644
index 0000000000..40c1051b3c
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.canvas.min.js
@@ -0,0 +1,7 @@
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){var options={canvas:true};var render,getTextInfo,addText;var hasOwnProperty=Object.prototype.hasOwnProperty;function init(plot,classes){var Canvas=classes.Canvas;if(render==null){getTextInfo=Canvas.prototype.getTextInfo,addText=Canvas.prototype.addText,render=Canvas.prototype.render}Canvas.prototype.render=function(){if(!plot.getOptions().canvas){return render.call(this)}var context=this.context,cache=this._textCache;context.save();context.textBaseline="middle";for(var layerKey in cache){if(hasOwnProperty.call(cache,layerKey)){var layerCache=cache[layerKey];for(var styleKey in layerCache){if(hasOwnProperty.call(layerCache,styleKey)){var styleCache=layerCache[styleKey],updateStyles=true;for(var key in styleCache){if(hasOwnProperty.call(styleCache,key)){var info=styleCache[key],positions=info.positions,lines=info.lines;if(updateStyles){context.fillStyle=info.font.color;context.font=info.font.definition;updateStyles=false}for(var i=0,position;position=positions[i];i++){if(position.active){for(var j=0,line;line=position.lines[j];j++){context.fillText(lines[j].text,line[0],line[1])}}else{positions.splice(i--,1)}}if(positions.length==0){delete styleCache[key]}}}}}}}context.restore()};Canvas.prototype.getTextInfo=function(layer,text,font,angle,width){if(!plot.getOptions().canvas){return getTextInfo.call(this,layer,text,font,angle,width)}var textStyle,layerCache,styleCache,info;text=""+text;if(typeof font==="object"){textStyle=font.style+" "+font.variant+" "+font.weight+" "+font.size+"px "+font.family}else{textStyle=font}layerCache=this._textCache[layer];if(layerCache==null){layerCache=this._textCache[layer]={}}styleCache=layerCache[textStyle];if(styleCache==null){styleCache=layerCache[textStyle]={}}info=styleCache[text];if(info==null){var context=this.context;if(typeof font!=="object"){var element=$("<div>&nbsp;</div>").css("position","absolute").addClass(typeof font==="string"?font:null).appendTo(this.getTextLayer(layer));font={lineHeight:element.height(),style:element.css("font-style"),variant:element.css("font-variant"),weight:element.css("font-weight"),family:element.css("font-family"),color:element.css("color")};font.size=element.css("line-height",1).height();element.remove()}textStyle=font.style+" "+font.variant+" "+font.weight+" "+font.size+"px "+font.family;info=styleCache[text]={width:0,height:0,positions:[],lines:[],font:{definition:textStyle,color:font.color}};context.save();context.font=textStyle;var lines=(text+"").replace(/<br ?\/?>|\r\n|\r/g,"\n").split("\n");for(var i=0;i<lines.length;++i){var lineText=lines[i],measured=context.measureText(lineText);info.width=Math.max(measured.width,info.width);info.height+=font.lineHeight;info.lines.push({text:lineText,width:measured.width,height:font.lineHeight})}context.restore()}return info};Canvas.prototype.addText=function(layer,x,y,text,font,angle,width,halign,valign){if(!plot.getOptions().canvas){return addText.call(this,layer,x,y,text,font,angle,width,halign,valign)}var info=this.getTextInfo(layer,text,font,angle,width),positions=info.positions,lines=info.lines;y+=info.height/lines.length/2;if(valign=="middle"){y=Math.round(y-info.height/2)}else if(valign=="bottom"){y=Math.round(y-info.height)}else{y=Math.round(y)}if(!!(window.opera&&window.opera.version().split(".")[0]<12)){y-=2}for(var i=0,position;position=positions[i];i++){if(position.x==x&&position.y==y){position.active=true;return}}position={active:true,lines:[],x:x,y:y};positions.push(position);for(var i=0,line;line=lines[i];i++){if(halign=="center"){position.lines.push([Math.round(x-line.width/2),y])}else if(halign=="right"){position.lines.push([Math.round(x-line.width),y])}else{position.lines.push([Math.round(x),y])}y+=line.height}}}$.plot.plugins.push({init:init,options:options,name:"canvas",version:"1.0"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.categories.js b/pandora_console/include/graphs/flot/jquery.flot.categories.js
new file mode 100644
index 0000000000..2f9b257971
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.categories.js
@@ -0,0 +1,190 @@
+/* Flot plugin for plotting textual data or categories.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+Consider a dataset like [["February", 34], ["March", 20], ...]. This plugin
+allows you to plot such a dataset directly.
+
+To enable it, you must specify mode: "categories" on the axis with the textual
+labels, e.g.
+
+	$.plot("#placeholder", data, { xaxis: { mode: "categories" } });
+
+By default, the labels are ordered as they are met in the data series. If you
+need a different ordering, you can specify "categories" on the axis options
+and list the categories there:
+
+	xaxis: {
+		mode: "categories",
+		categories: ["February", "March", "April"]
+	}
+
+If you need to customize the distances between the categories, you can specify
+"categories" as an object mapping labels to values
+
+	xaxis: {
+		mode: "categories",
+		categories: { "February": 1, "March": 3, "April": 4 }
+	}
+
+If you don't specify all categories, the remaining categories will be numbered
+from the max value plus 1 (with a spacing of 1 between each).
+
+Internally, the plugin works by transforming the input data through an auto-
+generated mapping where the first category becomes 0, the second 1, etc.
+Hence, a point like ["February", 34] becomes [0, 34] internally in Flot (this
+is visible in hover and click events that return numbers rather than the
+category labels). The plugin also overrides the tick generator to spit out the
+categories as ticks instead of the values.
+
+If you need to map a value back to its label, the mapping is always accessible
+as "categories" on the axis object, e.g. plot.getAxes().xaxis.categories.
+
+*/
+
+(function ($) {
+    var options = {
+        xaxis: {
+            categories: null
+        },
+        yaxis: {
+            categories: null
+        }
+    };
+    
+    function processRawData(plot, series, data, datapoints) {
+        // if categories are enabled, we need to disable
+        // auto-transformation to numbers so the strings are intact
+        // for later processing
+
+        var xCategories = series.xaxis.options.mode == "categories",
+            yCategories = series.yaxis.options.mode == "categories";
+        
+        if (!(xCategories || yCategories))
+            return;
+
+        var format = datapoints.format;
+
+        if (!format) {
+            // FIXME: auto-detection should really not be defined here
+            var s = series;
+            format = [];
+            format.push({ x: true, number: true, required: true });
+            format.push({ y: true, number: true, required: true });
+
+            if (s.bars.show || (s.lines.show && s.lines.fill)) {
+                var autoscale = !!((s.bars.show && s.bars.zero) || (s.lines.show && s.lines.zero));
+                format.push({ y: true, number: true, required: false, defaultValue: 0, autoscale: autoscale });
+                if (s.bars.horizontal) {
+                    delete format[format.length - 1].y;
+                    format[format.length - 1].x = true;
+                }
+            }
+            
+            datapoints.format = format;
+        }
+
+        for (var m = 0; m < format.length; ++m) {
+            if (format[m].x && xCategories)
+                format[m].number = false;
+            
+            if (format[m].y && yCategories)
+                format[m].number = false;
+        }
+    }
+
+    function getNextIndex(categories) {
+        var index = -1;
+        
+        for (var v in categories)
+            if (categories[v] > index)
+                index = categories[v];
+
+        return index + 1;
+    }
+
+    function categoriesTickGenerator(axis) {
+        var res = [];
+        for (var label in axis.categories) {
+            var v = axis.categories[label];
+            if (v >= axis.min && v <= axis.max)
+                res.push([v, label]);
+        }
+
+        res.sort(function (a, b) { return a[0] - b[0]; });
+
+        return res;
+    }
+    
+    function setupCategoriesForAxis(series, axis, datapoints) {
+        if (series[axis].options.mode != "categories")
+            return;
+        
+        if (!series[axis].categories) {
+            // parse options
+            var c = {}, o = series[axis].options.categories || {};
+            if ($.isArray(o)) {
+                for (var i = 0; i < o.length; ++i)
+                    c[o[i]] = i;
+            }
+            else {
+                for (var v in o)
+                    c[v] = o[v];
+            }
+            
+            series[axis].categories = c;
+        }
+
+        // fix ticks
+        if (!series[axis].options.ticks)
+            series[axis].options.ticks = categoriesTickGenerator;
+
+        transformPointsOnAxis(datapoints, axis, series[axis].categories);
+    }
+    
+    function transformPointsOnAxis(datapoints, axis, categories) {
+        // go through the points, transforming them
+        var points = datapoints.points,
+            ps = datapoints.pointsize,
+            format = datapoints.format,
+            formatColumn = axis.charAt(0),
+            index = getNextIndex(categories);
+
+        for (var i = 0; i < points.length; i += ps) {
+            if (points[i] == null)
+                continue;
+            
+            for (var m = 0; m < ps; ++m) {
+                var val = points[i + m];
+
+                if (val == null || !format[m][formatColumn])
+                    continue;
+
+                if (!(val in categories)) {
+                    categories[val] = index;
+                    ++index;
+                }
+                
+                points[i + m] = categories[val];
+            }
+        }
+    }
+
+    function processDatapoints(plot, series, datapoints) {
+        setupCategoriesForAxis(series, "xaxis", datapoints);
+        setupCategoriesForAxis(series, "yaxis", datapoints);
+    }
+
+    function init(plot) {
+        plot.hooks.processRawData.push(processRawData);
+        plot.hooks.processDatapoints.push(processDatapoints);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'categories',
+        version: '1.0'
+    });
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.categories.min.js b/pandora_console/include/graphs/flot/jquery.flot.categories.min.js
new file mode 100644
index 0000000000..5bce588e3d
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.categories.min.js
@@ -0,0 +1,7 @@
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){var options={xaxis:{categories:null},yaxis:{categories:null}};function processRawData(plot,series,data,datapoints){var xCategories=series.xaxis.options.mode=="categories",yCategories=series.yaxis.options.mode=="categories";if(!(xCategories||yCategories))return;var format=datapoints.format;if(!format){var s=series;format=[];format.push({x:true,number:true,required:true});format.push({y:true,number:true,required:true});if(s.bars.show||s.lines.show&&s.lines.fill){var autoscale=!!(s.bars.show&&s.bars.zero||s.lines.show&&s.lines.zero);format.push({y:true,number:true,required:false,defaultValue:0,autoscale:autoscale});if(s.bars.horizontal){delete format[format.length-1].y;format[format.length-1].x=true}}datapoints.format=format}for(var m=0;m<format.length;++m){if(format[m].x&&xCategories)format[m].number=false;if(format[m].y&&yCategories)format[m].number=false}}function getNextIndex(categories){var index=-1;for(var v in categories)if(categories[v]>index)index=categories[v];return index+1}function categoriesTickGenerator(axis){var res=[];for(var label in axis.categories){var v=axis.categories[label];if(v>=axis.min&&v<=axis.max)res.push([v,label])}res.sort(function(a,b){return a[0]-b[0]});return res}function setupCategoriesForAxis(series,axis,datapoints){if(series[axis].options.mode!="categories")return;if(!series[axis].categories){var c={},o=series[axis].options.categories||{};if($.isArray(o)){for(var i=0;i<o.length;++i)c[o[i]]=i}else{for(var v in o)c[v]=o[v]}series[axis].categories=c}if(!series[axis].options.ticks)series[axis].options.ticks=categoriesTickGenerator;transformPointsOnAxis(datapoints,axis,series[axis].categories)}function transformPointsOnAxis(datapoints,axis,categories){var points=datapoints.points,ps=datapoints.pointsize,format=datapoints.format,formatColumn=axis.charAt(0),index=getNextIndex(categories);for(var i=0;i<points.length;i+=ps){if(points[i]==null)continue;for(var m=0;m<ps;++m){var val=points[i+m];if(val==null||!format[m][formatColumn])continue;if(!(val in categories)){categories[val]=index;++index}points[i+m]=categories[val]}}}function processDatapoints(plot,series,datapoints){setupCategoriesForAxis(series,"xaxis",datapoints);setupCategoriesForAxis(series,"yaxis",datapoints)}function init(plot){plot.hooks.processRawData.push(processRawData);plot.hooks.processDatapoints.push(processDatapoints)}$.plot.plugins.push({init:init,options:options,name:"categories",version:"1.0"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.crosshair.js b/pandora_console/include/graphs/flot/jquery.flot.crosshair.js
new file mode 100644
index 0000000000..5111695e3d
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.crosshair.js
@@ -0,0 +1,176 @@
+/* Flot plugin for showing crosshairs when the mouse hovers over the plot.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+The plugin supports these options:
+
+	crosshair: {
+		mode: null or "x" or "y" or "xy"
+		color: color
+		lineWidth: number
+	}
+
+Set the mode to one of "x", "y" or "xy". The "x" mode enables a vertical
+crosshair that lets you trace the values on the x axis, "y" enables a
+horizontal crosshair and "xy" enables them both. "color" is the color of the
+crosshair (default is "rgba(170, 0, 0, 0.80)"), "lineWidth" is the width of
+the drawn lines (default is 1).
+
+The plugin also adds four public methods:
+
+  - setCrosshair( pos )
+
+    Set the position of the crosshair. Note that this is cleared if the user
+    moves the mouse. "pos" is in coordinates of the plot and should be on the
+    form { x: xpos, y: ypos } (you can use x2/x3/... if you're using multiple
+    axes), which is coincidentally the same format as what you get from a
+    "plothover" event. If "pos" is null, the crosshair is cleared.
+
+  - clearCrosshair()
+
+    Clear the crosshair.
+
+  - lockCrosshair(pos)
+
+    Cause the crosshair to lock to the current location, no longer updating if
+    the user moves the mouse. Optionally supply a position (passed on to
+    setCrosshair()) to move it to.
+
+    Example usage:
+
+	var myFlot = $.plot( $("#graph"), ..., { crosshair: { mode: "x" } } };
+	$("#graph").bind( "plothover", function ( evt, position, item ) {
+		if ( item ) {
+			// Lock the crosshair to the data point being hovered
+			myFlot.lockCrosshair({
+				x: item.datapoint[ 0 ],
+				y: item.datapoint[ 1 ]
+			});
+		} else {
+			// Return normal crosshair operation
+			myFlot.unlockCrosshair();
+		}
+	});
+
+  - unlockCrosshair()
+
+    Free the crosshair to move again after locking it.
+*/
+
+(function ($) {
+    var options = {
+        crosshair: {
+            mode: null, // one of null, "x", "y" or "xy",
+            color: "rgba(170, 0, 0, 0.80)",
+            lineWidth: 1
+        }
+    };
+    
+    function init(plot) {
+        // position of crosshair in pixels
+        var crosshair = { x: -1, y: -1, locked: false };
+
+        plot.setCrosshair = function setCrosshair(pos) {
+            if (!pos)
+                crosshair.x = -1;
+            else {
+                var o = plot.p2c(pos);
+                crosshair.x = Math.max(0, Math.min(o.left, plot.width()));
+                crosshair.y = Math.max(0, Math.min(o.top, plot.height()));
+            }
+            
+            plot.triggerRedrawOverlay();
+        };
+        
+        plot.clearCrosshair = plot.setCrosshair; // passes null for pos
+        
+        plot.lockCrosshair = function lockCrosshair(pos) {
+            if (pos)
+                plot.setCrosshair(pos);
+            crosshair.locked = true;
+        };
+
+        plot.unlockCrosshair = function unlockCrosshair() {
+            crosshair.locked = false;
+        };
+
+        function onMouseOut(e) {
+            if (crosshair.locked)
+                return;
+
+            if (crosshair.x != -1) {
+                crosshair.x = -1;
+                plot.triggerRedrawOverlay();
+            }
+        }
+
+        function onMouseMove(e) {
+            if (crosshair.locked)
+                return;
+                
+            if (plot.getSelection && plot.getSelection()) {
+                crosshair.x = -1; // hide the crosshair while selecting
+                return;
+            }
+                
+            var offset = plot.offset();
+            crosshair.x = Math.max(0, Math.min(e.pageX - offset.left, plot.width()));
+            crosshair.y = Math.max(0, Math.min(e.pageY - offset.top, plot.height()));
+            plot.triggerRedrawOverlay();
+        }
+        
+        plot.hooks.bindEvents.push(function (plot, eventHolder) {
+            if (!plot.getOptions().crosshair.mode)
+                return;
+
+            eventHolder.mouseout(onMouseOut);
+            eventHolder.mousemove(onMouseMove);
+        });
+
+        plot.hooks.drawOverlay.push(function (plot, ctx) {
+            var c = plot.getOptions().crosshair;
+            if (!c.mode)
+                return;
+
+            var plotOffset = plot.getPlotOffset();
+            
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            if (crosshair.x != -1) {
+                var adj = plot.getOptions().crosshair.lineWidth % 2 ? 0.5 : 0;
+
+                ctx.strokeStyle = c.color;
+                ctx.lineWidth = c.lineWidth;
+                ctx.lineJoin = "round";
+
+                ctx.beginPath();
+                if (c.mode.indexOf("x") != -1) {
+                    var drawX = Math.floor(crosshair.x) + adj;
+                    ctx.moveTo(drawX, 0);
+                    ctx.lineTo(drawX, plot.height());
+                }
+                if (c.mode.indexOf("y") != -1) {
+                    var drawY = Math.floor(crosshair.y) + adj;
+                    ctx.moveTo(0, drawY);
+                    ctx.lineTo(plot.width(), drawY);
+                }
+                ctx.stroke();
+            }
+            ctx.restore();
+        });
+
+        plot.hooks.shutdown.push(function (plot, eventHolder) {
+            eventHolder.unbind("mouseout", onMouseOut);
+            eventHolder.unbind("mousemove", onMouseMove);
+        });
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'crosshair',
+        version: '1.0'
+    });
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.crosshair.min.js b/pandora_console/include/graphs/flot/jquery.flot.crosshair.min.js
index ccaf240366..e98ee065eb 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.crosshair.min.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.crosshair.min.js
@@ -1 +1,7 @@
-(function(b){var a={crosshair:{mode:null,color:"rgba(170, 0, 0, 0.80)",lineWidth:1}};function c(h){var j={x:-1,y:-1,locked:false};h.setCrosshair=function e(l){if(!l){j.x=-1}else{var k=h.p2c(l);j.x=Math.max(0,Math.min(k.left,h.width()));j.y=Math.max(0,Math.min(k.top,h.height()))}h.triggerRedrawOverlay()};h.clearCrosshair=h.setCrosshair;h.lockCrosshair=function f(k){if(k){h.setCrosshair(k)}j.locked=true};h.unlockCrosshair=function g(){j.locked=false};function d(k){if(j.locked){return}if(j.x!=-1){j.x=-1;h.triggerRedrawOverlay()}}function i(k){if(j.locked){return}if(h.getSelection&&h.getSelection()){j.x=-1;return}var l=h.offset();j.x=Math.max(0,Math.min(k.pageX-l.left,h.width()));j.y=Math.max(0,Math.min(k.pageY-l.top,h.height()));h.triggerRedrawOverlay()}h.hooks.bindEvents.push(function(l,k){if(!l.getOptions().crosshair.mode){return}k.mouseout(d);k.mousemove(i)});h.hooks.drawOverlay.push(function(m,k){var n=m.getOptions().crosshair;if(!n.mode){return}var l=m.getPlotOffset();k.save();k.translate(l.left,l.top);if(j.x!=-1){k.strokeStyle=n.color;k.lineWidth=n.lineWidth;k.lineJoin="round";k.beginPath();if(n.mode.indexOf("x")!=-1){k.moveTo(j.x,0);k.lineTo(j.x,m.height())}if(n.mode.indexOf("y")!=-1){k.moveTo(0,j.y);k.lineTo(m.width(),j.y)}k.stroke()}k.restore()});h.hooks.shutdown.push(function(l,k){k.unbind("mouseout",d);k.unbind("mousemove",i)})}b.plot.plugins.push({init:c,options:a,name:"crosshair",version:"1.0"})})(jQuery);
\ No newline at end of file
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){var options={crosshair:{mode:null,color:"rgba(170, 0, 0, 0.80)",lineWidth:1}};function init(plot){var crosshair={x:-1,y:-1,locked:false};plot.setCrosshair=function setCrosshair(pos){if(!pos)crosshair.x=-1;else{var o=plot.p2c(pos);crosshair.x=Math.max(0,Math.min(o.left,plot.width()));crosshair.y=Math.max(0,Math.min(o.top,plot.height()))}plot.triggerRedrawOverlay()};plot.clearCrosshair=plot.setCrosshair;plot.lockCrosshair=function lockCrosshair(pos){if(pos)plot.setCrosshair(pos);crosshair.locked=true};plot.unlockCrosshair=function unlockCrosshair(){crosshair.locked=false};function onMouseOut(e){if(crosshair.locked)return;if(crosshair.x!=-1){crosshair.x=-1;plot.triggerRedrawOverlay()}}function onMouseMove(e){if(crosshair.locked)return;if(plot.getSelection&&plot.getSelection()){crosshair.x=-1;return}var offset=plot.offset();crosshair.x=Math.max(0,Math.min(e.pageX-offset.left,plot.width()));crosshair.y=Math.max(0,Math.min(e.pageY-offset.top,plot.height()));plot.triggerRedrawOverlay()}plot.hooks.bindEvents.push(function(plot,eventHolder){if(!plot.getOptions().crosshair.mode)return;eventHolder.mouseout(onMouseOut);eventHolder.mousemove(onMouseMove)});plot.hooks.drawOverlay.push(function(plot,ctx){var c=plot.getOptions().crosshair;if(!c.mode)return;var plotOffset=plot.getPlotOffset();ctx.save();ctx.translate(plotOffset.left,plotOffset.top);if(crosshair.x!=-1){var adj=plot.getOptions().crosshair.lineWidth%2?.5:0;ctx.strokeStyle=c.color;ctx.lineWidth=c.lineWidth;ctx.lineJoin="round";ctx.beginPath();if(c.mode.indexOf("x")!=-1){var drawX=Math.floor(crosshair.x)+adj;ctx.moveTo(drawX,0);ctx.lineTo(drawX,plot.height())}if(c.mode.indexOf("y")!=-1){var drawY=Math.floor(crosshair.y)+adj;ctx.moveTo(0,drawY);ctx.lineTo(plot.width(),drawY)}ctx.stroke()}ctx.restore()});plot.hooks.shutdown.push(function(plot,eventHolder){eventHolder.unbind("mouseout",onMouseOut);eventHolder.unbind("mousemove",onMouseMove)})}$.plot.plugins.push({init:init,options:options,name:"crosshair",version:"1.0"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.errorbars.js b/pandora_console/include/graphs/flot/jquery.flot.errorbars.js
new file mode 100644
index 0000000000..2583d5c20c
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.errorbars.js
@@ -0,0 +1,353 @@
+/* Flot plugin for plotting error bars.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+Error bars are used to show standard deviation and other statistical
+properties in a plot.
+
+* Created by Rui Pereira  -  rui (dot) pereira (at) gmail (dot) com
+
+This plugin allows you to plot error-bars over points. Set "errorbars" inside
+the points series to the axis name over which there will be error values in
+your data array (*even* if you do not intend to plot them later, by setting
+"show: null" on xerr/yerr).
+
+The plugin supports these options:
+
+	series: {
+		points: {
+			errorbars: "x" or "y" or "xy",
+			xerr: {
+				show: null/false or true,
+				asymmetric: null/false or true,
+				upperCap: null or "-" or function,
+				lowerCap: null or "-" or function,
+				color: null or color,
+				radius: null or number
+			},
+			yerr: { same options as xerr }
+		}
+	}
+
+Each data point array is expected to be of the type:
+
+	"x"  [ x, y, xerr ]
+	"y"  [ x, y, yerr ]
+	"xy" [ x, y, xerr, yerr ]
+
+Where xerr becomes xerr_lower,xerr_upper for the asymmetric error case, and
+equivalently for yerr. Eg., a datapoint for the "xy" case with symmetric
+error-bars on X and asymmetric on Y would be:
+
+	[ x, y, xerr, yerr_lower, yerr_upper ]
+
+By default no end caps are drawn. Setting upperCap and/or lowerCap to "-" will
+draw a small cap perpendicular to the error bar. They can also be set to a
+user-defined drawing function, with (ctx, x, y, radius) as parameters, as eg.
+
+	function drawSemiCircle( ctx, x, y, radius ) {
+		ctx.beginPath();
+		ctx.arc( x, y, radius, 0, Math.PI, false );
+		ctx.moveTo( x - radius, y );
+		ctx.lineTo( x + radius, y );
+		ctx.stroke();
+	}
+
+Color and radius both default to the same ones of the points series if not
+set. The independent radius parameter on xerr/yerr is useful for the case when
+we may want to add error-bars to a line, without showing the interconnecting
+points (with radius: 0), and still showing end caps on the error-bars.
+shadowSize and lineWidth are derived as well from the points series.
+
+*/
+
+(function ($) {
+    var options = {
+        series: {
+            points: {
+                errorbars: null, //should be 'x', 'y' or 'xy'
+                xerr: { err: 'x', show: null, asymmetric: null, upperCap: null, lowerCap: null, color: null, radius: null},
+                yerr: { err: 'y', show: null, asymmetric: null, upperCap: null, lowerCap: null, color: null, radius: null}
+            }
+        }
+    };
+
+    function processRawData(plot, series, data, datapoints){
+        if (!series.points.errorbars)
+            return;
+
+        // x,y values
+        var format = [
+            { x: true, number: true, required: true },
+            { y: true, number: true, required: true }
+        ];
+
+        var errors = series.points.errorbars;
+        // error bars - first X then Y
+        if (errors == 'x' || errors == 'xy') {
+            // lower / upper error
+            if (series.points.xerr.asymmetric) {
+                format.push({ x: true, number: true, required: true });
+                format.push({ x: true, number: true, required: true });
+            } else
+                format.push({ x: true, number: true, required: true });
+        }
+        if (errors == 'y' || errors == 'xy') {
+            // lower / upper error
+            if (series.points.yerr.asymmetric) {
+                format.push({ y: true, number: true, required: true });
+                format.push({ y: true, number: true, required: true });
+            } else
+                format.push({ y: true, number: true, required: true });
+        }
+        datapoints.format = format;
+    }
+
+    function parseErrors(series, i){
+
+        var points = series.datapoints.points;
+
+        // read errors from points array
+        var exl = null,
+                exu = null,
+                eyl = null,
+                eyu = null;
+        var xerr = series.points.xerr,
+                yerr = series.points.yerr;
+
+        var eb = series.points.errorbars;
+        // error bars - first X
+        if (eb == 'x' || eb == 'xy') {
+            if (xerr.asymmetric) {
+                exl = points[i + 2];
+                exu = points[i + 3];
+                if (eb == 'xy')
+                    if (yerr.asymmetric){
+                        eyl = points[i + 4];
+                        eyu = points[i + 5];
+                    } else eyl = points[i + 4];
+            } else {
+                exl = points[i + 2];
+                if (eb == 'xy')
+                    if (yerr.asymmetric) {
+                        eyl = points[i + 3];
+                        eyu = points[i + 4];
+                    } else eyl = points[i + 3];
+            }
+        // only Y
+        } else if (eb == 'y')
+            if (yerr.asymmetric) {
+                eyl = points[i + 2];
+                eyu = points[i + 3];
+            } else eyl = points[i + 2];
+
+        // symmetric errors?
+        if (exu == null) exu = exl;
+        if (eyu == null) eyu = eyl;
+
+        var errRanges = [exl, exu, eyl, eyu];
+        // nullify if not showing
+        if (!xerr.show){
+            errRanges[0] = null;
+            errRanges[1] = null;
+        }
+        if (!yerr.show){
+            errRanges[2] = null;
+            errRanges[3] = null;
+        }
+        return errRanges;
+    }
+
+    function drawSeriesErrors(plot, ctx, s){
+
+        var points = s.datapoints.points,
+                ps = s.datapoints.pointsize,
+                ax = [s.xaxis, s.yaxis],
+                radius = s.points.radius,
+                err = [s.points.xerr, s.points.yerr];
+
+        //sanity check, in case some inverted axis hack is applied to flot
+        var invertX = false;
+        if (ax[0].p2c(ax[0].max) < ax[0].p2c(ax[0].min)) {
+            invertX = true;
+            var tmp = err[0].lowerCap;
+            err[0].lowerCap = err[0].upperCap;
+            err[0].upperCap = tmp;
+        }
+
+        var invertY = false;
+        if (ax[1].p2c(ax[1].min) < ax[1].p2c(ax[1].max)) {
+            invertY = true;
+            var tmp = err[1].lowerCap;
+            err[1].lowerCap = err[1].upperCap;
+            err[1].upperCap = tmp;
+        }
+
+        for (var i = 0; i < s.datapoints.points.length; i += ps) {
+
+            //parse
+            var errRanges = parseErrors(s, i);
+
+            //cycle xerr & yerr
+            for (var e = 0; e < err.length; e++){
+
+                var minmax = [ax[e].min, ax[e].max];
+
+                //draw this error?
+                if (errRanges[e * err.length]){
+
+                    //data coordinates
+                    var x = points[i],
+                        y = points[i + 1];
+
+                    //errorbar ranges
+                    var upper = [x, y][e] + errRanges[e * err.length + 1],
+                        lower = [x, y][e] - errRanges[e * err.length];
+
+                    //points outside of the canvas
+                    if (err[e].err == 'x')
+                        if (y > ax[1].max || y < ax[1].min || upper < ax[0].min || lower > ax[0].max)
+                            continue;
+                    if (err[e].err == 'y')
+                        if (x > ax[0].max || x < ax[0].min || upper < ax[1].min || lower > ax[1].max)
+                            continue;
+
+                    // prevent errorbars getting out of the canvas
+                    var drawUpper = true,
+                        drawLower = true;
+
+                    if (upper > minmax[1]) {
+                        drawUpper = false;
+                        upper = minmax[1];
+                    }
+                    if (lower < minmax[0]) {
+                        drawLower = false;
+                        lower = minmax[0];
+                    }
+
+                    //sanity check, in case some inverted axis hack is applied to flot
+                    if ((err[e].err == 'x' && invertX) || (err[e].err == 'y' && invertY)) {
+                        //swap coordinates
+                        var tmp = lower;
+                        lower = upper;
+                        upper = tmp;
+                        tmp = drawLower;
+                        drawLower = drawUpper;
+                        drawUpper = tmp;
+                        tmp = minmax[0];
+                        minmax[0] = minmax[1];
+                        minmax[1] = tmp;
+                    }
+
+                    // convert to pixels
+                    x = ax[0].p2c(x),
+                        y = ax[1].p2c(y),
+                        upper = ax[e].p2c(upper);
+                    lower = ax[e].p2c(lower);
+                    minmax[0] = ax[e].p2c(minmax[0]);
+                    minmax[1] = ax[e].p2c(minmax[1]);
+
+                    //same style as points by default
+                    var lw = err[e].lineWidth ? err[e].lineWidth : s.points.lineWidth,
+                        sw = s.points.shadowSize != null ? s.points.shadowSize : s.shadowSize;
+
+                    //shadow as for points
+                    if (lw > 0 && sw > 0) {
+                        var w = sw / 2;
+                        ctx.lineWidth = w;
+                        ctx.strokeStyle = "rgba(0,0,0,0.1)";
+                        drawError(ctx, err[e], x, y, upper, lower, drawUpper, drawLower, radius, w + w/2, minmax);
+
+                        ctx.strokeStyle = "rgba(0,0,0,0.2)";
+                        drawError(ctx, err[e], x, y, upper, lower, drawUpper, drawLower, radius, w/2, minmax);
+                    }
+
+                    ctx.strokeStyle = err[e].color? err[e].color: s.color;
+                    ctx.lineWidth = lw;
+                    //draw it
+                    drawError(ctx, err[e], x, y, upper, lower, drawUpper, drawLower, radius, 0, minmax);
+                }
+            }
+        }
+    }
+
+    function drawError(ctx,err,x,y,upper,lower,drawUpper,drawLower,radius,offset,minmax){
+
+        //shadow offset
+        y += offset;
+        upper += offset;
+        lower += offset;
+
+        // error bar - avoid plotting over circles
+        if (err.err == 'x'){
+            if (upper > x + radius) drawPath(ctx, [[upper,y],[Math.max(x + radius,minmax[0]),y]]);
+            else drawUpper = false;
+            if (lower < x - radius) drawPath(ctx, [[Math.min(x - radius,minmax[1]),y],[lower,y]] );
+            else drawLower = false;
+        }
+        else {
+            if (upper < y - radius) drawPath(ctx, [[x,upper],[x,Math.min(y - radius,minmax[0])]] );
+            else drawUpper = false;
+            if (lower > y + radius) drawPath(ctx, [[x,Math.max(y + radius,minmax[1])],[x,lower]] );
+            else drawLower = false;
+        }
+
+        //internal radius value in errorbar, allows to plot radius 0 points and still keep proper sized caps
+        //this is a way to get errorbars on lines without visible connecting dots
+        radius = err.radius != null? err.radius: radius;
+
+        // upper cap
+        if (drawUpper) {
+            if (err.upperCap == '-'){
+                if (err.err=='x') drawPath(ctx, [[upper,y - radius],[upper,y + radius]] );
+                else drawPath(ctx, [[x - radius,upper],[x + radius,upper]] );
+            } else if ($.isFunction(err.upperCap)){
+                if (err.err=='x') err.upperCap(ctx, upper, y, radius);
+                else err.upperCap(ctx, x, upper, radius);
+            }
+        }
+        // lower cap
+        if (drawLower) {
+            if (err.lowerCap == '-'){
+                if (err.err=='x') drawPath(ctx, [[lower,y - radius],[lower,y + radius]] );
+                else drawPath(ctx, [[x - radius,lower],[x + radius,lower]] );
+            } else if ($.isFunction(err.lowerCap)){
+                if (err.err=='x') err.lowerCap(ctx, lower, y, radius);
+                else err.lowerCap(ctx, x, lower, radius);
+            }
+        }
+    }
+
+    function drawPath(ctx, pts){
+        ctx.beginPath();
+        ctx.moveTo(pts[0][0], pts[0][1]);
+        for (var p=1; p < pts.length; p++)
+            ctx.lineTo(pts[p][0], pts[p][1]);
+        ctx.stroke();
+    }
+
+    function draw(plot, ctx){
+        var plotOffset = plot.getPlotOffset();
+
+        ctx.save();
+        ctx.translate(plotOffset.left, plotOffset.top);
+        $.each(plot.getData(), function (i, s) {
+            if (s.points.errorbars && (s.points.xerr.show || s.points.yerr.show))
+                drawSeriesErrors(plot, ctx, s);
+        });
+        ctx.restore();
+    }
+
+    function init(plot) {
+        plot.hooks.processRawData.push(processRawData);
+        plot.hooks.draw.push(draw);
+    }
+
+    $.plot.plugins.push({
+                init: init,
+                options: options,
+                name: 'errorbars',
+                version: '1.0'
+            });
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.errorbars.min.js b/pandora_console/include/graphs/flot/jquery.flot.errorbars.min.js
new file mode 100644
index 0000000000..aa79f541a6
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.errorbars.min.js
@@ -0,0 +1,7 @@
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){var options={series:{points:{errorbars:null,xerr:{err:"x",show:null,asymmetric:null,upperCap:null,lowerCap:null,color:null,radius:null},yerr:{err:"y",show:null,asymmetric:null,upperCap:null,lowerCap:null,color:null,radius:null}}}};function processRawData(plot,series,data,datapoints){if(!series.points.errorbars)return;var format=[{x:true,number:true,required:true},{y:true,number:true,required:true}];var errors=series.points.errorbars;if(errors=="x"||errors=="xy"){if(series.points.xerr.asymmetric){format.push({x:true,number:true,required:true});format.push({x:true,number:true,required:true})}else format.push({x:true,number:true,required:true})}if(errors=="y"||errors=="xy"){if(series.points.yerr.asymmetric){format.push({y:true,number:true,required:true});format.push({y:true,number:true,required:true})}else format.push({y:true,number:true,required:true})}datapoints.format=format}function parseErrors(series,i){var points=series.datapoints.points;var exl=null,exu=null,eyl=null,eyu=null;var xerr=series.points.xerr,yerr=series.points.yerr;var eb=series.points.errorbars;if(eb=="x"||eb=="xy"){if(xerr.asymmetric){exl=points[i+2];exu=points[i+3];if(eb=="xy")if(yerr.asymmetric){eyl=points[i+4];eyu=points[i+5]}else eyl=points[i+4]}else{exl=points[i+2];if(eb=="xy")if(yerr.asymmetric){eyl=points[i+3];eyu=points[i+4]}else eyl=points[i+3]}}else if(eb=="y")if(yerr.asymmetric){eyl=points[i+2];eyu=points[i+3]}else eyl=points[i+2];if(exu==null)exu=exl;if(eyu==null)eyu=eyl;var errRanges=[exl,exu,eyl,eyu];if(!xerr.show){errRanges[0]=null;errRanges[1]=null}if(!yerr.show){errRanges[2]=null;errRanges[3]=null}return errRanges}function drawSeriesErrors(plot,ctx,s){var points=s.datapoints.points,ps=s.datapoints.pointsize,ax=[s.xaxis,s.yaxis],radius=s.points.radius,err=[s.points.xerr,s.points.yerr];var invertX=false;if(ax[0].p2c(ax[0].max)<ax[0].p2c(ax[0].min)){invertX=true;var tmp=err[0].lowerCap;err[0].lowerCap=err[0].upperCap;err[0].upperCap=tmp}var invertY=false;if(ax[1].p2c(ax[1].min)<ax[1].p2c(ax[1].max)){invertY=true;var tmp=err[1].lowerCap;err[1].lowerCap=err[1].upperCap;err[1].upperCap=tmp}for(var i=0;i<s.datapoints.points.length;i+=ps){var errRanges=parseErrors(s,i);for(var e=0;e<err.length;e++){var minmax=[ax[e].min,ax[e].max];if(errRanges[e*err.length]){var x=points[i],y=points[i+1];var upper=[x,y][e]+errRanges[e*err.length+1],lower=[x,y][e]-errRanges[e*err.length];if(err[e].err=="x")if(y>ax[1].max||y<ax[1].min||upper<ax[0].min||lower>ax[0].max)continue;if(err[e].err=="y")if(x>ax[0].max||x<ax[0].min||upper<ax[1].min||lower>ax[1].max)continue;var drawUpper=true,drawLower=true;if(upper>minmax[1]){drawUpper=false;upper=minmax[1]}if(lower<minmax[0]){drawLower=false;lower=minmax[0]}if(err[e].err=="x"&&invertX||err[e].err=="y"&&invertY){var tmp=lower;lower=upper;upper=tmp;tmp=drawLower;drawLower=drawUpper;drawUpper=tmp;tmp=minmax[0];minmax[0]=minmax[1];minmax[1]=tmp}x=ax[0].p2c(x),y=ax[1].p2c(y),upper=ax[e].p2c(upper);lower=ax[e].p2c(lower);minmax[0]=ax[e].p2c(minmax[0]);minmax[1]=ax[e].p2c(minmax[1]);var lw=err[e].lineWidth?err[e].lineWidth:s.points.lineWidth,sw=s.points.shadowSize!=null?s.points.shadowSize:s.shadowSize;if(lw>0&&sw>0){var w=sw/2;ctx.lineWidth=w;ctx.strokeStyle="rgba(0,0,0,0.1)";drawError(ctx,err[e],x,y,upper,lower,drawUpper,drawLower,radius,w+w/2,minmax);ctx.strokeStyle="rgba(0,0,0,0.2)";drawError(ctx,err[e],x,y,upper,lower,drawUpper,drawLower,radius,w/2,minmax)}ctx.strokeStyle=err[e].color?err[e].color:s.color;ctx.lineWidth=lw;drawError(ctx,err[e],x,y,upper,lower,drawUpper,drawLower,radius,0,minmax)}}}}function drawError(ctx,err,x,y,upper,lower,drawUpper,drawLower,radius,offset,minmax){y+=offset;upper+=offset;lower+=offset;if(err.err=="x"){if(upper>x+radius)drawPath(ctx,[[upper,y],[Math.max(x+radius,minmax[0]),y]]);else drawUpper=false;if(lower<x-radius)drawPath(ctx,[[Math.min(x-radius,minmax[1]),y],[lower,y]]);else drawLower=false}else{if(upper<y-radius)drawPath(ctx,[[x,upper],[x,Math.min(y-radius,minmax[0])]]);else drawUpper=false;if(lower>y+radius)drawPath(ctx,[[x,Math.max(y+radius,minmax[1])],[x,lower]]);else drawLower=false}radius=err.radius!=null?err.radius:radius;if(drawUpper){if(err.upperCap=="-"){if(err.err=="x")drawPath(ctx,[[upper,y-radius],[upper,y+radius]]);else drawPath(ctx,[[x-radius,upper],[x+radius,upper]])}else if($.isFunction(err.upperCap)){if(err.err=="x")err.upperCap(ctx,upper,y,radius);else err.upperCap(ctx,x,upper,radius)}}if(drawLower){if(err.lowerCap=="-"){if(err.err=="x")drawPath(ctx,[[lower,y-radius],[lower,y+radius]]);else drawPath(ctx,[[x-radius,lower],[x+radius,lower]])}else if($.isFunction(err.lowerCap)){if(err.err=="x")err.lowerCap(ctx,lower,y,radius);else err.lowerCap(ctx,x,lower,radius)}}}function drawPath(ctx,pts){ctx.beginPath();ctx.moveTo(pts[0][0],pts[0][1]);for(var p=1;p<pts.length;p++)ctx.lineTo(pts[p][0],pts[p][1]);ctx.stroke()}function draw(plot,ctx){var plotOffset=plot.getPlotOffset();ctx.save();ctx.translate(plotOffset.left,plotOffset.top);$.each(plot.getData(),function(i,s){if(s.points.errorbars&&(s.points.xerr.show||s.points.yerr.show))drawSeriesErrors(plot,ctx,s)});ctx.restore()}function init(plot){plot.hooks.processRawData.push(processRawData);plot.hooks.draw.push(draw)}$.plot.plugins.push({init:init,options:options,name:"errorbars",version:"1.0"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.fillbetween.js b/pandora_console/include/graphs/flot/jquery.flot.fillbetween.js
new file mode 100644
index 0000000000..18b15d26db
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.fillbetween.js
@@ -0,0 +1,226 @@
+/* Flot plugin for computing bottoms for filled line and bar charts.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+The case: you've got two series that you want to fill the area between. In Flot
+terms, you need to use one as the fill bottom of the other. You can specify the
+bottom of each data point as the third coordinate manually, or you can use this
+plugin to compute it for you.
+
+In order to name the other series, you need to give it an id, like this:
+
+	var dataset = [
+		{ data: [ ... ], id: "foo" } ,         // use default bottom
+		{ data: [ ... ], fillBetween: "foo" }, // use first dataset as bottom
+	];
+
+	$.plot($("#placeholder"), dataset, { lines: { show: true, fill: true }});
+
+As a convenience, if the id given is a number that doesn't appear as an id in
+the series, it is interpreted as the index in the array instead (so fillBetween:
+0 can also mean the first series).
+
+Internally, the plugin modifies the datapoints in each series. For line series,
+extra data points might be inserted through interpolation. Note that at points
+where the bottom line is not defined (due to a null point or start/end of line),
+the current line will show a gap too. The algorithm comes from the
+jquery.flot.stack.js plugin, possibly some code could be shared.
+
+*/
+
+(function ( $ ) {
+
+	var options = {
+		series: {
+			fillBetween: null	// or number
+		}
+	};
+
+	function init( plot ) {
+
+		function findBottomSeries( s, allseries ) {
+
+			var i;
+
+			for ( i = 0; i < allseries.length; ++i ) {
+				if ( allseries[ i ].id === s.fillBetween ) {
+					return allseries[ i ];
+				}
+			}
+
+			if ( typeof s.fillBetween === "number" ) {
+				if ( s.fillBetween < 0 || s.fillBetween >= allseries.length ) {
+					return null;
+				}
+				return allseries[ s.fillBetween ];
+			}
+
+			return null;
+		}
+
+		function computeFillBottoms( plot, s, datapoints ) {
+
+			if ( s.fillBetween == null ) {
+				return;
+			}
+
+			var other = findBottomSeries( s, plot.getData() );
+
+			if ( !other ) {
+				return;
+			}
+
+			var ps = datapoints.pointsize,
+				points = datapoints.points,
+				otherps = other.datapoints.pointsize,
+				otherpoints = other.datapoints.points,
+				newpoints = [],
+				px, py, intery, qx, qy, bottom,
+				withlines = s.lines.show,
+				withbottom = ps > 2 && datapoints.format[2].y,
+				withsteps = withlines && s.lines.steps,
+				fromgap = true,
+				i = 0,
+				j = 0,
+				l, m;
+
+			while ( true ) {
+
+				if ( i >= points.length ) {
+					break;
+				}
+
+				l = newpoints.length;
+
+				if ( points[ i ] == null ) {
+
+					// copy gaps
+
+					for ( m = 0; m < ps; ++m ) {
+						newpoints.push( points[ i + m ] );
+					}
+
+					i += ps;
+
+				} else if ( j >= otherpoints.length ) {
+
+					// for lines, we can't use the rest of the points
+
+					if ( !withlines ) {
+						for ( m = 0; m < ps; ++m ) {
+							newpoints.push( points[ i + m ] );
+						}
+					}
+
+					i += ps;
+
+				} else if ( otherpoints[ j ] == null ) {
+
+					// oops, got a gap
+
+					for ( m = 0; m < ps; ++m ) {
+						newpoints.push( null );
+					}
+
+					fromgap = true;
+					j += otherps;
+
+				} else {
+
+					// cases where we actually got two points
+
+					px = points[ i ];
+					py = points[ i + 1 ];
+					qx = otherpoints[ j ];
+					qy = otherpoints[ j + 1 ];
+					bottom = 0;
+
+					if ( px === qx ) {
+
+						for ( m = 0; m < ps; ++m ) {
+							newpoints.push( points[ i + m ] );
+						}
+
+						//newpoints[ l + 1 ] += qy;
+						bottom = qy;
+
+						i += ps;
+						j += otherps;
+
+					} else if ( px > qx ) {
+
+						// we got past point below, might need to
+						// insert interpolated extra point
+
+						if ( withlines && i > 0 && points[ i - ps ] != null ) {
+							intery = py + ( points[ i - ps + 1 ] - py ) * ( qx - px ) / ( points[ i - ps ] - px );
+							newpoints.push( qx );
+							newpoints.push( intery );
+							for ( m = 2; m < ps; ++m ) {
+								newpoints.push( points[ i + m ] );
+							}
+							bottom = qy;
+						}
+
+						j += otherps;
+
+					} else { // px < qx
+
+						// if we come from a gap, we just skip this point
+
+						if ( fromgap && withlines ) {
+							i += ps;
+							continue;
+						}
+
+						for ( m = 0; m < ps; ++m ) {
+							newpoints.push( points[ i + m ] );
+						}
+
+						// we might be able to interpolate a point below,
+						// this can give us a better y
+
+						if ( withlines && j > 0 && otherpoints[ j - otherps ] != null ) {
+							bottom = qy + ( otherpoints[ j - otherps + 1 ] - qy ) * ( px - qx ) / ( otherpoints[ j - otherps ] - qx );
+						}
+
+						//newpoints[l + 1] += bottom;
+
+						i += ps;
+					}
+
+					fromgap = false;
+
+					if ( l !== newpoints.length && withbottom ) {
+						newpoints[ l + 2 ] = bottom;
+					}
+				}
+
+				// maintain the line steps invariant
+
+				if ( withsteps && l !== newpoints.length && l > 0 &&
+					newpoints[ l ] !== null &&
+					newpoints[ l ] !== newpoints[ l - ps ] &&
+					newpoints[ l + 1 ] !== newpoints[ l - ps + 1 ] ) {
+					for (m = 0; m < ps; ++m) {
+						newpoints[ l + ps + m ] = newpoints[ l + m ];
+					}
+					newpoints[ l + 1 ] = newpoints[ l - ps + 1 ];
+				}
+			}
+
+			datapoints.points = newpoints;
+		}
+
+		plot.hooks.processDatapoints.push( computeFillBottoms );
+	}
+
+	$.plot.plugins.push({
+		init: init,
+		options: options,
+		name: "fillbetween",
+		version: "1.0"
+	});
+
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.fillbetween.min.js b/pandora_console/include/graphs/flot/jquery.flot.fillbetween.min.js
new file mode 100644
index 0000000000..464bf72c84
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.fillbetween.min.js
@@ -0,0 +1,7 @@
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){var options={series:{fillBetween:null}};function init(plot){function findBottomSeries(s,allseries){var i;for(i=0;i<allseries.length;++i){if(allseries[i].id===s.fillBetween){return allseries[i]}}if(typeof s.fillBetween==="number"){if(s.fillBetween<0||s.fillBetween>=allseries.length){return null}return allseries[s.fillBetween]}return null}function computeFillBottoms(plot,s,datapoints){if(s.fillBetween==null){return}var other=findBottomSeries(s,plot.getData());if(!other){return}var ps=datapoints.pointsize,points=datapoints.points,otherps=other.datapoints.pointsize,otherpoints=other.datapoints.points,newpoints=[],px,py,intery,qx,qy,bottom,withlines=s.lines.show,withbottom=ps>2&&datapoints.format[2].y,withsteps=withlines&&s.lines.steps,fromgap=true,i=0,j=0,l,m;while(true){if(i>=points.length){break}l=newpoints.length;if(points[i]==null){for(m=0;m<ps;++m){newpoints.push(points[i+m])}i+=ps}else if(j>=otherpoints.length){if(!withlines){for(m=0;m<ps;++m){newpoints.push(points[i+m])}}i+=ps}else if(otherpoints[j]==null){for(m=0;m<ps;++m){newpoints.push(null)}fromgap=true;j+=otherps}else{px=points[i];py=points[i+1];qx=otherpoints[j];qy=otherpoints[j+1];bottom=0;if(px===qx){for(m=0;m<ps;++m){newpoints.push(points[i+m])}bottom=qy;i+=ps;j+=otherps}else if(px>qx){if(withlines&&i>0&&points[i-ps]!=null){intery=py+(points[i-ps+1]-py)*(qx-px)/(points[i-ps]-px);newpoints.push(qx);newpoints.push(intery);for(m=2;m<ps;++m){newpoints.push(points[i+m])}bottom=qy}j+=otherps}else{if(fromgap&&withlines){i+=ps;continue}for(m=0;m<ps;++m){newpoints.push(points[i+m])}if(withlines&&j>0&&otherpoints[j-otherps]!=null){bottom=qy+(otherpoints[j-otherps+1]-qy)*(px-qx)/(otherpoints[j-otherps]-qx)}i+=ps}fromgap=false;if(l!==newpoints.length&&withbottom){newpoints[l+2]=bottom}}if(withsteps&&l!==newpoints.length&&l>0&&newpoints[l]!==null&&newpoints[l]!==newpoints[l-ps]&&newpoints[l+1]!==newpoints[l-ps+1]){for(m=0;m<ps;++m){newpoints[l+ps+m]=newpoints[l+m]}newpoints[l+1]=newpoints[l-ps+1]}}datapoints.points=newpoints}plot.hooks.processDatapoints.push(computeFillBottoms)}$.plot.plugins.push({init:init,options:options,name:"fillbetween",version:"1.0"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.image.js b/pandora_console/include/graphs/flot/jquery.flot.image.js
new file mode 100644
index 0000000000..625a03571d
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.image.js
@@ -0,0 +1,241 @@
+/* Flot plugin for plotting images.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+The data syntax is [ [ image, x1, y1, x2, y2 ], ... ] where (x1, y1) and
+(x2, y2) are where you intend the two opposite corners of the image to end up
+in the plot. Image must be a fully loaded Javascript image (you can make one
+with new Image()). If the image is not complete, it's skipped when plotting.
+
+There are two helpers included for retrieving images. The easiest work the way
+that you put in URLs instead of images in the data, like this:
+
+	[ "myimage.png", 0, 0, 10, 10 ]
+
+Then call $.plot.image.loadData( data, options, callback ) where data and
+options are the same as you pass in to $.plot. This loads the images, replaces
+the URLs in the data with the corresponding images and calls "callback" when
+all images are loaded (or failed loading). In the callback, you can then call
+$.plot with the data set. See the included example.
+
+A more low-level helper, $.plot.image.load(urls, callback) is also included.
+Given a list of URLs, it calls callback with an object mapping from URL to
+Image object when all images are loaded or have failed loading.
+
+The plugin supports these options:
+
+	series: {
+		images: {
+			show: boolean
+			anchor: "corner" or "center"
+			alpha: [ 0, 1 ]
+		}
+	}
+
+They can be specified for a specific series:
+
+	$.plot( $("#placeholder"), [{
+		data: [ ... ],
+		images: { ... }
+	])
+
+Note that because the data format is different from usual data points, you
+can't use images with anything else in a specific data series.
+
+Setting "anchor" to "center" causes the pixels in the image to be anchored at
+the corner pixel centers inside of at the pixel corners, effectively letting
+half a pixel stick out to each side in the plot.
+
+A possible future direction could be support for tiling for large images (like
+Google Maps).
+
+*/
+
+(function ($) {
+    var options = {
+        series: {
+            images: {
+                show: false,
+                alpha: 1,
+                anchor: "corner" // or "center"
+            }
+        }
+    };
+
+    $.plot.image = {};
+
+    $.plot.image.loadDataImages = function (series, options, callback) {
+        var urls = [], points = [];
+
+        var defaultShow = options.series.images.show;
+        
+        $.each(series, function (i, s) {
+            if (!(defaultShow || s.images.show))
+                return;
+            
+            if (s.data)
+                s = s.data;
+
+            $.each(s, function (i, p) {
+                if (typeof p[0] == "string") {
+                    urls.push(p[0]);
+                    points.push(p);
+                }
+            });
+        });
+
+        $.plot.image.load(urls, function (loadedImages) {
+            $.each(points, function (i, p) {
+                var url = p[0];
+                if (loadedImages[url])
+                    p[0] = loadedImages[url];
+            });
+
+            callback();
+        });
+    }
+    
+    $.plot.image.load = function (urls, callback) {
+        var missing = urls.length, loaded = {};
+        if (missing == 0)
+            callback({});
+
+        $.each(urls, function (i, url) {
+            var handler = function () {
+                --missing;
+                
+                loaded[url] = this;
+                
+                if (missing == 0)
+                    callback(loaded);
+            };
+
+            $('<img />').load(handler).error(handler).attr('src', url);
+        });
+    };
+    
+    function drawSeries(plot, ctx, series) {
+        var plotOffset = plot.getPlotOffset();
+        
+        if (!series.images || !series.images.show)
+            return;
+        
+        var points = series.datapoints.points,
+            ps = series.datapoints.pointsize;
+        
+        for (var i = 0; i < points.length; i += ps) {
+            var img = points[i],
+                x1 = points[i + 1], y1 = points[i + 2],
+                x2 = points[i + 3], y2 = points[i + 4],
+                xaxis = series.xaxis, yaxis = series.yaxis,
+                tmp;
+
+            // actually we should check img.complete, but it
+            // appears to be a somewhat unreliable indicator in
+            // IE6 (false even after load event)
+            if (!img || img.width <= 0 || img.height <= 0)
+                continue;
+
+            if (x1 > x2) {
+                tmp = x2;
+                x2 = x1;
+                x1 = tmp;
+            }
+            if (y1 > y2) {
+                tmp = y2;
+                y2 = y1;
+                y1 = tmp;
+            }
+            
+            // if the anchor is at the center of the pixel, expand the 
+            // image by 1/2 pixel in each direction
+            if (series.images.anchor == "center") {
+                tmp = 0.5 * (x2-x1) / (img.width - 1);
+                x1 -= tmp;
+                x2 += tmp;
+                tmp = 0.5 * (y2-y1) / (img.height - 1);
+                y1 -= tmp;
+                y2 += tmp;
+            }
+            
+            // clip
+            if (x1 == x2 || y1 == y2 ||
+                x1 >= xaxis.max || x2 <= xaxis.min ||
+                y1 >= yaxis.max || y2 <= yaxis.min)
+                continue;
+
+            var sx1 = 0, sy1 = 0, sx2 = img.width, sy2 = img.height;
+            if (x1 < xaxis.min) {
+                sx1 += (sx2 - sx1) * (xaxis.min - x1) / (x2 - x1);
+                x1 = xaxis.min;
+            }
+
+            if (x2 > xaxis.max) {
+                sx2 += (sx2 - sx1) * (xaxis.max - x2) / (x2 - x1);
+                x2 = xaxis.max;
+            }
+
+            if (y1 < yaxis.min) {
+                sy2 += (sy1 - sy2) * (yaxis.min - y1) / (y2 - y1);
+                y1 = yaxis.min;
+            }
+
+            if (y2 > yaxis.max) {
+                sy1 += (sy1 - sy2) * (yaxis.max - y2) / (y2 - y1);
+                y2 = yaxis.max;
+            }
+            
+            x1 = xaxis.p2c(x1);
+            x2 = xaxis.p2c(x2);
+            y1 = yaxis.p2c(y1);
+            y2 = yaxis.p2c(y2);
+            
+            // the transformation may have swapped us
+            if (x1 > x2) {
+                tmp = x2;
+                x2 = x1;
+                x1 = tmp;
+            }
+            if (y1 > y2) {
+                tmp = y2;
+                y2 = y1;
+                y1 = tmp;
+            }
+
+            tmp = ctx.globalAlpha;
+            ctx.globalAlpha *= series.images.alpha;
+            ctx.drawImage(img,
+                          sx1, sy1, sx2 - sx1, sy2 - sy1,
+                          x1 + plotOffset.left, y1 + plotOffset.top,
+                          x2 - x1, y2 - y1);
+            ctx.globalAlpha = tmp;
+        }
+    }
+
+    function processRawData(plot, series, data, datapoints) {
+        if (!series.images.show)
+            return;
+
+        // format is Image, x1, y1, x2, y2 (opposite corners)
+        datapoints.format = [
+            { required: true },
+            { x: true, number: true, required: true },
+            { y: true, number: true, required: true },
+            { x: true, number: true, required: true },
+            { y: true, number: true, required: true }
+        ];
+    }
+    
+    function init(plot) {
+        plot.hooks.processRawData.push(processRawData);
+        plot.hooks.drawSeries.push(drawSeries);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'image',
+        version: '1.1'
+    });
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.image.min.js b/pandora_console/include/graphs/flot/jquery.flot.image.min.js
new file mode 100644
index 0000000000..09df132f00
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.image.min.js
@@ -0,0 +1,7 @@
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){var options={series:{images:{show:false,alpha:1,anchor:"corner"}}};$.plot.image={};$.plot.image.loadDataImages=function(series,options,callback){var urls=[],points=[];var defaultShow=options.series.images.show;$.each(series,function(i,s){if(!(defaultShow||s.images.show))return;if(s.data)s=s.data;$.each(s,function(i,p){if(typeof p[0]=="string"){urls.push(p[0]);points.push(p)}})});$.plot.image.load(urls,function(loadedImages){$.each(points,function(i,p){var url=p[0];if(loadedImages[url])p[0]=loadedImages[url]});callback()})};$.plot.image.load=function(urls,callback){var missing=urls.length,loaded={};if(missing==0)callback({});$.each(urls,function(i,url){var handler=function(){--missing;loaded[url]=this;if(missing==0)callback(loaded)};$("<img />").load(handler).error(handler).attr("src",url)})};function drawSeries(plot,ctx,series){var plotOffset=plot.getPlotOffset();if(!series.images||!series.images.show)return;var points=series.datapoints.points,ps=series.datapoints.pointsize;for(var i=0;i<points.length;i+=ps){var img=points[i],x1=points[i+1],y1=points[i+2],x2=points[i+3],y2=points[i+4],xaxis=series.xaxis,yaxis=series.yaxis,tmp;if(!img||img.width<=0||img.height<=0)continue;if(x1>x2){tmp=x2;x2=x1;x1=tmp}if(y1>y2){tmp=y2;y2=y1;y1=tmp}if(series.images.anchor=="center"){tmp=.5*(x2-x1)/(img.width-1);x1-=tmp;x2+=tmp;tmp=.5*(y2-y1)/(img.height-1);y1-=tmp;y2+=tmp}if(x1==x2||y1==y2||x1>=xaxis.max||x2<=xaxis.min||y1>=yaxis.max||y2<=yaxis.min)continue;var sx1=0,sy1=0,sx2=img.width,sy2=img.height;if(x1<xaxis.min){sx1+=(sx2-sx1)*(xaxis.min-x1)/(x2-x1);x1=xaxis.min}if(x2>xaxis.max){sx2+=(sx2-sx1)*(xaxis.max-x2)/(x2-x1);x2=xaxis.max}if(y1<yaxis.min){sy2+=(sy1-sy2)*(yaxis.min-y1)/(y2-y1);y1=yaxis.min}if(y2>yaxis.max){sy1+=(sy1-sy2)*(yaxis.max-y2)/(y2-y1);y2=yaxis.max}x1=xaxis.p2c(x1);x2=xaxis.p2c(x2);y1=yaxis.p2c(y1);y2=yaxis.p2c(y2);if(x1>x2){tmp=x2;x2=x1;x1=tmp}if(y1>y2){tmp=y2;y2=y1;y1=tmp}tmp=ctx.globalAlpha;ctx.globalAlpha*=series.images.alpha;ctx.drawImage(img,sx1,sy1,sx2-sx1,sy2-sy1,x1+plotOffset.left,y1+plotOffset.top,x2-x1,y2-y1);ctx.globalAlpha=tmp}}function processRawData(plot,series,data,datapoints){if(!series.images.show)return;datapoints.format=[{required:true},{x:true,number:true,required:true},{y:true,number:true,required:true},{x:true,number:true,required:true},{y:true,number:true,required:true}]}function init(plot){plot.hooks.processRawData.push(processRawData);plot.hooks.drawSeries.push(drawSeries)}$.plot.plugins.push({init:init,options:options,name:"image",version:"1.1"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.js b/pandora_console/include/graphs/flot/jquery.flot.js
new file mode 100644
index 0000000000..39f3e4cf3e
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.js
@@ -0,0 +1,3168 @@
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+
+// first an inline dependency, jquery.colorhelpers.js, we inline it here
+// for convenience
+
+/* Plugin for jQuery for working with colors.
+ *
+ * Version 1.1.
+ *
+ * Inspiration from jQuery color animation plugin by John Resig.
+ *
+ * Released under the MIT license by Ole Laursen, October 2009.
+ *
+ * Examples:
+ *
+ *   $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString()
+ *   var c = $.color.extract($("#mydiv"), 'background-color');
+ *   console.log(c.r, c.g, c.b, c.a);
+ *   $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
+ *
+ * Note that .scale() and .add() return the same modified object
+ * instead of making a new one.
+ *
+ * V. 1.1: Fix error handling so e.g. parsing an empty string does
+ * produce a color rather than just crashing.
+ */
+(function($){$.color={};$.color.make=function(r,g,b,a){var o={};o.r=r||0;o.g=g||0;o.b=b||0;o.a=a!=null?a:1;o.add=function(c,d){for(var i=0;i<c.length;++i)o[c.charAt(i)]+=d;return o.normalize()};o.scale=function(c,f){for(var i=0;i<c.length;++i)o[c.charAt(i)]*=f;return o.normalize()};o.toString=function(){if(o.a>=1){return"rgb("+[o.r,o.g,o.b].join(",")+")"}else{return"rgba("+[o.r,o.g,o.b,o.a].join(",")+")"}};o.normalize=function(){function clamp(min,value,max){return value<min?min:value>max?max:value}o.r=clamp(0,parseInt(o.r),255);o.g=clamp(0,parseInt(o.g),255);o.b=clamp(0,parseInt(o.b),255);o.a=clamp(0,o.a,1);return o};o.clone=function(){return $.color.make(o.r,o.b,o.g,o.a)};return o.normalize()};$.color.extract=function(elem,css){var c;do{c=elem.css(css).toLowerCase();if(c!=""&&c!="transparent")break;elem=elem.parent()}while(elem.length&&!$.nodeName(elem.get(0),"body"));if(c=="rgba(0, 0, 0, 0)")c="transparent";return $.color.parse(c)};$.color.parse=function(str){var res,m=$.color.make;if(res=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10));if(res=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10),parseFloat(res[4]));if(res=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55);if(res=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55,parseFloat(res[4]));if(res=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))return m(parseInt(res[1],16),parseInt(res[2],16),parseInt(res[3],16));if(res=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))return m(parseInt(res[1]+res[1],16),parseInt(res[2]+res[2],16),parseInt(res[3]+res[3],16));var name=$.trim(str).toLowerCase();if(name=="transparent")return m(255,255,255,0);else{res=lookupColors[name]||[0,0,0];return m(res[0],res[1],res[2])}};var lookupColors={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);
+
+// the actual Flot code
+(function($) {
+
+	// Cache the prototype hasOwnProperty for faster access
+
+	var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+    // A shim to provide 'detach' to jQuery versions prior to 1.4.  Using a DOM
+    // operation produces the same effect as detach, i.e. removing the element
+    // without touching its jQuery data.
+
+    // Do not merge this into Flot 0.9, since it requires jQuery 1.4.4+.
+
+    if (!$.fn.detach) {
+        $.fn.detach = function() {
+            return this.each(function() {
+                if (this.parentNode) {
+                    this.parentNode.removeChild( this );
+                }
+            });
+        };
+    }
+
+	///////////////////////////////////////////////////////////////////////////
+	// The Canvas object is a wrapper around an HTML5 <canvas> tag.
+	//
+	// @constructor
+	// @param {string} cls List of classes to apply to the canvas.
+	// @param {element} container Element onto which to append the canvas.
+	//
+	// Requiring a container is a little iffy, but unfortunately canvas
+	// operations don't work unless the canvas is attached to the DOM.
+
+	function Canvas(cls, container) {
+
+		var element = container.children("." + cls)[0];
+
+		if (element == null) {
+
+			element = document.createElement("canvas");
+			element.className = cls;
+
+			$(element).css({ direction: "ltr", position: "absolute", left: 0, top: 0 })
+				.appendTo(container);
+
+			// If HTML5 Canvas isn't available, fall back to [Ex|Flash]canvas
+
+			if (!element.getContext) {
+				if (window.G_vmlCanvasManager) {
+					element = window.G_vmlCanvasManager.initElement(element);
+				} else {
+					throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.");
+				}
+			}
+		}
+
+		this.element = element;
+
+		var context = this.context = element.getContext("2d");
+
+		// Determine the screen's ratio of physical to device-independent
+		// pixels.  This is the ratio between the canvas width that the browser
+		// advertises and the number of pixels actually present in that space.
+
+		// The iPhone 4, for example, has a device-independent width of 320px,
+		// but its screen is actually 640px wide.  It therefore has a pixel
+		// ratio of 2, while most normal devices have a ratio of 1.
+
+		var devicePixelRatio = window.devicePixelRatio || 1,
+			backingStoreRatio =
+				context.webkitBackingStorePixelRatio ||
+				context.mozBackingStorePixelRatio ||
+				context.msBackingStorePixelRatio ||
+				context.oBackingStorePixelRatio ||
+				context.backingStorePixelRatio || 1;
+
+		this.pixelRatio = devicePixelRatio / backingStoreRatio;
+
+		// Size the canvas to match the internal dimensions of its container
+
+		this.resize(container.width(), container.height());
+
+		// Collection of HTML div layers for text overlaid onto the canvas
+
+		this.textContainer = null;
+		this.text = {};
+
+		// Cache of text fragments and metrics, so we can avoid expensively
+		// re-calculating them when the plot is re-rendered in a loop.
+
+		this._textCache = {};
+	}
+
+	// Resizes the canvas to the given dimensions.
+	//
+	// @param {number} width New width of the canvas, in pixels.
+	// @param {number} width New height of the canvas, in pixels.
+
+	Canvas.prototype.resize = function(width, height) {
+
+		if (width <= 0 || height <= 0) {
+			throw new Error("Invalid dimensions for plot, width = " + width + ", height = " + height);
+		}
+
+		var element = this.element,
+			context = this.context,
+			pixelRatio = this.pixelRatio;
+
+		// Resize the canvas, increasing its density based on the display's
+		// pixel ratio; basically giving it more pixels without increasing the
+		// size of its element, to take advantage of the fact that retina
+		// displays have that many more pixels in the same advertised space.
+
+		// Resizing should reset the state (excanvas seems to be buggy though)
+
+		if (this.width != width) {
+			element.width = width * pixelRatio;
+			element.style.width = width + "px";
+			this.width = width;
+		}
+
+		if (this.height != height) {
+			element.height = height * pixelRatio;
+			element.style.height = height + "px";
+			this.height = height;
+		}
+
+		// Save the context, so we can reset in case we get replotted.  The
+		// restore ensure that we're really back at the initial state, and
+		// should be safe even if we haven't saved the initial state yet.
+
+		context.restore();
+		context.save();
+
+		// Scale the coordinate space to match the display density; so even though we
+		// may have twice as many pixels, we still want lines and other drawing to
+		// appear at the same size; the extra pixels will just make them crisper.
+
+		context.scale(pixelRatio, pixelRatio);
+	};
+
+	// Clears the entire canvas area, not including any overlaid HTML text
+
+	Canvas.prototype.clear = function() {
+		this.context.clearRect(0, 0, this.width, this.height);
+	};
+
+	// Finishes rendering the canvas, including managing the text overlay.
+
+	Canvas.prototype.render = function() {
+
+		var cache = this._textCache;
+
+		// For each text layer, add elements marked as active that haven't
+		// already been rendered, and remove those that are no longer active.
+
+		for (var layerKey in cache) {
+			if (hasOwnProperty.call(cache, layerKey)) {
+
+				var layer = this.getTextLayer(layerKey),
+					layerCache = cache[layerKey];
+
+				layer.hide();
+
+				for (var styleKey in layerCache) {
+					if (hasOwnProperty.call(layerCache, styleKey)) {
+						var styleCache = layerCache[styleKey];
+						for (var key in styleCache) {
+							if (hasOwnProperty.call(styleCache, key)) {
+
+								var positions = styleCache[key].positions;
+
+								for (var i = 0, position; position = positions[i]; i++) {
+									if (position.active) {
+										if (!position.rendered) {
+											layer.append(position.element);
+											position.rendered = true;
+										}
+									} else {
+										positions.splice(i--, 1);
+										if (position.rendered) {
+											position.element.detach();
+										}
+									}
+								}
+
+								if (positions.length == 0) {
+									delete styleCache[key];
+								}
+							}
+						}
+					}
+				}
+
+				layer.show();
+			}
+		}
+	};
+
+	// Creates (if necessary) and returns the text overlay container.
+	//
+	// @param {string} classes String of space-separated CSS classes used to
+	//     uniquely identify the text layer.
+	// @return {object} The jQuery-wrapped text-layer div.
+
+	Canvas.prototype.getTextLayer = function(classes) {
+
+		var layer = this.text[classes];
+
+		// Create the text layer if it doesn't exist
+
+		if (layer == null) {
+
+			// Create the text layer container, if it doesn't exist
+
+			if (this.textContainer == null) {
+				this.textContainer = $("<div class='flot-text'></div>")
+					.css({
+						position: "absolute",
+						top: 0,
+						left: 0,
+						bottom: 0,
+						right: 0,
+						'font-size': "smaller",
+						color: "#545454"
+					})
+					.insertAfter(this.element);
+			}
+
+			layer = this.text[classes] = $("<div></div>")
+				.addClass(classes)
+				.css({
+					position: "absolute",
+					top: 0,
+					left: 0,
+					bottom: 0,
+					right: 0
+				})
+				.appendTo(this.textContainer);
+		}
+
+		return layer;
+	};
+
+	// Creates (if necessary) and returns a text info object.
+	//
+	// The object looks like this:
+	//
+	// {
+	//     width: Width of the text's wrapper div.
+	//     height: Height of the text's wrapper div.
+	//     element: The jQuery-wrapped HTML div containing the text.
+	//     positions: Array of positions at which this text is drawn.
+	// }
+	//
+	// The positions array contains objects that look like this:
+	//
+	// {
+	//     active: Flag indicating whether the text should be visible.
+	//     rendered: Flag indicating whether the text is currently visible.
+	//     element: The jQuery-wrapped HTML div containing the text.
+	//     x: X coordinate at which to draw the text.
+	//     y: Y coordinate at which to draw the text.
+	// }
+	//
+	// Each position after the first receives a clone of the original element.
+	//
+	// The idea is that that the width, height, and general 'identity' of the
+	// text is constant no matter where it is placed; the placements are a
+	// secondary property.
+	//
+	// Canvas maintains a cache of recently-used text info objects; getTextInfo
+	// either returns the cached element or creates a new entry.
+	//
+	// @param {string} layer A string of space-separated CSS classes uniquely
+	//     identifying the layer containing this text.
+	// @param {string} text Text string to retrieve info for.
+	// @param {(string|object)=} font Either a string of space-separated CSS
+	//     classes or a font-spec object, defining the text's font and style.
+	// @param {number=} angle Angle at which to rotate the text, in degrees.
+	//     Angle is currently unused, it will be implemented in the future.
+	// @param {number=} width Maximum width of the text before it wraps.
+	// @return {object} a text info object.
+
+	Canvas.prototype.getTextInfo = function(layer, text, font, angle, width) {
+
+		var textStyle, layerCache, styleCache, info;
+
+		// Cast the value to a string, in case we were given a number or such
+
+		text = "" + text;
+
+		// If the font is a font-spec object, generate a CSS font definition
+
+		if (typeof font === "object") {
+			textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px/" + font.lineHeight + "px " + font.family;
+		} else {
+			textStyle = font;
+		}
+
+		// Retrieve (or create) the cache for the text's layer and styles
+
+		layerCache = this._textCache[layer];
+
+		if (layerCache == null) {
+			layerCache = this._textCache[layer] = {};
+		}
+
+		styleCache = layerCache[textStyle];
+
+		if (styleCache == null) {
+			styleCache = layerCache[textStyle] = {};
+		}
+
+		info = styleCache[text];
+
+		// If we can't find a matching element in our cache, create a new one
+
+		if (info == null) {
+
+			var element = $("<div></div>").html(text)
+				.css({
+					position: "absolute",
+					'max-width': width,
+					top: -9999
+				})
+				.appendTo(this.getTextLayer(layer));
+
+			if (typeof font === "object") {
+				element.css({
+					font: textStyle,
+					color: font.color
+				});
+			} else if (typeof font === "string") {
+				element.addClass(font);
+			}
+
+			info = styleCache[text] = {
+				width: element.outerWidth(true),
+				height: element.outerHeight(true),
+				element: element,
+				positions: []
+			};
+
+			element.detach();
+		}
+
+		return info;
+	};
+
+	// Adds a text string to the canvas text overlay.
+	//
+	// The text isn't drawn immediately; it is marked as rendering, which will
+	// result in its addition to the canvas on the next render pass.
+	//
+	// @param {string} layer A string of space-separated CSS classes uniquely
+	//     identifying the layer containing this text.
+	// @param {number} x X coordinate at which to draw the text.
+	// @param {number} y Y coordinate at which to draw the text.
+	// @param {string} text Text string to draw.
+	// @param {(string|object)=} font Either a string of space-separated CSS
+	//     classes or a font-spec object, defining the text's font and style.
+	// @param {number=} angle Angle at which to rotate the text, in degrees.
+	//     Angle is currently unused, it will be implemented in the future.
+	// @param {number=} width Maximum width of the text before it wraps.
+	// @param {string=} halign Horizontal alignment of the text; either "left",
+	//     "center" or "right".
+	// @param {string=} valign Vertical alignment of the text; either "top",
+	//     "middle" or "bottom".
+
+	Canvas.prototype.addText = function(layer, x, y, text, font, angle, width, halign, valign) {
+
+		var info = this.getTextInfo(layer, text, font, angle, width),
+			positions = info.positions;
+
+		// Tweak the div's position to match the text's alignment
+
+		if (halign == "center") {
+			x -= info.width / 2;
+		} else if (halign == "right") {
+			x -= info.width;
+		}
+
+		if (valign == "middle") {
+			y -= info.height / 2;
+		} else if (valign == "bottom") {
+			y -= info.height;
+		}
+
+		// Determine whether this text already exists at this position.
+		// If so, mark it for inclusion in the next render pass.
+
+		for (var i = 0, position; position = positions[i]; i++) {
+			if (position.x == x && position.y == y) {
+				position.active = true;
+				return;
+			}
+		}
+
+		// If the text doesn't exist at this position, create a new entry
+
+		// For the very first position we'll re-use the original element,
+		// while for subsequent ones we'll clone it.
+
+		position = {
+			active: true,
+			rendered: false,
+			element: positions.length ? info.element.clone() : info.element,
+			x: x,
+			y: y
+		};
+
+		positions.push(position);
+
+		// Move the element to its final position within the container
+
+		position.element.css({
+			top: Math.round(y),
+			left: Math.round(x),
+			'text-align': halign	// In case the text wraps
+		});
+	};
+
+	// Removes one or more text strings from the canvas text overlay.
+	//
+	// If no parameters are given, all text within the layer is removed.
+	//
+	// Note that the text is not immediately removed; it is simply marked as
+	// inactive, which will result in its removal on the next render pass.
+	// This avoids the performance penalty for 'clear and redraw' behavior,
+	// where we potentially get rid of all text on a layer, but will likely
+	// add back most or all of it later, as when redrawing axes, for example.
+	//
+	// @param {string} layer A string of space-separated CSS classes uniquely
+	//     identifying the layer containing this text.
+	// @param {number=} x X coordinate of the text.
+	// @param {number=} y Y coordinate of the text.
+	// @param {string=} text Text string to remove.
+	// @param {(string|object)=} font Either a string of space-separated CSS
+	//     classes or a font-spec object, defining the text's font and style.
+	// @param {number=} angle Angle at which the text is rotated, in degrees.
+	//     Angle is currently unused, it will be implemented in the future.
+
+	Canvas.prototype.removeText = function(layer, x, y, text, font, angle) {
+		if (text == null) {
+			var layerCache = this._textCache[layer];
+			if (layerCache != null) {
+				for (var styleKey in layerCache) {
+					if (hasOwnProperty.call(layerCache, styleKey)) {
+						var styleCache = layerCache[styleKey];
+						for (var key in styleCache) {
+							if (hasOwnProperty.call(styleCache, key)) {
+								var positions = styleCache[key].positions;
+								for (var i = 0, position; position = positions[i]; i++) {
+									position.active = false;
+								}
+							}
+						}
+					}
+				}
+			}
+		} else {
+			var positions = this.getTextInfo(layer, text, font, angle).positions;
+			for (var i = 0, position; position = positions[i]; i++) {
+				if (position.x == x && position.y == y) {
+					position.active = false;
+				}
+			}
+		}
+	};
+
+	///////////////////////////////////////////////////////////////////////////
+	// The top-level container for the entire plot.
+
+    function Plot(placeholder, data_, options_, plugins) {
+        // data is on the form:
+        //   [ series1, series2 ... ]
+        // where series is either just the data as [ [x1, y1], [x2, y2], ... ]
+        // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... }
+
+        var series = [],
+            options = {
+                // the color theme used for graphs
+                colors: ["#edc240", "#afd8f8", "#cb4b4b", "#4da74d", "#9440ed"],
+                legend: {
+                    show: true,
+                    noColumns: 1, // number of colums in legend table
+                    labelFormatter: null, // fn: string -> string
+                    labelBoxBorderColor: "#ccc", // border color for the little label boxes
+                    container: null, // container (as jQuery object) to put legend in, null means default on top of graph
+                    position: "ne", // position of default legend container within plot
+                    margin: 5, // distance from grid edge to default legend container within plot
+                    backgroundColor: null, // null means auto-detect
+                    backgroundOpacity: 0.85, // set to 0 to avoid background
+                    sorted: null    // default to no legend sorting
+                },
+                xaxis: {
+                    show: null, // null = auto-detect, true = always, false = never
+                    position: "bottom", // or "top"
+                    mode: null, // null or "time"
+                    font: null, // null (derived from CSS in placeholder) or object like { size: 11, lineHeight: 13, style: "italic", weight: "bold", family: "sans-serif", variant: "small-caps" }
+                    color: null, // base color, labels, ticks
+                    tickColor: null, // possibly different color of ticks, e.g. "rgba(0,0,0,0.15)"
+                    transform: null, // null or f: number -> number to transform axis
+                    inverseTransform: null, // if transform is set, this should be the inverse function
+                    min: null, // min. value to show, null means set automatically
+                    max: null, // max. value to show, null means set automatically
+                    autoscaleMargin: null, // margin in % to add if auto-setting min/max
+                    ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks
+                    tickFormatter: null, // fn: number -> string
+                    labelWidth: null, // size of tick labels in pixels
+                    labelHeight: null,
+                    reserveSpace: null, // whether to reserve space even if axis isn't shown
+                    tickLength: null, // size in pixels of ticks, or "full" for whole line
+                    alignTicksWithAxis: null, // axis number or null for no sync
+                    tickDecimals: null, // no. of decimals, null means auto
+                    tickSize: null, // number or [number, "unit"]
+                    minTickSize: null // number or [number, "unit"]
+                },
+                yaxis: {
+                    autoscaleMargin: 0.02,
+                    position: "left" // or "right"
+                },
+                xaxes: [],
+                yaxes: [],
+                series: {
+                    points: {
+                        show: false,
+                        radius: 3,
+                        lineWidth: 2, // in pixels
+                        fill: true,
+                        fillColor: "#ffffff",
+                        symbol: "circle" // or callback
+                    },
+                    lines: {
+                        // we don't put in show: false so we can see
+                        // whether lines were actively disabled
+                        lineWidth: 2, // in pixels
+                        fill: false,
+                        fillColor: null,
+                        steps: false
+                        // Omit 'zero', so we can later default its value to
+                        // match that of the 'fill' option.
+                    },
+                    bars: {
+                        show: false,
+                        lineWidth: 2, // in pixels
+                        barWidth: 1, // in units of the x axis
+                        fill: true,
+                        fillColor: null,
+                        align: "left", // "left", "right", or "center"
+                        horizontal: false,
+                        zero: true
+                    },
+                    shadowSize: 3,
+                    highlightColor: null
+                },
+                grid: {
+                    show: true,
+                    aboveData: false,
+                    color: "#545454", // primary color used for outline and labels
+                    backgroundColor: null, // null for transparent, else color
+                    borderColor: null, // set if different from the grid color
+                    tickColor: null, // color for the ticks, e.g. "rgba(0,0,0,0.15)"
+                    margin: 0, // distance from the canvas edge to the grid
+                    labelMargin: 5, // in pixels
+                    axisMargin: 8, // in pixels
+                    borderWidth: 2, // in pixels
+                    minBorderMargin: null, // in pixels, null means taken from points radius
+                    markings: null, // array of ranges or fn: axes -> array of ranges
+                    markingsColor: "#f4f4f4",
+                    markingsLineWidth: 2,
+                    // interactive stuff
+                    clickable: false,
+                    hoverable: false,
+                    autoHighlight: true, // highlight in case mouse is near
+                    mouseActiveRadius: 10 // how far the mouse can be away to activate an item
+                },
+                interaction: {
+                    redrawOverlayInterval: 1000/60 // time between updates, -1 means in same flow
+                },
+                hooks: {}
+            },
+        surface = null,     // the canvas for the plot itself
+        overlay = null,     // canvas for interactive stuff on top of plot
+        eventHolder = null, // jQuery object that events should be bound to
+        ctx = null, octx = null,
+        xaxes = [], yaxes = [],
+        plotOffset = { left: 0, right: 0, top: 0, bottom: 0},
+        plotWidth = 0, plotHeight = 0,
+        hooks = {
+            processOptions: [],
+            processRawData: [],
+            processDatapoints: [],
+            processOffset: [],
+            drawBackground: [],
+            drawSeries: [],
+            draw: [],
+            bindEvents: [],
+            drawOverlay: [],
+            shutdown: []
+        },
+        plot = this;
+
+        // public functions
+        plot.setData = setData;
+        plot.setupGrid = setupGrid;
+        plot.draw = draw;
+        plot.getPlaceholder = function() { return placeholder; };
+        plot.getCanvas = function() { return surface.element; };
+        plot.getPlotOffset = function() { return plotOffset; };
+        plot.width = function () { return plotWidth; };
+        plot.height = function () { return plotHeight; };
+        plot.offset = function () {
+            var o = eventHolder.offset();
+            o.left += plotOffset.left;
+            o.top += plotOffset.top;
+            return o;
+        };
+        plot.getData = function () { return series; };
+        plot.getAxes = function () {
+            var res = {}, i;
+            $.each(xaxes.concat(yaxes), function (_, axis) {
+                if (axis)
+                    res[axis.direction + (axis.n != 1 ? axis.n : "") + "axis"] = axis;
+            });
+            return res;
+        };
+        plot.getXAxes = function () { return xaxes; };
+        plot.getYAxes = function () { return yaxes; };
+        plot.c2p = canvasToAxisCoords;
+        plot.p2c = axisToCanvasCoords;
+        plot.getOptions = function () { return options; };
+        plot.highlight = highlight;
+        plot.unhighlight = unhighlight;
+        plot.triggerRedrawOverlay = triggerRedrawOverlay;
+        plot.pointOffset = function(point) {
+            return {
+                left: parseInt(xaxes[axisNumber(point, "x") - 1].p2c(+point.x) + plotOffset.left, 10),
+                top: parseInt(yaxes[axisNumber(point, "y") - 1].p2c(+point.y) + plotOffset.top, 10)
+            };
+        };
+        plot.shutdown = shutdown;
+        plot.destroy = function () {
+            shutdown();
+            placeholder.removeData("plot").empty();
+
+            series = [];
+            options = null;
+            surface = null;
+            overlay = null;
+            eventHolder = null;
+            ctx = null;
+            octx = null;
+            xaxes = [];
+            yaxes = [];
+            hooks = null;
+            highlights = [];
+            plot = null;
+        };
+        plot.resize = function () {
+        	var width = placeholder.width(),
+        		height = placeholder.height();
+            surface.resize(width, height);
+            overlay.resize(width, height);
+        };
+
+        // public attributes
+        plot.hooks = hooks;
+
+        // initialize
+        initPlugins(plot);
+        parseOptions(options_);
+        setupCanvases();
+        setData(data_);
+        setupGrid();
+        draw();
+        bindEvents();
+
+
+        function executeHooks(hook, args) {
+            args = [plot].concat(args);
+            for (var i = 0; i < hook.length; ++i)
+                hook[i].apply(this, args);
+        }
+
+        function initPlugins() {
+
+            // References to key classes, allowing plugins to modify them
+
+            var classes = {
+                Canvas: Canvas
+            };
+
+            for (var i = 0; i < plugins.length; ++i) {
+                var p = plugins[i];
+                p.init(plot, classes);
+                if (p.options)
+                    $.extend(true, options, p.options);
+            }
+        }
+
+        function parseOptions(opts) {
+
+            $.extend(true, options, opts);
+
+            // $.extend merges arrays, rather than replacing them.  When less
+            // colors are provided than the size of the default palette, we
+            // end up with those colors plus the remaining defaults, which is
+            // not expected behavior; avoid it by replacing them here.
+
+            if (opts && opts.colors) {
+            	options.colors = opts.colors;
+            }
+
+            if (options.xaxis.color == null)
+                options.xaxis.color = $.color.parse(options.grid.color).scale('a', 0.22).toString();
+            if (options.yaxis.color == null)
+                options.yaxis.color = $.color.parse(options.grid.color).scale('a', 0.22).toString();
+
+            if (options.xaxis.tickColor == null) // grid.tickColor for back-compatibility
+                options.xaxis.tickColor = options.grid.tickColor || options.xaxis.color;
+            if (options.yaxis.tickColor == null) // grid.tickColor for back-compatibility
+                options.yaxis.tickColor = options.grid.tickColor || options.yaxis.color;
+
+            if (options.grid.borderColor == null)
+                options.grid.borderColor = options.grid.color;
+            if (options.grid.tickColor == null)
+                options.grid.tickColor = $.color.parse(options.grid.color).scale('a', 0.22).toString();
+
+            // Fill in defaults for axis options, including any unspecified
+            // font-spec fields, if a font-spec was provided.
+
+            // If no x/y axis options were provided, create one of each anyway,
+            // since the rest of the code assumes that they exist.
+
+            var i, axisOptions, axisCount,
+                fontSize = placeholder.css("font-size"),
+                fontSizeDefault = fontSize ? +fontSize.replace("px", "") : 13,
+                fontDefaults = {
+                    style: placeholder.css("font-style"),
+                    size: Math.round(0.8 * fontSizeDefault),
+                    variant: placeholder.css("font-variant"),
+                    weight: placeholder.css("font-weight"),
+                    family: placeholder.css("font-family")
+                };
+
+            axisCount = options.xaxes.length || 1;
+            for (i = 0; i < axisCount; ++i) {
+
+                axisOptions = options.xaxes[i];
+                if (axisOptions && !axisOptions.tickColor) {
+                    axisOptions.tickColor = axisOptions.color;
+                }
+
+                axisOptions = $.extend(true, {}, options.xaxis, axisOptions);
+                options.xaxes[i] = axisOptions;
+
+                if (axisOptions.font) {
+                    axisOptions.font = $.extend({}, fontDefaults, axisOptions.font);
+                    if (!axisOptions.font.color) {
+                        axisOptions.font.color = axisOptions.color;
+                    }
+                    if (!axisOptions.font.lineHeight) {
+                        axisOptions.font.lineHeight = Math.round(axisOptions.font.size * 1.15);
+                    }
+                }
+            }
+
+            axisCount = options.yaxes.length || 1;
+            for (i = 0; i < axisCount; ++i) {
+
+                axisOptions = options.yaxes[i];
+                if (axisOptions && !axisOptions.tickColor) {
+                    axisOptions.tickColor = axisOptions.color;
+                }
+
+                axisOptions = $.extend(true, {}, options.yaxis, axisOptions);
+                options.yaxes[i] = axisOptions;
+
+                if (axisOptions.font) {
+                    axisOptions.font = $.extend({}, fontDefaults, axisOptions.font);
+                    if (!axisOptions.font.color) {
+                        axisOptions.font.color = axisOptions.color;
+                    }
+                    if (!axisOptions.font.lineHeight) {
+                        axisOptions.font.lineHeight = Math.round(axisOptions.font.size * 1.15);
+                    }
+                }
+            }
+
+            // backwards compatibility, to be removed in future
+            if (options.xaxis.noTicks && options.xaxis.ticks == null)
+                options.xaxis.ticks = options.xaxis.noTicks;
+            if (options.yaxis.noTicks && options.yaxis.ticks == null)
+                options.yaxis.ticks = options.yaxis.noTicks;
+            if (options.x2axis) {
+                options.xaxes[1] = $.extend(true, {}, options.xaxis, options.x2axis);
+                options.xaxes[1].position = "top";
+                // Override the inherit to allow the axis to auto-scale
+                if (options.x2axis.min == null) {
+                    options.xaxes[1].min = null;
+                }
+                if (options.x2axis.max == null) {
+                    options.xaxes[1].max = null;
+                }
+            }
+            if (options.y2axis) {
+                options.yaxes[1] = $.extend(true, {}, options.yaxis, options.y2axis);
+                options.yaxes[1].position = "right";
+                // Override the inherit to allow the axis to auto-scale
+                if (options.y2axis.min == null) {
+                    options.yaxes[1].min = null;
+                }
+                if (options.y2axis.max == null) {
+                    options.yaxes[1].max = null;
+                }
+            }
+            if (options.grid.coloredAreas)
+                options.grid.markings = options.grid.coloredAreas;
+            if (options.grid.coloredAreasColor)
+                options.grid.markingsColor = options.grid.coloredAreasColor;
+            if (options.lines)
+                $.extend(true, options.series.lines, options.lines);
+            if (options.points)
+                $.extend(true, options.series.points, options.points);
+            if (options.bars)
+                $.extend(true, options.series.bars, options.bars);
+            if (options.shadowSize != null)
+                options.series.shadowSize = options.shadowSize;
+            if (options.highlightColor != null)
+                options.series.highlightColor = options.highlightColor;
+
+            // save options on axes for future reference
+            for (i = 0; i < options.xaxes.length; ++i)
+                getOrCreateAxis(xaxes, i + 1).options = options.xaxes[i];
+            for (i = 0; i < options.yaxes.length; ++i)
+                getOrCreateAxis(yaxes, i + 1).options = options.yaxes[i];
+
+            // add hooks from options
+            for (var n in hooks)
+                if (options.hooks[n] && options.hooks[n].length)
+                    hooks[n] = hooks[n].concat(options.hooks[n]);
+
+            executeHooks(hooks.processOptions, [options]);
+        }
+
+        function setData(d) {
+            series = parseData(d);
+            fillInSeriesOptions();
+            processData();
+        }
+
+        function parseData(d) {
+            var res = [];
+            for (var i = 0; i < d.length; ++i) {
+                var s = $.extend(true, {}, options.series);
+
+                if (d[i].data != null) {
+                    s.data = d[i].data; // move the data instead of deep-copy
+                    delete d[i].data;
+
+                    $.extend(true, s, d[i]);
+
+                    d[i].data = s.data;
+                }
+                else
+                    s.data = d[i];
+                res.push(s);
+            }
+
+            return res;
+        }
+
+        function axisNumber(obj, coord) {
+            var a = obj[coord + "axis"];
+            if (typeof a == "object") // if we got a real axis, extract number
+                a = a.n;
+            if (typeof a != "number")
+                a = 1; // default to first axis
+            return a;
+        }
+
+        function allAxes() {
+            // return flat array without annoying null entries
+            return $.grep(xaxes.concat(yaxes), function (a) { return a; });
+        }
+
+        function canvasToAxisCoords(pos) {
+            // return an object with x/y corresponding to all used axes
+            var res = {}, i, axis;
+            for (i = 0; i < xaxes.length; ++i) {
+                axis = xaxes[i];
+                if (axis && axis.used)
+                    res["x" + axis.n] = axis.c2p(pos.left);
+            }
+
+            for (i = 0; i < yaxes.length; ++i) {
+                axis = yaxes[i];
+                if (axis && axis.used)
+                    res["y" + axis.n] = axis.c2p(pos.top);
+            }
+
+            if (res.x1 !== undefined)
+                res.x = res.x1;
+            if (res.y1 !== undefined)
+                res.y = res.y1;
+
+            return res;
+        }
+
+        function axisToCanvasCoords(pos) {
+            // get canvas coords from the first pair of x/y found in pos
+            var res = {}, i, axis, key;
+
+            for (i = 0; i < xaxes.length; ++i) {
+                axis = xaxes[i];
+                if (axis && axis.used) {
+                    key = "x" + axis.n;
+                    if (pos[key] == null && axis.n == 1)
+                        key = "x";
+
+                    if (pos[key] != null) {
+                        res.left = axis.p2c(pos[key]);
+                        break;
+                    }
+                }
+            }
+
+            for (i = 0; i < yaxes.length; ++i) {
+                axis = yaxes[i];
+                if (axis && axis.used) {
+                    key = "y" + axis.n;
+                    if (pos[key] == null && axis.n == 1)
+                        key = "y";
+
+                    if (pos[key] != null) {
+                        res.top = axis.p2c(pos[key]);
+                        break;
+                    }
+                }
+            }
+
+            return res;
+        }
+
+        function getOrCreateAxis(axes, number) {
+            if (!axes[number - 1])
+                axes[number - 1] = {
+                    n: number, // save the number for future reference
+                    direction: axes == xaxes ? "x" : "y",
+                    options: $.extend(true, {}, axes == xaxes ? options.xaxis : options.yaxis)
+                };
+
+            return axes[number - 1];
+        }
+
+        function fillInSeriesOptions() {
+
+            var neededColors = series.length, maxIndex = -1, i;
+
+            // Subtract the number of series that already have fixed colors or
+            // color indexes from the number that we still need to generate.
+
+            for (i = 0; i < series.length; ++i) {
+                var sc = series[i].color;
+                if (sc != null) {
+                    neededColors--;
+                    if (typeof sc == "number" && sc > maxIndex) {
+                        maxIndex = sc;
+                    }
+                }
+            }
+
+            // If any of the series have fixed color indexes, then we need to
+            // generate at least as many colors as the highest index.
+
+            if (neededColors <= maxIndex) {
+                neededColors = maxIndex + 1;
+            }
+
+            // Generate all the colors, using first the option colors and then
+            // variations on those colors once they're exhausted.
+
+            var c, colors = [], colorPool = options.colors,
+                colorPoolSize = colorPool.length, variation = 0;
+
+            for (i = 0; i < neededColors; i++) {
+
+                c = $.color.parse(colorPool[i % colorPoolSize] || "#666");
+
+                // Each time we exhaust the colors in the pool we adjust
+                // a scaling factor used to produce more variations on
+                // those colors. The factor alternates negative/positive
+                // to produce lighter/darker colors.
+
+                // Reset the variation after every few cycles, or else
+                // it will end up producing only white or black colors.
+
+                if (i % colorPoolSize == 0 && i) {
+                    if (variation >= 0) {
+                        if (variation < 0.5) {
+                            variation = -variation - 0.2;
+                        } else variation = 0;
+                    } else variation = -variation;
+                }
+
+                colors[i] = c.scale('rgb', 1 + variation);
+            }
+
+            // Finalize the series options, filling in their colors
+
+            var colori = 0, s;
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+
+                // assign colors
+                if (s.color == null) {
+                    s.color = colors[colori].toString();
+                    ++colori;
+                }
+                else if (typeof s.color == "number")
+                    s.color = colors[s.color].toString();
+
+                // turn on lines automatically in case nothing is set
+                if (s.lines.show == null) {
+                    var v, show = true;
+                    for (v in s)
+                        if (s[v] && s[v].show) {
+                            show = false;
+                            break;
+                        }
+                    if (show)
+                        s.lines.show = true;
+                }
+
+                // If nothing was provided for lines.zero, default it to match
+                // lines.fill, since areas by default should extend to zero.
+
+                if (s.lines.zero == null) {
+                    s.lines.zero = !!s.lines.fill;
+                }
+
+                // setup axes
+                s.xaxis = getOrCreateAxis(xaxes, axisNumber(s, "x"));
+                s.yaxis = getOrCreateAxis(yaxes, axisNumber(s, "y"));
+            }
+        }
+
+        function processData() {
+            var topSentry = Number.POSITIVE_INFINITY,
+                bottomSentry = Number.NEGATIVE_INFINITY,
+                fakeInfinity = Number.MAX_VALUE,
+                i, j, k, m, length,
+                s, points, ps, x, y, axis, val, f, p,
+                data, format;
+
+            function updateAxis(axis, min, max) {
+                if (min < axis.datamin && min != -fakeInfinity)
+                    axis.datamin = min;
+                if (max > axis.datamax && max != fakeInfinity)
+                    axis.datamax = max;
+            }
+
+            $.each(allAxes(), function (_, axis) {
+                // init axis
+                axis.datamin = topSentry;
+                axis.datamax = bottomSentry;
+                axis.used = false;
+            });
+
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+                s.datapoints = { points: [] };
+
+                executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]);
+            }
+
+            // first pass: clean and copy data
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+
+                data = s.data;
+                format = s.datapoints.format;
+
+                if (!format) {
+                    format = [];
+                    // find out how to copy
+                    format.push({ x: true, number: true, required: true });
+                    format.push({ y: true, number: true, required: true });
+
+                    if (s.bars.show || (s.lines.show && s.lines.fill)) {
+                        var autoscale = !!((s.bars.show && s.bars.zero) || (s.lines.show && s.lines.zero));
+                        format.push({ y: true, number: true, required: false, defaultValue: 0, autoscale: autoscale });
+                        if (s.bars.horizontal) {
+                            delete format[format.length - 1].y;
+                            format[format.length - 1].x = true;
+                        }
+                    }
+
+                    s.datapoints.format = format;
+                }
+
+                if (s.datapoints.pointsize != null)
+                    continue; // already filled in
+
+                s.datapoints.pointsize = format.length;
+
+                ps = s.datapoints.pointsize;
+                points = s.datapoints.points;
+
+                var insertSteps = s.lines.show && s.lines.steps;
+                s.xaxis.used = s.yaxis.used = true;
+
+                for (j = k = 0; j < data.length; ++j, k += ps) {
+                    p = data[j];
+
+                    var nullify = p == null;
+                    if (!nullify) {
+                        for (m = 0; m < ps; ++m) {
+                            val = p[m];
+                            f = format[m];
+
+                            if (f) {
+                                if (f.number && val != null) {
+                                    val = +val; // convert to number
+                                    if (isNaN(val))
+                                        val = null;
+                                    else if (val == Infinity)
+                                        val = fakeInfinity;
+                                    else if (val == -Infinity)
+                                        val = -fakeInfinity;
+                                }
+
+                                if (val == null) {
+                                    if (f.required)
+                                        nullify = true;
+
+                                    if (f.defaultValue != null)
+                                        val = f.defaultValue;
+                                }
+                            }
+
+                            points[k + m] = val;
+                        }
+                    }
+
+                    if (nullify) {
+                        for (m = 0; m < ps; ++m) {
+                            val = points[k + m];
+                            if (val != null) {
+                                f = format[m];
+                                // extract min/max info
+                                if (f.autoscale !== false) {
+                                    if (f.x) {
+                                        updateAxis(s.xaxis, val, val);
+                                    }
+                                    if (f.y) {
+                                        updateAxis(s.yaxis, val, val);
+                                    }
+                                }
+                            }
+                            points[k + m] = null;
+                        }
+                    }
+                    else {
+                        // a little bit of line specific stuff that
+                        // perhaps shouldn't be here, but lacking
+                        // better means...
+                        if (insertSteps && k > 0
+                            && points[k - ps] != null
+                            && points[k - ps] != points[k]
+                            && points[k - ps + 1] != points[k + 1]) {
+                            // copy the point to make room for a middle point
+                            for (m = 0; m < ps; ++m)
+                                points[k + ps + m] = points[k + m];
+
+                            // middle point has same y
+                            points[k + 1] = points[k - ps + 1];
+
+                            // we've added a point, better reflect that
+                            k += ps;
+                        }
+                    }
+                }
+            }
+
+            // give the hooks a chance to run
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+
+                executeHooks(hooks.processDatapoints, [ s, s.datapoints]);
+            }
+
+            // second pass: find datamax/datamin for auto-scaling
+            for (i = 0; i < series.length; ++i) {
+                s = series[i];
+                points = s.datapoints.points;
+                ps = s.datapoints.pointsize;
+                format = s.datapoints.format;
+
+                var xmin = topSentry, ymin = topSentry,
+                    xmax = bottomSentry, ymax = bottomSentry;
+
+                for (j = 0; j < points.length; j += ps) {
+                    if (points[j] == null)
+                        continue;
+
+                    for (m = 0; m < ps; ++m) {
+                        val = points[j + m];
+                        f = format[m];
+                        if (!f || f.autoscale === false || val == fakeInfinity || val == -fakeInfinity)
+                            continue;
+
+                        if (f.x) {
+                            if (val < xmin)
+                                xmin = val;
+                            if (val > xmax)
+                                xmax = val;
+                        }
+                        if (f.y) {
+                            if (val < ymin)
+                                ymin = val;
+                            if (val > ymax)
+                                ymax = val;
+                        }
+                    }
+                }
+
+                if (s.bars.show) {
+                    // make sure we got room for the bar on the dancing floor
+                    var delta;
+
+                    switch (s.bars.align) {
+                        case "left":
+                            delta = 0;
+                            break;
+                        case "right":
+                            delta = -s.bars.barWidth;
+                            break;
+                        default:
+                            delta = -s.bars.barWidth / 2;
+                    }
+
+                    if (s.bars.horizontal) {
+                        ymin += delta;
+                        ymax += delta + s.bars.barWidth;
+                    }
+                    else {
+                        xmin += delta;
+                        xmax += delta + s.bars.barWidth;
+                    }
+                }
+
+                updateAxis(s.xaxis, xmin, xmax);
+                updateAxis(s.yaxis, ymin, ymax);
+            }
+
+            $.each(allAxes(), function (_, axis) {
+                if (axis.datamin == topSentry)
+                    axis.datamin = null;
+                if (axis.datamax == bottomSentry)
+                    axis.datamax = null;
+            });
+        }
+
+        function setupCanvases() {
+
+            // Make sure the placeholder is clear of everything except canvases
+            // from a previous plot in this container that we'll try to re-use.
+
+            placeholder.css("padding", 0) // padding messes up the positioning
+                .children().filter(function(){
+                    return !$(this).hasClass("flot-overlay") && !$(this).hasClass('flot-base');
+                }).remove();
+
+            if (placeholder.css("position") == 'static')
+                placeholder.css("position", "relative"); // for positioning labels and overlay
+
+            surface = new Canvas("flot-base", placeholder);
+            overlay = new Canvas("flot-overlay", placeholder); // overlay canvas for interactive features
+
+            ctx = surface.context;
+            octx = overlay.context;
+
+            // define which element we're listening for events on
+            eventHolder = $(overlay.element).unbind();
+
+            // If we're re-using a plot object, shut down the old one
+
+            var existing = placeholder.data("plot");
+
+            if (existing) {
+                existing.shutdown();
+                overlay.clear();
+            }
+
+            // save in case we get replotted
+            placeholder.data("plot", plot);
+        }
+
+        function bindEvents() {
+            // bind events
+            if (options.grid.hoverable) {
+                eventHolder.mousemove(onMouseMove);
+
+                // Use bind, rather than .mouseleave, because we officially
+                // still support jQuery 1.2.6, which doesn't define a shortcut
+                // for mouseenter or mouseleave.  This was a bug/oversight that
+                // was fixed somewhere around 1.3.x.  We can return to using
+                // .mouseleave when we drop support for 1.2.6.
+
+                eventHolder.bind("mouseleave", onMouseLeave);
+            }
+
+            if (options.grid.clickable)
+                eventHolder.click(onClick);
+
+            executeHooks(hooks.bindEvents, [eventHolder]);
+        }
+
+        function shutdown() {
+            if (redrawTimeout)
+                clearTimeout(redrawTimeout);
+
+            eventHolder.unbind("mousemove", onMouseMove);
+            eventHolder.unbind("mouseleave", onMouseLeave);
+            eventHolder.unbind("click", onClick);
+
+            executeHooks(hooks.shutdown, [eventHolder]);
+        }
+
+        function setTransformationHelpers(axis) {
+            // set helper functions on the axis, assumes plot area
+            // has been computed already
+
+            function identity(x) { return x; }
+
+            var s, m, t = axis.options.transform || identity,
+                it = axis.options.inverseTransform;
+
+            // precompute how much the axis is scaling a point
+            // in canvas space
+            if (axis.direction == "x") {
+                s = axis.scale = plotWidth / Math.abs(t(axis.max) - t(axis.min));
+                m = Math.min(t(axis.max), t(axis.min));
+            }
+            else {
+                s = axis.scale = plotHeight / Math.abs(t(axis.max) - t(axis.min));
+                s = -s;
+                m = Math.max(t(axis.max), t(axis.min));
+            }
+
+            // data point to canvas coordinate
+            if (t == identity) // slight optimization
+                axis.p2c = function (p) { return (p - m) * s; };
+            else
+                axis.p2c = function (p) { return (t(p) - m) * s; };
+            // canvas coordinate to data point
+            if (!it)
+                axis.c2p = function (c) { return m + c / s; };
+            else
+                axis.c2p = function (c) { return it(m + c / s); };
+        }
+
+        function measureTickLabels(axis) {
+
+            var opts = axis.options,
+                ticks = axis.ticks || [],
+                labelWidth = opts.labelWidth || 0,
+                labelHeight = opts.labelHeight || 0,
+                maxWidth = labelWidth || (axis.direction == "x" ? Math.floor(surface.width / (ticks.length || 1)) : null),
+                legacyStyles = axis.direction + "Axis " + axis.direction + axis.n + "Axis",
+                layer = "flot-" + axis.direction + "-axis flot-" + axis.direction + axis.n + "-axis " + legacyStyles,
+                font = opts.font || "flot-tick-label tickLabel";
+
+            for (var i = 0; i < ticks.length; ++i) {
+
+                var t = ticks[i];
+
+                if (!t.label)
+                    continue;
+
+                var info = surface.getTextInfo(layer, t.label, font, null, maxWidth);
+
+                labelWidth = Math.max(labelWidth, info.width);
+                labelHeight = Math.max(labelHeight, info.height);
+            }
+
+            axis.labelWidth = opts.labelWidth || labelWidth;
+            axis.labelHeight = opts.labelHeight || labelHeight;
+        }
+
+        function allocateAxisBoxFirstPhase(axis) {
+            // find the bounding box of the axis by looking at label
+            // widths/heights and ticks, make room by diminishing the
+            // plotOffset; this first phase only looks at one
+            // dimension per axis, the other dimension depends on the
+            // other axes so will have to wait
+
+            var lw = axis.labelWidth,
+                lh = axis.labelHeight,
+                pos = axis.options.position,
+                isXAxis = axis.direction === "x",
+                tickLength = axis.options.tickLength,
+                axisMargin = options.grid.axisMargin,
+                padding = options.grid.labelMargin,
+                innermost = true,
+                outermost = true,
+                first = true,
+                found = false;
+
+            // Determine the axis's position in its direction and on its side
+
+            $.each(isXAxis ? xaxes : yaxes, function(i, a) {
+                if (a && (a.show || a.reserveSpace)) {
+                    if (a === axis) {
+                        found = true;
+                    } else if (a.options.position === pos) {
+                        if (found) {
+                            outermost = false;
+                        } else {
+                            innermost = false;
+                        }
+                    }
+                    if (!found) {
+                        first = false;
+                    }
+                }
+            });
+
+            // The outermost axis on each side has no margin
+
+            if (outermost) {
+                axisMargin = 0;
+            }
+
+            // The ticks for the first axis in each direction stretch across
+
+            if (tickLength == null) {
+                tickLength = first ? "full" : 5;
+            }
+
+            if (!isNaN(+tickLength))
+                padding += +tickLength;
+
+            if (isXAxis) {
+                lh += padding;
+
+                if (pos == "bottom") {
+                    plotOffset.bottom += lh + axisMargin;
+                    axis.box = { top: surface.height - plotOffset.bottom, height: lh };
+                }
+                else {
+                    axis.box = { top: plotOffset.top + axisMargin, height: lh };
+                    plotOffset.top += lh + axisMargin;
+                }
+            }
+            else {
+                lw += padding;
+
+                if (pos == "left") {
+                    axis.box = { left: plotOffset.left + axisMargin, width: lw };
+                    plotOffset.left += lw + axisMargin;
+                }
+                else {
+                    plotOffset.right += lw + axisMargin;
+                    axis.box = { left: surface.width - plotOffset.right, width: lw };
+                }
+            }
+
+             // save for future reference
+            axis.position = pos;
+            axis.tickLength = tickLength;
+            axis.box.padding = padding;
+            axis.innermost = innermost;
+        }
+
+        function allocateAxisBoxSecondPhase(axis) {
+            // now that all axis boxes have been placed in one
+            // dimension, we can set the remaining dimension coordinates
+            if (axis.direction == "x") {
+                axis.box.left = plotOffset.left - axis.labelWidth / 2;
+                axis.box.width = surface.width - plotOffset.left - plotOffset.right + axis.labelWidth;
+            }
+            else {
+                axis.box.top = plotOffset.top - axis.labelHeight / 2;
+                axis.box.height = surface.height - plotOffset.bottom - plotOffset.top + axis.labelHeight;
+            }
+        }
+
+        function adjustLayoutForThingsStickingOut() {
+            // possibly adjust plot offset to ensure everything stays
+            // inside the canvas and isn't clipped off
+
+            var minMargin = options.grid.minBorderMargin,
+                axis, i;
+
+            // check stuff from the plot (FIXME: this should just read
+            // a value from the series, otherwise it's impossible to
+            // customize)
+            if (minMargin == null) {
+                minMargin = 0;
+                for (i = 0; i < series.length; ++i)
+                    minMargin = Math.max(minMargin, 2 * (series[i].points.radius + series[i].points.lineWidth/2));
+            }
+
+            var margins = {
+                left: minMargin,
+                right: minMargin,
+                top: minMargin,
+                bottom: minMargin
+            };
+
+            // check axis labels, note we don't check the actual
+            // labels but instead use the overall width/height to not
+            // jump as much around with replots
+            $.each(allAxes(), function (_, axis) {
+                if (axis.reserveSpace && axis.ticks && axis.ticks.length) {
+                    if (axis.direction === "x") {
+                        margins.left = Math.max(margins.left, axis.labelWidth / 2);
+                        margins.right = Math.max(margins.right, axis.labelWidth / 2);
+                    } else {
+                        margins.bottom = Math.max(margins.bottom, axis.labelHeight / 2);
+                        margins.top = Math.max(margins.top, axis.labelHeight / 2);
+                    }
+                }
+            });
+
+            plotOffset.left = Math.ceil(Math.max(margins.left, plotOffset.left));
+            plotOffset.right = Math.ceil(Math.max(margins.right, plotOffset.right));
+            plotOffset.top = Math.ceil(Math.max(margins.top, plotOffset.top));
+            plotOffset.bottom = Math.ceil(Math.max(margins.bottom, plotOffset.bottom));
+        }
+
+        function setupGrid() {
+            var i, axes = allAxes(), showGrid = options.grid.show;
+
+            // Initialize the plot's offset from the edge of the canvas
+
+            for (var a in plotOffset) {
+                var margin = options.grid.margin || 0;
+                plotOffset[a] = typeof margin == "number" ? margin : margin[a] || 0;
+            }
+
+            executeHooks(hooks.processOffset, [plotOffset]);
+
+            // If the grid is visible, add its border width to the offset
+
+            for (var a in plotOffset) {
+                if(typeof(options.grid.borderWidth) == "object") {
+                    plotOffset[a] += showGrid ? options.grid.borderWidth[a] : 0;
+                }
+                else {
+                    plotOffset[a] += showGrid ? options.grid.borderWidth : 0;
+                }
+            }
+
+            $.each(axes, function (_, axis) {
+                var axisOpts = axis.options;
+                axis.show = axisOpts.show == null ? axis.used : axisOpts.show;
+                axis.reserveSpace = axisOpts.reserveSpace == null ? axis.show : axisOpts.reserveSpace;
+                setRange(axis);
+            });
+
+            if (showGrid) {
+
+                var allocatedAxes = $.grep(axes, function (axis) {
+                    return axis.show || axis.reserveSpace;
+                });
+
+                $.each(allocatedAxes, function (_, axis) {
+                    // make the ticks
+                    setupTickGeneration(axis);
+                    setTicks(axis);
+                    snapRangeToTicks(axis, axis.ticks);
+                    // find labelWidth/Height for axis
+                    measureTickLabels(axis);
+                });
+
+                // with all dimensions calculated, we can compute the
+                // axis bounding boxes, start from the outside
+                // (reverse order)
+                for (i = allocatedAxes.length - 1; i >= 0; --i)
+                    allocateAxisBoxFirstPhase(allocatedAxes[i]);
+
+                // make sure we've got enough space for things that
+                // might stick out
+                adjustLayoutForThingsStickingOut();
+
+                $.each(allocatedAxes, function (_, axis) {
+                    allocateAxisBoxSecondPhase(axis);
+                });
+            }
+
+            plotWidth = surface.width - plotOffset.left - plotOffset.right;
+            plotHeight = surface.height - plotOffset.bottom - plotOffset.top;
+
+            // now we got the proper plot dimensions, we can compute the scaling
+            $.each(axes, function (_, axis) {
+                setTransformationHelpers(axis);
+            });
+
+            if (showGrid) {
+                drawAxisLabels();
+            }
+
+            insertLegend();
+        }
+
+        function setRange(axis) {
+            var opts = axis.options,
+                min = +(opts.min != null ? opts.min : axis.datamin),
+                max = +(opts.max != null ? opts.max : axis.datamax),
+                delta = max - min;
+
+            if (delta == 0.0) {
+                // degenerate case
+                var widen = max == 0 ? 1 : 0.01;
+
+                if (opts.min == null)
+                    min -= widen;
+                // always widen max if we couldn't widen min to ensure we
+                // don't fall into min == max which doesn't work
+                if (opts.max == null || opts.min != null)
+                    max += widen;
+            }
+            else {
+                // consider autoscaling
+                var margin = opts.autoscaleMargin;
+                if (margin != null) {
+                    if (opts.min == null) {
+                        min -= delta * margin;
+                        // make sure we don't go below zero if all values
+                        // are positive
+                        if (min < 0 && axis.datamin != null && axis.datamin >= 0)
+                            min = 0;
+                    }
+                    if (opts.max == null) {
+                        max += delta * margin;
+                        if (max > 0 && axis.datamax != null && axis.datamax <= 0)
+                            max = 0;
+                    }
+                }
+            }
+            axis.min = min;
+            axis.max = max;
+        }
+
+        function setupTickGeneration(axis) {
+            var opts = axis.options;
+
+            // estimate number of ticks
+            var noTicks;
+            if (typeof opts.ticks == "number" && opts.ticks > 0)
+                noTicks = opts.ticks;
+            else
+                // heuristic based on the model a*sqrt(x) fitted to
+                // some data points that seemed reasonable
+                noTicks = 0.3 * Math.sqrt(axis.direction == "x" ? surface.width : surface.height);
+
+            var delta = (axis.max - axis.min) / noTicks,
+                dec = -Math.floor(Math.log(delta) / Math.LN10),
+                maxDec = opts.tickDecimals;
+
+            if (maxDec != null && dec > maxDec) {
+                dec = maxDec;
+            }
+
+            var magn = Math.pow(10, -dec),
+                norm = delta / magn, // norm is between 1.0 and 10.0
+                size;
+
+            if (norm < 1.5) {
+                size = 1;
+            } else if (norm < 3) {
+                size = 2;
+                // special case for 2.5, requires an extra decimal
+                if (norm > 2.25 && (maxDec == null || dec + 1 <= maxDec)) {
+                    size = 2.5;
+                    ++dec;
+                }
+            } else if (norm < 7.5) {
+                size = 5;
+            } else {
+                size = 10;
+            }
+
+            size *= magn;
+
+            if (opts.minTickSize != null && size < opts.minTickSize) {
+                size = opts.minTickSize;
+            }
+
+            axis.delta = delta;
+            axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec);
+            axis.tickSize = opts.tickSize || size;
+
+            // Time mode was moved to a plug-in in 0.8, and since so many people use it
+            // we'll add an especially friendly reminder to make sure they included it.
+
+            if (opts.mode == "time" && !axis.tickGenerator) {
+                throw new Error("Time mode requires the flot.time plugin.");
+            }
+
+            // Flot supports base-10 axes; any other mode else is handled by a plug-in,
+            // like flot.time.js.
+
+            if (!axis.tickGenerator) {
+
+                axis.tickGenerator = function (axis) {
+
+                    var ticks = [],
+                        start = floorInBase(axis.min, axis.tickSize),
+                        i = 0,
+                        v = Number.NaN,
+                        prev;
+
+                    do {
+                        prev = v;
+                        v = start + i * axis.tickSize;
+                        ticks.push(v);
+                        ++i;
+                    } while (v < axis.max && v != prev);
+                    return ticks;
+                };
+
+				axis.tickFormatter = function (value, axis) {
+
+					var factor = axis.tickDecimals ? Math.pow(10, axis.tickDecimals) : 1;
+					var formatted = "" + Math.round(value * factor) / factor;
+
+					// If tickDecimals was specified, ensure that we have exactly that
+					// much precision; otherwise default to the value's own precision.
+
+					if (axis.tickDecimals != null) {
+						var decimal = formatted.indexOf(".");
+						var precision = decimal == -1 ? 0 : formatted.length - decimal - 1;
+						if (precision < axis.tickDecimals) {
+							return (precision ? formatted : formatted + ".") + ("" + factor).substr(1, axis.tickDecimals - precision);
+						}
+					}
+
+                    return formatted;
+                };
+            }
+
+            if ($.isFunction(opts.tickFormatter))
+                axis.tickFormatter = function (v, axis) { return "" + opts.tickFormatter(v, axis); };
+
+            if (opts.alignTicksWithAxis != null) {
+                var otherAxis = (axis.direction == "x" ? xaxes : yaxes)[opts.alignTicksWithAxis - 1];
+                if (otherAxis && otherAxis.used && otherAxis != axis) {
+                    // consider snapping min/max to outermost nice ticks
+                    var niceTicks = axis.tickGenerator(axis);
+                    if (niceTicks.length > 0) {
+                        if (opts.min == null)
+                            axis.min = Math.min(axis.min, niceTicks[0]);
+                        if (opts.max == null && niceTicks.length > 1)
+                            axis.max = Math.max(axis.max, niceTicks[niceTicks.length - 1]);
+                    }
+
+                    axis.tickGenerator = function (axis) {
+                        // copy ticks, scaled to this axis
+                        var ticks = [], v, i;
+                        for (i = 0; i < otherAxis.ticks.length; ++i) {
+                            v = (otherAxis.ticks[i].v - otherAxis.min) / (otherAxis.max - otherAxis.min);
+                            v = axis.min + v * (axis.max - axis.min);
+                            ticks.push(v);
+                        }
+                        return ticks;
+                    };
+
+                    // we might need an extra decimal since forced
+                    // ticks don't necessarily fit naturally
+                    if (!axis.mode && opts.tickDecimals == null) {
+                        var extraDec = Math.max(0, -Math.floor(Math.log(axis.delta) / Math.LN10) + 1),
+                            ts = axis.tickGenerator(axis);
+
+                        // only proceed if the tick interval rounded
+                        // with an extra decimal doesn't give us a
+                        // zero at end
+                        if (!(ts.length > 1 && /\..*0$/.test((ts[1] - ts[0]).toFixed(extraDec))))
+                            axis.tickDecimals = extraDec;
+                    }
+                }
+            }
+        }
+
+        function setTicks(axis) {
+            var oticks = axis.options.ticks, ticks = [];
+            if (oticks == null || (typeof oticks == "number" && oticks > 0))
+                ticks = axis.tickGenerator(axis);
+            else if (oticks) {
+                if ($.isFunction(oticks))
+                    // generate the ticks
+                    ticks = oticks(axis);
+                else
+                    ticks = oticks;
+            }
+
+            // clean up/labelify the supplied ticks, copy them over
+            var i, v;
+            axis.ticks = [];
+            for (i = 0; i < ticks.length; ++i) {
+                var label = null;
+                var t = ticks[i];
+                if (typeof t == "object") {
+                    v = +t[0];
+                    if (t.length > 1)
+                        label = t[1];
+                }
+                else
+                    v = +t;
+                if (label == null)
+                    label = axis.tickFormatter(v, axis);
+                if (!isNaN(v))
+                    axis.ticks.push({ v: v, label: label });
+            }
+        }
+
+        function snapRangeToTicks(axis, ticks) {
+            if (axis.options.autoscaleMargin && ticks.length > 0) {
+                // snap to ticks
+                if (axis.options.min == null)
+                    axis.min = Math.min(axis.min, ticks[0].v);
+                if (axis.options.max == null && ticks.length > 1)
+                    axis.max = Math.max(axis.max, ticks[ticks.length - 1].v);
+            }
+        }
+
+        function draw() {
+
+            surface.clear();
+
+            executeHooks(hooks.drawBackground, [ctx]);
+
+            var grid = options.grid;
+
+            // draw background, if any
+            if (grid.show && grid.backgroundColor)
+                drawBackground();
+
+            if (grid.show && !grid.aboveData) {
+                drawGrid();
+            }
+
+            for (var i = 0; i < series.length; ++i) {
+                executeHooks(hooks.drawSeries, [ctx, series[i]]);
+                drawSeries(series[i]);
+            }
+
+            executeHooks(hooks.draw, [ctx]);
+
+            if (grid.show && grid.aboveData) {
+                drawGrid();
+            }
+
+            surface.render();
+
+            // A draw implies that either the axes or data have changed, so we
+            // should probably update the overlay highlights as well.
+
+            triggerRedrawOverlay();
+        }
+
+        function extractRange(ranges, coord) {
+            var axis, from, to, key, axes = allAxes();
+
+            for (var i = 0; i < axes.length; ++i) {
+                axis = axes[i];
+                if (axis.direction == coord) {
+                    key = coord + axis.n + "axis";
+                    if (!ranges[key] && axis.n == 1)
+                        key = coord + "axis"; // support x1axis as xaxis
+                    if (ranges[key]) {
+                        from = ranges[key].from;
+                        to = ranges[key].to;
+                        break;
+                    }
+                }
+            }
+
+            // backwards-compat stuff - to be removed in future
+            if (!ranges[key]) {
+                axis = coord == "x" ? xaxes[0] : yaxes[0];
+                from = ranges[coord + "1"];
+                to = ranges[coord + "2"];
+            }
+
+            // auto-reverse as an added bonus
+            if (from != null && to != null && from > to) {
+                var tmp = from;
+                from = to;
+                to = tmp;
+            }
+
+            return { from: from, to: to, axis: axis };
+        }
+
+        function drawBackground() {
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)");
+            ctx.fillRect(0, 0, plotWidth, plotHeight);
+            ctx.restore();
+        }
+
+        function drawGrid() {
+            var i, axes, bw, bc;
+
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            // draw markings
+            var markings = options.grid.markings;
+            if (markings) {
+                if ($.isFunction(markings)) {
+                    axes = plot.getAxes();
+                    // xmin etc. is backwards compatibility, to be
+                    // removed in the future
+                    axes.xmin = axes.xaxis.min;
+                    axes.xmax = axes.xaxis.max;
+                    axes.ymin = axes.yaxis.min;
+                    axes.ymax = axes.yaxis.max;
+
+                    markings = markings(axes);
+                }
+
+                for (i = 0; i < markings.length; ++i) {
+                    var m = markings[i],
+                        xrange = extractRange(m, "x"),
+                        yrange = extractRange(m, "y");
+
+                    // fill in missing
+                    if (xrange.from == null)
+                        xrange.from = xrange.axis.min;
+                    if (xrange.to == null)
+                        xrange.to = xrange.axis.max;
+                    if (yrange.from == null)
+                        yrange.from = yrange.axis.min;
+                    if (yrange.to == null)
+                        yrange.to = yrange.axis.max;
+
+                    // clip
+                    if (xrange.to < xrange.axis.min || xrange.from > xrange.axis.max ||
+                        yrange.to < yrange.axis.min || yrange.from > yrange.axis.max)
+                        continue;
+
+                    xrange.from = Math.max(xrange.from, xrange.axis.min);
+                    xrange.to = Math.min(xrange.to, xrange.axis.max);
+                    yrange.from = Math.max(yrange.from, yrange.axis.min);
+                    yrange.to = Math.min(yrange.to, yrange.axis.max);
+
+                    var xequal = xrange.from === xrange.to,
+                        yequal = yrange.from === yrange.to;
+
+                    if (xequal && yequal) {
+                        continue;
+                    }
+
+                    // then draw
+                    xrange.from = Math.floor(xrange.axis.p2c(xrange.from));
+                    xrange.to = Math.floor(xrange.axis.p2c(xrange.to));
+                    yrange.from = Math.floor(yrange.axis.p2c(yrange.from));
+                    yrange.to = Math.floor(yrange.axis.p2c(yrange.to));
+
+                    if (xequal || yequal) {
+                        var lineWidth = m.lineWidth || options.grid.markingsLineWidth,
+                            subPixel = lineWidth % 2 ? 0.5 : 0;
+                        ctx.beginPath();
+                        ctx.strokeStyle = m.color || options.grid.markingsColor;
+                        ctx.lineWidth = lineWidth;
+                        if (xequal) {
+                            ctx.moveTo(xrange.to + subPixel, yrange.from);
+                            ctx.lineTo(xrange.to + subPixel, yrange.to);
+                        } else {
+                            ctx.moveTo(xrange.from, yrange.to + subPixel);
+                            ctx.lineTo(xrange.to, yrange.to + subPixel);                            
+                        }
+                        ctx.stroke();
+                    } else {
+                        ctx.fillStyle = m.color || options.grid.markingsColor;
+                        ctx.fillRect(xrange.from, yrange.to,
+                                     xrange.to - xrange.from,
+                                     yrange.from - yrange.to);
+                    }
+                }
+            }
+
+            // draw the ticks
+            axes = allAxes();
+            bw = options.grid.borderWidth;
+
+            for (var j = 0; j < axes.length; ++j) {
+                var axis = axes[j], box = axis.box,
+                    t = axis.tickLength, x, y, xoff, yoff;
+                if (!axis.show || axis.ticks.length == 0)
+                    continue;
+
+                ctx.lineWidth = 1;
+
+                // find the edges
+                if (axis.direction == "x") {
+                    x = 0;
+                    if (t == "full")
+                        y = (axis.position == "top" ? 0 : plotHeight);
+                    else
+                        y = box.top - plotOffset.top + (axis.position == "top" ? box.height : 0);
+                }
+                else {
+                    y = 0;
+                    if (t == "full")
+                        x = (axis.position == "left" ? 0 : plotWidth);
+                    else
+                        x = box.left - plotOffset.left + (axis.position == "left" ? box.width : 0);
+                }
+
+                // draw tick bar
+                if (!axis.innermost) {
+                    ctx.strokeStyle = axis.options.color;
+                    ctx.beginPath();
+                    xoff = yoff = 0;
+                    if (axis.direction == "x")
+                        xoff = plotWidth + 1;
+                    else
+                        yoff = plotHeight + 1;
+
+                    if (ctx.lineWidth == 1) {
+                        if (axis.direction == "x") {
+                            y = Math.floor(y) + 0.5;
+                        } else {
+                            x = Math.floor(x) + 0.5;
+                        }
+                    }
+
+                    ctx.moveTo(x, y);
+                    ctx.lineTo(x + xoff, y + yoff);
+                    ctx.stroke();
+                }
+
+                // draw ticks
+
+                ctx.strokeStyle = axis.options.tickColor;
+
+                ctx.beginPath();
+                for (i = 0; i < axis.ticks.length; ++i) {
+                    var v = axis.ticks[i].v;
+
+                    xoff = yoff = 0;
+
+                    if (isNaN(v) || v < axis.min || v > axis.max
+                        // skip those lying on the axes if we got a border
+                        || (t == "full"
+                            && ((typeof bw == "object" && bw[axis.position] > 0) || bw > 0)
+                            && (v == axis.min || v == axis.max)))
+                        continue;
+
+                    if (axis.direction == "x") {
+                        x = axis.p2c(v);
+                        yoff = t == "full" ? -plotHeight : t;
+
+                        if (axis.position == "top")
+                            yoff = -yoff;
+                    }
+                    else {
+                        y = axis.p2c(v);
+                        xoff = t == "full" ? -plotWidth : t;
+
+                        if (axis.position == "left")
+                            xoff = -xoff;
+                    }
+
+                    if (ctx.lineWidth == 1) {
+                        if (axis.direction == "x")
+                            x = Math.floor(x) + 0.5;
+                        else
+                            y = Math.floor(y) + 0.5;
+                    }
+
+                    ctx.moveTo(x, y);
+                    ctx.lineTo(x + xoff, y + yoff);
+                }
+
+                ctx.stroke();
+            }
+
+
+            // draw border
+            if (bw) {
+                // If either borderWidth or borderColor is an object, then draw the border
+                // line by line instead of as one rectangle
+                bc = options.grid.borderColor;
+                if(typeof bw == "object" || typeof bc == "object") {
+                    if (typeof bw !== "object") {
+                        bw = {top: bw, right: bw, bottom: bw, left: bw};
+                    }
+                    if (typeof bc !== "object") {
+                        bc = {top: bc, right: bc, bottom: bc, left: bc};
+                    }
+
+                    if (bw.top > 0) {
+                        ctx.strokeStyle = bc.top;
+                        ctx.lineWidth = bw.top;
+                        ctx.beginPath();
+                        ctx.moveTo(0 - bw.left, 0 - bw.top/2);
+                        ctx.lineTo(plotWidth, 0 - bw.top/2);
+                        ctx.stroke();
+                    }
+
+                    if (bw.right > 0) {
+                        ctx.strokeStyle = bc.right;
+                        ctx.lineWidth = bw.right;
+                        ctx.beginPath();
+                        ctx.moveTo(plotWidth + bw.right / 2, 0 - bw.top);
+                        ctx.lineTo(plotWidth + bw.right / 2, plotHeight);
+                        ctx.stroke();
+                    }
+
+                    if (bw.bottom > 0) {
+                        ctx.strokeStyle = bc.bottom;
+                        ctx.lineWidth = bw.bottom;
+                        ctx.beginPath();
+                        ctx.moveTo(plotWidth + bw.right, plotHeight + bw.bottom / 2);
+                        ctx.lineTo(0, plotHeight + bw.bottom / 2);
+                        ctx.stroke();
+                    }
+
+                    if (bw.left > 0) {
+                        ctx.strokeStyle = bc.left;
+                        ctx.lineWidth = bw.left;
+                        ctx.beginPath();
+                        ctx.moveTo(0 - bw.left/2, plotHeight + bw.bottom);
+                        ctx.lineTo(0- bw.left/2, 0);
+                        ctx.stroke();
+                    }
+                }
+                else {
+                    ctx.lineWidth = bw;
+                    ctx.strokeStyle = options.grid.borderColor;
+                    ctx.strokeRect(-bw/2, -bw/2, plotWidth + bw, plotHeight + bw);
+                }
+            }
+
+            ctx.restore();
+        }
+
+        function drawAxisLabels() {
+
+            $.each(allAxes(), function (_, axis) {
+                var box = axis.box,
+                    legacyStyles = axis.direction + "Axis " + axis.direction + axis.n + "Axis",
+                    layer = "flot-" + axis.direction + "-axis flot-" + axis.direction + axis.n + "-axis " + legacyStyles,
+                    font = axis.options.font || "flot-tick-label tickLabel",
+                    tick, x, y, halign, valign;
+
+                // Remove text before checking for axis.show and ticks.length;
+                // otherwise plugins, like flot-tickrotor, that draw their own
+                // tick labels will end up with both theirs and the defaults.
+
+                surface.removeText(layer);
+
+                if (!axis.show || axis.ticks.length == 0)
+                    return;
+
+                for (var i = 0; i < axis.ticks.length; ++i) {
+
+                    tick = axis.ticks[i];
+                    if (!tick.label || tick.v < axis.min || tick.v > axis.max)
+                        continue;
+
+                    if (axis.direction == "x") {
+                        halign = "center";
+                        x = plotOffset.left + axis.p2c(tick.v);
+                        if (axis.position == "bottom") {
+                            y = box.top + box.padding;
+                        } else {
+                            y = box.top + box.height - box.padding;
+                            valign = "bottom";
+                        }
+                    } else {
+                        valign = "middle";
+                        y = plotOffset.top + axis.p2c(tick.v);
+                        if (axis.position == "left") {
+                            x = box.left + box.width - box.padding;
+                            halign = "right";
+                        } else {
+                            x = box.left + box.padding;
+                        }
+                    }
+
+                    surface.addText(layer, x, y, tick.label, font, null, null, halign, valign);
+                }
+            });
+        }
+
+        function drawSeries(series) {
+            if (series.lines.show)
+                drawSeriesLines(series);
+            if (series.bars.show)
+                drawSeriesBars(series);
+            if (series.points.show)
+                drawSeriesPoints(series);
+        }
+
+        function drawSeriesLines(series) {
+            function plotLine(datapoints, xoffset, yoffset, axisx, axisy) {
+                var points = datapoints.points,
+                    ps = datapoints.pointsize,
+                    prevx = null, prevy = null;
+
+                ctx.beginPath();
+                for (var i = ps; i < points.length; i += ps) {
+                    var x1 = points[i - ps], y1 = points[i - ps + 1],
+                        x2 = points[i], y2 = points[i + 1];
+
+                    if (x1 == null || x2 == null)
+                        continue;
+
+                    // clip with ymin
+                    if (y1 <= y2 && y1 < axisy.min) {
+                        if (y2 < axisy.min)
+                            continue;   // line segment is outside
+                        // compute new intersection point
+                        x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.min;
+                    }
+                    else if (y2 <= y1 && y2 < axisy.min) {
+                        if (y1 < axisy.min)
+                            continue;
+                        x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.min;
+                    }
+
+                    // clip with ymax
+                    if (y1 >= y2 && y1 > axisy.max) {
+                        if (y2 > axisy.max)
+                            continue;
+                        x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.max;
+                    }
+                    else if (y2 >= y1 && y2 > axisy.max) {
+                        if (y1 > axisy.max)
+                            continue;
+                        x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.max;
+                    }
+
+                    // clip with xmin
+                    if (x1 <= x2 && x1 < axisx.min) {
+                        if (x2 < axisx.min)
+                            continue;
+                        y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.min;
+                    }
+                    else if (x2 <= x1 && x2 < axisx.min) {
+                        if (x1 < axisx.min)
+                            continue;
+                        y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.min;
+                    }
+
+                    // clip with xmax
+                    if (x1 >= x2 && x1 > axisx.max) {
+                        if (x2 > axisx.max)
+                            continue;
+                        y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.max;
+                    }
+                    else if (x2 >= x1 && x2 > axisx.max) {
+                        if (x1 > axisx.max)
+                            continue;
+                        y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.max;
+                    }
+
+                    if (x1 != prevx || y1 != prevy)
+                        ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset);
+
+                    prevx = x2;
+                    prevy = y2;
+                    ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset);
+                }
+                ctx.stroke();
+            }
+
+            function plotLineArea(datapoints, axisx, axisy) {
+                var points = datapoints.points,
+                    ps = datapoints.pointsize,
+                    bottom = Math.min(Math.max(0, axisy.min), axisy.max),
+                    i = 0, top, areaOpen = false,
+                    ypos = 1, segmentStart = 0, segmentEnd = 0;
+
+                // we process each segment in two turns, first forward
+                // direction to sketch out top, then once we hit the
+                // end we go backwards to sketch the bottom
+                while (true) {
+                    if (ps > 0 && i > points.length + ps)
+                        break;
+
+                    i += ps; // ps is negative if going backwards
+
+                    var x1 = points[i - ps],
+                        y1 = points[i - ps + ypos],
+                        x2 = points[i], y2 = points[i + ypos];
+
+                    if (areaOpen) {
+                        if (ps > 0 && x1 != null && x2 == null) {
+                            // at turning point
+                            segmentEnd = i;
+                            ps = -ps;
+                            ypos = 2;
+                            continue;
+                        }
+
+                        if (ps < 0 && i == segmentStart + ps) {
+                            // done with the reverse sweep
+                            ctx.fill();
+                            areaOpen = false;
+                            ps = -ps;
+                            ypos = 1;
+                            i = segmentStart = segmentEnd + ps;
+                            continue;
+                        }
+                    }
+
+                    if (x1 == null || x2 == null)
+                        continue;
+
+                    // clip x values
+
+                    // clip with xmin
+                    if (x1 <= x2 && x1 < axisx.min) {
+                        if (x2 < axisx.min)
+                            continue;
+                        y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.min;
+                    }
+                    else if (x2 <= x1 && x2 < axisx.min) {
+                        if (x1 < axisx.min)
+                            continue;
+                        y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.min;
+                    }
+
+                    // clip with xmax
+                    if (x1 >= x2 && x1 > axisx.max) {
+                        if (x2 > axisx.max)
+                            continue;
+                        y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x1 = axisx.max;
+                    }
+                    else if (x2 >= x1 && x2 > axisx.max) {
+                        if (x1 > axisx.max)
+                            continue;
+                        y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        x2 = axisx.max;
+                    }
+
+                    if (!areaOpen) {
+                        // open area
+                        ctx.beginPath();
+                        ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom));
+                        areaOpen = true;
+                    }
+
+                    // now first check the case where both is outside
+                    if (y1 >= axisy.max && y2 >= axisy.max) {
+                        ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max));
+                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.max));
+                        continue;
+                    }
+                    else if (y1 <= axisy.min && y2 <= axisy.min) {
+                        ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.min));
+                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min));
+                        continue;
+                    }
+
+                    // else it's a bit more complicated, there might
+                    // be a flat maxed out rectangle first, then a
+                    // triangular cutout or reverse; to find these
+                    // keep track of the current x values
+                    var x1old = x1, x2old = x2;
+
+                    // clip the y values, without shortcutting, we
+                    // go through all cases in turn
+
+                    // clip with ymin
+                    if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) {
+                        x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.min;
+                    }
+                    else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) {
+                        x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.min;
+                    }
+
+                    // clip with ymax
+                    if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) {
+                        x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y1 = axisy.max;
+                    }
+                    else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) {
+                        x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        y2 = axisy.max;
+                    }
+
+                    // if the x value was changed we got a rectangle
+                    // to fill
+                    if (x1 != x1old) {
+                        ctx.lineTo(axisx.p2c(x1old), axisy.p2c(y1));
+                        // it goes to (x1, y1), but we fill that below
+                    }
+
+                    // fill triangular section, this sometimes result
+                    // in redundant points if (x1, y1) hasn't changed
+                    // from previous line to, but we just ignore that
+                    ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1));
+                    ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
+
+                    // fill the other rectangle if it's there
+                    if (x2 != x2old) {
+                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
+                        ctx.lineTo(axisx.p2c(x2old), axisy.p2c(y2));
+                    }
+                }
+            }
+
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+            ctx.lineJoin = "round";
+
+            var lw = series.lines.lineWidth,
+                sw = series.shadowSize;
+            // FIXME: consider another form of shadow when filling is turned on
+            if (lw > 0 && sw > 0) {
+                // draw shadow as a thick and thin line with transparency
+                ctx.lineWidth = sw;
+                ctx.strokeStyle = "rgba(0,0,0,0.1)";
+                // position shadow at angle from the mid of line
+                var angle = Math.PI/18;
+                plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2), series.xaxis, series.yaxis);
+                ctx.lineWidth = sw/2;
+                plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4), series.xaxis, series.yaxis);
+            }
+
+            ctx.lineWidth = lw;
+            ctx.strokeStyle = series.color;
+            var fillStyle = getFillStyle(series.lines, series.color, 0, plotHeight);
+            if (fillStyle) {
+                ctx.fillStyle = fillStyle;
+                plotLineArea(series.datapoints, series.xaxis, series.yaxis);
+            }
+
+            if (lw > 0)
+                plotLine(series.datapoints, 0, 0, series.xaxis, series.yaxis);
+            ctx.restore();
+        }
+
+        function drawSeriesPoints(series) {
+            function plotPoints(datapoints, radius, fillStyle, offset, shadow, axisx, axisy, symbol) {
+                var points = datapoints.points, ps = datapoints.pointsize;
+
+                for (var i = 0; i < points.length; i += ps) {
+                    var x = points[i], y = points[i + 1];
+                    if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
+                        continue;
+
+                    ctx.beginPath();
+                    x = axisx.p2c(x);
+                    y = axisy.p2c(y) + offset;
+                    if (symbol == "circle")
+                        ctx.arc(x, y, radius, 0, shadow ? Math.PI : Math.PI * 2, false);
+                    else
+                        symbol(ctx, x, y, radius, shadow);
+                    ctx.closePath();
+
+                    if (fillStyle) {
+                        ctx.fillStyle = fillStyle;
+                        ctx.fill();
+                    }
+                    ctx.stroke();
+                }
+            }
+
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            var lw = series.points.lineWidth,
+                sw = series.shadowSize,
+                radius = series.points.radius,
+                symbol = series.points.symbol;
+
+            // If the user sets the line width to 0, we change it to a very 
+            // small value. A line width of 0 seems to force the default of 1.
+            // Doing the conditional here allows the shadow setting to still be 
+            // optional even with a lineWidth of 0.
+
+            if( lw == 0 )
+                lw = 0.0001;
+
+            if (lw > 0 && sw > 0) {
+                // draw shadow in two steps
+                var w = sw / 2;
+                ctx.lineWidth = w;
+                ctx.strokeStyle = "rgba(0,0,0,0.1)";
+                plotPoints(series.datapoints, radius, null, w + w/2, true,
+                           series.xaxis, series.yaxis, symbol);
+
+                ctx.strokeStyle = "rgba(0,0,0,0.2)";
+                plotPoints(series.datapoints, radius, null, w/2, true,
+                           series.xaxis, series.yaxis, symbol);
+            }
+
+            ctx.lineWidth = lw;
+            ctx.strokeStyle = series.color;
+            plotPoints(series.datapoints, radius,
+                       getFillStyle(series.points, series.color), 0, false,
+                       series.xaxis, series.yaxis, symbol);
+            ctx.restore();
+        }
+
+        function drawBar(x, y, b, barLeft, barRight, fillStyleCallback, axisx, axisy, c, horizontal, lineWidth) {
+            var left, right, bottom, top,
+                drawLeft, drawRight, drawTop, drawBottom,
+                tmp;
+
+            // in horizontal mode, we start the bar from the left
+            // instead of from the bottom so it appears to be
+            // horizontal rather than vertical
+            if (horizontal) {
+                drawBottom = drawRight = drawTop = true;
+                drawLeft = false;
+                left = b;
+                right = x;
+                top = y + barLeft;
+                bottom = y + barRight;
+
+                // account for negative bars
+                if (right < left) {
+                    tmp = right;
+                    right = left;
+                    left = tmp;
+                    drawLeft = true;
+                    drawRight = false;
+                }
+            }
+            else {
+                drawLeft = drawRight = drawTop = true;
+                drawBottom = false;
+                left = x + barLeft;
+                right = x + barRight;
+                bottom = b;
+                top = y;
+
+                // account for negative bars
+                if (top < bottom) {
+                    tmp = top;
+                    top = bottom;
+                    bottom = tmp;
+                    drawBottom = true;
+                    drawTop = false;
+                }
+            }
+
+            // clip
+            if (right < axisx.min || left > axisx.max ||
+                top < axisy.min || bottom > axisy.max)
+                return;
+
+            if (left < axisx.min) {
+                left = axisx.min;
+                drawLeft = false;
+            }
+
+            if (right > axisx.max) {
+                right = axisx.max;
+                drawRight = false;
+            }
+
+            if (bottom < axisy.min) {
+                bottom = axisy.min;
+                drawBottom = false;
+            }
+
+            if (top > axisy.max) {
+                top = axisy.max;
+                drawTop = false;
+            }
+
+            left = axisx.p2c(left);
+            bottom = axisy.p2c(bottom);
+            right = axisx.p2c(right);
+            top = axisy.p2c(top);
+
+            // fill the bar
+            if (fillStyleCallback) {
+                c.fillStyle = fillStyleCallback(bottom, top);
+                c.fillRect(left, top, right - left, bottom - top)
+            }
+
+            // draw outline
+            if (lineWidth > 0 && (drawLeft || drawRight || drawTop || drawBottom)) {
+                c.beginPath();
+
+                // FIXME: inline moveTo is buggy with excanvas
+                c.moveTo(left, bottom);
+                if (drawLeft)
+                    c.lineTo(left, top);
+                else
+                    c.moveTo(left, top);
+                if (drawTop)
+                    c.lineTo(right, top);
+                else
+                    c.moveTo(right, top);
+                if (drawRight)
+                    c.lineTo(right, bottom);
+                else
+                    c.moveTo(right, bottom);
+                if (drawBottom)
+                    c.lineTo(left, bottom);
+                else
+                    c.moveTo(left, bottom);
+                c.stroke();
+            }
+        }
+
+        function drawSeriesBars(series) {
+            function plotBars(datapoints, barLeft, barRight, fillStyleCallback, axisx, axisy) {
+                var points = datapoints.points, ps = datapoints.pointsize;
+
+                for (var i = 0; i < points.length; i += ps) {
+                    if (points[i] == null)
+                        continue;
+                    drawBar(points[i], points[i + 1], points[i + 2], barLeft, barRight, fillStyleCallback, axisx, axisy, ctx, series.bars.horizontal, series.bars.lineWidth);
+                }
+            }
+
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
+            // FIXME: figure out a way to add shadows (for instance along the right edge)
+            ctx.lineWidth = series.bars.lineWidth;
+            ctx.strokeStyle = series.color;
+
+            var barLeft;
+
+            switch (series.bars.align) {
+                case "left":
+                    barLeft = 0;
+                    break;
+                case "right":
+                    barLeft = -series.bars.barWidth;
+                    break;
+                default:
+                    barLeft = -series.bars.barWidth / 2;
+            }
+
+            var fillStyleCallback = series.bars.fill ? function (bottom, top) { return getFillStyle(series.bars, series.color, bottom, top); } : null;
+            plotBars(series.datapoints, barLeft, barLeft + series.bars.barWidth, fillStyleCallback, series.xaxis, series.yaxis);
+            ctx.restore();
+        }
+
+        function getFillStyle(filloptions, seriesColor, bottom, top) {
+            var fill = filloptions.fill;
+            if (!fill)
+                return null;
+
+            if (filloptions.fillColor)
+                return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor);
+
+            var c = $.color.parse(seriesColor);
+            c.a = typeof fill == "number" ? fill : 0.4;
+            c.normalize();
+            return c.toString();
+        }
+
+        function insertLegend() {
+
+            if (options.legend.container != null) {
+                $(options.legend.container).html("");
+            } else {
+                placeholder.find(".legend").remove();
+            }
+
+            if (!options.legend.show) {
+                return;
+            }
+
+            var fragments = [], entries = [], rowStarted = false,
+                lf = options.legend.labelFormatter, s, label;
+
+            // Build a list of legend entries, with each having a label and a color
+
+            for (var i = 0; i < series.length; ++i) {
+                s = series[i];
+                if (s.label) {
+                    label = lf ? lf(s.label, s) : s.label;
+                    if (label) {
+                        entries.push({
+                            label: label,
+                            color: s.color
+                        });
+                    }
+                }
+            }
+
+            // Sort the legend using either the default or a custom comparator
+
+            if (options.legend.sorted) {
+                if ($.isFunction(options.legend.sorted)) {
+                    entries.sort(options.legend.sorted);
+                } else if (options.legend.sorted == "reverse") {
+                	entries.reverse();
+                } else {
+                    var ascending = options.legend.sorted != "descending";
+                    entries.sort(function(a, b) {
+                        return a.label == b.label ? 0 : (
+                            (a.label < b.label) != ascending ? 1 : -1   // Logical XOR
+                        );
+                    });
+                }
+            }
+
+            // Generate markup for the list of entries, in their final order
+
+            for (var i = 0; i < entries.length; ++i) {
+
+                var entry = entries[i];
+
+                if (i % options.legend.noColumns == 0) {
+                    if (rowStarted)
+                        fragments.push('</tr>');
+                    fragments.push('<tr>');
+                    rowStarted = true;
+                }
+
+                fragments.push(
+                    '<td class="legendColorBox"><div style="border:1px solid ' + options.legend.labelBoxBorderColor + ';padding:1px"><div style="width:4px;height:0;border:5px solid ' + entry.color + ';overflow:hidden"></div></div></td>' +
+                    '<td class="legendLabel">' + entry.label + '</td>'
+                );
+            }
+
+            if (rowStarted)
+                fragments.push('</tr>');
+
+            if (fragments.length == 0)
+                return;
+
+            var table = '<table style="font-size:smaller;color:' + options.grid.color + '">' + fragments.join("") + '</table>';
+            if (options.legend.container != null)
+                $(options.legend.container).html(table);
+            else {
+                var pos = "",
+                    p = options.legend.position,
+                    m = options.legend.margin;
+                if (m[0] == null)
+                    m = [m, m];
+                if (p.charAt(0) == "n")
+                    pos += 'top:' + (m[1] + plotOffset.top) + 'px;';
+                else if (p.charAt(0) == "s")
+                    pos += 'bottom:' + (m[1] + plotOffset.bottom) + 'px;';
+                if (p.charAt(1) == "e")
+                    pos += 'right:' + (m[0] + plotOffset.right) + 'px;';
+                else if (p.charAt(1) == "w")
+                    pos += 'left:' + (m[0] + plotOffset.left) + 'px;';
+                var legend = $('<div class="legend">' + table.replace('style="', 'style="position:absolute;' + pos +';') + '</div>').appendTo(placeholder);
+                if (options.legend.backgroundOpacity != 0.0) {
+                    // put in the transparent background
+                    // separately to avoid blended labels and
+                    // label boxes
+                    var c = options.legend.backgroundColor;
+                    if (c == null) {
+                        c = options.grid.backgroundColor;
+                        if (c && typeof c == "string")
+                            c = $.color.parse(c);
+                        else
+                            c = $.color.extract(legend, 'background-color');
+                        c.a = 1;
+                        c = c.toString();
+                    }
+                    var div = legend.children();
+                    $('<div style="position:absolute;width:' + div.width() + 'px;height:' + div.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').prependTo(legend).css('opacity', options.legend.backgroundOpacity);
+                }
+            }
+        }
+
+
+        // interactive features
+
+        var highlights = [],
+            redrawTimeout = null;
+
+        // returns the data item the mouse is over, or null if none is found
+        function findNearbyItem(mouseX, mouseY, seriesFilter) {
+            var maxDistance = options.grid.mouseActiveRadius,
+                smallestDistance = maxDistance * maxDistance + 1,
+                item = null, foundPoint = false, i, j, ps;
+
+            for (i = series.length - 1; i >= 0; --i) {
+                if (!seriesFilter(series[i]))
+                    continue;
+
+                var s = series[i],
+                    axisx = s.xaxis,
+                    axisy = s.yaxis,
+                    points = s.datapoints.points,
+                    mx = axisx.c2p(mouseX), // precompute some stuff to make the loop faster
+                    my = axisy.c2p(mouseY),
+                    maxx = maxDistance / axisx.scale,
+                    maxy = maxDistance / axisy.scale;
+
+                ps = s.datapoints.pointsize;
+                // with inverse transforms, we can't use the maxx/maxy
+                // optimization, sadly
+                if (axisx.options.inverseTransform)
+                    maxx = Number.MAX_VALUE;
+                if (axisy.options.inverseTransform)
+                    maxy = Number.MAX_VALUE;
+
+                if (s.lines.show || s.points.show) {
+                    for (j = 0; j < points.length; j += ps) {
+                        var x = points[j], y = points[j + 1];
+                        if (x == null)
+                            continue;
+
+                        // For points and lines, the cursor must be within a
+                        // certain distance to the data point
+                        if (x - mx > maxx || x - mx < -maxx ||
+                            y - my > maxy || y - my < -maxy)
+                            continue;
+
+                        // We have to calculate distances in pixels, not in
+                        // data units, because the scales of the axes may be different
+                        var dx = Math.abs(axisx.p2c(x) - mouseX),
+                            dy = Math.abs(axisy.p2c(y) - mouseY),
+                            dist = dx * dx + dy * dy; // we save the sqrt
+
+                        // use <= to ensure last point takes precedence
+                        // (last generally means on top of)
+                        if (dist < smallestDistance) {
+                            smallestDistance = dist;
+                            item = [i, j / ps];
+                        }
+                    }
+                }
+
+                if (s.bars.show && !item) { // no other point can be nearby
+
+                    var barLeft, barRight;
+
+                    switch (s.bars.align) {
+                        case "left":
+                            barLeft = 0;
+                            break;
+                        case "right":
+                            barLeft = -s.bars.barWidth;
+                            break;
+                        default:
+                            barLeft = -s.bars.barWidth / 2;
+                    }
+
+                    barRight = barLeft + s.bars.barWidth;
+
+                    for (j = 0; j < points.length; j += ps) {
+                        var x = points[j], y = points[j + 1], b = points[j + 2];
+                        if (x == null)
+                            continue;
+
+                        // for a bar graph, the cursor must be inside the bar
+                        if (series[i].bars.horizontal ?
+                            (mx <= Math.max(b, x) && mx >= Math.min(b, x) &&
+                             my >= y + barLeft && my <= y + barRight) :
+                            (mx >= x + barLeft && mx <= x + barRight &&
+                             my >= Math.min(b, y) && my <= Math.max(b, y)))
+                                item = [i, j / ps];
+                    }
+                }
+            }
+
+            if (item) {
+                i = item[0];
+                j = item[1];
+                ps = series[i].datapoints.pointsize;
+
+                return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps),
+                         dataIndex: j,
+                         series: series[i],
+                         seriesIndex: i };
+            }
+
+            return null;
+        }
+
+        function onMouseMove(e) {
+            if (options.grid.hoverable)
+                triggerClickHoverEvent("plothover", e,
+                                       function (s) { return s["hoverable"] != false; });
+        }
+
+        function onMouseLeave(e) {
+            if (options.grid.hoverable)
+                triggerClickHoverEvent("plothover", e,
+                                       function (s) { return false; });
+        }
+
+        function onClick(e) {
+            triggerClickHoverEvent("plotclick", e,
+                                   function (s) { return s["clickable"] != false; });
+        }
+
+        // trigger click or hover event (they send the same parameters
+        // so we share their code)
+        function triggerClickHoverEvent(eventname, event, seriesFilter) {
+            var offset = eventHolder.offset(),
+                canvasX = event.pageX - offset.left - plotOffset.left,
+                canvasY = event.pageY - offset.top - plotOffset.top,
+            pos = canvasToAxisCoords({ left: canvasX, top: canvasY });
+
+            pos.pageX = event.pageX;
+            pos.pageY = event.pageY;
+
+            var item = findNearbyItem(canvasX, canvasY, seriesFilter);
+
+            if (item) {
+                // fill in mouse pos for any listeners out there
+                item.pageX = parseInt(item.series.xaxis.p2c(item.datapoint[0]) + offset.left + plotOffset.left, 10);
+                item.pageY = parseInt(item.series.yaxis.p2c(item.datapoint[1]) + offset.top + plotOffset.top, 10);
+            }
+
+            if (options.grid.autoHighlight) {
+                // clear auto-highlights
+                for (var i = 0; i < highlights.length; ++i) {
+                    var h = highlights[i];
+                    if (h.auto == eventname &&
+                        !(item && h.series == item.series &&
+                          h.point[0] == item.datapoint[0] &&
+                          h.point[1] == item.datapoint[1]))
+                        unhighlight(h.series, h.point);
+                }
+
+                if (item)
+                    highlight(item.series, item.datapoint, eventname);
+            }
+
+            placeholder.trigger(eventname, [ pos, item ]);
+        }
+
+        function triggerRedrawOverlay() {
+            var t = options.interaction.redrawOverlayInterval;
+            if (t == -1) {      // skip event queue
+                drawOverlay();
+                return;
+            }
+
+            if (!redrawTimeout)
+                redrawTimeout = setTimeout(drawOverlay, t);
+        }
+
+        function drawOverlay() {
+            redrawTimeout = null;
+
+            // draw highlights
+            octx.save();
+            overlay.clear();
+            octx.translate(plotOffset.left, plotOffset.top);
+
+            var i, hi;
+            for (i = 0; i < highlights.length; ++i) {
+                hi = highlights[i];
+
+                if (hi.series.bars.show)
+                    drawBarHighlight(hi.series, hi.point);
+                else
+                    drawPointHighlight(hi.series, hi.point);
+            }
+            octx.restore();
+
+            executeHooks(hooks.drawOverlay, [octx]);
+        }
+
+        function highlight(s, point, auto) {
+            if (typeof s == "number")
+                s = series[s];
+
+            if (typeof point == "number") {
+                var ps = s.datapoints.pointsize;
+                point = s.datapoints.points.slice(ps * point, ps * (point + 1));
+            }
+
+            var i = indexOfHighlight(s, point);
+            if (i == -1) {
+                highlights.push({ series: s, point: point, auto: auto });
+
+                triggerRedrawOverlay();
+            }
+            else if (!auto)
+                highlights[i].auto = false;
+        }
+
+        function unhighlight(s, point) {
+            if (s == null && point == null) {
+                highlights = [];
+                triggerRedrawOverlay();
+                return;
+            }
+
+            if (typeof s == "number")
+                s = series[s];
+
+            if (typeof point == "number") {
+                var ps = s.datapoints.pointsize;
+                point = s.datapoints.points.slice(ps * point, ps * (point + 1));
+            }
+
+            var i = indexOfHighlight(s, point);
+            if (i != -1) {
+                highlights.splice(i, 1);
+
+                triggerRedrawOverlay();
+            }
+        }
+
+        function indexOfHighlight(s, p) {
+            for (var i = 0; i < highlights.length; ++i) {
+                var h = highlights[i];
+                if (h.series == s && h.point[0] == p[0]
+                    && h.point[1] == p[1])
+                    return i;
+            }
+            return -1;
+        }
+
+        function drawPointHighlight(series, point) {
+            var x = point[0], y = point[1],
+                axisx = series.xaxis, axisy = series.yaxis,
+                highlightColor = (typeof series.highlightColor === "string") ? series.highlightColor : $.color.parse(series.color).scale('a', 0.5).toString();
+
+            if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
+                return;
+
+            var pointRadius = series.points.radius + series.points.lineWidth / 2;
+            octx.lineWidth = pointRadius;
+            octx.strokeStyle = highlightColor;
+            var radius = 1.5 * pointRadius;
+            x = axisx.p2c(x);
+            y = axisy.p2c(y);
+
+            octx.beginPath();
+            if (series.points.symbol == "circle")
+                octx.arc(x, y, radius, 0, 2 * Math.PI, false);
+            else
+                series.points.symbol(octx, x, y, radius, false);
+            octx.closePath();
+            octx.stroke();
+        }
+
+        function drawBarHighlight(series, point) {
+            var highlightColor = (typeof series.highlightColor === "string") ? series.highlightColor : $.color.parse(series.color).scale('a', 0.5).toString(),
+                fillStyle = highlightColor,
+                barLeft;
+
+            switch (series.bars.align) {
+                case "left":
+                    barLeft = 0;
+                    break;
+                case "right":
+                    barLeft = -series.bars.barWidth;
+                    break;
+                default:
+                    barLeft = -series.bars.barWidth / 2;
+            }
+
+            octx.lineWidth = series.bars.lineWidth;
+            octx.strokeStyle = highlightColor;
+
+            drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth,
+                    function () { return fillStyle; }, series.xaxis, series.yaxis, octx, series.bars.horizontal, series.bars.lineWidth);
+        }
+
+        function getColorOrGradient(spec, bottom, top, defaultColor) {
+            if (typeof spec == "string")
+                return spec;
+            else {
+                // assume this is a gradient spec; IE currently only
+                // supports a simple vertical gradient properly, so that's
+                // what we support too
+                var gradient = ctx.createLinearGradient(0, top, 0, bottom);
+
+                for (var i = 0, l = spec.colors.length; i < l; ++i) {
+                    var c = spec.colors[i];
+                    if (typeof c != "string") {
+                        var co = $.color.parse(defaultColor);
+                        if (c.brightness != null)
+                            co = co.scale('rgb', c.brightness);
+                        if (c.opacity != null)
+                            co.a *= c.opacity;
+                        c = co.toString();
+                    }
+                    gradient.addColorStop(i / (l - 1), c);
+                }
+
+                return gradient;
+            }
+        }
+    }
+
+    // Add the plot function to the top level of the jQuery object
+
+    $.plot = function(placeholder, data, options) {
+        //var t0 = new Date();
+        var plot = new Plot($(placeholder), data, options, $.plot.plugins);
+        //(window.console ? console.log : alert)("time used (msecs): " + ((new Date()).getTime() - t0.getTime()));
+        return plot;
+    };
+
+    $.plot.version = "0.8.3";
+
+    $.plot.plugins = [];
+
+    // Also add the plot function as a chainable property
+
+    $.fn.plot = function(data, options) {
+        return this.each(function() {
+            $.plot(this, data, options);
+        });
+    };
+
+    // round to nearby lower multiple of base
+    function floorInBase(n, base) {
+        return base * Math.floor(n / base);
+    }
+
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.min.js b/pandora_console/include/graphs/flot/jquery.flot.min.js
index a25407dd43..968d3ebd99 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.min.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.min.js
@@ -1,6 +1,8 @@
-/* Javascript plotting library for jQuery, v. 0.7.
- *
- * Released under the MIT license by IOLA, December 2007.
- *
- */
-(function(b){b.color={};b.color.make=function(d,e,g,f){var c={};c.r=d||0;c.g=e||0;c.b=g||0;c.a=f!=null?f:1;c.add=function(h,j){for(var k=0;k<h.length;++k){c[h.charAt(k)]+=j}return c.normalize()};c.scale=function(h,j){for(var k=0;k<h.length;++k){c[h.charAt(k)]*=j}return c.normalize()};c.toString=function(){if(c.a>=1){return"rgb("+[c.r,c.g,c.b].join(",")+")"}else{return"rgba("+[c.r,c.g,c.b,c.a].join(",")+")"}};c.normalize=function(){function h(k,j,l){return j<k?k:(j>l?l:j)}c.r=h(0,parseInt(c.r),255);c.g=h(0,parseInt(c.g),255);c.b=h(0,parseInt(c.b),255);c.a=h(0,c.a,1);return c};c.clone=function(){return b.color.make(c.r,c.b,c.g,c.a)};return c.normalize()};b.color.extract=function(d,e){var c;do{c=d.css(e).toLowerCase();if(c!=""&&c!="transparent"){break}d=d.parent()}while(!b.nodeName(d.get(0),"body"));if(c=="rgba(0, 0, 0, 0)"){c="transparent"}return b.color.parse(c)};b.color.parse=function(c){var d,f=b.color.make;if(d=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c)){return f(parseInt(d[1],10),parseInt(d[2],10),parseInt(d[3],10))}if(d=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(c)){return f(parseInt(d[1],10),parseInt(d[2],10),parseInt(d[3],10),parseFloat(d[4]))}if(d=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c)){return f(parseFloat(d[1])*2.55,parseFloat(d[2])*2.55,parseFloat(d[3])*2.55)}if(d=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(c)){return f(parseFloat(d[1])*2.55,parseFloat(d[2])*2.55,parseFloat(d[3])*2.55,parseFloat(d[4]))}if(d=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c)){return f(parseInt(d[1],16),parseInt(d[2],16),parseInt(d[3],16))}if(d=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c)){return f(parseInt(d[1]+d[1],16),parseInt(d[2]+d[2],16),parseInt(d[3]+d[3],16))}var e=b.trim(c).toLowerCase();if(e=="transparent"){return f(255,255,255,0)}else{d=a[e]||[0,0,0];return f(d[0],d[1],d[2])}};var a={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);(function(c){function b(av,ai,J,af){var Q=[],O={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:true,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:0.85},xaxis:{show:null,position:"bottom",mode:null,color:null,tickColor:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,reserveSpace:null,tickLength:null,alignTicksWithAxis:null,tickDecimals:null,tickSize:null,minTickSize:null,monthNames:null,timeformat:null,twelveHourClock:false},yaxis:{autoscaleMargin:0.02,position:"left"},xaxes:[],yaxes:[],series:{points:{show:false,radius:3,lineWidth:2,fill:true,fillColor:"#ffffff",symbol:"circle"},lines:{lineWidth:2,fill:false,fillColor:null,steps:false},bars:{show:false,lineWidth:2,barWidth:1,fill:true,fillColor:null,align:"left",horizontal:false},shadowSize:3},grid:{show:true,aboveData:false,backgroundColor:null,borderColor:null,tickColor:null,labelMargin:5,axisMargin:8,borderWidth:2,minBorderMargin:null,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:false,hoverable:false,autoHighlight:true,mouseActiveRadius:10},hooks:{}},az=null,ad=null,y=null,H=null,A=null,p=[],aw=[],q={left:0,right:0,top:0,bottom:0},G=0,I=0,h=0,w=0,ak={processOptions:[],processRawData:[],processDatapoints:[],drawSeries:[],draw:[],bindEvents:[],drawOverlay:[],shutdown:[]},aq=this;aq.setData=aj;aq.setupGrid=t;aq.draw=W;aq.getPlaceholder=function(){return av};aq.getCanvas=function(){return az};aq.getPlotOffset=function(){return q};aq.width=function(){return h};aq.height=function(){return w};aq.offset=function(){var aB=y.offset();aB.left+=q.left;aB.top+=q.top;return aB};aq.getData=function(){return Q};aq.getAxes=function(){var aC={},aB;c.each(p.concat(aw),function(aD,aE){if(aE){aC[aE.direction+(aE.n!=1?aE.n:"")+"axis"]=aE}});return aC};aq.getXAxes=function(){return p};aq.getYAxes=function(){return aw};aq.c2p=C;aq.p2c=ar;aq.getOptions=function(){return O};aq.highlight=x;aq.unhighlight=T;aq.triggerRedrawOverlay=f;aq.pointOffset=function(aB){return{left:parseInt(p[aA(aB,"x")-1].p2c(+aB.x)+q.left),top:parseInt(aw[aA(aB,"y")-1].p2c(+aB.y)+q.top)}};aq.shutdown=ag;aq.resize=function(){B();g(az);g(ad)};aq.hooks=ak;F(aq);Z(J);X();aj(ai);t();W();ah();function an(aD,aB){aB=[aq].concat(aB);for(var aC=0;aC<aD.length;++aC){aD[aC].apply(this,aB)}}function F(){for(var aB=0;aB<af.length;++aB){var aC=af[aB];aC.init(aq);if(aC.options){c.extend(true,O,aC.options)}}}function Z(aC){var aB;c.extend(true,O,aC);if(O.xaxis.color==null){O.xaxis.color=O.grid.color}if(O.yaxis.color==null){O.yaxis.color=O.grid.color}if(O.xaxis.tickColor==null){O.xaxis.tickColor=O.grid.tickColor}if(O.yaxis.tickColor==null){O.yaxis.tickColor=O.grid.tickColor}if(O.grid.borderColor==null){O.grid.borderColor=O.grid.color}if(O.grid.tickColor==null){O.grid.tickColor=c.color.parse(O.grid.color).scale("a",0.22).toString()}for(aB=0;aB<Math.max(1,O.xaxes.length);++aB){O.xaxes[aB]=c.extend(true,{},O.xaxis,O.xaxes[aB])}for(aB=0;aB<Math.max(1,O.yaxes.length);++aB){O.yaxes[aB]=c.extend(true,{},O.yaxis,O.yaxes[aB])}if(O.xaxis.noTicks&&O.xaxis.ticks==null){O.xaxis.ticks=O.xaxis.noTicks}if(O.yaxis.noTicks&&O.yaxis.ticks==null){O.yaxis.ticks=O.yaxis.noTicks}if(O.x2axis){O.xaxes[1]=c.extend(true,{},O.xaxis,O.x2axis);O.xaxes[1].position="top"}if(O.y2axis){O.yaxes[1]=c.extend(true,{},O.yaxis,O.y2axis);O.yaxes[1].position="right"}if(O.grid.coloredAreas){O.grid.markings=O.grid.coloredAreas}if(O.grid.coloredAreasColor){O.grid.markingsColor=O.grid.coloredAreasColor}if(O.lines){c.extend(true,O.series.lines,O.lines)}if(O.points){c.extend(true,O.series.points,O.points)}if(O.bars){c.extend(true,O.series.bars,O.bars)}if(O.shadowSize!=null){O.series.shadowSize=O.shadowSize}for(aB=0;aB<O.xaxes.length;++aB){V(p,aB+1).options=O.xaxes[aB]}for(aB=0;aB<O.yaxes.length;++aB){V(aw,aB+1).options=O.yaxes[aB]}for(var aD in ak){if(O.hooks[aD]&&O.hooks[aD].length){ak[aD]=ak[aD].concat(O.hooks[aD])}}an(ak.processOptions,[O])}function aj(aB){Q=Y(aB);ax();z()}function Y(aE){var aC=[];for(var aB=0;aB<aE.length;++aB){var aD=c.extend(true,{},O.series);if(aE[aB].data!=null){aD.data=aE[aB].data;delete aE[aB].data;c.extend(true,aD,aE[aB]);aE[aB].data=aD.data}else{aD.data=aE[aB]}aC.push(aD)}return aC}function aA(aC,aD){var aB=aC[aD+"axis"];if(typeof aB=="object"){aB=aB.n}if(typeof aB!="number"){aB=1}return aB}function m(){return c.grep(p.concat(aw),function(aB){return aB})}function C(aE){var aC={},aB,aD;for(aB=0;aB<p.length;++aB){aD=p[aB];if(aD&&aD.used){aC["x"+aD.n]=aD.c2p(aE.left)}}for(aB=0;aB<aw.length;++aB){aD=aw[aB];if(aD&&aD.used){aC["y"+aD.n]=aD.c2p(aE.top)}}if(aC.x1!==undefined){aC.x=aC.x1}if(aC.y1!==undefined){aC.y=aC.y1}return aC}function ar(aF){var aD={},aC,aE,aB;for(aC=0;aC<p.length;++aC){aE=p[aC];if(aE&&aE.used){aB="x"+aE.n;if(aF[aB]==null&&aE.n==1){aB="x"}if(aF[aB]!=null){aD.left=aE.p2c(aF[aB]);break}}}for(aC=0;aC<aw.length;++aC){aE=aw[aC];if(aE&&aE.used){aB="y"+aE.n;if(aF[aB]==null&&aE.n==1){aB="y"}if(aF[aB]!=null){aD.top=aE.p2c(aF[aB]);break}}}return aD}function V(aC,aB){if(!aC[aB-1]){aC[aB-1]={n:aB,direction:aC==p?"x":"y",options:c.extend(true,{},aC==p?O.xaxis:O.yaxis)}}return aC[aB-1]}function ax(){var aG;var aM=Q.length,aB=[],aE=[];for(aG=0;aG<Q.length;++aG){var aJ=Q[aG].color;if(aJ!=null){--aM;if(typeof aJ=="number"){aE.push(aJ)}else{aB.push(c.color.parse(Q[aG].color))}}}for(aG=0;aG<aE.length;++aG){aM=Math.max(aM,aE[aG]+1)}var aC=[],aF=0;aG=0;while(aC.length<aM){var aI;if(O.colors.length==aG){aI=c.color.make(100,100,100)}else{aI=c.color.parse(O.colors[aG])}var aD=aF%2==1?-1:1;aI.scale("rgb",1+aD*Math.ceil(aF/2)*0.2);aC.push(aI);++aG;if(aG>=O.colors.length){aG=0;++aF}}var aH=0,aN;for(aG=0;aG<Q.length;++aG){aN=Q[aG];if(aN.color==null){aN.color=aC[aH].toString();++aH}else{if(typeof aN.color=="number"){aN.color=aC[aN.color].toString()}}if(aN.lines.show==null){var aL,aK=true;for(aL in aN){if(aN[aL]&&aN[aL].show){aK=false;break}}if(aK){aN.lines.show=true}}aN.xaxis=V(p,aA(aN,"x"));aN.yaxis=V(aw,aA(aN,"y"))}}function z(){var aO=Number.POSITIVE_INFINITY,aI=Number.NEGATIVE_INFINITY,aB=Number.MAX_VALUE,aU,aS,aR,aN,aD,aJ,aT,aP,aH,aG,aC,a0,aX,aL;function aF(a3,a2,a1){if(a2<a3.datamin&&a2!=-aB){a3.datamin=a2}if(a1>a3.datamax&&a1!=aB){a3.datamax=a1}}c.each(m(),function(a1,a2){a2.datamin=aO;a2.datamax=aI;a2.used=false});for(aU=0;aU<Q.length;++aU){aJ=Q[aU];aJ.datapoints={points:[]};an(ak.processRawData,[aJ,aJ.data,aJ.datapoints])}for(aU=0;aU<Q.length;++aU){aJ=Q[aU];var aZ=aJ.data,aW=aJ.datapoints.format;if(!aW){aW=[];aW.push({x:true,number:true,required:true});aW.push({y:true,number:true,required:true});if(aJ.bars.show||(aJ.lines.show&&aJ.lines.fill)){aW.push({y:true,number:true,required:false,defaultValue:0});if(aJ.bars.horizontal){delete aW[aW.length-1].y;aW[aW.length-1].x=true}}aJ.datapoints.format=aW}if(aJ.datapoints.pointsize!=null){continue}aJ.datapoints.pointsize=aW.length;aP=aJ.datapoints.pointsize;aT=aJ.datapoints.points;insertSteps=aJ.lines.show&&aJ.lines.steps;aJ.xaxis.used=aJ.yaxis.used=true;for(aS=aR=0;aS<aZ.length;++aS,aR+=aP){aL=aZ[aS];var aE=aL==null;if(!aE){for(aN=0;aN<aP;++aN){a0=aL[aN];aX=aW[aN];if(aX){if(aX.number&&a0!=null){a0=+a0;if(isNaN(a0)){a0=null}else{if(a0==Infinity){a0=aB}else{if(a0==-Infinity){a0=-aB}}}}if(a0==null){if(aX.required){aE=true}if(aX.defaultValue!=null){a0=aX.defaultValue}}}aT[aR+aN]=a0}}if(aE){for(aN=0;aN<aP;++aN){a0=aT[aR+aN];if(a0!=null){aX=aW[aN];if(aX.x){aF(aJ.xaxis,a0,a0)}if(aX.y){aF(aJ.yaxis,a0,a0)}}aT[aR+aN]=null}}else{if(insertSteps&&aR>0&&aT[aR-aP]!=null&&aT[aR-aP]!=aT[aR]&&aT[aR-aP+1]!=aT[aR+1]){for(aN=0;aN<aP;++aN){aT[aR+aP+aN]=aT[aR+aN]}aT[aR+1]=aT[aR-aP+1];aR+=aP}}}}for(aU=0;aU<Q.length;++aU){aJ=Q[aU];an(ak.processDatapoints,[aJ,aJ.datapoints])}for(aU=0;aU<Q.length;++aU){aJ=Q[aU];aT=aJ.datapoints.points,aP=aJ.datapoints.pointsize;var aK=aO,aQ=aO,aM=aI,aV=aI;for(aS=0;aS<aT.length;aS+=aP){if(aT[aS]==null){continue}for(aN=0;aN<aP;++aN){a0=aT[aS+aN];aX=aW[aN];if(!aX||a0==aB||a0==-aB){continue}if(aX.x){if(a0<aK){aK=a0}if(a0>aM){aM=a0}}if(aX.y){if(a0<aQ){aQ=a0}if(a0>aV){aV=a0}}}}if(aJ.bars.show){var aY=aJ.bars.align=="left"?0:-aJ.bars.barWidth/2;if(aJ.bars.horizontal){aQ+=aY;aV+=aY+aJ.bars.barWidth}else{aK+=aY;aM+=aY+aJ.bars.barWidth}}aF(aJ.xaxis,aK,aM);aF(aJ.yaxis,aQ,aV)}c.each(m(),function(a1,a2){if(a2.datamin==aO){a2.datamin=null}if(a2.datamax==aI){a2.datamax=null}})}function j(aB,aC){var aD=document.createElement("canvas");aD.className=aC;aD.width=G;aD.height=I;if(!aB){c(aD).css({position:"absolute",left:0,top:0})}c(aD).appendTo(av);if(!aD.getContext){aD=window.G_vmlCanvasManager.initElement(aD)}aD.getContext("2d").save();return aD}function B(){G=av.width();I=av.height();if(G<=0||I<=0){throw"Invalid dimensions for plot, width = "+G+", height = "+I}}function g(aC){if(aC.width!=G){aC.width=G}if(aC.height!=I){aC.height=I}var aB=aC.getContext("2d");aB.restore();aB.save()}function X(){var aC,aB=av.children("canvas.base"),aD=av.children("canvas.overlay");if(aB.length==0||aD==0){av.html("");av.css({padding:0});if(av.css("position")=="static"){av.css("position","relative")}B();az=j(true,"base");ad=j(false,"overlay");aC=false}else{az=aB.get(0);ad=aD.get(0);aC=true}H=az.getContext("2d");A=ad.getContext("2d");y=c([ad,az]);if(aC){av.data("plot").shutdown();aq.resize();A.clearRect(0,0,G,I);y.unbind();av.children().not([az,ad]).remove()}av.data("plot",aq)}function ah(){if(O.grid.hoverable){y.mousemove(aa);y.mouseleave(l)}if(O.grid.clickable){y.click(R)}an(ak.bindEvents,[y])}function ag(){if(M){clearTimeout(M)}y.unbind("mousemove",aa);y.unbind("mouseleave",l);y.unbind("click",R);an(ak.shutdown,[y])}function r(aG){function aC(aH){return aH}var aF,aB,aD=aG.options.transform||aC,aE=aG.options.inverseTransform;if(aG.direction=="x"){aF=aG.scale=h/Math.abs(aD(aG.max)-aD(aG.min));aB=Math.min(aD(aG.max),aD(aG.min))}else{aF=aG.scale=w/Math.abs(aD(aG.max)-aD(aG.min));aF=-aF;aB=Math.max(aD(aG.max),aD(aG.min))}if(aD==aC){aG.p2c=function(aH){return(aH-aB)*aF}}else{aG.p2c=function(aH){return(aD(aH)-aB)*aF}}if(!aE){aG.c2p=function(aH){return aB+aH/aF}}else{aG.c2p=function(aH){return aE(aB+aH/aF)}}}function L(aD){var aB=aD.options,aF,aJ=aD.ticks||[],aI=[],aE,aK=aB.labelWidth,aG=aB.labelHeight,aC;function aH(aM,aL){return c('<div style="position:absolute;top:-10000px;'+aL+'font-size:smaller"><div class="'+aD.direction+"Axis "+aD.direction+aD.n+'Axis">'+aM.join("")+"</div></div>").appendTo(av)}if(aD.direction=="x"){if(aK==null){aK=Math.floor(G/(aJ.length>0?aJ.length:1))}if(aG==null){aI=[];for(aF=0;aF<aJ.length;++aF){aE=aJ[aF].label;if(aE){aI.push('<div class="tickLabel" style="float:left;width:'+aK+'px">'+aE+"</div>")}}if(aI.length>0){aI.push('<div style="clear:left"></div>');aC=aH(aI,"width:10000px;");aG=aC.height();aC.remove()}}}else{if(aK==null||aG==null){for(aF=0;aF<aJ.length;++aF){aE=aJ[aF].label;if(aE){aI.push('<div class="tickLabel">'+aE+"</div>")}}if(aI.length>0){aC=aH(aI,"");if(aK==null){aK=aC.children().width()}if(aG==null){aG=aC.find("div.tickLabel").height()}aC.remove()}}}if(aK==null){aK=0}if(aG==null){aG=0}aD.labelWidth=aK;aD.labelHeight=aG}function au(aD){var aC=aD.labelWidth,aL=aD.labelHeight,aH=aD.options.position,aF=aD.options.tickLength,aG=O.grid.axisMargin,aJ=O.grid.labelMargin,aK=aD.direction=="x"?p:aw,aE;var aB=c.grep(aK,function(aN){return aN&&aN.options.position==aH&&aN.reserveSpace});if(c.inArray(aD,aB)==aB.length-1){aG=0}if(aF==null){aF="full"}var aI=c.grep(aK,function(aN){return aN&&aN.reserveSpace});var aM=c.inArray(aD,aI)==0;if(!aM&&aF=="full"){aF=5}if(!isNaN(+aF)){aJ+=+aF}if(aD.direction=="x"){aL+=aJ;if(aH=="bottom"){q.bottom+=aL+aG;aD.box={top:I-q.bottom,height:aL}}else{aD.box={top:q.top+aG,height:aL};q.top+=aL+aG}}else{aC+=aJ;if(aH=="left"){aD.box={left:q.left+aG,width:aC};q.left+=aC+aG}else{q.right+=aC+aG;aD.box={left:G-q.right,width:aC}}}aD.position=aH;aD.tickLength=aF;aD.box.padding=aJ;aD.innermost=aM}function U(aB){if(aB.direction=="x"){aB.box.left=q.left;aB.box.width=h}else{aB.box.top=q.top;aB.box.height=w}}function t(){var aC,aE=m();c.each(aE,function(aF,aG){aG.show=aG.options.show;if(aG.show==null){aG.show=aG.used}aG.reserveSpace=aG.show||aG.options.reserveSpace;n(aG)});allocatedAxes=c.grep(aE,function(aF){return aF.reserveSpace});q.left=q.right=q.top=q.bottom=0;if(O.grid.show){c.each(allocatedAxes,function(aF,aG){S(aG);P(aG);ap(aG,aG.ticks);L(aG)});for(aC=allocatedAxes.length-1;aC>=0;--aC){au(allocatedAxes[aC])}var aD=O.grid.minBorderMargin;if(aD==null){aD=0;for(aC=0;aC<Q.length;++aC){aD=Math.max(aD,Q[aC].points.radius+Q[aC].points.lineWidth/2)}}for(var aB in q){q[aB]+=O.grid.borderWidth;q[aB]=Math.max(aD,q[aB])}}h=G-q.left-q.right;w=I-q.bottom-q.top;c.each(aE,function(aF,aG){r(aG)});if(O.grid.show){c.each(allocatedAxes,function(aF,aG){U(aG)});k()}o()}function n(aE){var aF=aE.options,aD=+(aF.min!=null?aF.min:aE.datamin),aB=+(aF.max!=null?aF.max:aE.datamax),aH=aB-aD;if(aH==0){var aC=aB==0?1:0.01;if(aF.min==null){aD-=aC}if(aF.max==null||aF.min!=null){aB+=aC}}else{var aG=aF.autoscaleMargin;if(aG!=null){if(aF.min==null){aD-=aH*aG;if(aD<0&&aE.datamin!=null&&aE.datamin>=0){aD=0}}if(aF.max==null){aB+=aH*aG;if(aB>0&&aE.datamax!=null&&aE.datamax<=0){aB=0}}}}aE.min=aD;aE.max=aB}function S(aG){var aM=aG.options;var aH;if(typeof aM.ticks=="number"&&aM.ticks>0){aH=aM.ticks}else{aH=0.3*Math.sqrt(aG.direction=="x"?G:I)}var aT=(aG.max-aG.min)/aH,aO,aB,aN,aR,aS,aQ,aI;if(aM.mode=="time"){var aJ={second:1000,minute:60*1000,hour:60*60*1000,day:24*60*60*1000,month:30*24*60*60*1000,year:365.2425*24*60*60*1000};var aK=[[1,"second"],[2,"second"],[5,"second"],[10,"second"],[30,"second"],[1,"minute"],[2,"minute"],[5,"minute"],[10,"minute"],[30,"minute"],[1,"hour"],[2,"hour"],[4,"hour"],[8,"hour"],[12,"hour"],[1,"day"],[2,"day"],[3,"day"],[0.25,"month"],[0.5,"month"],[1,"month"],[2,"month"],[3,"month"],[6,"month"],[1,"year"]];var aC=0;if(aM.minTickSize!=null){if(typeof aM.tickSize=="number"){aC=aM.tickSize}else{aC=aM.minTickSize[0]*aJ[aM.minTickSize[1]]}}for(var aS=0;aS<aK.length-1;++aS){if(aT<(aK[aS][0]*aJ[aK[aS][1]]+aK[aS+1][0]*aJ[aK[aS+1][1]])/2&&aK[aS][0]*aJ[aK[aS][1]]>=aC){break}}aO=aK[aS][0];aN=aK[aS][1];if(aN=="year"){aQ=Math.pow(10,Math.floor(Math.log(aT/aJ.year)/Math.LN10));aI=(aT/aJ.year)/aQ;if(aI<1.5){aO=1}else{if(aI<3){aO=2}else{if(aI<7.5){aO=5}else{aO=10}}}aO*=aQ}aG.tickSize=aM.tickSize||[aO,aN];aB=function(aX){var a2=[],a0=aX.tickSize[0],a3=aX.tickSize[1],a1=new Date(aX.min);var aW=a0*aJ[a3];if(a3=="second"){a1.setUTCSeconds(a(a1.getUTCSeconds(),a0))}if(a3=="minute"){a1.setUTCMinutes(a(a1.getUTCMinutes(),a0))}if(a3=="hour"){a1.setUTCHours(a(a1.getUTCHours(),a0))}if(a3=="month"){a1.setUTCMonth(a(a1.getUTCMonth(),a0))}if(a3=="year"){a1.setUTCFullYear(a(a1.getUTCFullYear(),a0))}a1.setUTCMilliseconds(0);if(aW>=aJ.minute){a1.setUTCSeconds(0)}if(aW>=aJ.hour){a1.setUTCMinutes(0)}if(aW>=aJ.day){a1.setUTCHours(0)}if(aW>=aJ.day*4){a1.setUTCDate(1)}if(aW>=aJ.year){a1.setUTCMonth(0)}var a5=0,a4=Number.NaN,aY;do{aY=a4;a4=a1.getTime();a2.push(a4);if(a3=="month"){if(a0<1){a1.setUTCDate(1);var aV=a1.getTime();a1.setUTCMonth(a1.getUTCMonth()+1);var aZ=a1.getTime();a1.setTime(a4+a5*aJ.hour+(aZ-aV)*a0);a5=a1.getUTCHours();a1.setUTCHours(0)}else{a1.setUTCMonth(a1.getUTCMonth()+a0)}}else{if(a3=="year"){a1.setUTCFullYear(a1.getUTCFullYear()+a0)}else{a1.setTime(a4+aW)}}}while(a4<aX.max&&a4!=aY);return a2};aR=function(aV,aY){var a0=new Date(aV);if(aM.timeformat!=null){return c.plot.formatDate(a0,aM.timeformat,aM.monthNames)}var aW=aY.tickSize[0]*aJ[aY.tickSize[1]];var aX=aY.max-aY.min;var aZ=(aM.twelveHourClock)?" %p":"";if(aW<aJ.minute){fmt="%h:%M:%S"+aZ}else{if(aW<aJ.day){if(aX<2*aJ.day){fmt="%h:%M"+aZ}else{fmt="%b %d %h:%M"+aZ}}else{if(aW<aJ.month){fmt="%b %d"}else{if(aW<aJ.year){if(aX<aJ.year){fmt="%b"}else{fmt="%b %y"}}else{fmt="%y"}}}}return c.plot.formatDate(a0,fmt,aM.monthNames)}}else{var aU=aM.tickDecimals;var aP=-Math.floor(Math.log(aT)/Math.LN10);if(aU!=null&&aP>aU){aP=aU}aQ=Math.pow(10,-aP);aI=aT/aQ;if(aI<1.5){aO=1}else{if(aI<3){aO=2;if(aI>2.25&&(aU==null||aP+1<=aU)){aO=2.5;++aP}}else{if(aI<7.5){aO=5}else{aO=10}}}aO*=aQ;if(aM.minTickSize!=null&&aO<aM.minTickSize){aO=aM.minTickSize}aG.tickDecimals=Math.max(0,aU!=null?aU:aP);aG.tickSize=aM.tickSize||aO;aB=function(aX){var aZ=[];var a0=a(aX.min,aX.tickSize),aW=0,aV=Number.NaN,aY;do{aY=aV;aV=a0+aW*aX.tickSize;aZ.push(aV);++aW}while(aV<aX.max&&aV!=aY);return aZ};aR=function(aV,aW){return aV.toFixed(aW.tickDecimals)}}if(aM.alignTicksWithAxis!=null){var aF=(aG.direction=="x"?p:aw)[aM.alignTicksWithAxis-1];if(aF&&aF.used&&aF!=aG){var aL=aB(aG);if(aL.length>0){if(aM.min==null){aG.min=Math.min(aG.min,aL[0])}if(aM.max==null&&aL.length>1){aG.max=Math.max(aG.max,aL[aL.length-1])}}aB=function(aX){var aY=[],aV,aW;for(aW=0;aW<aF.ticks.length;++aW){aV=(aF.ticks[aW].v-aF.min)/(aF.max-aF.min);aV=aX.min+aV*(aX.max-aX.min);aY.push(aV)}return aY};if(aG.mode!="time"&&aM.tickDecimals==null){var aE=Math.max(0,-Math.floor(Math.log(aT)/Math.LN10)+1),aD=aB(aG);if(!(aD.length>1&&/\..*0$/.test((aD[1]-aD[0]).toFixed(aE)))){aG.tickDecimals=aE}}}}aG.tickGenerator=aB;if(c.isFunction(aM.tickFormatter)){aG.tickFormatter=function(aV,aW){return""+aM.tickFormatter(aV,aW)}}else{aG.tickFormatter=aR}}function P(aF){var aH=aF.options.ticks,aG=[];if(aH==null||(typeof aH=="number"&&aH>0)){aG=aF.tickGenerator(aF)}else{if(aH){if(c.isFunction(aH)){aG=aH({min:aF.min,max:aF.max})}else{aG=aH}}}var aE,aB;aF.ticks=[];for(aE=0;aE<aG.length;++aE){var aC=null;var aD=aG[aE];if(typeof aD=="object"){aB=+aD[0];if(aD.length>1){aC=aD[1]}}else{aB=+aD}if(aC==null){aC=aF.tickFormatter(aB,aF)}if(!isNaN(aB)){aF.ticks.push({v:aB,label:aC})}}}function ap(aB,aC){if(aB.options.autoscaleMargin&&aC.length>0){if(aB.options.min==null){aB.min=Math.min(aB.min,aC[0].v)}if(aB.options.max==null&&aC.length>1){aB.max=Math.max(aB.max,aC[aC.length-1].v)}}}function W(){H.clearRect(0,0,G,I);var aC=O.grid;if(aC.show&&aC.backgroundColor){N()}if(aC.show&&!aC.aboveData){ac()}for(var aB=0;aB<Q.length;++aB){an(ak.drawSeries,[H,Q[aB]]);d(Q[aB])}an(ak.draw,[H]);if(aC.show&&aC.aboveData){ac()}}function D(aB,aI){var aE,aH,aG,aD,aF=m();for(i=0;i<aF.length;++i){aE=aF[i];if(aE.direction==aI){aD=aI+aE.n+"axis";if(!aB[aD]&&aE.n==1){aD=aI+"axis"}if(aB[aD]){aH=aB[aD].from;aG=aB[aD].to;break}}}if(!aB[aD]){aE=aI=="x"?p[0]:aw[0];aH=aB[aI+"1"];aG=aB[aI+"2"]}if(aH!=null&&aG!=null&&aH>aG){var aC=aH;aH=aG;aG=aC}return{from:aH,to:aG,axis:aE}}function N(){H.save();H.translate(q.left,q.top);H.fillStyle=am(O.grid.backgroundColor,w,0,"rgba(255, 255, 255, 0)");H.fillRect(0,0,h,w);H.restore()}function ac(){var aF;H.save();H.translate(q.left,q.top);var aH=O.grid.markings;if(aH){if(c.isFunction(aH)){var aK=aq.getAxes();aK.xmin=aK.xaxis.min;aK.xmax=aK.xaxis.max;aK.ymin=aK.yaxis.min;aK.ymax=aK.yaxis.max;aH=aH(aK)}for(aF=0;aF<aH.length;++aF){var aD=aH[aF],aC=D(aD,"x"),aI=D(aD,"y");if(aC.from==null){aC.from=aC.axis.min}if(aC.to==null){aC.to=aC.axis.max}if(aI.from==null){aI.from=aI.axis.min}if(aI.to==null){aI.to=aI.axis.max}if(aC.to<aC.axis.min||aC.from>aC.axis.max||aI.to<aI.axis.min||aI.from>aI.axis.max){continue}aC.from=Math.max(aC.from,aC.axis.min);aC.to=Math.min(aC.to,aC.axis.max);aI.from=Math.max(aI.from,aI.axis.min);aI.to=Math.min(aI.to,aI.axis.max);if(aC.from==aC.to&&aI.from==aI.to){continue}aC.from=aC.axis.p2c(aC.from);aC.to=aC.axis.p2c(aC.to);aI.from=aI.axis.p2c(aI.from);aI.to=aI.axis.p2c(aI.to);if(aC.from==aC.to||aI.from==aI.to){H.beginPath();H.strokeStyle=aD.color||O.grid.markingsColor;H.lineWidth=aD.lineWidth||O.grid.markingsLineWidth;H.moveTo(aC.from,aI.from);H.lineTo(aC.to,aI.to);H.stroke()}else{H.fillStyle=aD.color||O.grid.markingsColor;H.fillRect(aC.from,aI.to,aC.to-aC.from,aI.from-aI.to)}}}var aK=m(),aM=O.grid.borderWidth;for(var aE=0;aE<aK.length;++aE){var aB=aK[aE],aG=aB.box,aQ=aB.tickLength,aN,aL,aP,aJ;if(!aB.show||aB.ticks.length==0){continue}H.strokeStyle=aB.options.tickColor||c.color.parse(aB.options.color).scale("a",0.22).toString();H.lineWidth=1;if(aB.direction=="x"){aN=0;if(aQ=="full"){aL=(aB.position=="top"?0:w)}else{aL=aG.top-q.top+(aB.position=="top"?aG.height:0)}}else{aL=0;if(aQ=="full"){aN=(aB.position=="left"?0:h)}else{aN=aG.left-q.left+(aB.position=="left"?aG.width:0)}}if(!aB.innermost){H.beginPath();aP=aJ=0;if(aB.direction=="x"){aP=h}else{aJ=w}if(H.lineWidth==1){aN=Math.floor(aN)+0.5;aL=Math.floor(aL)+0.5}H.moveTo(aN,aL);H.lineTo(aN+aP,aL+aJ);H.stroke()}H.beginPath();for(aF=0;aF<aB.ticks.length;++aF){var aO=aB.ticks[aF].v;aP=aJ=0;if(aO<aB.min||aO>aB.max||(aQ=="full"&&aM>0&&(aO==aB.min||aO==aB.max))){continue}if(aB.direction=="x"){aN=aB.p2c(aO);aJ=aQ=="full"?-w:aQ;if(aB.position=="top"){aJ=-aJ}}else{aL=aB.p2c(aO);aP=aQ=="full"?-h:aQ;if(aB.position=="left"){aP=-aP}}if(H.lineWidth==1){if(aB.direction=="x"){aN=Math.floor(aN)+0.5}else{aL=Math.floor(aL)+0.5}}H.moveTo(aN,aL);H.lineTo(aN+aP,aL+aJ)}H.stroke()}if(aM){H.lineWidth=aM;H.strokeStyle=O.grid.borderColor;H.strokeRect(-aM/2,-aM/2,h+aM,w+aM)}H.restore()}function k(){av.find(".tickLabels").remove();var aG=['<div class="tickLabels" style="font-size:smaller">'];var aJ=m();for(var aD=0;aD<aJ.length;++aD){var aC=aJ[aD],aF=aC.box;if(!aC.show){continue}aG.push('<div class="'+aC.direction+"Axis "+aC.direction+aC.n+'Axis" style="color:'+aC.options.color+'">');for(var aE=0;aE<aC.ticks.length;++aE){var aH=aC.ticks[aE];if(!aH.label||aH.v<aC.min||aH.v>aC.max){continue}var aK={},aI;if(aC.direction=="x"){aI="center";aK.left=Math.round(q.left+aC.p2c(aH.v)-aC.labelWidth/2);if(aC.position=="bottom"){aK.top=aF.top+aF.padding}else{aK.bottom=I-(aF.top+aF.height-aF.padding)}}else{aK.top=Math.round(q.top+aC.p2c(aH.v)-aC.labelHeight/2);if(aC.position=="left"){aK.right=G-(aF.left+aF.width-aF.padding);aI="right"}else{aK.left=aF.left+aF.padding;aI="left"}}aK.width=aC.labelWidth;var aB=["position:absolute","text-align:"+aI];for(var aL in aK){aB.push(aL+":"+aK[aL]+"px")}aG.push('<div class="tickLabel" style="'+aB.join(";")+'">'+aH.label+"</div>")}aG.push("</div>")}aG.push("</div>");av.append(aG.join(""))}function d(aB){if(aB.lines.show){at(aB)}if(aB.bars.show){e(aB)}if(aB.points.show){ao(aB)}}function at(aE){function aD(aP,aQ,aI,aU,aT){var aV=aP.points,aJ=aP.pointsize,aN=null,aM=null;H.beginPath();for(var aO=aJ;aO<aV.length;aO+=aJ){var aL=aV[aO-aJ],aS=aV[aO-aJ+1],aK=aV[aO],aR=aV[aO+1];if(aL==null||aK==null){continue}if(aS<=aR&&aS<aT.min){if(aR<aT.min){continue}aL=(aT.min-aS)/(aR-aS)*(aK-aL)+aL;aS=aT.min}else{if(aR<=aS&&aR<aT.min){if(aS<aT.min){continue}aK=(aT.min-aS)/(aR-aS)*(aK-aL)+aL;aR=aT.min}}if(aS>=aR&&aS>aT.max){if(aR>aT.max){continue}aL=(aT.max-aS)/(aR-aS)*(aK-aL)+aL;aS=aT.max}else{if(aR>=aS&&aR>aT.max){if(aS>aT.max){continue}aK=(aT.max-aS)/(aR-aS)*(aK-aL)+aL;aR=aT.max}}if(aL<=aK&&aL<aU.min){if(aK<aU.min){continue}aS=(aU.min-aL)/(aK-aL)*(aR-aS)+aS;aL=aU.min}else{if(aK<=aL&&aK<aU.min){if(aL<aU.min){continue}aR=(aU.min-aL)/(aK-aL)*(aR-aS)+aS;aK=aU.min}}if(aL>=aK&&aL>aU.max){if(aK>aU.max){continue}aS=(aU.max-aL)/(aK-aL)*(aR-aS)+aS;aL=aU.max}else{if(aK>=aL&&aK>aU.max){if(aL>aU.max){continue}aR=(aU.max-aL)/(aK-aL)*(aR-aS)+aS;aK=aU.max}}if(aL!=aN||aS!=aM){H.moveTo(aU.p2c(aL)+aQ,aT.p2c(aS)+aI)}aN=aK;aM=aR;H.lineTo(aU.p2c(aK)+aQ,aT.p2c(aR)+aI)}H.stroke()}function aF(aI,aQ,aP){var aW=aI.points,aV=aI.pointsize,aN=Math.min(Math.max(0,aP.min),aP.max),aX=0,aU,aT=false,aM=1,aL=0,aR=0;while(true){if(aV>0&&aX>aW.length+aV){break}aX+=aV;var aZ=aW[aX-aV],aK=aW[aX-aV+aM],aY=aW[aX],aJ=aW[aX+aM];if(aT){if(aV>0&&aZ!=null&&aY==null){aR=aX;aV=-aV;aM=2;continue}if(aV<0&&aX==aL+aV){H.fill();aT=false;aV=-aV;aM=1;aX=aL=aR+aV;continue}}if(aZ==null||aY==null){continue}if(aZ<=aY&&aZ<aQ.min){if(aY<aQ.min){continue}aK=(aQ.min-aZ)/(aY-aZ)*(aJ-aK)+aK;aZ=aQ.min}else{if(aY<=aZ&&aY<aQ.min){if(aZ<aQ.min){continue}aJ=(aQ.min-aZ)/(aY-aZ)*(aJ-aK)+aK;aY=aQ.min}}if(aZ>=aY&&aZ>aQ.max){if(aY>aQ.max){continue}aK=(aQ.max-aZ)/(aY-aZ)*(aJ-aK)+aK;aZ=aQ.max}else{if(aY>=aZ&&aY>aQ.max){if(aZ>aQ.max){continue}aJ=(aQ.max-aZ)/(aY-aZ)*(aJ-aK)+aK;aY=aQ.max}}if(!aT){H.beginPath();H.moveTo(aQ.p2c(aZ),aP.p2c(aN));aT=true}if(aK>=aP.max&&aJ>=aP.max){H.lineTo(aQ.p2c(aZ),aP.p2c(aP.max));H.lineTo(aQ.p2c(aY),aP.p2c(aP.max));continue}else{if(aK<=aP.min&&aJ<=aP.min){H.lineTo(aQ.p2c(aZ),aP.p2c(aP.min));H.lineTo(aQ.p2c(aY),aP.p2c(aP.min));continue}}var aO=aZ,aS=aY;if(aK<=aJ&&aK<aP.min&&aJ>=aP.min){aZ=(aP.min-aK)/(aJ-aK)*(aY-aZ)+aZ;aK=aP.min}else{if(aJ<=aK&&aJ<aP.min&&aK>=aP.min){aY=(aP.min-aK)/(aJ-aK)*(aY-aZ)+aZ;aJ=aP.min}}if(aK>=aJ&&aK>aP.max&&aJ<=aP.max){aZ=(aP.max-aK)/(aJ-aK)*(aY-aZ)+aZ;aK=aP.max}else{if(aJ>=aK&&aJ>aP.max&&aK<=aP.max){aY=(aP.max-aK)/(aJ-aK)*(aY-aZ)+aZ;aJ=aP.max}}if(aZ!=aO){H.lineTo(aQ.p2c(aO),aP.p2c(aK))}H.lineTo(aQ.p2c(aZ),aP.p2c(aK));H.lineTo(aQ.p2c(aY),aP.p2c(aJ));if(aY!=aS){H.lineTo(aQ.p2c(aY),aP.p2c(aJ));H.lineTo(aQ.p2c(aS),aP.p2c(aJ))}}}H.save();H.translate(q.left,q.top);H.lineJoin="round";var aG=aE.lines.lineWidth,aB=aE.shadowSize;if(aG>0&&aB>0){H.lineWidth=aB;H.strokeStyle="rgba(0,0,0,0.1)";var aH=Math.PI/18;aD(aE.datapoints,Math.sin(aH)*(aG/2+aB/2),Math.cos(aH)*(aG/2+aB/2),aE.xaxis,aE.yaxis);H.lineWidth=aB/2;aD(aE.datapoints,Math.sin(aH)*(aG/2+aB/4),Math.cos(aH)*(aG/2+aB/4),aE.xaxis,aE.yaxis)}H.lineWidth=aG;H.strokeStyle=aE.color;var aC=ae(aE.lines,aE.color,0,w);if(aC){H.fillStyle=aC;aF(aE.datapoints,aE.xaxis,aE.yaxis)}if(aG>0){aD(aE.datapoints,0,0,aE.xaxis,aE.yaxis)}H.restore()}function ao(aE){function aH(aN,aM,aU,aK,aS,aT,aQ,aJ){var aR=aN.points,aI=aN.pointsize;for(var aL=0;aL<aR.length;aL+=aI){var aP=aR[aL],aO=aR[aL+1];if(aP==null||aP<aT.min||aP>aT.max||aO<aQ.min||aO>aQ.max){continue}H.beginPath();aP=aT.p2c(aP);aO=aQ.p2c(aO)+aK;if(aJ=="circle"){H.arc(aP,aO,aM,0,aS?Math.PI:Math.PI*2,false)}else{aJ(H,aP,aO,aM,aS)}H.closePath();if(aU){H.fillStyle=aU;H.fill()}H.stroke()}}H.save();H.translate(q.left,q.top);var aG=aE.points.lineWidth,aC=aE.shadowSize,aB=aE.points.radius,aF=aE.points.symbol;if(aG>0&&aC>0){var aD=aC/2;H.lineWidth=aD;H.strokeStyle="rgba(0,0,0,0.1)";aH(aE.datapoints,aB,null,aD+aD/2,true,aE.xaxis,aE.yaxis,aF);H.strokeStyle="rgba(0,0,0,0.2)";aH(aE.datapoints,aB,null,aD/2,true,aE.xaxis,aE.yaxis,aF)}H.lineWidth=aG;H.strokeStyle=aE.color;aH(aE.datapoints,aB,ae(aE.points,aE.color),0,false,aE.xaxis,aE.yaxis,aF);H.restore()}function E(aN,aM,aV,aI,aQ,aF,aD,aL,aK,aU,aR,aC){var aE,aT,aJ,aP,aG,aB,aO,aH,aS;if(aR){aH=aB=aO=true;aG=false;aE=aV;aT=aN;aP=aM+aI;aJ=aM+aQ;if(aT<aE){aS=aT;aT=aE;aE=aS;aG=true;aB=false}}else{aG=aB=aO=true;aH=false;aE=aN+aI;aT=aN+aQ;aJ=aV;aP=aM;if(aP<aJ){aS=aP;aP=aJ;aJ=aS;aH=true;aO=false}}if(aT<aL.min||aE>aL.max||aP<aK.min||aJ>aK.max){return}if(aE<aL.min){aE=aL.min;aG=false}if(aT>aL.max){aT=aL.max;aB=false}if(aJ<aK.min){aJ=aK.min;aH=false}if(aP>aK.max){aP=aK.max;aO=false}aE=aL.p2c(aE);aJ=aK.p2c(aJ);aT=aL.p2c(aT);aP=aK.p2c(aP);if(aD){aU.beginPath();aU.moveTo(aE,aJ);aU.lineTo(aE,aP);aU.lineTo(aT,aP);aU.lineTo(aT,aJ);aU.fillStyle=aD(aJ,aP);aU.fill()}if(aC>0&&(aG||aB||aO||aH)){aU.beginPath();aU.moveTo(aE,aJ+aF);if(aG){aU.lineTo(aE,aP+aF)}else{aU.moveTo(aE,aP+aF)}if(aO){aU.lineTo(aT,aP+aF)}else{aU.moveTo(aT,aP+aF)}if(aB){aU.lineTo(aT,aJ+aF)}else{aU.moveTo(aT,aJ+aF)}if(aH){aU.lineTo(aE,aJ+aF)}else{aU.moveTo(aE,aJ+aF)}aU.stroke()}}function e(aD){function aC(aJ,aI,aL,aG,aK,aN,aM){var aO=aJ.points,aF=aJ.pointsize;for(var aH=0;aH<aO.length;aH+=aF){if(aO[aH]==null){continue}E(aO[aH],aO[aH+1],aO[aH+2],aI,aL,aG,aK,aN,aM,H,aD.bars.horizontal,aD.bars.lineWidth)}}H.save();H.translate(q.left,q.top);H.lineWidth=aD.bars.lineWidth;H.strokeStyle=aD.color;var aB=aD.bars.align=="left"?0:-aD.bars.barWidth/2;var aE=aD.bars.fill?function(aF,aG){return ae(aD.bars,aD.color,aF,aG)}:null;aC(aD.datapoints,aB,aB+aD.bars.barWidth,0,aE,aD.xaxis,aD.yaxis);H.restore()}function ae(aD,aB,aC,aF){var aE=aD.fill;if(!aE){return null}if(aD.fillColor){return am(aD.fillColor,aC,aF,aB)}var aG=c.color.parse(aB);aG.a=typeof aE=="number"?aE:0.4;aG.normalize();return aG.toString()}function o(){av.find(".legend").remove();if(!O.legend.show){return}var aH=[],aF=false,aN=O.legend.labelFormatter,aM,aJ;for(var aE=0;aE<Q.length;++aE){aM=Q[aE];aJ=aM.label;if(!aJ){continue}if(aE%O.legend.noColumns==0){if(aF){aH.push("</tr>")}aH.push("<tr>");aF=true}if(aN){aJ=aN(aJ,aM)}aH.push('<td class="legendColorBox"><div style="border:1px solid '+O.legend.labelBoxBorderColor+';padding:1px"><div style="width:4px;height:0;border:5px solid '+aM.color+';overflow:hidden"></div></div></td><td class="legendLabel">'+aJ+"</td>")}if(aF){aH.push("</tr>")}if(aH.length==0){return}var aL='<table style="font-size:smaller;color:'+O.grid.color+'">'+aH.join("")+"</table>";if(O.legend.container!=null){c(O.legend.container).html(aL)}else{var aI="",aC=O.legend.position,aD=O.legend.margin;if(aD[0]==null){aD=[aD,aD]}if(aC.charAt(0)=="n"){aI+="top:"+(aD[1]+q.top)+"px;"}else{if(aC.charAt(0)=="s"){aI+="bottom:"+(aD[1]+q.bottom)+"px;"}}if(aC.charAt(1)=="e"){aI+="right:"+(aD[0]+q.right)+"px;"}else{if(aC.charAt(1)=="w"){aI+="left:"+(aD[0]+q.left)+"px;"}}var aK=c('<div class="legend">'+aL.replace('style="','style="position:absolute;'+aI+";")+"</div>").appendTo(av);if(O.legend.backgroundOpacity!=0){var aG=O.legend.backgroundColor;if(aG==null){aG=O.grid.backgroundColor;if(aG&&typeof aG=="string"){aG=c.color.parse(aG)}else{aG=c.color.extract(aK,"background-color")}aG.a=1;aG=aG.toString()}var aB=aK.children();c('<div style="position:absolute;width:'+aB.width()+"px;height:"+aB.height()+"px;"+aI+"background-color:"+aG+';"> </div>').prependTo(aK).css("opacity",O.legend.backgroundOpacity)}}}var ab=[],M=null;function K(aI,aG,aD){var aO=O.grid.mouseActiveRadius,a0=aO*aO+1,aY=null,aR=false,aW,aU;for(aW=Q.length-1;aW>=0;--aW){if(!aD(Q[aW])){continue}var aP=Q[aW],aH=aP.xaxis,aF=aP.yaxis,aV=aP.datapoints.points,aT=aP.datapoints.pointsize,aQ=aH.c2p(aI),aN=aF.c2p(aG),aC=aO/aH.scale,aB=aO/aF.scale;if(aH.options.inverseTransform){aC=Number.MAX_VALUE}if(aF.options.inverseTransform){aB=Number.MAX_VALUE}if(aP.lines.show||aP.points.show){for(aU=0;aU<aV.length;aU+=aT){var aK=aV[aU],aJ=aV[aU+1];if(aK==null){continue}if(aK-aQ>aC||aK-aQ<-aC||aJ-aN>aB||aJ-aN<-aB){continue}var aM=Math.abs(aH.p2c(aK)-aI),aL=Math.abs(aF.p2c(aJ)-aG),aS=aM*aM+aL*aL;if(aS<a0){a0=aS;aY=[aW,aU/aT]}}}if(aP.bars.show&&!aY){var aE=aP.bars.align=="left"?0:-aP.bars.barWidth/2,aX=aE+aP.bars.barWidth;for(aU=0;aU<aV.length;aU+=aT){var aK=aV[aU],aJ=aV[aU+1],aZ=aV[aU+2];if(aK==null){continue}if(Q[aW].bars.horizontal?(aQ<=Math.max(aZ,aK)&&aQ>=Math.min(aZ,aK)&&aN>=aJ+aE&&aN<=aJ+aX):(aQ>=aK+aE&&aQ<=aK+aX&&aN>=Math.min(aZ,aJ)&&aN<=Math.max(aZ,aJ))){aY=[aW,aU/aT]}}}}if(aY){aW=aY[0];aU=aY[1];aT=Q[aW].datapoints.pointsize;return{datapoint:Q[aW].datapoints.points.slice(aU*aT,(aU+1)*aT),dataIndex:aU,series:Q[aW],seriesIndex:aW}}return null}function aa(aB){if(O.grid.hoverable){u("plothover",aB,function(aC){return aC.hoverable!=false})}}function l(aB){if(O.grid.hoverable){u("plothover",aB,function(aC){return false})}}function R(aB){u("plotclick",aB,function(aC){return aC.clickable!=false})}function u(aC,aB,aD){var aE=y.offset(),aH=aB.pageX-aE.left-q.left,aF=aB.pageY-aE.top-q.top,aJ=C({left:aH,top:aF});aJ.pageX=aB.pageX;aJ.pageY=aB.pageY;var aK=K(aH,aF,aD);if(aK){aK.pageX=parseInt(aK.series.xaxis.p2c(aK.datapoint[0])+aE.left+q.left);aK.pageY=parseInt(aK.series.yaxis.p2c(aK.datapoint[1])+aE.top+q.top)}if(O.grid.autoHighlight){for(var aG=0;aG<ab.length;++aG){var aI=ab[aG];if(aI.auto==aC&&!(aK&&aI.series==aK.series&&aI.point[0]==aK.datapoint[0]&&aI.point[1]==aK.datapoint[1])){T(aI.series,aI.point)}}if(aK){x(aK.series,aK.datapoint,aC)}}av.trigger(aC,[aJ,aK])}function f(){if(!M){M=setTimeout(s,30)}}function s(){M=null;A.save();A.clearRect(0,0,G,I);A.translate(q.left,q.top);var aC,aB;for(aC=0;aC<ab.length;++aC){aB=ab[aC];if(aB.series.bars.show){v(aB.series,aB.point)}else{ay(aB.series,aB.point)}}A.restore();an(ak.drawOverlay,[A])}function x(aD,aB,aF){if(typeof aD=="number"){aD=Q[aD]}if(typeof aB=="number"){var aE=aD.datapoints.pointsize;aB=aD.datapoints.points.slice(aE*aB,aE*(aB+1))}var aC=al(aD,aB);if(aC==-1){ab.push({series:aD,point:aB,auto:aF});f()}else{if(!aF){ab[aC].auto=false}}}function T(aD,aB){if(aD==null&&aB==null){ab=[];f()}if(typeof aD=="number"){aD=Q[aD]}if(typeof aB=="number"){aB=aD.data[aB]}var aC=al(aD,aB);if(aC!=-1){ab.splice(aC,1);f()}}function al(aD,aE){for(var aB=0;aB<ab.length;++aB){var aC=ab[aB];if(aC.series==aD&&aC.point[0]==aE[0]&&aC.point[1]==aE[1]){return aB}}return -1}function ay(aE,aD){var aC=aD[0],aI=aD[1],aH=aE.xaxis,aG=aE.yaxis;if(aC<aH.min||aC>aH.max||aI<aG.min||aI>aG.max){return}var aF=aE.points.radius+aE.points.lineWidth/2;A.lineWidth=aF;A.strokeStyle=c.color.parse(aE.color).scale("a",0.5).toString();var aB=1.5*aF,aC=aH.p2c(aC),aI=aG.p2c(aI);A.beginPath();if(aE.points.symbol=="circle"){A.arc(aC,aI,aB,0,2*Math.PI,false)}else{aE.points.symbol(A,aC,aI,aB,false)}A.closePath();A.stroke()}function v(aE,aB){A.lineWidth=aE.bars.lineWidth;A.strokeStyle=c.color.parse(aE.color).scale("a",0.5).toString();var aD=c.color.parse(aE.color).scale("a",0.5).toString();var aC=aE.bars.align=="left"?0:-aE.bars.barWidth/2;E(aB[0],aB[1],aB[2]||0,aC,aC+aE.bars.barWidth,0,function(){return aD},aE.xaxis,aE.yaxis,A,aE.bars.horizontal,aE.bars.lineWidth)}function am(aJ,aB,aH,aC){if(typeof aJ=="string"){return aJ}else{var aI=H.createLinearGradient(0,aH,0,aB);for(var aE=0,aD=aJ.colors.length;aE<aD;++aE){var aF=aJ.colors[aE];if(typeof aF!="string"){var aG=c.color.parse(aC);if(aF.brightness!=null){aG=aG.scale("rgb",aF.brightness)}if(aF.opacity!=null){aG.a*=aF.opacity}aF=aG.toString()}aI.addColorStop(aE/(aD-1),aF)}return aI}}}c.plot=function(g,e,d){var f=new b(c(g),e,d,c.plot.plugins);return f};c.plot.version="0.7";c.plot.plugins=[];c.plot.formatDate=function(l,f,h){var o=function(d){d=""+d;return d.length==1?"0"+d:d};var e=[];var p=false,j=false;var n=l.getUTCHours();var k=n<12;if(h==null){h=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]}if(f.search(/%p|%P/)!=-1){if(n>12){n=n-12}else{if(n==0){n=12}}}for(var g=0;g<f.length;++g){var m=f.charAt(g);if(p){switch(m){case"h":m=""+n;break;case"H":m=o(n);break;case"M":m=o(l.getUTCMinutes());break;case"S":m=o(l.getUTCSeconds());break;case"d":m=""+l.getUTCDate();break;case"m":m=""+(l.getUTCMonth()+1);break;case"y":m=""+l.getUTCFullYear();break;case"b":m=""+h[l.getUTCMonth()];break;case"p":m=(k)?("am"):("pm");break;case"P":m=(k)?("AM"):("PM");break;case"0":m="";j=true;break}if(m&&j){m=o(m);j=false}e.push(m);if(!j){p=false}}else{if(m=="%"){p=true}else{e.push(m)}}}return e.join("")};function a(e,d){return d*Math.floor(e/d)}})(jQuery);
\ No newline at end of file
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){$.color={};$.color.make=function(r,g,b,a){var o={};o.r=r||0;o.g=g||0;o.b=b||0;o.a=a!=null?a:1;o.add=function(c,d){for(var i=0;i<c.length;++i)o[c.charAt(i)]+=d;return o.normalize()};o.scale=function(c,f){for(var i=0;i<c.length;++i)o[c.charAt(i)]*=f;return o.normalize()};o.toString=function(){if(o.a>=1){return"rgb("+[o.r,o.g,o.b].join(",")+")"}else{return"rgba("+[o.r,o.g,o.b,o.a].join(",")+")"}};o.normalize=function(){function clamp(min,value,max){return value<min?min:value>max?max:value}o.r=clamp(0,parseInt(o.r),255);o.g=clamp(0,parseInt(o.g),255);o.b=clamp(0,parseInt(o.b),255);o.a=clamp(0,o.a,1);return o};o.clone=function(){return $.color.make(o.r,o.b,o.g,o.a)};return o.normalize()};$.color.extract=function(elem,css){var c;do{c=elem.css(css).toLowerCase();if(c!=""&&c!="transparent")break;elem=elem.parent()}while(elem.length&&!$.nodeName(elem.get(0),"body"));if(c=="rgba(0, 0, 0, 0)")c="transparent";return $.color.parse(c)};$.color.parse=function(str){var res,m=$.color.make;if(res=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10));if(res=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10),parseFloat(res[4]));if(res=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55);if(res=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55,parseFloat(res[4]));if(res=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))return m(parseInt(res[1],16),parseInt(res[2],16),parseInt(res[3],16));if(res=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))return m(parseInt(res[1]+res[1],16),parseInt(res[2]+res[2],16),parseInt(res[3]+res[3],16));var name=$.trim(str).toLowerCase();if(name=="transparent")return m(255,255,255,0);else{res=lookupColors[name]||[0,0,0];return m(res[0],res[1],res[2])}};var lookupColors={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);(function($){var hasOwnProperty=Object.prototype.hasOwnProperty;if(!$.fn.detach){$.fn.detach=function(){return this.each(function(){if(this.parentNode){this.parentNode.removeChild(this)}})}}function Canvas(cls,container){var element=container.children("."+cls)[0];if(element==null){element=document.createElement("canvas");element.className=cls;$(element).css({direction:"ltr",position:"absolute",left:0,top:0}).appendTo(container);if(!element.getContext){if(window.G_vmlCanvasManager){element=window.G_vmlCanvasManager.initElement(element)}else{throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.")}}}this.element=element;var context=this.context=element.getContext("2d");var devicePixelRatio=window.devicePixelRatio||1,backingStoreRatio=context.webkitBackingStorePixelRatio||context.mozBackingStorePixelRatio||context.msBackingStorePixelRatio||context.oBackingStorePixelRatio||context.backingStorePixelRatio||1;this.pixelRatio=devicePixelRatio/backingStoreRatio;this.resize(container.width(),container.height());this.textContainer=null;this.text={};this._textCache={}}Canvas.prototype.resize=function(width,height){if(width<=0||height<=0){throw new Error("Invalid dimensions for plot, width = "+width+", height = "+height)}var element=this.element,context=this.context,pixelRatio=this.pixelRatio;if(this.width!=width){element.width=width*pixelRatio;element.style.width=width+"px";this.width=width}if(this.height!=height){element.height=height*pixelRatio;element.style.height=height+"px";this.height=height}context.restore();context.save();context.scale(pixelRatio,pixelRatio)};Canvas.prototype.clear=function(){this.context.clearRect(0,0,this.width,this.height)};Canvas.prototype.render=function(){var cache=this._textCache;for(var layerKey in cache){if(hasOwnProperty.call(cache,layerKey)){var layer=this.getTextLayer(layerKey),layerCache=cache[layerKey];layer.hide();for(var styleKey in layerCache){if(hasOwnProperty.call(layerCache,styleKey)){var styleCache=layerCache[styleKey];for(var key in styleCache){if(hasOwnProperty.call(styleCache,key)){var positions=styleCache[key].positions;for(var i=0,position;position=positions[i];i++){if(position.active){if(!position.rendered){layer.append(position.element);position.rendered=true}}else{positions.splice(i--,1);if(position.rendered){position.element.detach()}}}if(positions.length==0){delete styleCache[key]}}}}}layer.show()}}};Canvas.prototype.getTextLayer=function(classes){var layer=this.text[classes];if(layer==null){if(this.textContainer==null){this.textContainer=$("<div class='flot-text'></div>").css({position:"absolute",top:0,left:0,bottom:0,right:0,"font-size":"smaller",color:"#545454"}).insertAfter(this.element)}layer=this.text[classes]=$("<div></div>").addClass(classes).css({position:"absolute",top:0,left:0,bottom:0,right:0}).appendTo(this.textContainer)}return layer};Canvas.prototype.getTextInfo=function(layer,text,font,angle,width){var textStyle,layerCache,styleCache,info;text=""+text;if(typeof font==="object"){textStyle=font.style+" "+font.variant+" "+font.weight+" "+font.size+"px/"+font.lineHeight+"px "+font.family}else{textStyle=font}layerCache=this._textCache[layer];if(layerCache==null){layerCache=this._textCache[layer]={}}styleCache=layerCache[textStyle];if(styleCache==null){styleCache=layerCache[textStyle]={}}info=styleCache[text];if(info==null){var element=$("<div></div>").html(text).css({position:"absolute","max-width":width,top:-9999}).appendTo(this.getTextLayer(layer));if(typeof font==="object"){element.css({font:textStyle,color:font.color})}else if(typeof font==="string"){element.addClass(font)}info=styleCache[text]={width:element.outerWidth(true),height:element.outerHeight(true),element:element,positions:[]};element.detach()}return info};Canvas.prototype.addText=function(layer,x,y,text,font,angle,width,halign,valign){var info=this.getTextInfo(layer,text,font,angle,width),positions=info.positions;if(halign=="center"){x-=info.width/2}else if(halign=="right"){x-=info.width}if(valign=="middle"){y-=info.height/2}else if(valign=="bottom"){y-=info.height}for(var i=0,position;position=positions[i];i++){if(position.x==x&&position.y==y){position.active=true;return}}position={active:true,rendered:false,element:positions.length?info.element.clone():info.element,x:x,y:y};positions.push(position);position.element.css({top:Math.round(y),left:Math.round(x),"text-align":halign})};Canvas.prototype.removeText=function(layer,x,y,text,font,angle){if(text==null){var layerCache=this._textCache[layer];if(layerCache!=null){for(var styleKey in layerCache){if(hasOwnProperty.call(layerCache,styleKey)){var styleCache=layerCache[styleKey];for(var key in styleCache){if(hasOwnProperty.call(styleCache,key)){var positions=styleCache[key].positions;for(var i=0,position;position=positions[i];i++){position.active=false}}}}}}}else{var positions=this.getTextInfo(layer,text,font,angle).positions;for(var i=0,position;position=positions[i];i++){if(position.x==x&&position.y==y){position.active=false}}}};function Plot(placeholder,data_,options_,plugins){var series=[],options={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:true,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:.85,sorted:null},xaxis:{show:null,position:"bottom",mode:null,font:null,color:null,tickColor:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,reserveSpace:null,tickLength:null,alignTicksWithAxis:null,tickDecimals:null,tickSize:null,minTickSize:null},yaxis:{autoscaleMargin:.02,position:"left"},xaxes:[],yaxes:[],series:{points:{show:false,radius:3,lineWidth:2,fill:true,fillColor:"#ffffff",symbol:"circle"},lines:{lineWidth:2,fill:false,fillColor:null,steps:false},bars:{show:false,lineWidth:2,barWidth:1,fill:true,fillColor:null,align:"left",horizontal:false,zero:true},shadowSize:3,highlightColor:null},grid:{show:true,aboveData:false,color:"#545454",backgroundColor:null,borderColor:null,tickColor:null,margin:0,labelMargin:5,axisMargin:8,borderWidth:2,minBorderMargin:null,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:false,hoverable:false,autoHighlight:true,mouseActiveRadius:10},interaction:{redrawOverlayInterval:1e3/60},hooks:{}},surface=null,overlay=null,eventHolder=null,ctx=null,octx=null,xaxes=[],yaxes=[],plotOffset={left:0,right:0,top:0,bottom:0},plotWidth=0,plotHeight=0,hooks={processOptions:[],processRawData:[],processDatapoints:[],processOffset:[],drawBackground:[],drawSeries:[],draw:[],bindEvents:[],drawOverlay:[],shutdown:[]},plot=this;plot.setData=setData;plot.setupGrid=setupGrid;plot.draw=draw;plot.getPlaceholder=function(){return placeholder};plot.getCanvas=function(){return surface.element};plot.getPlotOffset=function(){return plotOffset};plot.width=function(){return plotWidth};plot.height=function(){return plotHeight};plot.offset=function(){var o=eventHolder.offset();o.left+=plotOffset.left;o.top+=plotOffset.top;return o};plot.getData=function(){return series};plot.getAxes=function(){var res={},i;$.each(xaxes.concat(yaxes),function(_,axis){if(axis)res[axis.direction+(axis.n!=1?axis.n:"")+"axis"]=axis});return res};plot.getXAxes=function(){return xaxes};plot.getYAxes=function(){return yaxes};plot.c2p=canvasToAxisCoords;plot.p2c=axisToCanvasCoords;plot.getOptions=function(){return options};plot.highlight=highlight;plot.unhighlight=unhighlight;plot.triggerRedrawOverlay=triggerRedrawOverlay;plot.pointOffset=function(point){return{left:parseInt(xaxes[axisNumber(point,"x")-1].p2c(+point.x)+plotOffset.left,10),top:parseInt(yaxes[axisNumber(point,"y")-1].p2c(+point.y)+plotOffset.top,10)}};plot.shutdown=shutdown;plot.destroy=function(){shutdown();placeholder.removeData("plot").empty();series=[];options=null;surface=null;overlay=null;eventHolder=null;ctx=null;octx=null;xaxes=[];yaxes=[];hooks=null;highlights=[];plot=null};plot.resize=function(){var width=placeholder.width(),height=placeholder.height();surface.resize(width,height);overlay.resize(width,height)};plot.hooks=hooks;initPlugins(plot);parseOptions(options_);setupCanvases();setData(data_);setupGrid();draw();bindEvents();function executeHooks(hook,args){args=[plot].concat(args);for(var i=0;i<hook.length;++i)hook[i].apply(this,args)}function initPlugins(){var classes={Canvas:Canvas};for(var i=0;i<plugins.length;++i){var p=plugins[i];p.init(plot,classes);if(p.options)$.extend(true,options,p.options)}}function parseOptions(opts){$.extend(true,options,opts);if(opts&&opts.colors){options.colors=opts.colors}if(options.xaxis.color==null)options.xaxis.color=$.color.parse(options.grid.color).scale("a",.22).toString();if(options.yaxis.color==null)options.yaxis.color=$.color.parse(options.grid.color).scale("a",.22).toString();if(options.xaxis.tickColor==null)options.xaxis.tickColor=options.grid.tickColor||options.xaxis.color;if(options.yaxis.tickColor==null)options.yaxis.tickColor=options.grid.tickColor||options.yaxis.color;if(options.grid.borderColor==null)options.grid.borderColor=options.grid.color;if(options.grid.tickColor==null)options.grid.tickColor=$.color.parse(options.grid.color).scale("a",.22).toString();var i,axisOptions,axisCount,fontSize=placeholder.css("font-size"),fontSizeDefault=fontSize?+fontSize.replace("px",""):13,fontDefaults={style:placeholder.css("font-style"),size:Math.round(.8*fontSizeDefault),variant:placeholder.css("font-variant"),weight:placeholder.css("font-weight"),family:placeholder.css("font-family")};axisCount=options.xaxes.length||1;for(i=0;i<axisCount;++i){axisOptions=options.xaxes[i];if(axisOptions&&!axisOptions.tickColor){axisOptions.tickColor=axisOptions.color}axisOptions=$.extend(true,{},options.xaxis,axisOptions);options.xaxes[i]=axisOptions;if(axisOptions.font){axisOptions.font=$.extend({},fontDefaults,axisOptions.font);if(!axisOptions.font.color){axisOptions.font.color=axisOptions.color}if(!axisOptions.font.lineHeight){axisOptions.font.lineHeight=Math.round(axisOptions.font.size*1.15)}}}axisCount=options.yaxes.length||1;for(i=0;i<axisCount;++i){axisOptions=options.yaxes[i];if(axisOptions&&!axisOptions.tickColor){axisOptions.tickColor=axisOptions.color}axisOptions=$.extend(true,{},options.yaxis,axisOptions);options.yaxes[i]=axisOptions;if(axisOptions.font){axisOptions.font=$.extend({},fontDefaults,axisOptions.font);if(!axisOptions.font.color){axisOptions.font.color=axisOptions.color}if(!axisOptions.font.lineHeight){axisOptions.font.lineHeight=Math.round(axisOptions.font.size*1.15)}}}if(options.xaxis.noTicks&&options.xaxis.ticks==null)options.xaxis.ticks=options.xaxis.noTicks;if(options.yaxis.noTicks&&options.yaxis.ticks==null)options.yaxis.ticks=options.yaxis.noTicks;if(options.x2axis){options.xaxes[1]=$.extend(true,{},options.xaxis,options.x2axis);options.xaxes[1].position="top";if(options.x2axis.min==null){options.xaxes[1].min=null}if(options.x2axis.max==null){options.xaxes[1].max=null}}if(options.y2axis){options.yaxes[1]=$.extend(true,{},options.yaxis,options.y2axis);options.yaxes[1].position="right";if(options.y2axis.min==null){options.yaxes[1].min=null}if(options.y2axis.max==null){options.yaxes[1].max=null}}if(options.grid.coloredAreas)options.grid.markings=options.grid.coloredAreas;if(options.grid.coloredAreasColor)options.grid.markingsColor=options.grid.coloredAreasColor;if(options.lines)$.extend(true,options.series.lines,options.lines);if(options.points)$.extend(true,options.series.points,options.points);if(options.bars)$.extend(true,options.series.bars,options.bars);if(options.shadowSize!=null)options.series.shadowSize=options.shadowSize;if(options.highlightColor!=null)options.series.highlightColor=options.highlightColor;for(i=0;i<options.xaxes.length;++i)getOrCreateAxis(xaxes,i+1).options=options.xaxes[i];for(i=0;i<options.yaxes.length;++i)getOrCreateAxis(yaxes,i+1).options=options.yaxes[i];for(var n in hooks)if(options.hooks[n]&&options.hooks[n].length)hooks[n]=hooks[n].concat(options.hooks[n]);executeHooks(hooks.processOptions,[options])}function setData(d){series=parseData(d);fillInSeriesOptions();processData()}function parseData(d){var res=[];for(var i=0;i<d.length;++i){var s=$.extend(true,{},options.series);if(d[i].data!=null){s.data=d[i].data;delete d[i].data;$.extend(true,s,d[i]);d[i].data=s.data}else s.data=d[i];res.push(s)}return res}function axisNumber(obj,coord){var a=obj[coord+"axis"];if(typeof a=="object")a=a.n;if(typeof a!="number")a=1;return a}function allAxes(){return $.grep(xaxes.concat(yaxes),function(a){return a})}function canvasToAxisCoords(pos){var res={},i,axis;for(i=0;i<xaxes.length;++i){axis=xaxes[i];if(axis&&axis.used)res["x"+axis.n]=axis.c2p(pos.left)}for(i=0;i<yaxes.length;++i){axis=yaxes[i];if(axis&&axis.used)res["y"+axis.n]=axis.c2p(pos.top)}if(res.x1!==undefined)res.x=res.x1;if(res.y1!==undefined)res.y=res.y1;return res}function axisToCanvasCoords(pos){var res={},i,axis,key;for(i=0;i<xaxes.length;++i){axis=xaxes[i];if(axis&&axis.used){key="x"+axis.n;if(pos[key]==null&&axis.n==1)key="x";if(pos[key]!=null){res.left=axis.p2c(pos[key]);break}}}for(i=0;i<yaxes.length;++i){axis=yaxes[i];if(axis&&axis.used){key="y"+axis.n;if(pos[key]==null&&axis.n==1)key="y";if(pos[key]!=null){res.top=axis.p2c(pos[key]);break}}}return res}function getOrCreateAxis(axes,number){if(!axes[number-1])axes[number-1]={n:number,direction:axes==xaxes?"x":"y",options:$.extend(true,{},axes==xaxes?options.xaxis:options.yaxis)};return axes[number-1]}function fillInSeriesOptions(){var neededColors=series.length,maxIndex=-1,i;for(i=0;i<series.length;++i){var sc=series[i].color;if(sc!=null){neededColors--;if(typeof sc=="number"&&sc>maxIndex){maxIndex=sc}}}if(neededColors<=maxIndex){neededColors=maxIndex+1}var c,colors=[],colorPool=options.colors,colorPoolSize=colorPool.length,variation=0;for(i=0;i<neededColors;i++){c=$.color.parse(colorPool[i%colorPoolSize]||"#666");if(i%colorPoolSize==0&&i){if(variation>=0){if(variation<.5){variation=-variation-.2}else variation=0}else variation=-variation}colors[i]=c.scale("rgb",1+variation)}var colori=0,s;for(i=0;i<series.length;++i){s=series[i];if(s.color==null){s.color=colors[colori].toString();++colori}else if(typeof s.color=="number")s.color=colors[s.color].toString();if(s.lines.show==null){var v,show=true;for(v in s)if(s[v]&&s[v].show){show=false;break}if(show)s.lines.show=true}if(s.lines.zero==null){s.lines.zero=!!s.lines.fill}s.xaxis=getOrCreateAxis(xaxes,axisNumber(s,"x"));s.yaxis=getOrCreateAxis(yaxes,axisNumber(s,"y"))}}function processData(){var topSentry=Number.POSITIVE_INFINITY,bottomSentry=Number.NEGATIVE_INFINITY,fakeInfinity=Number.MAX_VALUE,i,j,k,m,length,s,points,ps,x,y,axis,val,f,p,data,format;function updateAxis(axis,min,max){if(min<axis.datamin&&min!=-fakeInfinity)axis.datamin=min;if(max>axis.datamax&&max!=fakeInfinity)axis.datamax=max}$.each(allAxes(),function(_,axis){axis.datamin=topSentry;axis.datamax=bottomSentry;axis.used=false});for(i=0;i<series.length;++i){s=series[i];s.datapoints={points:[]};executeHooks(hooks.processRawData,[s,s.data,s.datapoints])}for(i=0;i<series.length;++i){s=series[i];data=s.data;format=s.datapoints.format;if(!format){format=[];format.push({x:true,number:true,required:true});format.push({y:true,number:true,required:true});if(s.bars.show||s.lines.show&&s.lines.fill){var autoscale=!!(s.bars.show&&s.bars.zero||s.lines.show&&s.lines.zero);format.push({y:true,number:true,required:false,defaultValue:0,autoscale:autoscale});if(s.bars.horizontal){delete format[format.length-1].y;format[format.length-1].x=true}}s.datapoints.format=format}if(s.datapoints.pointsize!=null)continue;s.datapoints.pointsize=format.length;ps=s.datapoints.pointsize;points=s.datapoints.points;var insertSteps=s.lines.show&&s.lines.steps;s.xaxis.used=s.yaxis.used=true;for(j=k=0;j<data.length;++j,k+=ps){p=data[j];var nullify=p==null;if(!nullify){for(m=0;m<ps;++m){val=p[m];f=format[m];if(f){if(f.number&&val!=null){val=+val;if(isNaN(val))val=null;else if(val==Infinity)val=fakeInfinity;else if(val==-Infinity)val=-fakeInfinity}if(val==null){if(f.required)nullify=true;if(f.defaultValue!=null)val=f.defaultValue}}points[k+m]=val}}if(nullify){for(m=0;m<ps;++m){val=points[k+m];if(val!=null){f=format[m];if(f.autoscale!==false){if(f.x){updateAxis(s.xaxis,val,val)}if(f.y){updateAxis(s.yaxis,val,val)}}}points[k+m]=null}}else{if(insertSteps&&k>0&&points[k-ps]!=null&&points[k-ps]!=points[k]&&points[k-ps+1]!=points[k+1]){for(m=0;m<ps;++m)points[k+ps+m]=points[k+m];points[k+1]=points[k-ps+1];k+=ps}}}}for(i=0;i<series.length;++i){s=series[i];executeHooks(hooks.processDatapoints,[s,s.datapoints])}for(i=0;i<series.length;++i){s=series[i];points=s.datapoints.points;ps=s.datapoints.pointsize;format=s.datapoints.format;var xmin=topSentry,ymin=topSentry,xmax=bottomSentry,ymax=bottomSentry;for(j=0;j<points.length;j+=ps){if(points[j]==null)continue;for(m=0;m<ps;++m){val=points[j+m];f=format[m];if(!f||f.autoscale===false||val==fakeInfinity||val==-fakeInfinity)continue;if(f.x){if(val<xmin)xmin=val;if(val>xmax)xmax=val}if(f.y){if(val<ymin)ymin=val;if(val>ymax)ymax=val}}}if(s.bars.show){var delta;switch(s.bars.align){case"left":delta=0;break;case"right":delta=-s.bars.barWidth;break;default:delta=-s.bars.barWidth/2}if(s.bars.horizontal){ymin+=delta;ymax+=delta+s.bars.barWidth}else{xmin+=delta;xmax+=delta+s.bars.barWidth}}updateAxis(s.xaxis,xmin,xmax);updateAxis(s.yaxis,ymin,ymax)}$.each(allAxes(),function(_,axis){if(axis.datamin==topSentry)axis.datamin=null;if(axis.datamax==bottomSentry)axis.datamax=null})}function setupCanvases(){placeholder.css("padding",0).children().filter(function(){return!$(this).hasClass("flot-overlay")&&!$(this).hasClass("flot-base")}).remove();if(placeholder.css("position")=="static")placeholder.css("position","relative");surface=new Canvas("flot-base",placeholder);overlay=new Canvas("flot-overlay",placeholder);ctx=surface.context;octx=overlay.context;eventHolder=$(overlay.element).unbind();var existing=placeholder.data("plot");if(existing){existing.shutdown();overlay.clear()}placeholder.data("plot",plot)}function bindEvents(){if(options.grid.hoverable){eventHolder.mousemove(onMouseMove);eventHolder.bind("mouseleave",onMouseLeave)}if(options.grid.clickable)eventHolder.click(onClick);executeHooks(hooks.bindEvents,[eventHolder])}function shutdown(){if(redrawTimeout)clearTimeout(redrawTimeout);eventHolder.unbind("mousemove",onMouseMove);eventHolder.unbind("mouseleave",onMouseLeave);eventHolder.unbind("click",onClick);executeHooks(hooks.shutdown,[eventHolder])}function setTransformationHelpers(axis){function identity(x){return x}var s,m,t=axis.options.transform||identity,it=axis.options.inverseTransform;if(axis.direction=="x"){s=axis.scale=plotWidth/Math.abs(t(axis.max)-t(axis.min));m=Math.min(t(axis.max),t(axis.min))}else{s=axis.scale=plotHeight/Math.abs(t(axis.max)-t(axis.min));s=-s;m=Math.max(t(axis.max),t(axis.min))}if(t==identity)axis.p2c=function(p){return(p-m)*s};else axis.p2c=function(p){return(t(p)-m)*s};if(!it)axis.c2p=function(c){return m+c/s};else axis.c2p=function(c){return it(m+c/s)}}function measureTickLabels(axis){var opts=axis.options,ticks=axis.ticks||[],labelWidth=opts.labelWidth||0,labelHeight=opts.labelHeight||0,maxWidth=labelWidth||(axis.direction=="x"?Math.floor(surface.width/(ticks.length||1)):null),legacyStyles=axis.direction+"Axis "+axis.direction+axis.n+"Axis",layer="flot-"+axis.direction+"-axis flot-"+axis.direction+axis.n+"-axis "+legacyStyles,font=opts.font||"flot-tick-label tickLabel";for(var i=0;i<ticks.length;++i){var t=ticks[i];if(!t.label)continue;var info=surface.getTextInfo(layer,t.label,font,null,maxWidth);labelWidth=Math.max(labelWidth,info.width);labelHeight=Math.max(labelHeight,info.height)}axis.labelWidth=opts.labelWidth||labelWidth;axis.labelHeight=opts.labelHeight||labelHeight}function allocateAxisBoxFirstPhase(axis){var lw=axis.labelWidth,lh=axis.labelHeight,pos=axis.options.position,isXAxis=axis.direction==="x",tickLength=axis.options.tickLength,axisMargin=options.grid.axisMargin,padding=options.grid.labelMargin,innermost=true,outermost=true,first=true,found=false;$.each(isXAxis?xaxes:yaxes,function(i,a){if(a&&(a.show||a.reserveSpace)){if(a===axis){found=true}else if(a.options.position===pos){if(found){outermost=false}else{innermost=false}}if(!found){first=false}}});if(outermost){axisMargin=0}if(tickLength==null){tickLength=first?"full":5}if(!isNaN(+tickLength))padding+=+tickLength;if(isXAxis){lh+=padding;if(pos=="bottom"){plotOffset.bottom+=lh+axisMargin;axis.box={top:surface.height-plotOffset.bottom,height:lh}}else{axis.box={top:plotOffset.top+axisMargin,height:lh};plotOffset.top+=lh+axisMargin}}else{lw+=padding;if(pos=="left"){axis.box={left:plotOffset.left+axisMargin,width:lw};plotOffset.left+=lw+axisMargin}else{plotOffset.right+=lw+axisMargin;axis.box={left:surface.width-plotOffset.right,width:lw}}}axis.position=pos;axis.tickLength=tickLength;axis.box.padding=padding;axis.innermost=innermost}function allocateAxisBoxSecondPhase(axis){if(axis.direction=="x"){axis.box.left=plotOffset.left-axis.labelWidth/2;axis.box.width=surface.width-plotOffset.left-plotOffset.right+axis.labelWidth}else{axis.box.top=plotOffset.top-axis.labelHeight/2;axis.box.height=surface.height-plotOffset.bottom-plotOffset.top+axis.labelHeight}}function adjustLayoutForThingsStickingOut(){var minMargin=options.grid.minBorderMargin,axis,i;if(minMargin==null){minMargin=0;for(i=0;i<series.length;++i)minMargin=Math.max(minMargin,2*(series[i].points.radius+series[i].points.lineWidth/2))}var margins={left:minMargin,right:minMargin,top:minMargin,bottom:minMargin};$.each(allAxes(),function(_,axis){if(axis.reserveSpace&&axis.ticks&&axis.ticks.length){if(axis.direction==="x"){margins.left=Math.max(margins.left,axis.labelWidth/2);margins.right=Math.max(margins.right,axis.labelWidth/2)}else{margins.bottom=Math.max(margins.bottom,axis.labelHeight/2);margins.top=Math.max(margins.top,axis.labelHeight/2)}}});plotOffset.left=Math.ceil(Math.max(margins.left,plotOffset.left));plotOffset.right=Math.ceil(Math.max(margins.right,plotOffset.right));plotOffset.top=Math.ceil(Math.max(margins.top,plotOffset.top));plotOffset.bottom=Math.ceil(Math.max(margins.bottom,plotOffset.bottom))}function setupGrid(){var i,axes=allAxes(),showGrid=options.grid.show;for(var a in plotOffset){var margin=options.grid.margin||0;plotOffset[a]=typeof margin=="number"?margin:margin[a]||0}executeHooks(hooks.processOffset,[plotOffset]);for(var a in plotOffset){if(typeof options.grid.borderWidth=="object"){plotOffset[a]+=showGrid?options.grid.borderWidth[a]:0}else{plotOffset[a]+=showGrid?options.grid.borderWidth:0}}$.each(axes,function(_,axis){var axisOpts=axis.options;axis.show=axisOpts.show==null?axis.used:axisOpts.show;axis.reserveSpace=axisOpts.reserveSpace==null?axis.show:axisOpts.reserveSpace;setRange(axis)});if(showGrid){var allocatedAxes=$.grep(axes,function(axis){return axis.show||axis.reserveSpace});$.each(allocatedAxes,function(_,axis){setupTickGeneration(axis);setTicks(axis);snapRangeToTicks(axis,axis.ticks);measureTickLabels(axis)});for(i=allocatedAxes.length-1;i>=0;--i)allocateAxisBoxFirstPhase(allocatedAxes[i]);adjustLayoutForThingsStickingOut();$.each(allocatedAxes,function(_,axis){allocateAxisBoxSecondPhase(axis)})}plotWidth=surface.width-plotOffset.left-plotOffset.right;plotHeight=surface.height-plotOffset.bottom-plotOffset.top;$.each(axes,function(_,axis){setTransformationHelpers(axis)});if(showGrid){drawAxisLabels()}insertLegend()}function setRange(axis){var opts=axis.options,min=+(opts.min!=null?opts.min:axis.datamin),max=+(opts.max!=null?opts.max:axis.datamax),delta=max-min;if(delta==0){var widen=max==0?1:.01;if(opts.min==null)min-=widen;if(opts.max==null||opts.min!=null)max+=widen}else{var margin=opts.autoscaleMargin;if(margin!=null){if(opts.min==null){min-=delta*margin;if(min<0&&axis.datamin!=null&&axis.datamin>=0)min=0}if(opts.max==null){max+=delta*margin;if(max>0&&axis.datamax!=null&&axis.datamax<=0)max=0}}}axis.min=min;axis.max=max}function setupTickGeneration(axis){var opts=axis.options;var noTicks;if(typeof opts.ticks=="number"&&opts.ticks>0)noTicks=opts.ticks;else noTicks=.3*Math.sqrt(axis.direction=="x"?surface.width:surface.height);var delta=(axis.max-axis.min)/noTicks,dec=-Math.floor(Math.log(delta)/Math.LN10),maxDec=opts.tickDecimals;if(maxDec!=null&&dec>maxDec){dec=maxDec}var magn=Math.pow(10,-dec),norm=delta/magn,size;if(norm<1.5){size=1}else if(norm<3){size=2;if(norm>2.25&&(maxDec==null||dec+1<=maxDec)){size=2.5;++dec}}else if(norm<7.5){size=5}else{size=10}size*=magn;if(opts.minTickSize!=null&&size<opts.minTickSize){size=opts.minTickSize}axis.delta=delta;axis.tickDecimals=Math.max(0,maxDec!=null?maxDec:dec);axis.tickSize=opts.tickSize||size;if(opts.mode=="time"&&!axis.tickGenerator){throw new Error("Time mode requires the flot.time plugin.")}if(!axis.tickGenerator){axis.tickGenerator=function(axis){var ticks=[],start=floorInBase(axis.min,axis.tickSize),i=0,v=Number.NaN,prev;do{prev=v;v=start+i*axis.tickSize;ticks.push(v);++i}while(v<axis.max&&v!=prev);return ticks};axis.tickFormatter=function(value,axis){var factor=axis.tickDecimals?Math.pow(10,axis.tickDecimals):1;var formatted=""+Math.round(value*factor)/factor;if(axis.tickDecimals!=null){var decimal=formatted.indexOf(".");var precision=decimal==-1?0:formatted.length-decimal-1;if(precision<axis.tickDecimals){return(precision?formatted:formatted+".")+(""+factor).substr(1,axis.tickDecimals-precision)}}return formatted}}if($.isFunction(opts.tickFormatter))axis.tickFormatter=function(v,axis){return""+opts.tickFormatter(v,axis)};if(opts.alignTicksWithAxis!=null){var otherAxis=(axis.direction=="x"?xaxes:yaxes)[opts.alignTicksWithAxis-1];if(otherAxis&&otherAxis.used&&otherAxis!=axis){var niceTicks=axis.tickGenerator(axis);if(niceTicks.length>0){if(opts.min==null)axis.min=Math.min(axis.min,niceTicks[0]);if(opts.max==null&&niceTicks.length>1)axis.max=Math.max(axis.max,niceTicks[niceTicks.length-1])}axis.tickGenerator=function(axis){var ticks=[],v,i;for(i=0;i<otherAxis.ticks.length;++i){v=(otherAxis.ticks[i].v-otherAxis.min)/(otherAxis.max-otherAxis.min);v=axis.min+v*(axis.max-axis.min);ticks.push(v)}return ticks};if(!axis.mode&&opts.tickDecimals==null){var extraDec=Math.max(0,-Math.floor(Math.log(axis.delta)/Math.LN10)+1),ts=axis.tickGenerator(axis);if(!(ts.length>1&&/\..*0$/.test((ts[1]-ts[0]).toFixed(extraDec))))axis.tickDecimals=extraDec}}}}function setTicks(axis){var oticks=axis.options.ticks,ticks=[];if(oticks==null||typeof oticks=="number"&&oticks>0)ticks=axis.tickGenerator(axis);else if(oticks){if($.isFunction(oticks))ticks=oticks(axis);else ticks=oticks}var i,v;axis.ticks=[];for(i=0;i<ticks.length;++i){var label=null;var t=ticks[i];if(typeof t=="object"){v=+t[0];if(t.length>1)label=t[1]}else v=+t;if(label==null)label=axis.tickFormatter(v,axis);if(!isNaN(v))axis.ticks.push({v:v,label:label})}}function snapRangeToTicks(axis,ticks){if(axis.options.autoscaleMargin&&ticks.length>0){if(axis.options.min==null)axis.min=Math.min(axis.min,ticks[0].v);if(axis.options.max==null&&ticks.length>1)axis.max=Math.max(axis.max,ticks[ticks.length-1].v)}}function draw(){surface.clear();executeHooks(hooks.drawBackground,[ctx]);var grid=options.grid;if(grid.show&&grid.backgroundColor)drawBackground();if(grid.show&&!grid.aboveData){drawGrid()}for(var i=0;i<series.length;++i){executeHooks(hooks.drawSeries,[ctx,series[i]]);drawSeries(series[i])}executeHooks(hooks.draw,[ctx]);if(grid.show&&grid.aboveData){drawGrid()}surface.render();triggerRedrawOverlay()}function extractRange(ranges,coord){var axis,from,to,key,axes=allAxes();for(var i=0;i<axes.length;++i){axis=axes[i];if(axis.direction==coord){key=coord+axis.n+"axis";if(!ranges[key]&&axis.n==1)key=coord+"axis";if(ranges[key]){from=ranges[key].from;to=ranges[key].to;break}}}if(!ranges[key]){axis=coord=="x"?xaxes[0]:yaxes[0];from=ranges[coord+"1"];to=ranges[coord+"2"]}if(from!=null&&to!=null&&from>to){var tmp=from;from=to;to=tmp}return{from:from,to:to,axis:axis}}function drawBackground(){ctx.save();ctx.translate(plotOffset.left,plotOffset.top);ctx.fillStyle=getColorOrGradient(options.grid.backgroundColor,plotHeight,0,"rgba(255, 255, 255, 0)");ctx.fillRect(0,0,plotWidth,plotHeight);ctx.restore()}function drawGrid(){var i,axes,bw,bc;ctx.save();ctx.translate(plotOffset.left,plotOffset.top);var markings=options.grid.markings;if(markings){if($.isFunction(markings)){axes=plot.getAxes();axes.xmin=axes.xaxis.min;axes.xmax=axes.xaxis.max;axes.ymin=axes.yaxis.min;axes.ymax=axes.yaxis.max;markings=markings(axes)}for(i=0;i<markings.length;++i){var m=markings[i],xrange=extractRange(m,"x"),yrange=extractRange(m,"y");if(xrange.from==null)xrange.from=xrange.axis.min;if(xrange.to==null)xrange.to=xrange.axis.max;
+if(yrange.from==null)yrange.from=yrange.axis.min;if(yrange.to==null)yrange.to=yrange.axis.max;if(xrange.to<xrange.axis.min||xrange.from>xrange.axis.max||yrange.to<yrange.axis.min||yrange.from>yrange.axis.max)continue;xrange.from=Math.max(xrange.from,xrange.axis.min);xrange.to=Math.min(xrange.to,xrange.axis.max);yrange.from=Math.max(yrange.from,yrange.axis.min);yrange.to=Math.min(yrange.to,yrange.axis.max);var xequal=xrange.from===xrange.to,yequal=yrange.from===yrange.to;if(xequal&&yequal){continue}xrange.from=Math.floor(xrange.axis.p2c(xrange.from));xrange.to=Math.floor(xrange.axis.p2c(xrange.to));yrange.from=Math.floor(yrange.axis.p2c(yrange.from));yrange.to=Math.floor(yrange.axis.p2c(yrange.to));if(xequal||yequal){var lineWidth=m.lineWidth||options.grid.markingsLineWidth,subPixel=lineWidth%2?.5:0;ctx.beginPath();ctx.strokeStyle=m.color||options.grid.markingsColor;ctx.lineWidth=lineWidth;if(xequal){ctx.moveTo(xrange.to+subPixel,yrange.from);ctx.lineTo(xrange.to+subPixel,yrange.to)}else{ctx.moveTo(xrange.from,yrange.to+subPixel);ctx.lineTo(xrange.to,yrange.to+subPixel)}ctx.stroke()}else{ctx.fillStyle=m.color||options.grid.markingsColor;ctx.fillRect(xrange.from,yrange.to,xrange.to-xrange.from,yrange.from-yrange.to)}}}axes=allAxes();bw=options.grid.borderWidth;for(var j=0;j<axes.length;++j){var axis=axes[j],box=axis.box,t=axis.tickLength,x,y,xoff,yoff;if(!axis.show||axis.ticks.length==0)continue;ctx.lineWidth=1;if(axis.direction=="x"){x=0;if(t=="full")y=axis.position=="top"?0:plotHeight;else y=box.top-plotOffset.top+(axis.position=="top"?box.height:0)}else{y=0;if(t=="full")x=axis.position=="left"?0:plotWidth;else x=box.left-plotOffset.left+(axis.position=="left"?box.width:0)}if(!axis.innermost){ctx.strokeStyle=axis.options.color;ctx.beginPath();xoff=yoff=0;if(axis.direction=="x")xoff=plotWidth+1;else yoff=plotHeight+1;if(ctx.lineWidth==1){if(axis.direction=="x"){y=Math.floor(y)+.5}else{x=Math.floor(x)+.5}}ctx.moveTo(x,y);ctx.lineTo(x+xoff,y+yoff);ctx.stroke()}ctx.strokeStyle=axis.options.tickColor;ctx.beginPath();for(i=0;i<axis.ticks.length;++i){var v=axis.ticks[i].v;xoff=yoff=0;if(isNaN(v)||v<axis.min||v>axis.max||t=="full"&&(typeof bw=="object"&&bw[axis.position]>0||bw>0)&&(v==axis.min||v==axis.max))continue;if(axis.direction=="x"){x=axis.p2c(v);yoff=t=="full"?-plotHeight:t;if(axis.position=="top")yoff=-yoff}else{y=axis.p2c(v);xoff=t=="full"?-plotWidth:t;if(axis.position=="left")xoff=-xoff}if(ctx.lineWidth==1){if(axis.direction=="x")x=Math.floor(x)+.5;else y=Math.floor(y)+.5}ctx.moveTo(x,y);ctx.lineTo(x+xoff,y+yoff)}ctx.stroke()}if(bw){bc=options.grid.borderColor;if(typeof bw=="object"||typeof bc=="object"){if(typeof bw!=="object"){bw={top:bw,right:bw,bottom:bw,left:bw}}if(typeof bc!=="object"){bc={top:bc,right:bc,bottom:bc,left:bc}}if(bw.top>0){ctx.strokeStyle=bc.top;ctx.lineWidth=bw.top;ctx.beginPath();ctx.moveTo(0-bw.left,0-bw.top/2);ctx.lineTo(plotWidth,0-bw.top/2);ctx.stroke()}if(bw.right>0){ctx.strokeStyle=bc.right;ctx.lineWidth=bw.right;ctx.beginPath();ctx.moveTo(plotWidth+bw.right/2,0-bw.top);ctx.lineTo(plotWidth+bw.right/2,plotHeight);ctx.stroke()}if(bw.bottom>0){ctx.strokeStyle=bc.bottom;ctx.lineWidth=bw.bottom;ctx.beginPath();ctx.moveTo(plotWidth+bw.right,plotHeight+bw.bottom/2);ctx.lineTo(0,plotHeight+bw.bottom/2);ctx.stroke()}if(bw.left>0){ctx.strokeStyle=bc.left;ctx.lineWidth=bw.left;ctx.beginPath();ctx.moveTo(0-bw.left/2,plotHeight+bw.bottom);ctx.lineTo(0-bw.left/2,0);ctx.stroke()}}else{ctx.lineWidth=bw;ctx.strokeStyle=options.grid.borderColor;ctx.strokeRect(-bw/2,-bw/2,plotWidth+bw,plotHeight+bw)}}ctx.restore()}function drawAxisLabels(){$.each(allAxes(),function(_,axis){var box=axis.box,legacyStyles=axis.direction+"Axis "+axis.direction+axis.n+"Axis",layer="flot-"+axis.direction+"-axis flot-"+axis.direction+axis.n+"-axis "+legacyStyles,font=axis.options.font||"flot-tick-label tickLabel",tick,x,y,halign,valign;surface.removeText(layer);if(!axis.show||axis.ticks.length==0)return;for(var i=0;i<axis.ticks.length;++i){tick=axis.ticks[i];if(!tick.label||tick.v<axis.min||tick.v>axis.max)continue;if(axis.direction=="x"){halign="center";x=plotOffset.left+axis.p2c(tick.v);if(axis.position=="bottom"){y=box.top+box.padding}else{y=box.top+box.height-box.padding;valign="bottom"}}else{valign="middle";y=plotOffset.top+axis.p2c(tick.v);if(axis.position=="left"){x=box.left+box.width-box.padding;halign="right"}else{x=box.left+box.padding}}surface.addText(layer,x,y,tick.label,font,null,null,halign,valign)}})}function drawSeries(series){if(series.lines.show)drawSeriesLines(series);if(series.bars.show)drawSeriesBars(series);if(series.points.show)drawSeriesPoints(series)}function drawSeriesLines(series){function plotLine(datapoints,xoffset,yoffset,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize,prevx=null,prevy=null;ctx.beginPath();for(var i=ps;i<points.length;i+=ps){var x1=points[i-ps],y1=points[i-ps+1],x2=points[i],y2=points[i+1];if(x1==null||x2==null)continue;if(y1<=y2&&y1<axisy.min){if(y2<axisy.min)continue;x1=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.min}else if(y2<=y1&&y2<axisy.min){if(y1<axisy.min)continue;x2=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.min}if(y1>=y2&&y1>axisy.max){if(y2>axisy.max)continue;x1=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.max}else if(y2>=y1&&y2>axisy.max){if(y1>axisy.max)continue;x2=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.max}if(x1<=x2&&x1<axisx.min){if(x2<axisx.min)continue;y1=(axisx.min-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.min}else if(x2<=x1&&x2<axisx.min){if(x1<axisx.min)continue;y2=(axisx.min-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.min}if(x1>=x2&&x1>axisx.max){if(x2>axisx.max)continue;y1=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.max}else if(x2>=x1&&x2>axisx.max){if(x1>axisx.max)continue;y2=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.max}if(x1!=prevx||y1!=prevy)ctx.moveTo(axisx.p2c(x1)+xoffset,axisy.p2c(y1)+yoffset);prevx=x2;prevy=y2;ctx.lineTo(axisx.p2c(x2)+xoffset,axisy.p2c(y2)+yoffset)}ctx.stroke()}function plotLineArea(datapoints,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize,bottom=Math.min(Math.max(0,axisy.min),axisy.max),i=0,top,areaOpen=false,ypos=1,segmentStart=0,segmentEnd=0;while(true){if(ps>0&&i>points.length+ps)break;i+=ps;var x1=points[i-ps],y1=points[i-ps+ypos],x2=points[i],y2=points[i+ypos];if(areaOpen){if(ps>0&&x1!=null&&x2==null){segmentEnd=i;ps=-ps;ypos=2;continue}if(ps<0&&i==segmentStart+ps){ctx.fill();areaOpen=false;ps=-ps;ypos=1;i=segmentStart=segmentEnd+ps;continue}}if(x1==null||x2==null)continue;if(x1<=x2&&x1<axisx.min){if(x2<axisx.min)continue;y1=(axisx.min-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.min}else if(x2<=x1&&x2<axisx.min){if(x1<axisx.min)continue;y2=(axisx.min-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.min}if(x1>=x2&&x1>axisx.max){if(x2>axisx.max)continue;y1=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.max}else if(x2>=x1&&x2>axisx.max){if(x1>axisx.max)continue;y2=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.max}if(!areaOpen){ctx.beginPath();ctx.moveTo(axisx.p2c(x1),axisy.p2c(bottom));areaOpen=true}if(y1>=axisy.max&&y2>=axisy.max){ctx.lineTo(axisx.p2c(x1),axisy.p2c(axisy.max));ctx.lineTo(axisx.p2c(x2),axisy.p2c(axisy.max));continue}else if(y1<=axisy.min&&y2<=axisy.min){ctx.lineTo(axisx.p2c(x1),axisy.p2c(axisy.min));ctx.lineTo(axisx.p2c(x2),axisy.p2c(axisy.min));continue}var x1old=x1,x2old=x2;if(y1<=y2&&y1<axisy.min&&y2>=axisy.min){x1=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.min}else if(y2<=y1&&y2<axisy.min&&y1>=axisy.min){x2=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.min}if(y1>=y2&&y1>axisy.max&&y2<=axisy.max){x1=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.max}else if(y2>=y1&&y2>axisy.max&&y1<=axisy.max){x2=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.max}if(x1!=x1old){ctx.lineTo(axisx.p2c(x1old),axisy.p2c(y1))}ctx.lineTo(axisx.p2c(x1),axisy.p2c(y1));ctx.lineTo(axisx.p2c(x2),axisy.p2c(y2));if(x2!=x2old){ctx.lineTo(axisx.p2c(x2),axisy.p2c(y2));ctx.lineTo(axisx.p2c(x2old),axisy.p2c(y2))}}}ctx.save();ctx.translate(plotOffset.left,plotOffset.top);ctx.lineJoin="round";var lw=series.lines.lineWidth,sw=series.shadowSize;if(lw>0&&sw>0){ctx.lineWidth=sw;ctx.strokeStyle="rgba(0,0,0,0.1)";var angle=Math.PI/18;plotLine(series.datapoints,Math.sin(angle)*(lw/2+sw/2),Math.cos(angle)*(lw/2+sw/2),series.xaxis,series.yaxis);ctx.lineWidth=sw/2;plotLine(series.datapoints,Math.sin(angle)*(lw/2+sw/4),Math.cos(angle)*(lw/2+sw/4),series.xaxis,series.yaxis)}ctx.lineWidth=lw;ctx.strokeStyle=series.color;var fillStyle=getFillStyle(series.lines,series.color,0,plotHeight);if(fillStyle){ctx.fillStyle=fillStyle;plotLineArea(series.datapoints,series.xaxis,series.yaxis)}if(lw>0)plotLine(series.datapoints,0,0,series.xaxis,series.yaxis);ctx.restore()}function drawSeriesPoints(series){function plotPoints(datapoints,radius,fillStyle,offset,shadow,axisx,axisy,symbol){var points=datapoints.points,ps=datapoints.pointsize;for(var i=0;i<points.length;i+=ps){var x=points[i],y=points[i+1];if(x==null||x<axisx.min||x>axisx.max||y<axisy.min||y>axisy.max)continue;ctx.beginPath();x=axisx.p2c(x);y=axisy.p2c(y)+offset;if(symbol=="circle")ctx.arc(x,y,radius,0,shadow?Math.PI:Math.PI*2,false);else symbol(ctx,x,y,radius,shadow);ctx.closePath();if(fillStyle){ctx.fillStyle=fillStyle;ctx.fill()}ctx.stroke()}}ctx.save();ctx.translate(plotOffset.left,plotOffset.top);var lw=series.points.lineWidth,sw=series.shadowSize,radius=series.points.radius,symbol=series.points.symbol;if(lw==0)lw=1e-4;if(lw>0&&sw>0){var w=sw/2;ctx.lineWidth=w;ctx.strokeStyle="rgba(0,0,0,0.1)";plotPoints(series.datapoints,radius,null,w+w/2,true,series.xaxis,series.yaxis,symbol);ctx.strokeStyle="rgba(0,0,0,0.2)";plotPoints(series.datapoints,radius,null,w/2,true,series.xaxis,series.yaxis,symbol)}ctx.lineWidth=lw;ctx.strokeStyle=series.color;plotPoints(series.datapoints,radius,getFillStyle(series.points,series.color),0,false,series.xaxis,series.yaxis,symbol);ctx.restore()}function drawBar(x,y,b,barLeft,barRight,fillStyleCallback,axisx,axisy,c,horizontal,lineWidth){var left,right,bottom,top,drawLeft,drawRight,drawTop,drawBottom,tmp;if(horizontal){drawBottom=drawRight=drawTop=true;drawLeft=false;left=b;right=x;top=y+barLeft;bottom=y+barRight;if(right<left){tmp=right;right=left;left=tmp;drawLeft=true;drawRight=false}}else{drawLeft=drawRight=drawTop=true;drawBottom=false;left=x+barLeft;right=x+barRight;bottom=b;top=y;if(top<bottom){tmp=top;top=bottom;bottom=tmp;drawBottom=true;drawTop=false}}if(right<axisx.min||left>axisx.max||top<axisy.min||bottom>axisy.max)return;if(left<axisx.min){left=axisx.min;drawLeft=false}if(right>axisx.max){right=axisx.max;drawRight=false}if(bottom<axisy.min){bottom=axisy.min;drawBottom=false}if(top>axisy.max){top=axisy.max;drawTop=false}left=axisx.p2c(left);bottom=axisy.p2c(bottom);right=axisx.p2c(right);top=axisy.p2c(top);if(fillStyleCallback){c.fillStyle=fillStyleCallback(bottom,top);c.fillRect(left,top,right-left,bottom-top)}if(lineWidth>0&&(drawLeft||drawRight||drawTop||drawBottom)){c.beginPath();c.moveTo(left,bottom);if(drawLeft)c.lineTo(left,top);else c.moveTo(left,top);if(drawTop)c.lineTo(right,top);else c.moveTo(right,top);if(drawRight)c.lineTo(right,bottom);else c.moveTo(right,bottom);if(drawBottom)c.lineTo(left,bottom);else c.moveTo(left,bottom);c.stroke()}}function drawSeriesBars(series){function plotBars(datapoints,barLeft,barRight,fillStyleCallback,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize;for(var i=0;i<points.length;i+=ps){if(points[i]==null)continue;drawBar(points[i],points[i+1],points[i+2],barLeft,barRight,fillStyleCallback,axisx,axisy,ctx,series.bars.horizontal,series.bars.lineWidth)}}ctx.save();ctx.translate(plotOffset.left,plotOffset.top);ctx.lineWidth=series.bars.lineWidth;ctx.strokeStyle=series.color;var barLeft;switch(series.bars.align){case"left":barLeft=0;break;case"right":barLeft=-series.bars.barWidth;break;default:barLeft=-series.bars.barWidth/2}var fillStyleCallback=series.bars.fill?function(bottom,top){return getFillStyle(series.bars,series.color,bottom,top)}:null;plotBars(series.datapoints,barLeft,barLeft+series.bars.barWidth,fillStyleCallback,series.xaxis,series.yaxis);ctx.restore()}function getFillStyle(filloptions,seriesColor,bottom,top){var fill=filloptions.fill;if(!fill)return null;if(filloptions.fillColor)return getColorOrGradient(filloptions.fillColor,bottom,top,seriesColor);var c=$.color.parse(seriesColor);c.a=typeof fill=="number"?fill:.4;c.normalize();return c.toString()}function insertLegend(){if(options.legend.container!=null){$(options.legend.container).html("")}else{placeholder.find(".legend").remove()}if(!options.legend.show){return}var fragments=[],entries=[],rowStarted=false,lf=options.legend.labelFormatter,s,label;for(var i=0;i<series.length;++i){s=series[i];if(s.label){label=lf?lf(s.label,s):s.label;if(label){entries.push({label:label,color:s.color})}}}if(options.legend.sorted){if($.isFunction(options.legend.sorted)){entries.sort(options.legend.sorted)}else if(options.legend.sorted=="reverse"){entries.reverse()}else{var ascending=options.legend.sorted!="descending";entries.sort(function(a,b){return a.label==b.label?0:a.label<b.label!=ascending?1:-1})}}for(var i=0;i<entries.length;++i){var entry=entries[i];if(i%options.legend.noColumns==0){if(rowStarted)fragments.push("</tr>");fragments.push("<tr>");rowStarted=true}fragments.push('<td class="legendColorBox"><div style="border:1px solid '+options.legend.labelBoxBorderColor+';padding:1px"><div style="width:4px;height:0;border:5px solid '+entry.color+';overflow:hidden"></div></div></td>'+'<td class="legendLabel">'+entry.label+"</td>")}if(rowStarted)fragments.push("</tr>");if(fragments.length==0)return;var table='<table style="font-size:smaller;color:'+options.grid.color+'">'+fragments.join("")+"</table>";if(options.legend.container!=null)$(options.legend.container).html(table);else{var pos="",p=options.legend.position,m=options.legend.margin;if(m[0]==null)m=[m,m];if(p.charAt(0)=="n")pos+="top:"+(m[1]+plotOffset.top)+"px;";else if(p.charAt(0)=="s")pos+="bottom:"+(m[1]+plotOffset.bottom)+"px;";if(p.charAt(1)=="e")pos+="right:"+(m[0]+plotOffset.right)+"px;";else if(p.charAt(1)=="w")pos+="left:"+(m[0]+plotOffset.left)+"px;";var legend=$('<div class="legend">'+table.replace('style="','style="position:absolute;'+pos+";")+"</div>").appendTo(placeholder);if(options.legend.backgroundOpacity!=0){var c=options.legend.backgroundColor;if(c==null){c=options.grid.backgroundColor;if(c&&typeof c=="string")c=$.color.parse(c);else c=$.color.extract(legend,"background-color");c.a=1;c=c.toString()}var div=legend.children();$('<div style="position:absolute;width:'+div.width()+"px;height:"+div.height()+"px;"+pos+"background-color:"+c+';"> </div>').prependTo(legend).css("opacity",options.legend.backgroundOpacity)}}}var highlights=[],redrawTimeout=null;function findNearbyItem(mouseX,mouseY,seriesFilter){var maxDistance=options.grid.mouseActiveRadius,smallestDistance=maxDistance*maxDistance+1,item=null,foundPoint=false,i,j,ps;for(i=series.length-1;i>=0;--i){if(!seriesFilter(series[i]))continue;var s=series[i],axisx=s.xaxis,axisy=s.yaxis,points=s.datapoints.points,mx=axisx.c2p(mouseX),my=axisy.c2p(mouseY),maxx=maxDistance/axisx.scale,maxy=maxDistance/axisy.scale;ps=s.datapoints.pointsize;if(axisx.options.inverseTransform)maxx=Number.MAX_VALUE;if(axisy.options.inverseTransform)maxy=Number.MAX_VALUE;if(s.lines.show||s.points.show){for(j=0;j<points.length;j+=ps){var x=points[j],y=points[j+1];if(x==null)continue;if(x-mx>maxx||x-mx<-maxx||y-my>maxy||y-my<-maxy)continue;var dx=Math.abs(axisx.p2c(x)-mouseX),dy=Math.abs(axisy.p2c(y)-mouseY),dist=dx*dx+dy*dy;if(dist<smallestDistance){smallestDistance=dist;item=[i,j/ps]}}}if(s.bars.show&&!item){var barLeft,barRight;switch(s.bars.align){case"left":barLeft=0;break;case"right":barLeft=-s.bars.barWidth;break;default:barLeft=-s.bars.barWidth/2}barRight=barLeft+s.bars.barWidth;for(j=0;j<points.length;j+=ps){var x=points[j],y=points[j+1],b=points[j+2];if(x==null)continue;if(series[i].bars.horizontal?mx<=Math.max(b,x)&&mx>=Math.min(b,x)&&my>=y+barLeft&&my<=y+barRight:mx>=x+barLeft&&mx<=x+barRight&&my>=Math.min(b,y)&&my<=Math.max(b,y))item=[i,j/ps]}}}if(item){i=item[0];j=item[1];ps=series[i].datapoints.pointsize;return{datapoint:series[i].datapoints.points.slice(j*ps,(j+1)*ps),dataIndex:j,series:series[i],seriesIndex:i}}return null}function onMouseMove(e){if(options.grid.hoverable)triggerClickHoverEvent("plothover",e,function(s){return s["hoverable"]!=false})}function onMouseLeave(e){if(options.grid.hoverable)triggerClickHoverEvent("plothover",e,function(s){return false})}function onClick(e){triggerClickHoverEvent("plotclick",e,function(s){return s["clickable"]!=false})}function triggerClickHoverEvent(eventname,event,seriesFilter){var offset=eventHolder.offset(),canvasX=event.pageX-offset.left-plotOffset.left,canvasY=event.pageY-offset.top-plotOffset.top,pos=canvasToAxisCoords({left:canvasX,top:canvasY});pos.pageX=event.pageX;pos.pageY=event.pageY;var item=findNearbyItem(canvasX,canvasY,seriesFilter);if(item){item.pageX=parseInt(item.series.xaxis.p2c(item.datapoint[0])+offset.left+plotOffset.left,10);item.pageY=parseInt(item.series.yaxis.p2c(item.datapoint[1])+offset.top+plotOffset.top,10)}if(options.grid.autoHighlight){for(var i=0;i<highlights.length;++i){var h=highlights[i];if(h.auto==eventname&&!(item&&h.series==item.series&&h.point[0]==item.datapoint[0]&&h.point[1]==item.datapoint[1]))unhighlight(h.series,h.point)}if(item)highlight(item.series,item.datapoint,eventname)}placeholder.trigger(eventname,[pos,item])}function triggerRedrawOverlay(){var t=options.interaction.redrawOverlayInterval;if(t==-1){drawOverlay();return}if(!redrawTimeout)redrawTimeout=setTimeout(drawOverlay,t)}function drawOverlay(){redrawTimeout=null;octx.save();overlay.clear();octx.translate(plotOffset.left,plotOffset.top);var i,hi;for(i=0;i<highlights.length;++i){hi=highlights[i];if(hi.series.bars.show)drawBarHighlight(hi.series,hi.point);else drawPointHighlight(hi.series,hi.point)}octx.restore();executeHooks(hooks.drawOverlay,[octx])}function highlight(s,point,auto){if(typeof s=="number")s=series[s];if(typeof point=="number"){var ps=s.datapoints.pointsize;point=s.datapoints.points.slice(ps*point,ps*(point+1))}var i=indexOfHighlight(s,point);if(i==-1){highlights.push({series:s,point:point,auto:auto});triggerRedrawOverlay()}else if(!auto)highlights[i].auto=false}function unhighlight(s,point){if(s==null&&point==null){highlights=[];triggerRedrawOverlay();return}if(typeof s=="number")s=series[s];if(typeof point=="number"){var ps=s.datapoints.pointsize;point=s.datapoints.points.slice(ps*point,ps*(point+1))}var i=indexOfHighlight(s,point);if(i!=-1){highlights.splice(i,1);triggerRedrawOverlay()}}function indexOfHighlight(s,p){for(var i=0;i<highlights.length;++i){var h=highlights[i];if(h.series==s&&h.point[0]==p[0]&&h.point[1]==p[1])return i}return-1}function drawPointHighlight(series,point){var x=point[0],y=point[1],axisx=series.xaxis,axisy=series.yaxis,highlightColor=typeof series.highlightColor==="string"?series.highlightColor:$.color.parse(series.color).scale("a",.5).toString();if(x<axisx.min||x>axisx.max||y<axisy.min||y>axisy.max)return;var pointRadius=series.points.radius+series.points.lineWidth/2;octx.lineWidth=pointRadius;octx.strokeStyle=highlightColor;var radius=1.5*pointRadius;x=axisx.p2c(x);y=axisy.p2c(y);octx.beginPath();if(series.points.symbol=="circle")octx.arc(x,y,radius,0,2*Math.PI,false);else series.points.symbol(octx,x,y,radius,false);octx.closePath();octx.stroke()}function drawBarHighlight(series,point){var highlightColor=typeof series.highlightColor==="string"?series.highlightColor:$.color.parse(series.color).scale("a",.5).toString(),fillStyle=highlightColor,barLeft;switch(series.bars.align){case"left":barLeft=0;break;case"right":barLeft=-series.bars.barWidth;break;default:barLeft=-series.bars.barWidth/2}octx.lineWidth=series.bars.lineWidth;octx.strokeStyle=highlightColor;drawBar(point[0],point[1],point[2]||0,barLeft,barLeft+series.bars.barWidth,function(){return fillStyle},series.xaxis,series.yaxis,octx,series.bars.horizontal,series.bars.lineWidth)}function getColorOrGradient(spec,bottom,top,defaultColor){if(typeof spec=="string")return spec;else{var gradient=ctx.createLinearGradient(0,top,0,bottom);for(var i=0,l=spec.colors.length;i<l;++i){var c=spec.colors[i];if(typeof c!="string"){var co=$.color.parse(defaultColor);if(c.brightness!=null)co=co.scale("rgb",c.brightness);if(c.opacity!=null)co.a*=c.opacity;c=co.toString()}gradient.addColorStop(i/(l-1),c)}return gradient}}}$.plot=function(placeholder,data,options){var plot=new Plot($(placeholder),data,options,$.plot.plugins);return plot};$.plot.version="0.8.3";$.plot.plugins=[];$.fn.plot=function(data,options){return this.each(function(){$.plot(this,data,options)})};function floorInBase(n,base){return base*Math.floor(n/base)}})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.navigate.js b/pandora_console/include/graphs/flot/jquery.flot.navigate.js
new file mode 100644
index 0000000000..13fb7f17d0
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.navigate.js
@@ -0,0 +1,346 @@
+/* Flot plugin for adding the ability to pan and zoom the plot.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+The default behaviour is double click and scrollwheel up/down to zoom in, drag
+to pan. The plugin defines plot.zoom({ center }), plot.zoomOut() and
+plot.pan( offset ) so you easily can add custom controls. It also fires
+"plotpan" and "plotzoom" events, useful for synchronizing plots.
+
+The plugin supports these options:
+
+	zoom: {
+		interactive: false
+		trigger: "dblclick" // or "click" for single click
+		amount: 1.5         // 2 = 200% (zoom in), 0.5 = 50% (zoom out)
+	}
+
+	pan: {
+		interactive: false
+		cursor: "move"      // CSS mouse cursor value used when dragging, e.g. "pointer"
+		frameRate: 20
+	}
+
+	xaxis, yaxis, x2axis, y2axis: {
+		zoomRange: null  // or [ number, number ] (min range, max range) or false
+		panRange: null   // or [ number, number ] (min, max) or false
+	}
+
+"interactive" enables the built-in drag/click behaviour. If you enable
+interactive for pan, then you'll have a basic plot that supports moving
+around; the same for zoom.
+
+"amount" specifies the default amount to zoom in (so 1.5 = 150%) relative to
+the current viewport.
+
+"cursor" is a standard CSS mouse cursor string used for visual feedback to the
+user when dragging.
+
+"frameRate" specifies the maximum number of times per second the plot will
+update itself while the user is panning around on it (set to null to disable
+intermediate pans, the plot will then not update until the mouse button is
+released).
+
+"zoomRange" is the interval in which zooming can happen, e.g. with zoomRange:
+[1, 100] the zoom will never scale the axis so that the difference between min
+and max is smaller than 1 or larger than 100. You can set either end to null
+to ignore, e.g. [1, null]. If you set zoomRange to false, zooming on that axis
+will be disabled.
+
+"panRange" confines the panning to stay within a range, e.g. with panRange:
+[-10, 20] panning stops at -10 in one end and at 20 in the other. Either can
+be null, e.g. [-10, null]. If you set panRange to false, panning on that axis
+will be disabled.
+
+Example API usage:
+
+	plot = $.plot(...);
+
+	// zoom default amount in on the pixel ( 10, 20 )
+	plot.zoom({ center: { left: 10, top: 20 } });
+
+	// zoom out again
+	plot.zoomOut({ center: { left: 10, top: 20 } });
+
+	// zoom 200% in on the pixel (10, 20)
+	plot.zoom({ amount: 2, center: { left: 10, top: 20 } });
+
+	// pan 100 pixels to the left and 20 down
+	plot.pan({ left: -100, top: 20 })
+
+Here, "center" specifies where the center of the zooming should happen. Note
+that this is defined in pixel space, not the space of the data points (you can
+use the p2c helpers on the axes in Flot to help you convert between these).
+
+"amount" is the amount to zoom the viewport relative to the current range, so
+1 is 100% (i.e. no change), 1.5 is 150% (zoom in), 0.7 is 70% (zoom out). You
+can set the default in the options.
+
+*/
+
+// First two dependencies, jquery.event.drag.js and
+// jquery.mousewheel.js, we put them inline here to save people the
+// effort of downloading them.
+
+/*
+jquery.event.drag.js ~ v1.5 ~ Copyright (c) 2008, Three Dub Media (http://threedubmedia.com)
+Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-LICENSE.txt
+*/
+(function(a){function e(h){var k,j=this,l=h.data||{};if(l.elem)j=h.dragTarget=l.elem,h.dragProxy=d.proxy||j,h.cursorOffsetX=l.pageX-l.left,h.cursorOffsetY=l.pageY-l.top,h.offsetX=h.pageX-h.cursorOffsetX,h.offsetY=h.pageY-h.cursorOffsetY;else if(d.dragging||l.which>0&&h.which!=l.which||a(h.target).is(l.not))return;switch(h.type){case"mousedown":return a.extend(l,a(j).offset(),{elem:j,target:h.target,pageX:h.pageX,pageY:h.pageY}),b.add(document,"mousemove mouseup",e,l),i(j,!1),d.dragging=null,!1;case!d.dragging&&"mousemove":if(g(h.pageX-l.pageX)+g(h.pageY-l.pageY)<l.distance)break;h.target=l.target,k=f(h,"dragstart",j),k!==!1&&(d.dragging=j,d.proxy=h.dragProxy=a(k||j)[0]);case"mousemove":if(d.dragging){if(k=f(h,"drag",j),c.drop&&(c.drop.allowed=k!==!1,c.drop.handler(h)),k!==!1)break;h.type="mouseup"}case"mouseup":b.remove(document,"mousemove mouseup",e),d.dragging&&(c.drop&&c.drop.handler(h),f(h,"dragend",j)),i(j,!0),d.dragging=d.proxy=l.elem=!1}return!0}function f(b,c,d){b.type=c;var e=a.event.dispatch.call(d,b);return e===!1?!1:e||b.result}function g(a){return Math.pow(a,2)}function h(){return d.dragging===!1}function i(a,b){a&&(a.unselectable=b?"off":"on",a.onselectstart=function(){return b},a.style&&(a.style.MozUserSelect=b?"":"none"))}a.fn.drag=function(a,b,c){return b&&this.bind("dragstart",a),c&&this.bind("dragend",c),a?this.bind("drag",b?b:a):this.trigger("drag")};var b=a.event,c=b.special,d=c.drag={not:":input",distance:0,which:1,dragging:!1,setup:function(c){c=a.extend({distance:d.distance,which:d.which,not:d.not},c||{}),c.distance=g(c.distance),b.add(this,"mousedown",e,c),this.attachEvent&&this.attachEvent("ondragstart",h)},teardown:function(){b.remove(this,"mousedown",e),this===d.dragging&&(d.dragging=d.proxy=!1),i(this,!0),this.detachEvent&&this.detachEvent("ondragstart",h)}};c.dragstart=c.dragend={setup:function(){},teardown:function(){}}})(jQuery);
+
+/* jquery.mousewheel.min.js
+ * Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
+ * Licensed under the MIT License (LICENSE.txt).
+ * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
+ * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
+ * Thanks to: Seamus Leahy for adding deltaX and deltaY
+ *
+ * Version: 3.0.6
+ *
+ * Requires: 1.2.2+
+ */
+(function(d){function e(a){var b=a||window.event,c=[].slice.call(arguments,1),f=0,e=0,g=0,a=d.event.fix(b);a.type="mousewheel";b.wheelDelta&&(f=b.wheelDelta/120);b.detail&&(f=-b.detail/3);g=f;void 0!==b.axis&&b.axis===b.HORIZONTAL_AXIS&&(g=0,e=-1*f);void 0!==b.wheelDeltaY&&(g=b.wheelDeltaY/120);void 0!==b.wheelDeltaX&&(e=-1*b.wheelDeltaX/120);c.unshift(a,f,e,g);return(d.event.dispatch||d.event.handle).apply(this,c)}var c=["DOMMouseScroll","mousewheel"];if(d.event.fixHooks)for(var h=c.length;h;)d.event.fixHooks[c[--h]]=d.event.mouseHooks;d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=c.length;a;)this.addEventListener(c[--a],e,!1);else this.onmousewheel=e},teardown:function(){if(this.removeEventListener)for(var a=c.length;a;)this.removeEventListener(c[--a],e,!1);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);
+
+
+
+
+(function ($) {
+    var options = {
+        xaxis: {
+            zoomRange: null, // or [number, number] (min range, max range)
+            panRange: null // or [number, number] (min, max)
+        },
+        zoom: {
+            interactive: false,
+            trigger: "dblclick", // or "click" for single click
+            amount: 1.5 // how much to zoom relative to current position, 2 = 200% (zoom in), 0.5 = 50% (zoom out)
+        },
+        pan: {
+            interactive: false,
+            cursor: "move",
+            frameRate: 20
+        }
+    };
+
+    function init(plot) {
+        function onZoomClick(e, zoomOut) {
+            var c = plot.offset();
+            c.left = e.pageX - c.left;
+            c.top = e.pageY - c.top;
+            if (zoomOut)
+                plot.zoomOut({ center: c });
+            else
+                plot.zoom({ center: c });
+        }
+
+        function onMouseWheel(e, delta) {
+            e.preventDefault();
+            onZoomClick(e, delta < 0);
+            return false;
+        }
+        
+        var prevCursor = 'default', prevPageX = 0, prevPageY = 0,
+            panTimeout = null;
+
+        function onDragStart(e) {
+            if (e.which != 1)  // only accept left-click
+                return false;
+            var c = plot.getPlaceholder().css('cursor');
+            if (c)
+                prevCursor = c;
+            plot.getPlaceholder().css('cursor', plot.getOptions().pan.cursor);
+            prevPageX = e.pageX;
+            prevPageY = e.pageY;
+        }
+        
+        function onDrag(e) {
+            var frameRate = plot.getOptions().pan.frameRate;
+            if (panTimeout || !frameRate)
+                return;
+
+            panTimeout = setTimeout(function () {
+                plot.pan({ left: prevPageX - e.pageX,
+                           top: prevPageY - e.pageY });
+                prevPageX = e.pageX;
+                prevPageY = e.pageY;
+                                                    
+                panTimeout = null;
+            }, 1 / frameRate * 1000);
+        }
+
+        function onDragEnd(e) {
+            if (panTimeout) {
+                clearTimeout(panTimeout);
+                panTimeout = null;
+            }
+                    
+            plot.getPlaceholder().css('cursor', prevCursor);
+            plot.pan({ left: prevPageX - e.pageX,
+                       top: prevPageY - e.pageY });
+        }
+        
+        function bindEvents(plot, eventHolder) {
+            var o = plot.getOptions();
+            if (o.zoom.interactive) {
+                eventHolder[o.zoom.trigger](onZoomClick);
+                eventHolder.mousewheel(onMouseWheel);
+            }
+
+            if (o.pan.interactive) {
+                eventHolder.bind("dragstart", { distance: 10 }, onDragStart);
+                eventHolder.bind("drag", onDrag);
+                eventHolder.bind("dragend", onDragEnd);
+            }
+        }
+
+        plot.zoomOut = function (args) {
+            if (!args)
+                args = {};
+            
+            if (!args.amount)
+                args.amount = plot.getOptions().zoom.amount;
+
+            args.amount = 1 / args.amount;
+            plot.zoom(args);
+        };
+        
+        plot.zoom = function (args) {
+            if (!args)
+                args = {};
+            
+            var c = args.center,
+                amount = args.amount || plot.getOptions().zoom.amount,
+                w = plot.width(), h = plot.height();
+
+            if (!c)
+                c = { left: w / 2, top: h / 2 };
+                
+            var xf = c.left / w,
+                yf = c.top / h,
+                minmax = {
+                    x: {
+                        min: c.left - xf * w / amount,
+                        max: c.left + (1 - xf) * w / amount
+                    },
+                    y: {
+                        min: c.top - yf * h / amount,
+                        max: c.top + (1 - yf) * h / amount
+                    }
+                };
+
+            $.each(plot.getAxes(), function(_, axis) {
+                var opts = axis.options,
+                    min = minmax[axis.direction].min,
+                    max = minmax[axis.direction].max,
+                    zr = opts.zoomRange,
+                    pr = opts.panRange;
+
+                if (zr === false) // no zooming on this axis
+                    return;
+                    
+                min = axis.c2p(min);
+                max = axis.c2p(max);
+                if (min > max) {
+                    // make sure min < max
+                    var tmp = min;
+                    min = max;
+                    max = tmp;
+                }
+
+                //Check that we are in panRange
+                if (pr) {
+                    if (pr[0] != null && min < pr[0]) {
+                        min = pr[0];
+                    }
+                    if (pr[1] != null && max > pr[1]) {
+                        max = pr[1];
+                    }
+                }
+
+                var range = max - min;
+                if (zr &&
+                    ((zr[0] != null && range < zr[0] && amount >1) ||
+                     (zr[1] != null && range > zr[1] && amount <1)))
+                    return;
+            
+                opts.min = min;
+                opts.max = max;
+            });
+            
+            plot.setupGrid();
+            plot.draw();
+            
+            if (!args.preventEvent)
+                plot.getPlaceholder().trigger("plotzoom", [ plot, args ]);
+        };
+
+        plot.pan = function (args) {
+            var delta = {
+                x: +args.left,
+                y: +args.top
+            };
+
+            if (isNaN(delta.x))
+                delta.x = 0;
+            if (isNaN(delta.y))
+                delta.y = 0;
+
+            $.each(plot.getAxes(), function (_, axis) {
+                var opts = axis.options,
+                    min, max, d = delta[axis.direction];
+
+                min = axis.c2p(axis.p2c(axis.min) + d),
+                max = axis.c2p(axis.p2c(axis.max) + d);
+
+                var pr = opts.panRange;
+                if (pr === false) // no panning on this axis
+                    return;
+                
+                if (pr) {
+                    // check whether we hit the wall
+                    if (pr[0] != null && pr[0] > min) {
+                        d = pr[0] - min;
+                        min += d;
+                        max += d;
+                    }
+                    
+                    if (pr[1] != null && pr[1] < max) {
+                        d = pr[1] - max;
+                        min += d;
+                        max += d;
+                    }
+                }
+                
+                opts.min = min;
+                opts.max = max;
+            });
+            
+            plot.setupGrid();
+            plot.draw();
+            
+            if (!args.preventEvent)
+                plot.getPlaceholder().trigger("plotpan", [ plot, args ]);
+        };
+
+        function shutdown(plot, eventHolder) {
+            eventHolder.unbind(plot.getOptions().zoom.trigger, onZoomClick);
+            eventHolder.unbind("mousewheel", onMouseWheel);
+            eventHolder.unbind("dragstart", onDragStart);
+            eventHolder.unbind("drag", onDrag);
+            eventHolder.unbind("dragend", onDragEnd);
+            if (panTimeout)
+                clearTimeout(panTimeout);
+        }
+        
+        plot.hooks.bindEvents.push(bindEvents);
+        plot.hooks.shutdown.push(shutdown);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'navigate',
+        version: '1.3'
+    });
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.navigate.min.js b/pandora_console/include/graphs/flot/jquery.flot.navigate.min.js
new file mode 100644
index 0000000000..7288a23fab
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.navigate.min.js
@@ -0,0 +1,7 @@
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function(a){function e(h){var k,j=this,l=h.data||{};if(l.elem)j=h.dragTarget=l.elem,h.dragProxy=d.proxy||j,h.cursorOffsetX=l.pageX-l.left,h.cursorOffsetY=l.pageY-l.top,h.offsetX=h.pageX-h.cursorOffsetX,h.offsetY=h.pageY-h.cursorOffsetY;else if(d.dragging||l.which>0&&h.which!=l.which||a(h.target).is(l.not))return;switch(h.type){case"mousedown":return a.extend(l,a(j).offset(),{elem:j,target:h.target,pageX:h.pageX,pageY:h.pageY}),b.add(document,"mousemove mouseup",e,l),i(j,!1),d.dragging=null,!1;case!d.dragging&&"mousemove":if(g(h.pageX-l.pageX)+g(h.pageY-l.pageY)<l.distance)break;h.target=l.target,k=f(h,"dragstart",j),k!==!1&&(d.dragging=j,d.proxy=h.dragProxy=a(k||j)[0]);case"mousemove":if(d.dragging){if(k=f(h,"drag",j),c.drop&&(c.drop.allowed=k!==!1,c.drop.handler(h)),k!==!1)break;h.type="mouseup"}case"mouseup":b.remove(document,"mousemove mouseup",e),d.dragging&&(c.drop&&c.drop.handler(h),f(h,"dragend",j)),i(j,!0),d.dragging=d.proxy=l.elem=!1}return!0}function f(b,c,d){b.type=c;var e=a.event.dispatch.call(d,b);return e===!1?!1:e||b.result}function g(a){return Math.pow(a,2)}function h(){return d.dragging===!1}function i(a,b){a&&(a.unselectable=b?"off":"on",a.onselectstart=function(){return b},a.style&&(a.style.MozUserSelect=b?"":"none"))}a.fn.drag=function(a,b,c){return b&&this.bind("dragstart",a),c&&this.bind("dragend",c),a?this.bind("drag",b?b:a):this.trigger("drag")};var b=a.event,c=b.special,d=c.drag={not:":input",distance:0,which:1,dragging:!1,setup:function(c){c=a.extend({distance:d.distance,which:d.which,not:d.not},c||{}),c.distance=g(c.distance),b.add(this,"mousedown",e,c),this.attachEvent&&this.attachEvent("ondragstart",h)},teardown:function(){b.remove(this,"mousedown",e),this===d.dragging&&(d.dragging=d.proxy=!1),i(this,!0),this.detachEvent&&this.detachEvent("ondragstart",h)}};c.dragstart=c.dragend={setup:function(){},teardown:function(){}}})(jQuery);(function(d){function e(a){var b=a||window.event,c=[].slice.call(arguments,1),f=0,e=0,g=0,a=d.event.fix(b);a.type="mousewheel";b.wheelDelta&&(f=b.wheelDelta/120);b.detail&&(f=-b.detail/3);g=f;void 0!==b.axis&&b.axis===b.HORIZONTAL_AXIS&&(g=0,e=-1*f);void 0!==b.wheelDeltaY&&(g=b.wheelDeltaY/120);void 0!==b.wheelDeltaX&&(e=-1*b.wheelDeltaX/120);c.unshift(a,f,e,g);return(d.event.dispatch||d.event.handle).apply(this,c)}var c=["DOMMouseScroll","mousewheel"];if(d.event.fixHooks)for(var h=c.length;h;)d.event.fixHooks[c[--h]]=d.event.mouseHooks;d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=c.length;a;)this.addEventListener(c[--a],e,!1);else this.onmousewheel=e},teardown:function(){if(this.removeEventListener)for(var a=c.length;a;)this.removeEventListener(c[--a],e,!1);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);(function($){var options={xaxis:{zoomRange:null,panRange:null},zoom:{interactive:false,trigger:"dblclick",amount:1.5},pan:{interactive:false,cursor:"move",frameRate:20}};function init(plot){function onZoomClick(e,zoomOut){var c=plot.offset();c.left=e.pageX-c.left;c.top=e.pageY-c.top;if(zoomOut)plot.zoomOut({center:c});else plot.zoom({center:c})}function onMouseWheel(e,delta){e.preventDefault();onZoomClick(e,delta<0);return false}var prevCursor="default",prevPageX=0,prevPageY=0,panTimeout=null;function onDragStart(e){if(e.which!=1)return false;var c=plot.getPlaceholder().css("cursor");if(c)prevCursor=c;plot.getPlaceholder().css("cursor",plot.getOptions().pan.cursor);prevPageX=e.pageX;prevPageY=e.pageY}function onDrag(e){var frameRate=plot.getOptions().pan.frameRate;if(panTimeout||!frameRate)return;panTimeout=setTimeout(function(){plot.pan({left:prevPageX-e.pageX,top:prevPageY-e.pageY});prevPageX=e.pageX;prevPageY=e.pageY;panTimeout=null},1/frameRate*1e3)}function onDragEnd(e){if(panTimeout){clearTimeout(panTimeout);panTimeout=null}plot.getPlaceholder().css("cursor",prevCursor);plot.pan({left:prevPageX-e.pageX,top:prevPageY-e.pageY})}function bindEvents(plot,eventHolder){var o=plot.getOptions();if(o.zoom.interactive){eventHolder[o.zoom.trigger](onZoomClick);eventHolder.mousewheel(onMouseWheel)}if(o.pan.interactive){eventHolder.bind("dragstart",{distance:10},onDragStart);eventHolder.bind("drag",onDrag);eventHolder.bind("dragend",onDragEnd)}}plot.zoomOut=function(args){if(!args)args={};if(!args.amount)args.amount=plot.getOptions().zoom.amount;args.amount=1/args.amount;plot.zoom(args)};plot.zoom=function(args){if(!args)args={};var c=args.center,amount=args.amount||plot.getOptions().zoom.amount,w=plot.width(),h=plot.height();if(!c)c={left:w/2,top:h/2};var xf=c.left/w,yf=c.top/h,minmax={x:{min:c.left-xf*w/amount,max:c.left+(1-xf)*w/amount},y:{min:c.top-yf*h/amount,max:c.top+(1-yf)*h/amount}};$.each(plot.getAxes(),function(_,axis){var opts=axis.options,min=minmax[axis.direction].min,max=minmax[axis.direction].max,zr=opts.zoomRange,pr=opts.panRange;if(zr===false)return;min=axis.c2p(min);max=axis.c2p(max);if(min>max){var tmp=min;min=max;max=tmp}if(pr){if(pr[0]!=null&&min<pr[0]){min=pr[0]}if(pr[1]!=null&&max>pr[1]){max=pr[1]}}var range=max-min;if(zr&&(zr[0]!=null&&range<zr[0]&&amount>1||zr[1]!=null&&range>zr[1]&&amount<1))return;opts.min=min;opts.max=max});plot.setupGrid();plot.draw();if(!args.preventEvent)plot.getPlaceholder().trigger("plotzoom",[plot,args])};plot.pan=function(args){var delta={x:+args.left,y:+args.top};if(isNaN(delta.x))delta.x=0;if(isNaN(delta.y))delta.y=0;$.each(plot.getAxes(),function(_,axis){var opts=axis.options,min,max,d=delta[axis.direction];min=axis.c2p(axis.p2c(axis.min)+d),max=axis.c2p(axis.p2c(axis.max)+d);var pr=opts.panRange;if(pr===false)return;if(pr){if(pr[0]!=null&&pr[0]>min){d=pr[0]-min;min+=d;max+=d}if(pr[1]!=null&&pr[1]<max){d=pr[1]-max;min+=d;max+=d}}opts.min=min;opts.max=max});plot.setupGrid();plot.draw();if(!args.preventEvent)plot.getPlaceholder().trigger("plotpan",[plot,args])};function shutdown(plot,eventHolder){eventHolder.unbind(plot.getOptions().zoom.trigger,onZoomClick);eventHolder.unbind("mousewheel",onMouseWheel);eventHolder.unbind("dragstart",onDragStart);eventHolder.unbind("drag",onDrag);eventHolder.unbind("dragend",onDragEnd);if(panTimeout)clearTimeout(panTimeout)}plot.hooks.bindEvents.push(bindEvents);plot.hooks.shutdown.push(shutdown)}$.plot.plugins.push({init:init,options:options,name:"navigate",version:"1.3"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.pie.js b/pandora_console/include/graphs/flot/jquery.flot.pie.js
index ef36e97246..9c19db998b 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.pie.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.pie.js
@@ -1,756 +1,820 @@
-/*
-Flot plugin for rendering pie charts. The plugin assumes the data is 
-coming is as a single data value for each series, and each of those 
-values is a positive value or zero (negative numbers don't make 
-any sense and will cause strange effects). The data values do 
-NOT need to be passed in as percentage values because it 
-internally calculates the total and percentages.
-
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
-
-* Changes:
-	2009-10-22: lineJoin set to round
-	2009-10-23: IE full circle fix, donut
-	2009-11-11: Added basic hover from btburnett3 - does not work in IE, and center is off in Chrome and Opera
-	2009-11-17: Added IE hover capability submitted by Anthony Aragues
-	2009-11-18: Added bug fix submitted by Xavi Ivars (issues with arrays when other JS libraries are included as well)
-		
-
-Available options are:
-series: {
-	pie: {
-		show: true/false
-		radius: 0-1 for percentage of fullsize, or a specified pixel length, or 'auto'
-		innerRadius: 0-1 for percentage of fullsize or a specified pixel length, for creating a donut effect
-		startAngle: 0-2 factor of PI used for starting angle (in radians) i.e 3/2 starts at the top, 0 and 2 have the same result
-		tilt: 0-1 for percentage to tilt the pie, where 1 is no tilt, and 0 is completely flat (nothing will show)
-		offset: {
-			top: integer value to move the pie up or down
-			left: integer value to move the pie left or right, or 'auto'
-		},
-		stroke: {
-			color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#FFF')
-			width: integer pixel width of the stroke
-		},
-		label: {
-			show: true/false, or 'auto'
-			formatter:  a user-defined function that modifies the text/style of the label text
-			radius: 0-1 for percentage of fullsize, or a specified pixel length
-			background: {
-				color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#000')
-				opacity: 0-1
-			},
-			threshold: 0-1 for the percentage value at which to hide labels (if they're too small)
-		},
-		combine: {
-			threshold: 0-1 for the percentage value at which to combine slices (if they're too small)
-			color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#CCC'), if null, the plugin will automatically use the color of the first slice to be combined
-			label: any text value of what the combined slice should be labeled
-		}
-		highlight: {
-			opacity: 0-1
-		}
-	}
-}
-
-More detail and specific examples can be found in the included HTML file.
-
-*/
-
-(function ($) 
-{
-	function init(plot) // this is the "body" of the plugin
-	{
-		var canvas = null;
-		var target = null;
-		var maxRadius = null;
-		var centerLeft = null;
-		var centerTop = null;
-		var total = 0;
-		var redraw = true;
-		var redrawAttempts = 10;
-		var shrink = 0.95;
-		var legendWidth = 0;
-		var processed = false;
-		var raw = false;
-		
-		// interactive variables	
-		var highlights = [];	
-	
-		// add hook to determine if pie plugin in enabled, and then perform necessary operations
-		plot.hooks.processOptions.push(checkPieEnabled);
-		plot.hooks.bindEvents.push(bindEvents);	
-
-		// check to see if the pie plugin is enabled
-		function checkPieEnabled(plot, options)
-		{
-			if (options.series.pie.show)
-			{
-				//disable grid
-				options.grid.show = false;
-				
-				// set labels.show
-				if (options.series.pie.label.show=='auto')
-					if (options.legend.show)
-						options.series.pie.label.show = false;
-					else
-						options.series.pie.label.show = true;
-				
-				// set radius
-				if (options.series.pie.radius=='auto')
-					if (options.series.pie.label.show)
-						options.series.pie.radius = 3/4;
-					else
-						options.series.pie.radius = 1;
-						
-				// ensure sane tilt
-				if (options.series.pie.tilt>1)
-					options.series.pie.tilt=1;
-				if (options.series.pie.tilt<0)
-					options.series.pie.tilt=0;
-			
-				// add processData hook to do transformations on the data
-				plot.hooks.processDatapoints.push(processDatapoints);
-				plot.hooks.drawOverlay.push(drawOverlay);	
-				
-				// add draw hook
-				plot.hooks.draw.push(draw);
-			}
-		}
-	
-		// bind hoverable events
-		function bindEvents(plot, eventHolder) 		
-		{		
-			var options = plot.getOptions();
-			
-			if (options.series.pie.show && options.grid.hoverable)
-				eventHolder.unbind('mousemove').mousemove(onMouseMove);
-				
-			if (options.series.pie.show && options.grid.clickable)
-				eventHolder.unbind('click').click(onClick);
-		}	
-		
-
-		// debugging function that prints out an object
-		function alertObject(obj)
-		{
-			var msg = '';
-			function traverse(obj, depth)
-			{
-				if (!depth)
-					depth = 0;
-				for (var i = 0; i < obj.length; ++i)
-				{
-					for (var j=0; j<depth; j++)
-						msg += '\t';
-				
-					if( typeof obj[i] == "object")
-					{	// its an object
-						msg += ''+i+':\n';
-						traverse(obj[i], depth+1);
-					}
-					else
-					{	// its a value
-						msg += ''+i+': '+obj[i]+'\n';
-					}
-				}
-			}
-			traverse(obj);
-			alert(msg);
-		}
-		
-		function calcTotal(data)
-		{
-			for (var i = 0; i < data.length; ++i)
-			{
-				var item = parseFloat(data[i].data[0][1]);
-				if (item)
-					total += item;
-			}
-		}	
-		
-		function processDatapoints(plot, series, data, datapoints) 
-		{	
-			if (!processed)
-			{
-				processed = true;
-			
-				canvas = plot.getCanvas();
-				target = $(canvas).parent();
-				options = plot.getOptions();
-			
-				plot.setData(combine(plot.getData()));
-			}
-		}
-		
-		function setupPie()
-		{
-			legendWidth = target.children().filter('.legend').children().width();
-		
-			// calculate maximum radius and center point
-			maxRadius =  Math.min(canvas.width,(canvas.height/options.series.pie.tilt))/2;
-			centerTop = (canvas.height/2)+options.series.pie.offset.top;
-			centerLeft = (canvas.width/2);
-			
-			if (options.series.pie.offset.left=='auto')
-				if (options.legend.position.match('w'))
-					centerLeft += legendWidth;
-				else
-					centerLeft -= legendWidth;
-			else
-				centerLeft += options.series.pie.offset.left;
-					
-			if (centerLeft<maxRadius)
-				centerLeft = maxRadius;
-			else if (centerLeft>canvas.width-maxRadius)
-				centerLeft = canvas.width-maxRadius;
-		}
-		
-		function fixData(data)
-		{
-			for (var i = 0; i < data.length; ++i)
-			{
-				if (typeof(data[i].data)=='number')
-					data[i].data = [[1,data[i].data]];
-				else if (typeof(data[i].data)=='undefined' || typeof(data[i].data[0])=='undefined')
-				{
-					if (typeof(data[i].data)!='undefined' && typeof(data[i].data.label)!='undefined')
-						data[i].label = data[i].data.label; // fix weirdness coming from flot
-					data[i].data = [[1,0]];
-					
-				}
-			}
-			return data;
-		}
-		
-		function combine(data)
-		{
-			data = fixData(data);
-			calcTotal(data);
-			var combined = 0;
-			var numCombined = 0;
-			var color = options.series.pie.combine.color;
-			
-			var newdata = [];
-			for (var i = 0; i < data.length; ++i)
-			{
-				// make sure its a number
-				data[i].data[0][1] = parseFloat(data[i].data[0][1]);
-				if (!data[i].data[0][1])
-					data[i].data[0][1] = 0;
-					
-				if (data[i].data[0][1]/total<=options.series.pie.combine.threshold)
-				{
-					combined += data[i].data[0][1];
-					numCombined++;
-					if (!color)
-						color = data[i].color;
-				}				
-				else
-				{
-					newdata.push({
-						data: [[1,data[i].data[0][1]]], 
-						color: data[i].color, 
-						label: data[i].label,
-						angle: (data[i].data[0][1]*(Math.PI*2))/total,
-						percent: (data[i].data[0][1]/total*100)
-					});
-				}
-			}
-			if (numCombined>0)
-				newdata.push({
-					data: [[1,combined]], 
-					color: color, 
-					label: options.series.pie.combine.label,
-					angle: (combined*(Math.PI*2))/total,
-					percent: (combined/total*100)
-				});
-			return newdata;
-		}		
-		
-		function draw(plot, newCtx)
-		{
-			if (!target) return; // if no series were passed
-			ctx = newCtx;
-		
-			setupPie();
-			var slices = plot.getData();
-		
-			var attempts = 0;
-			while (redraw && attempts<redrawAttempts)
-			{
-				redraw = false;
-				if (attempts>0)
-					maxRadius *= shrink;
-				attempts += 1;
-				clear();
-				if (options.series.pie.tilt<=0.8)
-					drawShadow();
-				drawPie();
-			}
-			if (attempts >= redrawAttempts) {
-				clear();
-				target.prepend('<div class="error">Could not draw pie with labels contained inside canvas</div>');
-			}
-			
-			if ( plot.setSeries && plot.insertLegend )
-			{
-				plot.setSeries(slices);
-				plot.insertLegend();
-			}
-			
-			// we're actually done at this point, just defining internal functions at this point
-			
-			function clear()
-			{
-				ctx.clearRect(0,0,canvas.width,canvas.height);
-				target.children().filter('.pieLabel, .pieLabelBackground').remove();
-			}
-			
-			function drawShadow()
-			{
-				var shadowLeft = 5;
-				var shadowTop = 15;
-				var edge = 10;
-				var alpha = 0.02;
-			
-				// set radius
-				if (options.series.pie.radius>1)
-					var radius = options.series.pie.radius;
-				else
-					var radius = maxRadius * options.series.pie.radius;
-					
-				if (radius>=(canvas.width/2)-shadowLeft || radius*options.series.pie.tilt>=(canvas.height/2)-shadowTop || radius<=edge)
-					return;	// shadow would be outside canvas, so don't draw it
-			
-				ctx.save();
-				ctx.translate(shadowLeft,shadowTop);
-				ctx.globalAlpha = alpha;
-				ctx.fillStyle = '#000';
-
-				// center and rotate to starting position
-				ctx.translate(centerLeft,centerTop);
-				ctx.scale(1, options.series.pie.tilt);
-				
-				//radius -= edge;
-				for (var i=1; i<=edge; i++)
-				{
-					ctx.beginPath();
-					ctx.arc(0,0,radius,0,Math.PI*2,false);
-					ctx.fill();
-					radius -= i;
-				}	
-				
-				ctx.restore();
-			}
-			
-			function drawPie()
-			{
-				startAngle = Math.PI*options.series.pie.startAngle;
-				
-				// set radius
-				if (options.series.pie.radius>1)
-					var radius = options.series.pie.radius;
-				else
-					var radius = maxRadius * options.series.pie.radius;
-				
-				// center and rotate to starting position
-				ctx.save();
-				ctx.translate(centerLeft,centerTop);
-				ctx.scale(1, options.series.pie.tilt);
-				//ctx.rotate(startAngle); // start at top; -- This doesn't work properly in Opera
-				
-				// draw slices
-				ctx.save();
-				var currentAngle = startAngle;
-				for (var i = 0; i < slices.length; ++i)
-				{
-					slices[i].startAngle = currentAngle;
-					drawSlice(slices[i].angle, slices[i].color, true);
-				}
-				ctx.restore();
-				
-				// draw slice outlines
-				ctx.save();
-				ctx.lineWidth = options.series.pie.stroke.width;
-				currentAngle = startAngle;
-				for (var i = 0; i < slices.length; ++i)
-					drawSlice(slices[i].angle, options.series.pie.stroke.color, false);
-				ctx.restore();
-					
-				// draw donut hole
-				drawDonutHole(ctx);
-				
-				// draw labels
-				if (options.series.pie.label.show)
-					drawLabels();
-				
-				// restore to original state
-				ctx.restore();
-				
-				function drawSlice(angle, color, fill)
-				{	
-					if (angle<=0)
-						return;
-				
-					if (fill)
-						ctx.fillStyle = color;
-					else
-					{
-						ctx.strokeStyle = color;
-						ctx.lineJoin = 'round';
-					}
-						
-					ctx.beginPath();
-					if (Math.abs(angle - Math.PI*2) > 0.000000001)
-						ctx.moveTo(0,0); // Center of the pie
-					
-					//--------------------------------------------------
-					//JQUERY 1.9 DOES NOT SUPPORT THE BROWSER
-					//PANDORA FMS TEAM DISABLED THIS LINES
-					//else if ($.browser.msie)
-					//	angle -= 0.0001;
-					//--------------------------------------------------
-					
-					//ctx.arc(0,0,radius,0,angle,false); // This doesn't work properly in Opera
-					ctx.arc(0,0,radius,currentAngle,currentAngle+angle,false);
-					ctx.closePath();
-					//ctx.rotate(angle); // This doesn't work properly in Opera
-					currentAngle += angle;
-					
-					if (fill)
-						ctx.fill();
-					else
-						ctx.stroke();
-				}
-				
-				function drawLabels()
-				{
-					var currentAngle = startAngle;
-					
-					// set radius
-					if (options.series.pie.label.radius>1)
-						var radius = options.series.pie.label.radius;
-					else
-						var radius = maxRadius * options.series.pie.label.radius;
-					
-					for (var i = 0; i < slices.length; ++i)
-					{
-						if (slices[i].percent >= options.series.pie.label.threshold*100)
-							drawLabel(slices[i], currentAngle, i);
-						currentAngle += slices[i].angle;
-					}
-					
-					function drawLabel(slice, startAngle, index)
-					{
-						if (slice.data[0][1]==0)
-							return;
-							
-						// format label text
-						var lf = options.legend.labelFormatter, text, plf = options.series.pie.label.formatter;
-						if (lf)
-							text = lf(slice.label, slice);
-						else
-							text = slice.label;
-						if (plf)
-							text = plf(text, slice);
-							
-						var halfAngle = ((startAngle+slice.angle) + startAngle)/2;
-						var x = centerLeft + Math.round(Math.cos(halfAngle) * radius);
-						var y = centerTop + Math.round(Math.sin(halfAngle) * radius) * options.series.pie.tilt;
-						
-						var html = '<span class="pieLabel" id="pieLabel'+index+'" style="position:absolute;top:' + y + 'px;left:' + x + 'px;">' + text + "</span>";
-						target.append(html);
-						var label = target.children('#pieLabel'+index);
-						var labelTop = (y - label.height()/2);
-						var labelLeft = (x - label.width()/2);
-						label.css('top', labelTop);
-						label.css('left', labelLeft);
-						
-						// check to make sure that the label is not outside the canvas
-						if (0-labelTop>0 || 0-labelLeft>0 || canvas.height-(labelTop+label.height())<0 || canvas.width-(labelLeft+label.width())<0)
-							redraw = true;
-						
-						if (options.series.pie.label.background.opacity != 0) {
-							// put in the transparent background separately to avoid blended labels and label boxes
-							var c = options.series.pie.label.background.color;
-							if (c == null) {
-								c = slice.color;
-							}
-							var pos = 'top:'+labelTop+'px;left:'+labelLeft+'px;';
-							$('<div class="pieLabelBackground" style="position:absolute;width:' + label.width() + 'px;height:' + label.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').insertBefore(label).css('opacity', options.series.pie.label.background.opacity);
-						}
-					} // end individual label function
-				} // end drawLabels function
-			} // end drawPie function
-		} // end draw function
-		
-		// Placed here because it needs to be accessed from multiple locations 
-		function drawDonutHole(layer)
-		{
-			// draw donut hole
-			if(options.series.pie.innerRadius > 0)
-			{
-				// subtract the center
-				layer.save();
-				innerRadius = options.series.pie.innerRadius > 1 ? options.series.pie.innerRadius : maxRadius * options.series.pie.innerRadius;
-				layer.globalCompositeOperation = 'destination-out'; // this does not work with excanvas, but it will fall back to using the stroke color
-				layer.beginPath();
-				layer.fillStyle = options.series.pie.stroke.color;
-				layer.arc(0,0,innerRadius,0,Math.PI*2,false);
-				layer.fill();
-				layer.closePath();
-				layer.restore();
-				
-				// add inner stroke
-				layer.save();
-				layer.beginPath();
-				layer.strokeStyle = options.series.pie.stroke.color;
-				layer.arc(0,0,innerRadius,0,Math.PI*2,false);
-				layer.stroke();
-				layer.closePath();
-				layer.restore();
-				// TODO: add extra shadow inside hole (with a mask) if the pie is tilted.
-			}
-		}
-		
-		//-- Additional Interactive related functions --
-		
-		function isPointInPoly(poly, pt)
-		{
-			for(var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)
-				((poly[i][1] <= pt[1] && pt[1] < poly[j][1]) || (poly[j][1] <= pt[1] && pt[1]< poly[i][1]))
-				&& (pt[0] < (poly[j][0] - poly[i][0]) * (pt[1] - poly[i][1]) / (poly[j][1] - poly[i][1]) + poly[i][0])
-				&& (c = !c);
-			return c;
-		}
-		
-		function findNearbySlice(mouseX, mouseY)
-		{
-			var slices = plot.getData(),
-				options = plot.getOptions(),
-				radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-			
-			for (var i = 0; i < slices.length; ++i) 
-			{
-				var s = slices[i];	
-				
-				if(s.pie.show)
-				{
-					ctx.save();
-					ctx.beginPath();
-					ctx.moveTo(0,0); // Center of the pie
-					//ctx.scale(1, options.series.pie.tilt);	// this actually seems to break everything when here.
-					ctx.arc(0,0,radius,s.startAngle,s.startAngle+s.angle,false);
-					ctx.closePath();
-					x = mouseX-centerLeft;
-					y = mouseY-centerTop;
-					if(ctx.isPointInPath)
-					{
-						if (ctx.isPointInPath(mouseX-centerLeft, mouseY-centerTop))
-						{
-							//alert('found slice!');
-							ctx.restore();
-							return {datapoint: [s.percent, s.data], dataIndex: 0, series: s, seriesIndex: i};
-						}
-					}
-					else
-					{
-						// excanvas for IE doesn;t support isPointInPath, this is a workaround. 
-						p1X = (radius * Math.cos(s.startAngle));
-						p1Y = (radius * Math.sin(s.startAngle));
-						p2X = (radius * Math.cos(s.startAngle+(s.angle/4)));
-						p2Y = (radius * Math.sin(s.startAngle+(s.angle/4)));
-						p3X = (radius * Math.cos(s.startAngle+(s.angle/2)));
-						p3Y = (radius * Math.sin(s.startAngle+(s.angle/2)));
-						p4X = (radius * Math.cos(s.startAngle+(s.angle/1.5)));
-						p4Y = (radius * Math.sin(s.startAngle+(s.angle/1.5)));
-						p5X = (radius * Math.cos(s.startAngle+s.angle));
-						p5Y = (radius * Math.sin(s.startAngle+s.angle));
-						arrPoly = [[0,0],[p1X,p1Y],[p2X,p2Y],[p3X,p3Y],[p4X,p4Y],[p5X,p5Y]];
-						arrPoint = [x,y];
-						// TODO: perhaps do some mathmatical trickery here with the Y-coordinate to compensate for pie tilt?
-						if(isPointInPoly(arrPoly, arrPoint))
-						{
-							ctx.restore();
-							return {datapoint: [s.percent, s.data], dataIndex: 0, series: s, seriesIndex: i};
-						}			
-					}
-					ctx.restore();
-				}
-			}
-			
-			return null;
-		}
-
-		function onMouseMove(e) 
-		{
-			triggerClickHoverEvent('plothover', e);
-		}
-		
-        function onClick(e) 
-		{
-			triggerClickHoverEvent('plotclick', e);
-        }
-
-		// trigger click or hover event (they send the same parameters so we share their code)
-		function triggerClickHoverEvent(eventname, e) 
-		{
-			var offset = plot.offset(),
-				canvasX = parseInt(e.pageX - offset.left),
-				canvasY =  parseInt(e.pageY - offset.top),
-				item = findNearbySlice(canvasX, canvasY);
-			
-			if (options.grid.autoHighlight) 
-			{
-				// clear auto-highlights
-				for (var i = 0; i < highlights.length; ++i) 
-				{
-					var h = highlights[i];
-					if (h.auto == eventname && !(item && h.series == item.series))
-						unhighlight(h.series);
-				}
-			}
-			
-			// highlight the slice
-			if (item) 
-			    highlight(item.series, eventname);
-				
-			// trigger any hover bind events
-			var pos = { pageX: e.pageX, pageY: e.pageY };
-			target.trigger(eventname, [ pos, item ]);	
-		}
-
-		function highlight(s, auto) 
-		{
-			if (typeof s == "number")
-				s = series[s];
-
-			var i = indexOfHighlight(s);
-			if (i == -1) 
-			{
-				highlights.push({ series: s, auto: auto });
-				plot.triggerRedrawOverlay();
-			}
-			else if (!auto)
-				highlights[i].auto = false;
-		}
-
-		function unhighlight(s) 
-		{
-			if (s == null) 
-			{
-				highlights = [];
-				plot.triggerRedrawOverlay();
-			}
-			
-			if (typeof s == "number")
-				s = series[s];
-
-			var i = indexOfHighlight(s);
-			if (i != -1) 
-			{
-				highlights.splice(i, 1);
-				plot.triggerRedrawOverlay();
-			}
-		}
-
-		function indexOfHighlight(s) 
-		{
-			for (var i = 0; i < highlights.length; ++i) 
-			{
-				var h = highlights[i];
-				if (h.series == s)
-					return i;
-			}
-			return -1;
-		}
-
-		function drawOverlay(plot, octx) 
-		{
-			//alert(options.series.pie.radius);
-			var options = plot.getOptions();
-			//alert(options.series.pie.radius);
-			
-			var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
-			octx.save();
-			octx.translate(centerLeft, centerTop);
-			octx.scale(1, options.series.pie.tilt);
-			
-			for (i = 0; i < highlights.length; ++i) 
-				drawHighlight(highlights[i].series);
-			
-			drawDonutHole(octx);
-
-			octx.restore();
-
-			function drawHighlight(series) 
-			{
-				if (series.angle < 0) return;
-				
-				//octx.fillStyle = parseColor(options.series.pie.highlight.color).scale(null, null, null, options.series.pie.highlight.opacity).toString();
-				octx.fillStyle = "rgba(255, 255, 255, "+options.series.pie.highlight.opacity+")"; // this is temporary until we have access to parseColor
-				
-				octx.beginPath();
-				if (Math.abs(series.angle - Math.PI*2) > 0.000000001)
-					octx.moveTo(0,0); // Center of the pie
-				octx.arc(0,0,radius,series.startAngle,series.startAngle+series.angle,false);
-				octx.closePath();
-				octx.fill();
-			}
-			
-		}	
-		
-	} // end init (plugin body)
-	
-	// define pie specific options and their default values
-	var options = {
-		series: {
-			pie: {
-				show: false,
-				radius: 'auto',	// actual radius of the visible pie (based on full calculated radius if <=1, or hard pixel value)
-				innerRadius:0, /* for donut */
-				startAngle: 3/2,
-				tilt: 1,
-				offset: {
-					top: 0,
-					left: 'auto'
-				},
-				stroke: {
-					color: '#FFF',
-					width: 1
-				},
-				label: {
-					show: 'auto',
-					formatter: function(label, slice){
-						return '<div style="font-size:x-small;text-align:center;padding:2px;color:'+slice.color+';">'+label+'<br/>'+Math.round(slice.percent)+'%</div>';
-					},	// formatter function
-					radius: 1,	// radius at which to place the labels (based on full calculated radius if <=1, or hard pixel value)
-					background: {
-						color: null,
-						opacity: 0
-					},
-					threshold: 0	// percentage at which to hide the label (i.e. the slice is too narrow)
-				},
-				combine: {
-					threshold: -1,	// percentage at which to combine little slices into one larger slice
-					color: null,	// color to give the new slice (auto-generated if null)
-					label: 'Other'	// label to give the new slice
-				},
-				highlight: {
-					//color: '#FFF',		// will add this functionality once parseColor is available
-					opacity: 0.5
-				}
-			}
-		}
-	};
-    
-	$.plot.plugins.push({
-		init: init,
-		options: options,
-		name: "pie",
-		version: "1.0"
-	});
-})(jQuery);
+/* Flot plugin for rendering pie charts.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+The plugin assumes that each series has a single data value, and that each
+value is a positive integer or zero.  Negative numbers don't make sense for a
+pie chart, and have unpredictable results.  The values do NOT need to be
+passed in as percentages; the plugin will calculate the total and per-slice
+percentages internally.
+
+* Created by Brian Medendorp
+
+* Updated with contributions from btburnett3, Anthony Aragues and Xavi Ivars
+
+The plugin supports these options:
+
+	series: {
+		pie: {
+			show: true/false
+			radius: 0-1 for percentage of fullsize, or a specified pixel length, or 'auto'
+			innerRadius: 0-1 for percentage of fullsize or a specified pixel length, for creating a donut effect
+			startAngle: 0-2 factor of PI used for starting angle (in radians) i.e 3/2 starts at the top, 0 and 2 have the same result
+			tilt: 0-1 for percentage to tilt the pie, where 1 is no tilt, and 0 is completely flat (nothing will show)
+			offset: {
+				top: integer value to move the pie up or down
+				left: integer value to move the pie left or right, or 'auto'
+			},
+			stroke: {
+				color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#FFF')
+				width: integer pixel width of the stroke
+			},
+			label: {
+				show: true/false, or 'auto'
+				formatter:  a user-defined function that modifies the text/style of the label text
+				radius: 0-1 for percentage of fullsize, or a specified pixel length
+				background: {
+					color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#000')
+					opacity: 0-1
+				},
+				threshold: 0-1 for the percentage value at which to hide labels (if they're too small)
+			},
+			combine: {
+				threshold: 0-1 for the percentage value at which to combine slices (if they're too small)
+				color: any hexidecimal color value (other formats may or may not work, so best to stick with something like '#CCC'), if null, the plugin will automatically use the color of the first slice to be combined
+				label: any text value of what the combined slice should be labeled
+			}
+			highlight: {
+				opacity: 0-1
+			}
+		}
+	}
+
+More detail and specific examples can be found in the included HTML file.
+
+*/
+
+(function($) {
+
+	// Maximum redraw attempts when fitting labels within the plot
+
+	var REDRAW_ATTEMPTS = 10;
+
+	// Factor by which to shrink the pie when fitting labels within the plot
+
+	var REDRAW_SHRINK = 0.95;
+
+	function init(plot) {
+
+		var canvas = null,
+			target = null,
+			options = null,
+			maxRadius = null,
+			centerLeft = null,
+			centerTop = null,
+			processed = false,
+			ctx = null;
+
+		// interactive variables
+
+		var highlights = [];
+
+		// add hook to determine if pie plugin in enabled, and then perform necessary operations
+
+		plot.hooks.processOptions.push(function(plot, options) {
+			if (options.series.pie.show) {
+
+				options.grid.show = false;
+
+				// set labels.show
+
+				if (options.series.pie.label.show == "auto") {
+					if (options.legend.show) {
+						options.series.pie.label.show = false;
+					} else {
+						options.series.pie.label.show = true;
+					}
+				}
+
+				// set radius
+
+				if (options.series.pie.radius == "auto") {
+					if (options.series.pie.label.show) {
+						options.series.pie.radius = 3/4;
+					} else {
+						options.series.pie.radius = 1;
+					}
+				}
+
+				// ensure sane tilt
+
+				if (options.series.pie.tilt > 1) {
+					options.series.pie.tilt = 1;
+				} else if (options.series.pie.tilt < 0) {
+					options.series.pie.tilt = 0;
+				}
+			}
+		});
+
+		plot.hooks.bindEvents.push(function(plot, eventHolder) {
+			var options = plot.getOptions();
+			if (options.series.pie.show) {
+				if (options.grid.hoverable) {
+					eventHolder.unbind("mousemove").mousemove(onMouseMove);
+				}
+				if (options.grid.clickable) {
+					eventHolder.unbind("click").click(onClick);
+				}
+			}
+		});
+
+		plot.hooks.processDatapoints.push(function(plot, series, data, datapoints) {
+			var options = plot.getOptions();
+			if (options.series.pie.show) {
+				processDatapoints(plot, series, data, datapoints);
+			}
+		});
+
+		plot.hooks.drawOverlay.push(function(plot, octx) {
+			var options = plot.getOptions();
+			if (options.series.pie.show) {
+				drawOverlay(plot, octx);
+			}
+		});
+
+		plot.hooks.draw.push(function(plot, newCtx) {
+			var options = plot.getOptions();
+			if (options.series.pie.show) {
+				draw(plot, newCtx);
+			}
+		});
+
+		function processDatapoints(plot, series, datapoints) {
+			if (!processed)	{
+				processed = true;
+				canvas = plot.getCanvas();
+				target = $(canvas).parent();
+				options = plot.getOptions();
+				plot.setData(combine(plot.getData()));
+			}
+		}
+
+		function combine(data) {
+
+			var total = 0,
+				combined = 0,
+				numCombined = 0,
+				color = options.series.pie.combine.color,
+				newdata = [];
+
+			// Fix up the raw data from Flot, ensuring the data is numeric
+
+			for (var i = 0; i < data.length; ++i) {
+
+				var value = data[i].data;
+
+				// If the data is an array, we'll assume that it's a standard
+				// Flot x-y pair, and are concerned only with the second value.
+
+				// Note how we use the original array, rather than creating a
+				// new one; this is more efficient and preserves any extra data
+				// that the user may have stored in higher indexes.
+
+				if ($.isArray(value) && value.length == 1) {
+    				value = value[0];
+				}
+
+				if ($.isArray(value)) {
+					// Equivalent to $.isNumeric() but compatible with jQuery < 1.7
+					if (!isNaN(parseFloat(value[1])) && isFinite(value[1])) {
+						value[1] = +value[1];
+					} else {
+						value[1] = 0;
+					}
+				} else if (!isNaN(parseFloat(value)) && isFinite(value)) {
+					value = [1, +value];
+				} else {
+					value = [1, 0];
+				}
+
+				data[i].data = [value];
+			}
+
+			// Sum up all the slices, so we can calculate percentages for each
+
+			for (var i = 0; i < data.length; ++i) {
+				total += data[i].data[0][1];
+			}
+
+			// Count the number of slices with percentages below the combine
+			// threshold; if it turns out to be just one, we won't combine.
+
+			for (var i = 0; i < data.length; ++i) {
+				var value = data[i].data[0][1];
+				if (value / total <= options.series.pie.combine.threshold) {
+					combined += value;
+					numCombined++;
+					if (!color) {
+						color = data[i].color;
+					}
+				}
+			}
+
+			for (var i = 0; i < data.length; ++i) {
+				var value = data[i].data[0][1];
+				if (numCombined < 2 || value / total > options.series.pie.combine.threshold) {
+					newdata.push(
+						$.extend(data[i], {     /* extend to allow keeping all other original data values
+						                           and using them e.g. in labelFormatter. */
+							data: [[1, value]],
+							color: data[i].color,
+							label: data[i].label,
+							angle: value * Math.PI * 2 / total,
+							percent: value / (total / 100)
+						})
+					);
+				}
+			}
+
+			if (numCombined > 1) {
+				newdata.push({
+					data: [[1, combined]],
+					color: color,
+					label: options.series.pie.combine.label,
+					angle: combined * Math.PI * 2 / total,
+					percent: combined / (total / 100)
+				});
+			}
+
+			return newdata;
+		}
+
+		function draw(plot, newCtx) {
+
+			if (!target) {
+				return; // if no series were passed
+			}
+
+			var canvasWidth = plot.getPlaceholder().width(),
+				canvasHeight = plot.getPlaceholder().height(),
+				legendWidth = target.children().filter(".legend").children().width() || 0;
+
+			ctx = newCtx;
+
+			// WARNING: HACK! REWRITE THIS CODE AS SOON AS POSSIBLE!
+
+			// When combining smaller slices into an 'other' slice, we need to
+			// add a new series.  Since Flot gives plugins no way to modify the
+			// list of series, the pie plugin uses a hack where the first call
+			// to processDatapoints results in a call to setData with the new
+			// list of series, then subsequent processDatapoints do nothing.
+
+			// The plugin-global 'processed' flag is used to control this hack;
+			// it starts out false, and is set to true after the first call to
+			// processDatapoints.
+
+			// Unfortunately this turns future setData calls into no-ops; they
+			// call processDatapoints, the flag is true, and nothing happens.
+
+			// To fix this we'll set the flag back to false here in draw, when
+			// all series have been processed, so the next sequence of calls to
+			// processDatapoints once again starts out with a slice-combine.
+			// This is really a hack; in 0.9 we need to give plugins a proper
+			// way to modify series before any processing begins.
+
+			processed = false;
+
+			// calculate maximum radius and center point
+
+			maxRadius =  Math.min(canvasWidth, canvasHeight / options.series.pie.tilt) / 2;
+			centerTop = canvasHeight / 2 + options.series.pie.offset.top;
+			centerLeft = canvasWidth / 2;
+
+			if (options.series.pie.offset.left == "auto") {
+				if (options.legend.position.match("w")) {
+					centerLeft += legendWidth / 2;
+				} else {
+					centerLeft -= legendWidth / 2;
+				}
+				if (centerLeft < maxRadius) {
+					centerLeft = maxRadius;
+				} else if (centerLeft > canvasWidth - maxRadius) {
+					centerLeft = canvasWidth - maxRadius;
+				}
+			} else {
+				centerLeft += options.series.pie.offset.left;
+			}
+
+			var slices = plot.getData(),
+				attempts = 0;
+
+			// Keep shrinking the pie's radius until drawPie returns true,
+			// indicating that all the labels fit, or we try too many times.
+
+			do {
+				if (attempts > 0) {
+					maxRadius *= REDRAW_SHRINK;
+				}
+				attempts += 1;
+				clear();
+				if (options.series.pie.tilt <= 0.8) {
+					drawShadow();
+				}
+			} while (!drawPie() && attempts < REDRAW_ATTEMPTS)
+
+			if (attempts >= REDRAW_ATTEMPTS) {
+				clear();
+				target.prepend("<div class='error'>Could not draw pie with labels contained inside canvas</div>");
+			}
+
+			if (plot.setSeries && plot.insertLegend) {
+				plot.setSeries(slices);
+				plot.insertLegend();
+			}
+
+			// we're actually done at this point, just defining internal functions at this point
+
+			function clear() {
+				ctx.clearRect(0, 0, canvasWidth, canvasHeight);
+				target.children().filter(".pieLabel, .pieLabelBackground").remove();
+			}
+
+			function drawShadow() {
+
+				var shadowLeft = options.series.pie.shadow.left;
+				var shadowTop = options.series.pie.shadow.top;
+				var edge = 10;
+				var alpha = options.series.pie.shadow.alpha;
+				var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
+
+				if (radius >= canvasWidth / 2 - shadowLeft || radius * options.series.pie.tilt >= canvasHeight / 2 - shadowTop || radius <= edge) {
+					return;	// shadow would be outside canvas, so don't draw it
+				}
+
+				ctx.save();
+				ctx.translate(shadowLeft,shadowTop);
+				ctx.globalAlpha = alpha;
+				ctx.fillStyle = "#000";
+
+				// center and rotate to starting position
+
+				ctx.translate(centerLeft,centerTop);
+				ctx.scale(1, options.series.pie.tilt);
+
+				//radius -= edge;
+
+				for (var i = 1; i <= edge; i++) {
+					ctx.beginPath();
+					ctx.arc(0, 0, radius, 0, Math.PI * 2, false);
+					ctx.fill();
+					radius -= i;
+				}
+
+				ctx.restore();
+			}
+
+			function drawPie() {
+
+				var startAngle = Math.PI * options.series.pie.startAngle;
+				var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
+
+				// center and rotate to starting position
+
+				ctx.save();
+				ctx.translate(centerLeft,centerTop);
+				ctx.scale(1, options.series.pie.tilt);
+				//ctx.rotate(startAngle); // start at top; -- This doesn't work properly in Opera
+
+				// draw slices
+
+				ctx.save();
+				var currentAngle = startAngle;
+				for (var i = 0; i < slices.length; ++i) {
+					slices[i].startAngle = currentAngle;
+					drawSlice(slices[i].angle, slices[i].color, true);
+				}
+				ctx.restore();
+
+				// draw slice outlines
+
+				if (options.series.pie.stroke.width > 0) {
+					ctx.save();
+					ctx.lineWidth = options.series.pie.stroke.width;
+					currentAngle = startAngle;
+					for (var i = 0; i < slices.length; ++i) {
+						drawSlice(slices[i].angle, options.series.pie.stroke.color, false);
+					}
+					ctx.restore();
+				}
+
+				// draw donut hole
+
+				drawDonutHole(ctx);
+
+				ctx.restore();
+
+				// Draw the labels, returning true if they fit within the plot
+
+				if (options.series.pie.label.show) {
+					return drawLabels();
+				} else return true;
+
+				function drawSlice(angle, color, fill) {
+
+					if (angle <= 0 || isNaN(angle)) {
+						return;
+					}
+
+					if (fill) {
+						ctx.fillStyle = color;
+					} else {
+						ctx.strokeStyle = color;
+						ctx.lineJoin = "round";
+					}
+
+					ctx.beginPath();
+					if (Math.abs(angle - Math.PI * 2) > 0.000000001) {
+						ctx.moveTo(0, 0); // Center of the pie
+					}
+
+					//ctx.arc(0, 0, radius, 0, angle, false); // This doesn't work properly in Opera
+					ctx.arc(0, 0, radius,currentAngle, currentAngle + angle / 2, false);
+					ctx.arc(0, 0, radius,currentAngle + angle / 2, currentAngle + angle, false);
+					ctx.closePath();
+					//ctx.rotate(angle); // This doesn't work properly in Opera
+					currentAngle += angle;
+
+					if (fill) {
+						ctx.fill();
+					} else {
+						ctx.stroke();
+					}
+				}
+
+				function drawLabels() {
+
+					var currentAngle = startAngle;
+					var radius = options.series.pie.label.radius > 1 ? options.series.pie.label.radius : maxRadius * options.series.pie.label.radius;
+
+					for (var i = 0; i < slices.length; ++i) {
+						if (slices[i].percent >= options.series.pie.label.threshold * 100) {
+							if (!drawLabel(slices[i], currentAngle, i)) {
+								return false;
+							}
+						}
+						currentAngle += slices[i].angle;
+					}
+
+					return true;
+
+					function drawLabel(slice, startAngle, index) {
+
+						if (slice.data[0][1] == 0) {
+							return true;
+						}
+
+						// format label text
+
+						var lf = options.legend.labelFormatter, text, plf = options.series.pie.label.formatter;
+
+						if (lf) {
+							text = lf(slice.label, slice);
+						} else {
+							text = slice.label;
+						}
+
+						if (plf) {
+							text = plf(text, slice);
+						}
+
+						var halfAngle = ((startAngle + slice.angle) + startAngle) / 2;
+						var x = centerLeft + Math.round(Math.cos(halfAngle) * radius);
+						var y = centerTop + Math.round(Math.sin(halfAngle) * radius) * options.series.pie.tilt;
+
+						var html = "<span class='pieLabel' id='pieLabel" + index + "' style='position:absolute;top:" + y + "px;left:" + x + "px;'>" + text + "</span>";
+						target.append(html);
+
+						var label = target.children("#pieLabel" + index);
+						var labelTop = (y - label.height() / 2);
+						var labelLeft = (x - label.width() / 2);
+
+						label.css("top", labelTop);
+						label.css("left", labelLeft);
+
+						// check to make sure that the label is not outside the canvas
+
+						if (0 - labelTop > 0 || 0 - labelLeft > 0 || canvasHeight - (labelTop + label.height()) < 0 || canvasWidth - (labelLeft + label.width()) < 0) {
+							return false;
+						}
+
+						if (options.series.pie.label.background.opacity != 0) {
+
+							// put in the transparent background separately to avoid blended labels and label boxes
+
+							var c = options.series.pie.label.background.color;
+
+							if (c == null) {
+								c = slice.color;
+							}
+
+							var pos = "top:" + labelTop + "px;left:" + labelLeft + "px;";
+							$("<div class='pieLabelBackground' style='position:absolute;width:" + label.width() + "px;height:" + label.height() + "px;" + pos + "background-color:" + c + ";'></div>")
+								.css("opacity", options.series.pie.label.background.opacity)
+								.insertBefore(label);
+						}
+
+						return true;
+					} // end individual label function
+				} // end drawLabels function
+			} // end drawPie function
+		} // end draw function
+
+		// Placed here because it needs to be accessed from multiple locations
+
+		function drawDonutHole(layer) {
+			if (options.series.pie.innerRadius > 0) {
+
+				// subtract the center
+
+				layer.save();
+				var innerRadius = options.series.pie.innerRadius > 1 ? options.series.pie.innerRadius : maxRadius * options.series.pie.innerRadius;
+				layer.globalCompositeOperation = "destination-out"; // this does not work with excanvas, but it will fall back to using the stroke color
+				layer.beginPath();
+				layer.fillStyle = options.series.pie.stroke.color;
+				layer.arc(0, 0, innerRadius, 0, Math.PI * 2, false);
+				layer.fill();
+				layer.closePath();
+				layer.restore();
+
+				// add inner stroke
+
+				layer.save();
+				layer.beginPath();
+				layer.strokeStyle = options.series.pie.stroke.color;
+				layer.arc(0, 0, innerRadius, 0, Math.PI * 2, false);
+				layer.stroke();
+				layer.closePath();
+				layer.restore();
+
+				// TODO: add extra shadow inside hole (with a mask) if the pie is tilted.
+			}
+		}
+
+		//-- Additional Interactive related functions --
+
+		function isPointInPoly(poly, pt) {
+			for(var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)
+				((poly[i][1] <= pt[1] && pt[1] < poly[j][1]) || (poly[j][1] <= pt[1] && pt[1]< poly[i][1]))
+				&& (pt[0] < (poly[j][0] - poly[i][0]) * (pt[1] - poly[i][1]) / (poly[j][1] - poly[i][1]) + poly[i][0])
+				&& (c = !c);
+			return c;
+		}
+
+		function findNearbySlice(mouseX, mouseY) {
+
+			var slices = plot.getData(),
+				options = plot.getOptions(),
+				radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius,
+				x, y;
+
+			for (var i = 0; i < slices.length; ++i) {
+
+				var s = slices[i];
+
+				if (s.pie.show) {
+
+					ctx.save();
+					ctx.beginPath();
+					ctx.moveTo(0, 0); // Center of the pie
+					//ctx.scale(1, options.series.pie.tilt);	// this actually seems to break everything when here.
+					ctx.arc(0, 0, radius, s.startAngle, s.startAngle + s.angle / 2, false);
+					ctx.arc(0, 0, radius, s.startAngle + s.angle / 2, s.startAngle + s.angle, false);
+					ctx.closePath();
+					x = mouseX - centerLeft;
+					y = mouseY - centerTop;
+
+					if (ctx.isPointInPath) {
+						if (ctx.isPointInPath(mouseX - centerLeft, mouseY - centerTop)) {
+							ctx.restore();
+							return {
+								datapoint: [s.percent, s.data],
+								dataIndex: 0,
+								series: s,
+								seriesIndex: i
+							};
+						}
+					} else {
+
+						// excanvas for IE doesn;t support isPointInPath, this is a workaround.
+
+						var p1X = radius * Math.cos(s.startAngle),
+							p1Y = radius * Math.sin(s.startAngle),
+							p2X = radius * Math.cos(s.startAngle + s.angle / 4),
+							p2Y = radius * Math.sin(s.startAngle + s.angle / 4),
+							p3X = radius * Math.cos(s.startAngle + s.angle / 2),
+							p3Y = radius * Math.sin(s.startAngle + s.angle / 2),
+							p4X = radius * Math.cos(s.startAngle + s.angle / 1.5),
+							p4Y = radius * Math.sin(s.startAngle + s.angle / 1.5),
+							p5X = radius * Math.cos(s.startAngle + s.angle),
+							p5Y = radius * Math.sin(s.startAngle + s.angle),
+							arrPoly = [[0, 0], [p1X, p1Y], [p2X, p2Y], [p3X, p3Y], [p4X, p4Y], [p5X, p5Y]],
+							arrPoint = [x, y];
+
+						// TODO: perhaps do some mathmatical trickery here with the Y-coordinate to compensate for pie tilt?
+
+						if (isPointInPoly(arrPoly, arrPoint)) {
+							ctx.restore();
+							return {
+								datapoint: [s.percent, s.data],
+								dataIndex: 0,
+								series: s,
+								seriesIndex: i
+							};
+						}
+					}
+
+					ctx.restore();
+				}
+			}
+
+			return null;
+		}
+
+		function onMouseMove(e) {
+			triggerClickHoverEvent("plothover", e);
+		}
+
+		function onClick(e) {
+			triggerClickHoverEvent("plotclick", e);
+		}
+
+		// trigger click or hover event (they send the same parameters so we share their code)
+
+		function triggerClickHoverEvent(eventname, e) {
+
+			var offset = plot.offset();
+			var canvasX = parseInt(e.pageX - offset.left);
+			var canvasY =  parseInt(e.pageY - offset.top);
+			var item = findNearbySlice(canvasX, canvasY);
+
+			if (options.grid.autoHighlight) {
+
+				// clear auto-highlights
+
+				for (var i = 0; i < highlights.length; ++i) {
+					var h = highlights[i];
+					if (h.auto == eventname && !(item && h.series == item.series)) {
+						unhighlight(h.series);
+					}
+				}
+			}
+
+			// highlight the slice
+
+			if (item) {
+				highlight(item.series, eventname);
+			}
+
+			// trigger any hover bind events
+
+			var pos = { pageX: e.pageX, pageY: e.pageY };
+			target.trigger(eventname, [pos, item]);
+		}
+
+		function highlight(s, auto) {
+			//if (typeof s == "number") {
+			//	s = series[s];
+			//}
+
+			var i = indexOfHighlight(s);
+
+			if (i == -1) {
+				highlights.push({ series: s, auto: auto });
+				plot.triggerRedrawOverlay();
+			} else if (!auto) {
+				highlights[i].auto = false;
+			}
+		}
+
+		function unhighlight(s) {
+			if (s == null) {
+				highlights = [];
+				plot.triggerRedrawOverlay();
+			}
+
+			//if (typeof s == "number") {
+			//	s = series[s];
+			//}
+
+			var i = indexOfHighlight(s);
+
+			if (i != -1) {
+				highlights.splice(i, 1);
+				plot.triggerRedrawOverlay();
+			}
+		}
+
+		function indexOfHighlight(s) {
+			for (var i = 0; i < highlights.length; ++i) {
+				var h = highlights[i];
+				if (h.series == s)
+					return i;
+			}
+			return -1;
+		}
+
+		function drawOverlay(plot, octx) {
+
+			var options = plot.getOptions();
+
+			var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
+
+			octx.save();
+			octx.translate(centerLeft, centerTop);
+			octx.scale(1, options.series.pie.tilt);
+
+			for (var i = 0; i < highlights.length; ++i) {
+				drawHighlight(highlights[i].series);
+			}
+
+			drawDonutHole(octx);
+
+			octx.restore();
+
+			function drawHighlight(series) {
+
+				if (series.angle <= 0 || isNaN(series.angle)) {
+					return;
+				}
+
+				//octx.fillStyle = parseColor(options.series.pie.highlight.color).scale(null, null, null, options.series.pie.highlight.opacity).toString();
+				octx.fillStyle = "rgba(255, 255, 255, " + options.series.pie.highlight.opacity + ")"; // this is temporary until we have access to parseColor
+				octx.beginPath();
+				if (Math.abs(series.angle - Math.PI * 2) > 0.000000001) {
+					octx.moveTo(0, 0); // Center of the pie
+				}
+				octx.arc(0, 0, radius, series.startAngle, series.startAngle + series.angle / 2, false);
+				octx.arc(0, 0, radius, series.startAngle + series.angle / 2, series.startAngle + series.angle, false);
+				octx.closePath();
+				octx.fill();
+			}
+		}
+	} // end init (plugin body)
+
+	// define pie specific options and their default values
+
+	var options = {
+		series: {
+			pie: {
+				show: false,
+				radius: "auto",	// actual radius of the visible pie (based on full calculated radius if <=1, or hard pixel value)
+				innerRadius: 0, /* for donut */
+				startAngle: 3/2,
+				tilt: 1,
+				shadow: {
+					left: 5,	// shadow left offset
+					top: 15,	// shadow top offset
+					alpha: 0.02	// shadow alpha
+				},
+				offset: {
+					top: 0,
+					left: "auto"
+				},
+				stroke: {
+					color: "#fff",
+					width: 1
+				},
+				label: {
+					show: "auto",
+					formatter: function(label, slice) {
+						return "<div style='font-size:x-small;text-align:center;padding:2px;color:" + slice.color + ";'>" + label + "<br/>" + Math.round(slice.percent) + "%</div>";
+					},	// formatter function
+					radius: 1,	// radius at which to place the labels (based on full calculated radius if <=1, or hard pixel value)
+					background: {
+						color: null,
+						opacity: 0
+					},
+					threshold: 0	// percentage at which to hide the label (i.e. the slice is too narrow)
+				},
+				combine: {
+					threshold: -1,	// percentage at which to combine little slices into one larger slice
+					color: null,	// color to give the new slice (auto-generated if null)
+					label: "Other"	// label to give the new slice
+				},
+				highlight: {
+					//color: "#fff",		// will add this functionality once parseColor is available
+					opacity: 0.5
+				}
+			}
+		}
+	};
+
+	$.plot.plugins.push({
+		init: init,
+		options: options,
+		name: "pie",
+		version: "1.1"
+	});
+
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.pie.min.js b/pandora_console/include/graphs/flot/jquery.flot.pie.min.js
new file mode 100644
index 0000000000..9bc488b154
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.pie.min.js
@@ -0,0 +1,7 @@
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){var REDRAW_ATTEMPTS=10;var REDRAW_SHRINK=.95;function init(plot){var canvas=null,target=null,options=null,maxRadius=null,centerLeft=null,centerTop=null,processed=false,ctx=null;var highlights=[];plot.hooks.processOptions.push(function(plot,options){if(options.series.pie.show){options.grid.show=false;if(options.series.pie.label.show=="auto"){if(options.legend.show){options.series.pie.label.show=false}else{options.series.pie.label.show=true}}if(options.series.pie.radius=="auto"){if(options.series.pie.label.show){options.series.pie.radius=3/4}else{options.series.pie.radius=1}}if(options.series.pie.tilt>1){options.series.pie.tilt=1}else if(options.series.pie.tilt<0){options.series.pie.tilt=0}}});plot.hooks.bindEvents.push(function(plot,eventHolder){var options=plot.getOptions();if(options.series.pie.show){if(options.grid.hoverable){eventHolder.unbind("mousemove").mousemove(onMouseMove)}if(options.grid.clickable){eventHolder.unbind("click").click(onClick)}}});plot.hooks.processDatapoints.push(function(plot,series,data,datapoints){var options=plot.getOptions();if(options.series.pie.show){processDatapoints(plot,series,data,datapoints)}});plot.hooks.drawOverlay.push(function(plot,octx){var options=plot.getOptions();if(options.series.pie.show){drawOverlay(plot,octx)}});plot.hooks.draw.push(function(plot,newCtx){var options=plot.getOptions();if(options.series.pie.show){draw(plot,newCtx)}});function processDatapoints(plot,series,datapoints){if(!processed){processed=true;canvas=plot.getCanvas();target=$(canvas).parent();options=plot.getOptions();plot.setData(combine(plot.getData()))}}function combine(data){var total=0,combined=0,numCombined=0,color=options.series.pie.combine.color,newdata=[];for(var i=0;i<data.length;++i){var value=data[i].data;if($.isArray(value)&&value.length==1){value=value[0]}if($.isArray(value)){if(!isNaN(parseFloat(value[1]))&&isFinite(value[1])){value[1]=+value[1]}else{value[1]=0}}else if(!isNaN(parseFloat(value))&&isFinite(value)){value=[1,+value]}else{value=[1,0]}data[i].data=[value]}for(var i=0;i<data.length;++i){total+=data[i].data[0][1]}for(var i=0;i<data.length;++i){var value=data[i].data[0][1];if(value/total<=options.series.pie.combine.threshold){combined+=value;numCombined++;if(!color){color=data[i].color}}}for(var i=0;i<data.length;++i){var value=data[i].data[0][1];if(numCombined<2||value/total>options.series.pie.combine.threshold){newdata.push($.extend(data[i],{data:[[1,value]],color:data[i].color,label:data[i].label,angle:value*Math.PI*2/total,percent:value/(total/100)}))}}if(numCombined>1){newdata.push({data:[[1,combined]],color:color,label:options.series.pie.combine.label,angle:combined*Math.PI*2/total,percent:combined/(total/100)})}return newdata}function draw(plot,newCtx){if(!target){return}var canvasWidth=plot.getPlaceholder().width(),canvasHeight=plot.getPlaceholder().height(),legendWidth=target.children().filter(".legend").children().width()||0;ctx=newCtx;processed=false;maxRadius=Math.min(canvasWidth,canvasHeight/options.series.pie.tilt)/2;centerTop=canvasHeight/2+options.series.pie.offset.top;centerLeft=canvasWidth/2;if(options.series.pie.offset.left=="auto"){if(options.legend.position.match("w")){centerLeft+=legendWidth/2}else{centerLeft-=legendWidth/2}if(centerLeft<maxRadius){centerLeft=maxRadius}else if(centerLeft>canvasWidth-maxRadius){centerLeft=canvasWidth-maxRadius}}else{centerLeft+=options.series.pie.offset.left}var slices=plot.getData(),attempts=0;do{if(attempts>0){maxRadius*=REDRAW_SHRINK}attempts+=1;clear();if(options.series.pie.tilt<=.8){drawShadow()}}while(!drawPie()&&attempts<REDRAW_ATTEMPTS);if(attempts>=REDRAW_ATTEMPTS){clear();target.prepend("<div class='error'>Could not draw pie with labels contained inside canvas</div>")}if(plot.setSeries&&plot.insertLegend){plot.setSeries(slices);plot.insertLegend()}function clear(){ctx.clearRect(0,0,canvasWidth,canvasHeight);target.children().filter(".pieLabel, .pieLabelBackground").remove()}function drawShadow(){var shadowLeft=options.series.pie.shadow.left;var shadowTop=options.series.pie.shadow.top;var edge=10;var alpha=options.series.pie.shadow.alpha;var radius=options.series.pie.radius>1?options.series.pie.radius:maxRadius*options.series.pie.radius;if(radius>=canvasWidth/2-shadowLeft||radius*options.series.pie.tilt>=canvasHeight/2-shadowTop||radius<=edge){return}ctx.save();ctx.translate(shadowLeft,shadowTop);ctx.globalAlpha=alpha;ctx.fillStyle="#000";ctx.translate(centerLeft,centerTop);ctx.scale(1,options.series.pie.tilt);for(var i=1;i<=edge;i++){ctx.beginPath();ctx.arc(0,0,radius,0,Math.PI*2,false);ctx.fill();radius-=i}ctx.restore()}function drawPie(){var startAngle=Math.PI*options.series.pie.startAngle;var radius=options.series.pie.radius>1?options.series.pie.radius:maxRadius*options.series.pie.radius;ctx.save();ctx.translate(centerLeft,centerTop);ctx.scale(1,options.series.pie.tilt);ctx.save();var currentAngle=startAngle;for(var i=0;i<slices.length;++i){slices[i].startAngle=currentAngle;drawSlice(slices[i].angle,slices[i].color,true)}ctx.restore();if(options.series.pie.stroke.width>0){ctx.save();ctx.lineWidth=options.series.pie.stroke.width;currentAngle=startAngle;for(var i=0;i<slices.length;++i){drawSlice(slices[i].angle,options.series.pie.stroke.color,false)}ctx.restore()}drawDonutHole(ctx);ctx.restore();if(options.series.pie.label.show){return drawLabels()}else return true;function drawSlice(angle,color,fill){if(angle<=0||isNaN(angle)){return}if(fill){ctx.fillStyle=color}else{ctx.strokeStyle=color;ctx.lineJoin="round"}ctx.beginPath();if(Math.abs(angle-Math.PI*2)>1e-9){ctx.moveTo(0,0)}ctx.arc(0,0,radius,currentAngle,currentAngle+angle/2,false);ctx.arc(0,0,radius,currentAngle+angle/2,currentAngle+angle,false);ctx.closePath();currentAngle+=angle;if(fill){ctx.fill()}else{ctx.stroke()}}function drawLabels(){var currentAngle=startAngle;var radius=options.series.pie.label.radius>1?options.series.pie.label.radius:maxRadius*options.series.pie.label.radius;for(var i=0;i<slices.length;++i){if(slices[i].percent>=options.series.pie.label.threshold*100){if(!drawLabel(slices[i],currentAngle,i)){return false}}currentAngle+=slices[i].angle}return true;function drawLabel(slice,startAngle,index){if(slice.data[0][1]==0){return true}var lf=options.legend.labelFormatter,text,plf=options.series.pie.label.formatter;if(lf){text=lf(slice.label,slice)}else{text=slice.label}if(plf){text=plf(text,slice)}var halfAngle=(startAngle+slice.angle+startAngle)/2;var x=centerLeft+Math.round(Math.cos(halfAngle)*radius);var y=centerTop+Math.round(Math.sin(halfAngle)*radius)*options.series.pie.tilt;var html="<span class='pieLabel' id='pieLabel"+index+"' style='position:absolute;top:"+y+"px;left:"+x+"px;'>"+text+"</span>";target.append(html);var label=target.children("#pieLabel"+index);var labelTop=y-label.height()/2;var labelLeft=x-label.width()/2;label.css("top",labelTop);label.css("left",labelLeft);if(0-labelTop>0||0-labelLeft>0||canvasHeight-(labelTop+label.height())<0||canvasWidth-(labelLeft+label.width())<0){return false}if(options.series.pie.label.background.opacity!=0){var c=options.series.pie.label.background.color;if(c==null){c=slice.color}var pos="top:"+labelTop+"px;left:"+labelLeft+"px;";$("<div class='pieLabelBackground' style='position:absolute;width:"+label.width()+"px;height:"+label.height()+"px;"+pos+"background-color:"+c+";'></div>").css("opacity",options.series.pie.label.background.opacity).insertBefore(label)}return true}}}}function drawDonutHole(layer){if(options.series.pie.innerRadius>0){layer.save();var innerRadius=options.series.pie.innerRadius>1?options.series.pie.innerRadius:maxRadius*options.series.pie.innerRadius;layer.globalCompositeOperation="destination-out";layer.beginPath();layer.fillStyle=options.series.pie.stroke.color;layer.arc(0,0,innerRadius,0,Math.PI*2,false);layer.fill();layer.closePath();layer.restore();layer.save();layer.beginPath();layer.strokeStyle=options.series.pie.stroke.color;layer.arc(0,0,innerRadius,0,Math.PI*2,false);layer.stroke();layer.closePath();layer.restore()}}function isPointInPoly(poly,pt){for(var c=false,i=-1,l=poly.length,j=l-1;++i<l;j=i)(poly[i][1]<=pt[1]&&pt[1]<poly[j][1]||poly[j][1]<=pt[1]&&pt[1]<poly[i][1])&&pt[0]<(poly[j][0]-poly[i][0])*(pt[1]-poly[i][1])/(poly[j][1]-poly[i][1])+poly[i][0]&&(c=!c);return c}function findNearbySlice(mouseX,mouseY){var slices=plot.getData(),options=plot.getOptions(),radius=options.series.pie.radius>1?options.series.pie.radius:maxRadius*options.series.pie.radius,x,y;for(var i=0;i<slices.length;++i){var s=slices[i];if(s.pie.show){ctx.save();ctx.beginPath();ctx.moveTo(0,0);ctx.arc(0,0,radius,s.startAngle,s.startAngle+s.angle/2,false);ctx.arc(0,0,radius,s.startAngle+s.angle/2,s.startAngle+s.angle,false);ctx.closePath();x=mouseX-centerLeft;y=mouseY-centerTop;if(ctx.isPointInPath){if(ctx.isPointInPath(mouseX-centerLeft,mouseY-centerTop)){ctx.restore();return{datapoint:[s.percent,s.data],dataIndex:0,series:s,seriesIndex:i}}}else{var p1X=radius*Math.cos(s.startAngle),p1Y=radius*Math.sin(s.startAngle),p2X=radius*Math.cos(s.startAngle+s.angle/4),p2Y=radius*Math.sin(s.startAngle+s.angle/4),p3X=radius*Math.cos(s.startAngle+s.angle/2),p3Y=radius*Math.sin(s.startAngle+s.angle/2),p4X=radius*Math.cos(s.startAngle+s.angle/1.5),p4Y=radius*Math.sin(s.startAngle+s.angle/1.5),p5X=radius*Math.cos(s.startAngle+s.angle),p5Y=radius*Math.sin(s.startAngle+s.angle),arrPoly=[[0,0],[p1X,p1Y],[p2X,p2Y],[p3X,p3Y],[p4X,p4Y],[p5X,p5Y]],arrPoint=[x,y];if(isPointInPoly(arrPoly,arrPoint)){ctx.restore();return{datapoint:[s.percent,s.data],dataIndex:0,series:s,seriesIndex:i}}}ctx.restore()}}return null}function onMouseMove(e){triggerClickHoverEvent("plothover",e)}function onClick(e){triggerClickHoverEvent("plotclick",e)}function triggerClickHoverEvent(eventname,e){var offset=plot.offset();var canvasX=parseInt(e.pageX-offset.left);var canvasY=parseInt(e.pageY-offset.top);var item=findNearbySlice(canvasX,canvasY);if(options.grid.autoHighlight){for(var i=0;i<highlights.length;++i){var h=highlights[i];if(h.auto==eventname&&!(item&&h.series==item.series)){unhighlight(h.series)}}}if(item){highlight(item.series,eventname)}var pos={pageX:e.pageX,pageY:e.pageY};target.trigger(eventname,[pos,item])}function highlight(s,auto){var i=indexOfHighlight(s);if(i==-1){highlights.push({series:s,auto:auto});plot.triggerRedrawOverlay()}else if(!auto){highlights[i].auto=false}}function unhighlight(s){if(s==null){highlights=[];plot.triggerRedrawOverlay()}var i=indexOfHighlight(s);if(i!=-1){highlights.splice(i,1);plot.triggerRedrawOverlay()}}function indexOfHighlight(s){for(var i=0;i<highlights.length;++i){var h=highlights[i];if(h.series==s)return i}return-1}function drawOverlay(plot,octx){var options=plot.getOptions();var radius=options.series.pie.radius>1?options.series.pie.radius:maxRadius*options.series.pie.radius;octx.save();octx.translate(centerLeft,centerTop);octx.scale(1,options.series.pie.tilt);for(var i=0;i<highlights.length;++i){drawHighlight(highlights[i].series)}drawDonutHole(octx);octx.restore();function drawHighlight(series){if(series.angle<=0||isNaN(series.angle)){return}octx.fillStyle="rgba(255, 255, 255, "+options.series.pie.highlight.opacity+")";octx.beginPath();if(Math.abs(series.angle-Math.PI*2)>1e-9){octx.moveTo(0,0)}octx.arc(0,0,radius,series.startAngle,series.startAngle+series.angle/2,false);octx.arc(0,0,radius,series.startAngle+series.angle/2,series.startAngle+series.angle,false);octx.closePath();octx.fill()}}}var options={series:{pie:{show:false,radius:"auto",innerRadius:0,startAngle:3/2,tilt:1,shadow:{left:5,top:15,alpha:.02},offset:{top:0,left:"auto"},stroke:{color:"#fff",width:1},label:{show:"auto",formatter:function(label,slice){return"<div style='font-size:x-small;text-align:center;padding:2px;color:"+slice.color+";'>"+label+"<br/>"+Math.round(slice.percent)+"%</div>"},radius:1,background:{color:null,opacity:0},threshold:0},combine:{threshold:-1,color:null,label:"Other"},highlight:{opacity:.5}}}};$.plot.plugins.push({init:init,options:options,name:"pie",version:"1.1"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.resize.js b/pandora_console/include/graphs/flot/jquery.flot.resize.js
new file mode 100644
index 0000000000..8a626dda0a
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.resize.js
@@ -0,0 +1,59 @@
+/* Flot plugin for automatically redrawing plots as the placeholder resizes.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+It works by listening for changes on the placeholder div (through the jQuery
+resize event plugin) - if the size changes, it will redraw the plot.
+
+There are no options. If you need to disable the plugin for some plots, you
+can just fix the size of their placeholders.
+
+*/
+
+/* Inline dependency:
+ * jQuery resize event - v1.1 - 3/14/2010
+ * http://benalman.com/projects/jquery-resize-plugin/
+ *
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,e,t){"$:nomunge";var i=[],n=$.resize=$.extend($.resize,{}),a,r=false,s="setTimeout",u="resize",m=u+"-special-event",o="pendingDelay",l="activeDelay",f="throttleWindow";n[o]=200;n[l]=20;n[f]=true;$.event.special[u]={setup:function(){if(!n[f]&&this[s]){return false}var e=$(this);i.push(this);e.data(m,{w:e.width(),h:e.height()});if(i.length===1){a=t;h()}},teardown:function(){if(!n[f]&&this[s]){return false}var e=$(this);for(var t=i.length-1;t>=0;t--){if(i[t]==this){i.splice(t,1);break}}e.removeData(m);if(!i.length){if(r){cancelAnimationFrame(a)}else{clearTimeout(a)}a=null}},add:function(e){if(!n[f]&&this[s]){return false}var i;function a(e,n,a){var r=$(this),s=r.data(m)||{};s.w=n!==t?n:r.width();s.h=a!==t?a:r.height();i.apply(this,arguments)}if($.isFunction(e)){i=e;return a}else{i=e.handler;e.handler=a}}};function h(t){if(r===true){r=t||1}for(var s=i.length-1;s>=0;s--){var l=$(i[s]);if(l[0]==e||l.is(":visible")){var f=l.width(),c=l.height(),d=l.data(m);if(d&&(f!==d.w||c!==d.h)){l.trigger(u,[d.w=f,d.h=c]);r=t||true}}else{d=l.data(m);d.w=0;d.h=0}}if(a!==null){if(r&&(t==null||t-r<1e3)){a=e.requestAnimationFrame(h)}else{a=setTimeout(h,n[o]);r=false}}}if(!e.requestAnimationFrame){e.requestAnimationFrame=function(){return e.webkitRequestAnimationFrame||e.mozRequestAnimationFrame||e.oRequestAnimationFrame||e.msRequestAnimationFrame||function(t,i){return e.setTimeout(function(){t((new Date).getTime())},n[l])}}()}if(!e.cancelAnimationFrame){e.cancelAnimationFrame=function(){return e.webkitCancelRequestAnimationFrame||e.mozCancelRequestAnimationFrame||e.oCancelRequestAnimationFrame||e.msCancelRequestAnimationFrame||clearTimeout}()}})(jQuery,this);
+
+(function ($) {
+    var options = { }; // no options
+
+    function init(plot) {
+        function onResize() {
+            var placeholder = plot.getPlaceholder();
+
+            // somebody might have hidden us and we can't plot
+            // when we don't have the dimensions
+            if (placeholder.width() == 0 || placeholder.height() == 0)
+                return;
+
+            plot.resize();
+            plot.setupGrid();
+            plot.draw();
+        }
+        
+        function bindEvents(plot, eventHolder) {
+            plot.getPlaceholder().resize(onResize);
+        }
+
+        function shutdown(plot, eventHolder) {
+            plot.getPlaceholder().unbind("resize", onResize);
+        }
+        
+        plot.hooks.bindEvents.push(bindEvents);
+        plot.hooks.shutdown.push(shutdown);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'resize',
+        version: '1.0'
+    });
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.resize.min.js b/pandora_console/include/graphs/flot/jquery.flot.resize.min.js
index 1fa0771f57..7e92aa681c 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.resize.min.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.resize.min.js
@@ -1 +1,7 @@
-(function(n,p,u){var w=n([]),s=n.resize=n.extend(n.resize,{}),o,l="setTimeout",m="resize",t=m+"-special-event",v="delay",r="throttleWindow";s[v]=250;s[r]=true;n.event.special[m]={setup:function(){if(!s[r]&&this[l]){return false}var a=n(this);w=w.add(a);n.data(this,t,{w:a.width(),h:a.height()});if(w.length===1){q()}},teardown:function(){if(!s[r]&&this[l]){return false}var a=n(this);w=w.not(a);a.removeData(t);if(!w.length){clearTimeout(o)}},add:function(b){if(!s[r]&&this[l]){return false}var c;function a(d,h,g){var f=n(this),e=n.data(this,t);e.w=h!==u?h:f.width();e.h=g!==u?g:f.height();c.apply(this,arguments)}if(n.isFunction(b)){c=b;return a}else{c=b.handler;b.handler=a}}};function q(){o=p[l](function(){w.each(function(){var d=n(this),a=d.width(),b=d.height(),c=n.data(this,t);if(a!==c.w||b!==c.h){d.trigger(m,[c.w=a,c.h=b])}});q()},s[v])}})(jQuery,this);(function(b){var a={};function c(f){function e(){var h=f.getPlaceholder();if(h.width()==0||h.height()==0){return}f.resize();f.setupGrid();f.draw()}function g(i,h){i.getPlaceholder().resize(e)}function d(i,h){i.getPlaceholder().unbind("resize",e)}f.hooks.bindEvents.push(g);f.hooks.shutdown.push(d)}b.plot.plugins.push({init:c,options:a,name:"resize",version:"1.0"})})(jQuery);
\ No newline at end of file
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($,e,t){"$:nomunge";var i=[],n=$.resize=$.extend($.resize,{}),a,r=false,s="setTimeout",u="resize",m=u+"-special-event",o="pendingDelay",l="activeDelay",f="throttleWindow";n[o]=200;n[l]=20;n[f]=true;$.event.special[u]={setup:function(){if(!n[f]&&this[s]){return false}var e=$(this);i.push(this);e.data(m,{w:e.width(),h:e.height()});if(i.length===1){a=t;h()}},teardown:function(){if(!n[f]&&this[s]){return false}var e=$(this);for(var t=i.length-1;t>=0;t--){if(i[t]==this){i.splice(t,1);break}}e.removeData(m);if(!i.length){if(r){cancelAnimationFrame(a)}else{clearTimeout(a)}a=null}},add:function(e){if(!n[f]&&this[s]){return false}var i;function a(e,n,a){var r=$(this),s=r.data(m)||{};s.w=n!==t?n:r.width();s.h=a!==t?a:r.height();i.apply(this,arguments)}if($.isFunction(e)){i=e;return a}else{i=e.handler;e.handler=a}}};function h(t){if(r===true){r=t||1}for(var s=i.length-1;s>=0;s--){var l=$(i[s]);if(l[0]==e||l.is(":visible")){var f=l.width(),c=l.height(),d=l.data(m);if(d&&(f!==d.w||c!==d.h)){l.trigger(u,[d.w=f,d.h=c]);r=t||true}}else{d=l.data(m);d.w=0;d.h=0}}if(a!==null){if(r&&(t==null||t-r<1e3)){a=e.requestAnimationFrame(h)}else{a=setTimeout(h,n[o]);r=false}}}if(!e.requestAnimationFrame){e.requestAnimationFrame=function(){return e.webkitRequestAnimationFrame||e.mozRequestAnimationFrame||e.oRequestAnimationFrame||e.msRequestAnimationFrame||function(t,i){return e.setTimeout(function(){t((new Date).getTime())},n[l])}}()}if(!e.cancelAnimationFrame){e.cancelAnimationFrame=function(){return e.webkitCancelRequestAnimationFrame||e.mozCancelRequestAnimationFrame||e.oCancelRequestAnimationFrame||e.msCancelRequestAnimationFrame||clearTimeout}()}})(jQuery,this);(function($){var options={};function init(plot){function onResize(){var placeholder=plot.getPlaceholder();if(placeholder.width()==0||placeholder.height()==0)return;plot.resize();plot.setupGrid();plot.draw()}function bindEvents(plot,eventHolder){plot.getPlaceholder().resize(onResize)}function shutdown(plot,eventHolder){plot.getPlaceholder().unbind("resize",onResize)}plot.hooks.bindEvents.push(bindEvents);plot.hooks.shutdown.push(shutdown)}$.plot.plugins.push({init:init,options:options,name:"resize",version:"1.0"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.selection.js b/pandora_console/include/graphs/flot/jquery.flot.selection.js
new file mode 100644
index 0000000000..d3c20fa4e1
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.selection.js
@@ -0,0 +1,360 @@
+/* Flot plugin for selecting regions of a plot.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+The plugin supports these options:
+
+selection: {
+	mode: null or "x" or "y" or "xy",
+	color: color,
+	shape: "round" or "miter" or "bevel",
+	minSize: number of pixels
+}
+
+Selection support is enabled by setting the mode to one of "x", "y" or "xy".
+In "x" mode, the user will only be able to specify the x range, similarly for
+"y" mode. For "xy", the selection becomes a rectangle where both ranges can be
+specified. "color" is color of the selection (if you need to change the color
+later on, you can get to it with plot.getOptions().selection.color). "shape"
+is the shape of the corners of the selection.
+
+"minSize" is the minimum size a selection can be in pixels. This value can
+be customized to determine the smallest size a selection can be and still
+have the selection rectangle be displayed. When customizing this value, the
+fact that it refers to pixels, not axis units must be taken into account.
+Thus, for example, if there is a bar graph in time mode with BarWidth set to 1
+minute, setting "minSize" to 1 will not make the minimum selection size 1
+minute, but rather 1 pixel. Note also that setting "minSize" to 0 will prevent
+"plotunselected" events from being fired when the user clicks the mouse without
+dragging.
+
+When selection support is enabled, a "plotselected" event will be emitted on
+the DOM element you passed into the plot function. The event handler gets a
+parameter with the ranges selected on the axes, like this:
+
+	placeholder.bind( "plotselected", function( event, ranges ) {
+		alert("You selected " + ranges.xaxis.from + " to " + ranges.xaxis.to)
+		// similar for yaxis - with multiple axes, the extra ones are in
+		// x2axis, x3axis, ...
+	});
+
+The "plotselected" event is only fired when the user has finished making the
+selection. A "plotselecting" event is fired during the process with the same
+parameters as the "plotselected" event, in case you want to know what's
+happening while it's happening,
+
+A "plotunselected" event with no arguments is emitted when the user clicks the
+mouse to remove the selection. As stated above, setting "minSize" to 0 will
+destroy this behavior.
+
+The plugin allso adds the following methods to the plot object:
+
+- setSelection( ranges, preventEvent )
+
+  Set the selection rectangle. The passed in ranges is on the same form as
+  returned in the "plotselected" event. If the selection mode is "x", you
+  should put in either an xaxis range, if the mode is "y" you need to put in
+  an yaxis range and both xaxis and yaxis if the selection mode is "xy", like
+  this:
+
+	setSelection({ xaxis: { from: 0, to: 10 }, yaxis: { from: 40, to: 60 } });
+
+  setSelection will trigger the "plotselected" event when called. If you don't
+  want that to happen, e.g. if you're inside a "plotselected" handler, pass
+  true as the second parameter. If you are using multiple axes, you can
+  specify the ranges on any of those, e.g. as x2axis/x3axis/... instead of
+  xaxis, the plugin picks the first one it sees.
+
+- clearSelection( preventEvent )
+
+  Clear the selection rectangle. Pass in true to avoid getting a
+  "plotunselected" event.
+
+- getSelection()
+
+  Returns the current selection in the same format as the "plotselected"
+  event. If there's currently no selection, the function returns null.
+
+*/
+
+(function ($) {
+    function init(plot) {
+        var selection = {
+                first: { x: -1, y: -1}, second: { x: -1, y: -1},
+                show: false,
+                active: false
+            };
+
+        // FIXME: The drag handling implemented here should be
+        // abstracted out, there's some similar code from a library in
+        // the navigation plugin, this should be massaged a bit to fit
+        // the Flot cases here better and reused. Doing this would
+        // make this plugin much slimmer.
+        var savedhandlers = {};
+
+        var mouseUpHandler = null;
+        
+        function onMouseMove(e) {
+            if (selection.active) {
+                updateSelection(e);
+                
+                plot.getPlaceholder().trigger("plotselecting", [ getSelection() ]);
+            }
+        }
+
+        function onMouseDown(e) {
+            if (e.which != 1)  // only accept left-click
+                return;
+            
+            // cancel out any text selections
+            document.body.focus();
+
+            // prevent text selection and drag in old-school browsers
+            if (document.onselectstart !== undefined && savedhandlers.onselectstart == null) {
+                savedhandlers.onselectstart = document.onselectstart;
+                document.onselectstart = function () { return false; };
+            }
+            if (document.ondrag !== undefined && savedhandlers.ondrag == null) {
+                savedhandlers.ondrag = document.ondrag;
+                document.ondrag = function () { return false; };
+            }
+
+            setSelectionPos(selection.first, e);
+
+            selection.active = true;
+
+            // this is a bit silly, but we have to use a closure to be
+            // able to whack the same handler again
+            mouseUpHandler = function (e) { onMouseUp(e); };
+            
+            $(document).one("mouseup", mouseUpHandler);
+        }
+
+        function onMouseUp(e) {
+            mouseUpHandler = null;
+            
+            // revert drag stuff for old-school browsers
+            if (document.onselectstart !== undefined)
+                document.onselectstart = savedhandlers.onselectstart;
+            if (document.ondrag !== undefined)
+                document.ondrag = savedhandlers.ondrag;
+
+            // no more dragging
+            selection.active = false;
+            updateSelection(e);
+
+            if (selectionIsSane())
+                triggerSelectedEvent();
+            else {
+                // this counts as a clear
+                plot.getPlaceholder().trigger("plotunselected", [ ]);
+                plot.getPlaceholder().trigger("plotselecting", [ null ]);
+            }
+
+            return false;
+        }
+
+        function getSelection() {
+            if (!selectionIsSane())
+                return null;
+            
+            if (!selection.show) return null;
+
+            var r = {}, c1 = selection.first, c2 = selection.second;
+            $.each(plot.getAxes(), function (name, axis) {
+                if (axis.used) {
+                    var p1 = axis.c2p(c1[axis.direction]), p2 = axis.c2p(c2[axis.direction]); 
+                    r[name] = { from: Math.min(p1, p2), to: Math.max(p1, p2) };
+                }
+            });
+            return r;
+        }
+
+        function triggerSelectedEvent() {
+            var r = getSelection();
+
+            plot.getPlaceholder().trigger("plotselected", [ r ]);
+
+            // backwards-compat stuff, to be removed in future
+            if (r.xaxis && r.yaxis)
+                plot.getPlaceholder().trigger("selected", [ { x1: r.xaxis.from, y1: r.yaxis.from, x2: r.xaxis.to, y2: r.yaxis.to } ]);
+        }
+
+        function clamp(min, value, max) {
+            return value < min ? min: (value > max ? max: value);
+        }
+
+        function setSelectionPos(pos, e) {
+            var o = plot.getOptions();
+            var offset = plot.getPlaceholder().offset();
+            var plotOffset = plot.getPlotOffset();
+            pos.x = clamp(0, e.pageX - offset.left - plotOffset.left, plot.width());
+            pos.y = clamp(0, e.pageY - offset.top - plotOffset.top, plot.height());
+
+            if (o.selection.mode == "y")
+                pos.x = pos == selection.first ? 0 : plot.width();
+
+            if (o.selection.mode == "x")
+                pos.y = pos == selection.first ? 0 : plot.height();
+        }
+
+        function updateSelection(pos) {
+            if (pos.pageX == null)
+                return;
+
+            setSelectionPos(selection.second, pos);
+            if (selectionIsSane()) {
+                selection.show = true;
+                plot.triggerRedrawOverlay();
+            }
+            else
+                clearSelection(true);
+        }
+
+        function clearSelection(preventEvent) {
+            if (selection.show) {
+                selection.show = false;
+                plot.triggerRedrawOverlay();
+                if (!preventEvent)
+                    plot.getPlaceholder().trigger("plotunselected", [ ]);
+            }
+        }
+
+        // function taken from markings support in Flot
+        function extractRange(ranges, coord) {
+            var axis, from, to, key, axes = plot.getAxes();
+
+            for (var k in axes) {
+                axis = axes[k];
+                if (axis.direction == coord) {
+                    key = coord + axis.n + "axis";
+                    if (!ranges[key] && axis.n == 1)
+                        key = coord + "axis"; // support x1axis as xaxis
+                    if (ranges[key]) {
+                        from = ranges[key].from;
+                        to = ranges[key].to;
+                        break;
+                    }
+                }
+            }
+
+            // backwards-compat stuff - to be removed in future
+            if (!ranges[key]) {
+                axis = coord == "x" ? plot.getXAxes()[0] : plot.getYAxes()[0];
+                from = ranges[coord + "1"];
+                to = ranges[coord + "2"];
+            }
+
+            // auto-reverse as an added bonus
+            if (from != null && to != null && from > to) {
+                var tmp = from;
+                from = to;
+                to = tmp;
+            }
+            
+            return { from: from, to: to, axis: axis };
+        }
+        
+        function setSelection(ranges, preventEvent) {
+            var axis, range, o = plot.getOptions();
+
+            if (o.selection.mode == "y") {
+                selection.first.x = 0;
+                selection.second.x = plot.width();
+            }
+            else {
+                range = extractRange(ranges, "x");
+
+                selection.first.x = range.axis.p2c(range.from);
+                selection.second.x = range.axis.p2c(range.to);
+            }
+
+            if (o.selection.mode == "x") {
+                selection.first.y = 0;
+                selection.second.y = plot.height();
+            }
+            else {
+                range = extractRange(ranges, "y");
+
+                selection.first.y = range.axis.p2c(range.from);
+                selection.second.y = range.axis.p2c(range.to);
+            }
+
+            selection.show = true;
+            plot.triggerRedrawOverlay();
+            if (!preventEvent && selectionIsSane())
+                triggerSelectedEvent();
+        }
+
+        function selectionIsSane() {
+            var minSize = plot.getOptions().selection.minSize;
+            return Math.abs(selection.second.x - selection.first.x) >= minSize &&
+                Math.abs(selection.second.y - selection.first.y) >= minSize;
+        }
+
+        plot.clearSelection = clearSelection;
+        plot.setSelection = setSelection;
+        plot.getSelection = getSelection;
+
+        plot.hooks.bindEvents.push(function(plot, eventHolder) {
+            var o = plot.getOptions();
+            if (o.selection.mode != null) {
+                eventHolder.mousemove(onMouseMove);
+                eventHolder.mousedown(onMouseDown);
+            }
+        });
+
+
+        plot.hooks.drawOverlay.push(function (plot, ctx) {
+            // draw selection
+            if (selection.show && selectionIsSane()) {
+                var plotOffset = plot.getPlotOffset();
+                var o = plot.getOptions();
+
+                ctx.save();
+                ctx.translate(plotOffset.left, plotOffset.top);
+
+                var c = $.color.parse(o.selection.color);
+
+                ctx.strokeStyle = c.scale('a', 0.8).toString();
+                ctx.lineWidth = 1;
+                ctx.lineJoin = o.selection.shape;
+                ctx.fillStyle = c.scale('a', 0.4).toString();
+
+                var x = Math.min(selection.first.x, selection.second.x) + 0.5,
+                    y = Math.min(selection.first.y, selection.second.y) + 0.5,
+                    w = Math.abs(selection.second.x - selection.first.x) - 1,
+                    h = Math.abs(selection.second.y - selection.first.y) - 1;
+
+                ctx.fillRect(x, y, w, h);
+                ctx.strokeRect(x, y, w, h);
+
+                ctx.restore();
+            }
+        });
+        
+        plot.hooks.shutdown.push(function (plot, eventHolder) {
+            eventHolder.unbind("mousemove", onMouseMove);
+            eventHolder.unbind("mousedown", onMouseDown);
+            
+            if (mouseUpHandler)
+                $(document).unbind("mouseup", mouseUpHandler);
+        });
+
+    }
+
+    $.plot.plugins.push({
+        init: init,
+        options: {
+            selection: {
+                mode: null, // one of null, "x", "y" or "xy"
+                color: "#e8cfac",
+                shape: "round", // one of "round", "miter", or "bevel"
+                minSize: 5 // minimum number of pixels
+            }
+        },
+        name: 'selection',
+        version: '1.1'
+    });
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.selection.min.js b/pandora_console/include/graphs/flot/jquery.flot.selection.min.js
index badc0052db..a0154fbc5b 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.selection.min.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.selection.min.js
@@ -1 +1,7 @@
-(function(a){function b(k){var p={first:{x:-1,y:-1},second:{x:-1,y:-1},show:false,active:false};var m={};var r=null;function e(s){if(p.active){l(s);k.getPlaceholder().trigger("plotselecting",[g()])}}function n(s){if(s.which!=1){return}document.body.focus();if(document.onselectstart!==undefined&&m.onselectstart==null){m.onselectstart=document.onselectstart;document.onselectstart=function(){return false}}if(document.ondrag!==undefined&&m.ondrag==null){m.ondrag=document.ondrag;document.ondrag=function(){return false}}d(p.first,s);p.active=true;r=function(t){j(t)};a(document).one("mouseup",r)}function j(s){r=null;if(document.onselectstart!==undefined){document.onselectstart=m.onselectstart}if(document.ondrag!==undefined){document.ondrag=m.ondrag}p.active=false;l(s);if(f()){i()}else{k.getPlaceholder().trigger("plotunselected",[]);k.getPlaceholder().trigger("plotselecting",[null])}return false}function g(){if(!f()){return null}var u={},t=p.first,s=p.second;a.each(k.getAxes(),function(v,w){if(w.used){var y=w.c2p(t[w.direction]),x=w.c2p(s[w.direction]);u[v]={from:Math.min(y,x),to:Math.max(y,x)}}});return u}function i(){var s=g();k.getPlaceholder().trigger("plotselected",[s]);if(s.xaxis&&s.yaxis){k.getPlaceholder().trigger("selected",[{x1:s.xaxis.from,y1:s.yaxis.from,x2:s.xaxis.to,y2:s.yaxis.to}])}}function h(t,u,s){return u<t?t:(u>s?s:u)}function d(w,t){var v=k.getOptions();var u=k.getPlaceholder().offset();var s=k.getPlotOffset();w.x=h(0,t.pageX-u.left-s.left,k.width());w.y=h(0,t.pageY-u.top-s.top,k.height());if(v.selection.mode=="y"){w.x=w==p.first?0:k.width()}if(v.selection.mode=="x"){w.y=w==p.first?0:k.height()}}function l(s){if(s.pageX==null){return}d(p.second,s);if(f()){p.show=true;k.triggerRedrawOverlay()}else{q(true)}}function q(s){if(p.show){p.show=false;k.triggerRedrawOverlay();if(!s){k.getPlaceholder().trigger("plotunselected",[])}}}function c(s,w){var t,y,z,A,x=k.getAxes();for(var u in x){t=x[u];if(t.direction==w){A=w+t.n+"axis";if(!s[A]&&t.n==1){A=w+"axis"}if(s[A]){y=s[A].from;z=s[A].to;break}}}if(!s[A]){t=w=="x"?k.getXAxes()[0]:k.getYAxes()[0];y=s[w+"1"];z=s[w+"2"]}if(y!=null&&z!=null&&y>z){var v=y;y=z;z=v}return{from:y,to:z,axis:t}}function o(t,s){var v,u,w=k.getOptions();if(w.selection.mode=="y"){p.first.x=0;p.second.x=k.width()}else{u=c(t,"x");p.first.x=u.axis.p2c(u.from);p.second.x=u.axis.p2c(u.to)}if(w.selection.mode=="x"){p.first.y=0;p.second.y=k.height()}else{u=c(t,"y");p.first.y=u.axis.p2c(u.from);p.second.y=u.axis.p2c(u.to)}p.show=true;k.triggerRedrawOverlay();if(!s&&f()){i()}}function f(){var s=5;return Math.abs(p.second.x-p.first.x)>=s&&Math.abs(p.second.y-p.first.y)>=s}k.clearSelection=q;k.setSelection=o;k.getSelection=g;k.hooks.bindEvents.push(function(t,s){var u=t.getOptions();if(u.selection.mode!=null){s.mousemove(e);s.mousedown(n)}});k.hooks.drawOverlay.push(function(v,D){if(p.show&&f()){var t=v.getPlotOffset();var s=v.getOptions();D.save();D.translate(t.left,t.top);var z=a.color.parse(s.selection.color);D.strokeStyle=z.scale("a",0.8).toString();D.lineWidth=1;D.lineJoin="round";D.fillStyle=z.scale("a",0.4).toString();var B=Math.min(p.first.x,p.second.x),A=Math.min(p.first.y,p.second.y),C=Math.abs(p.second.x-p.first.x),u=Math.abs(p.second.y-p.first.y);D.fillRect(B,A,C,u);D.strokeRect(B,A,C,u);D.restore()}});k.hooks.shutdown.push(function(t,s){s.unbind("mousemove",e);s.unbind("mousedown",n);if(r){a(document).unbind("mouseup",r)}})}a.plot.plugins.push({init:b,options:{selection:{mode:null,color:"#e8cfac"}},name:"selection",version:"1.1"})})(jQuery);
\ No newline at end of file
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){function init(plot){var selection={first:{x:-1,y:-1},second:{x:-1,y:-1},show:false,active:false};var savedhandlers={};var mouseUpHandler=null;function onMouseMove(e){if(selection.active){updateSelection(e);plot.getPlaceholder().trigger("plotselecting",[getSelection()])}}function onMouseDown(e){if(e.which!=1)return;document.body.focus();if(document.onselectstart!==undefined&&savedhandlers.onselectstart==null){savedhandlers.onselectstart=document.onselectstart;document.onselectstart=function(){return false}}if(document.ondrag!==undefined&&savedhandlers.ondrag==null){savedhandlers.ondrag=document.ondrag;document.ondrag=function(){return false}}setSelectionPos(selection.first,e);selection.active=true;mouseUpHandler=function(e){onMouseUp(e)};$(document).one("mouseup",mouseUpHandler)}function onMouseUp(e){mouseUpHandler=null;if(document.onselectstart!==undefined)document.onselectstart=savedhandlers.onselectstart;if(document.ondrag!==undefined)document.ondrag=savedhandlers.ondrag;selection.active=false;updateSelection(e);if(selectionIsSane())triggerSelectedEvent();else{plot.getPlaceholder().trigger("plotunselected",[]);plot.getPlaceholder().trigger("plotselecting",[null])}return false}function getSelection(){if(!selectionIsSane())return null;if(!selection.show)return null;var r={},c1=selection.first,c2=selection.second;$.each(plot.getAxes(),function(name,axis){if(axis.used){var p1=axis.c2p(c1[axis.direction]),p2=axis.c2p(c2[axis.direction]);r[name]={from:Math.min(p1,p2),to:Math.max(p1,p2)}}});return r}function triggerSelectedEvent(){var r=getSelection();plot.getPlaceholder().trigger("plotselected",[r]);if(r.xaxis&&r.yaxis)plot.getPlaceholder().trigger("selected",[{x1:r.xaxis.from,y1:r.yaxis.from,x2:r.xaxis.to,y2:r.yaxis.to}])}function clamp(min,value,max){return value<min?min:value>max?max:value}function setSelectionPos(pos,e){var o=plot.getOptions();var offset=plot.getPlaceholder().offset();var plotOffset=plot.getPlotOffset();pos.x=clamp(0,e.pageX-offset.left-plotOffset.left,plot.width());pos.y=clamp(0,e.pageY-offset.top-plotOffset.top,plot.height());if(o.selection.mode=="y")pos.x=pos==selection.first?0:plot.width();if(o.selection.mode=="x")pos.y=pos==selection.first?0:plot.height()}function updateSelection(pos){if(pos.pageX==null)return;setSelectionPos(selection.second,pos);if(selectionIsSane()){selection.show=true;plot.triggerRedrawOverlay()}else clearSelection(true)}function clearSelection(preventEvent){if(selection.show){selection.show=false;plot.triggerRedrawOverlay();if(!preventEvent)plot.getPlaceholder().trigger("plotunselected",[])}}function extractRange(ranges,coord){var axis,from,to,key,axes=plot.getAxes();for(var k in axes){axis=axes[k];if(axis.direction==coord){key=coord+axis.n+"axis";if(!ranges[key]&&axis.n==1)key=coord+"axis";if(ranges[key]){from=ranges[key].from;to=ranges[key].to;break}}}if(!ranges[key]){axis=coord=="x"?plot.getXAxes()[0]:plot.getYAxes()[0];from=ranges[coord+"1"];to=ranges[coord+"2"]}if(from!=null&&to!=null&&from>to){var tmp=from;from=to;to=tmp}return{from:from,to:to,axis:axis}}function setSelection(ranges,preventEvent){var axis,range,o=plot.getOptions();if(o.selection.mode=="y"){selection.first.x=0;selection.second.x=plot.width()}else{range=extractRange(ranges,"x");selection.first.x=range.axis.p2c(range.from);selection.second.x=range.axis.p2c(range.to)}if(o.selection.mode=="x"){selection.first.y=0;selection.second.y=plot.height()}else{range=extractRange(ranges,"y");selection.first.y=range.axis.p2c(range.from);selection.second.y=range.axis.p2c(range.to)}selection.show=true;plot.triggerRedrawOverlay();if(!preventEvent&&selectionIsSane())triggerSelectedEvent()}function selectionIsSane(){var minSize=plot.getOptions().selection.minSize;return Math.abs(selection.second.x-selection.first.x)>=minSize&&Math.abs(selection.second.y-selection.first.y)>=minSize}plot.clearSelection=clearSelection;plot.setSelection=setSelection;plot.getSelection=getSelection;plot.hooks.bindEvents.push(function(plot,eventHolder){var o=plot.getOptions();if(o.selection.mode!=null){eventHolder.mousemove(onMouseMove);eventHolder.mousedown(onMouseDown)}});plot.hooks.drawOverlay.push(function(plot,ctx){if(selection.show&&selectionIsSane()){var plotOffset=plot.getPlotOffset();var o=plot.getOptions();ctx.save();ctx.translate(plotOffset.left,plotOffset.top);var c=$.color.parse(o.selection.color);ctx.strokeStyle=c.scale("a",.8).toString();ctx.lineWidth=1;ctx.lineJoin=o.selection.shape;ctx.fillStyle=c.scale("a",.4).toString();var x=Math.min(selection.first.x,selection.second.x)+.5,y=Math.min(selection.first.y,selection.second.y)+.5,w=Math.abs(selection.second.x-selection.first.x)-1,h=Math.abs(selection.second.y-selection.first.y)-1;ctx.fillRect(x,y,w,h);ctx.strokeRect(x,y,w,h);ctx.restore()}});plot.hooks.shutdown.push(function(plot,eventHolder){eventHolder.unbind("mousemove",onMouseMove);eventHolder.unbind("mousedown",onMouseDown);if(mouseUpHandler)$(document).unbind("mouseup",mouseUpHandler)})}$.plot.plugins.push({init:init,options:{selection:{mode:null,color:"#e8cfac",shape:"round",minSize:5}},name:"selection",version:"1.1"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.stack.js b/pandora_console/include/graphs/flot/jquery.flot.stack.js
new file mode 100644
index 0000000000..e75a7dfc07
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.stack.js
@@ -0,0 +1,188 @@
+/* Flot plugin for stacking data sets rather than overlyaing them.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+The plugin assumes the data is sorted on x (or y if stacking horizontally).
+For line charts, it is assumed that if a line has an undefined gap (from a
+null point), then the line above it should have the same gap - insert zeros
+instead of "null" if you want another behaviour. This also holds for the start
+and end of the chart. Note that stacking a mix of positive and negative values
+in most instances doesn't make sense (so it looks weird).
+
+Two or more series are stacked when their "stack" attribute is set to the same
+key (which can be any number or string or just "true"). To specify the default
+stack, you can set the stack option like this:
+
+	series: {
+		stack: null/false, true, or a key (number/string)
+	}
+
+You can also specify it for a single series, like this:
+
+	$.plot( $("#placeholder"), [{
+		data: [ ... ],
+		stack: true
+	}])
+
+The stacking order is determined by the order of the data series in the array
+(later series end up on top of the previous).
+
+Internally, the plugin modifies the datapoints in each series, adding an
+offset to the y value. For line series, extra data points are inserted through
+interpolation. If there's a second y value, it's also adjusted (e.g for bar
+charts or filled areas).
+
+*/
+
+(function ($) {
+    var options = {
+        series: { stack: null } // or number/string
+    };
+    
+    function init(plot) {
+        function findMatchingSeries(s, allseries) {
+            var res = null;
+            for (var i = 0; i < allseries.length; ++i) {
+                if (s == allseries[i])
+                    break;
+                
+                if (allseries[i].stack == s.stack)
+                    res = allseries[i];
+            }
+            
+            return res;
+        }
+        
+        function stackData(plot, s, datapoints) {
+            if (s.stack == null || s.stack === false)
+                return;
+
+            var other = findMatchingSeries(s, plot.getData());
+            if (!other)
+                return;
+
+            var ps = datapoints.pointsize,
+                points = datapoints.points,
+                otherps = other.datapoints.pointsize,
+                otherpoints = other.datapoints.points,
+                newpoints = [],
+                px, py, intery, qx, qy, bottom,
+                withlines = s.lines.show,
+                horizontal = s.bars.horizontal,
+                withbottom = ps > 2 && (horizontal ? datapoints.format[2].x : datapoints.format[2].y),
+                withsteps = withlines && s.lines.steps,
+                fromgap = true,
+                keyOffset = horizontal ? 1 : 0,
+                accumulateOffset = horizontal ? 0 : 1,
+                i = 0, j = 0, l, m;
+
+            while (true) {
+                if (i >= points.length)
+                    break;
+
+                l = newpoints.length;
+
+                if (points[i] == null) {
+                    // copy gaps
+                    for (m = 0; m < ps; ++m)
+                        newpoints.push(points[i + m]);
+                    i += ps;
+                }
+                else if (j >= otherpoints.length) {
+                    // for lines, we can't use the rest of the points
+                    if (!withlines) {
+                        for (m = 0; m < ps; ++m)
+                            newpoints.push(points[i + m]);
+                    }
+                    i += ps;
+                }
+                else if (otherpoints[j] == null) {
+                    // oops, got a gap
+                    for (m = 0; m < ps; ++m)
+                        newpoints.push(null);
+                    fromgap = true;
+                    j += otherps;
+                }
+                else {
+                    // cases where we actually got two points
+                    px = points[i + keyOffset];
+                    py = points[i + accumulateOffset];
+                    qx = otherpoints[j + keyOffset];
+                    qy = otherpoints[j + accumulateOffset];
+                    bottom = 0;
+
+                    if (px == qx) {
+                        for (m = 0; m < ps; ++m)
+                            newpoints.push(points[i + m]);
+
+                        newpoints[l + accumulateOffset] += qy;
+                        bottom = qy;
+                        
+                        i += ps;
+                        j += otherps;
+                    }
+                    else if (px > qx) {
+                        // we got past point below, might need to
+                        // insert interpolated extra point
+                        if (withlines && i > 0 && points[i - ps] != null) {
+                            intery = py + (points[i - ps + accumulateOffset] - py) * (qx - px) / (points[i - ps + keyOffset] - px);
+                            newpoints.push(qx);
+                            newpoints.push(intery + qy);
+                            for (m = 2; m < ps; ++m)
+                                newpoints.push(points[i + m]);
+                            bottom = qy; 
+                        }
+
+                        j += otherps;
+                    }
+                    else { // px < qx
+                        if (fromgap && withlines) {
+                            // if we come from a gap, we just skip this point
+                            i += ps;
+                            continue;
+                        }
+                            
+                        for (m = 0; m < ps; ++m)
+                            newpoints.push(points[i + m]);
+                        
+                        // we might be able to interpolate a point below,
+                        // this can give us a better y
+                        if (withlines && j > 0 && otherpoints[j - otherps] != null)
+                            bottom = qy + (otherpoints[j - otherps + accumulateOffset] - qy) * (px - qx) / (otherpoints[j - otherps + keyOffset] - qx);
+
+                        newpoints[l + accumulateOffset] += bottom;
+                        
+                        i += ps;
+                    }
+
+                    fromgap = false;
+                    
+                    if (l != newpoints.length && withbottom)
+                        newpoints[l + 2] += bottom;
+                }
+
+                // maintain the line steps invariant
+                if (withsteps && l != newpoints.length && l > 0
+                    && newpoints[l] != null
+                    && newpoints[l] != newpoints[l - ps]
+                    && newpoints[l + 1] != newpoints[l - ps + 1]) {
+                    for (m = 0; m < ps; ++m)
+                        newpoints[l + ps + m] = newpoints[l + m];
+                    newpoints[l + 1] = newpoints[l - ps + 1];
+                }
+            }
+
+            datapoints.points = newpoints;
+        }
+        
+        plot.hooks.processDatapoints.push(stackData);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'stack',
+        version: '1.2'
+    });
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.stack.min.js b/pandora_console/include/graphs/flot/jquery.flot.stack.min.js
index bba2a0e5ff..920764f5e7 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.stack.min.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.stack.min.js
@@ -1 +1,7 @@
-(function(b){var a={series:{stack:null}};function c(f){function d(k,j){var h=null;for(var g=0;g<j.length;++g){if(k==j[g]){break}if(j[g].stack==k.stack){h=j[g]}}return h}function e(C,v,g){if(v.stack==null){return}var p=d(v,C.getData());if(!p){return}var z=g.pointsize,F=g.points,h=p.datapoints.pointsize,y=p.datapoints.points,t=[],x,w,k,J,I,r,u=v.lines.show,G=v.bars.horizontal,o=z>2&&(G?g.format[2].x:g.format[2].y),n=u&&v.lines.steps,E=true,q=G?1:0,H=G?0:1,D=0,B=0,A;while(true){if(D>=F.length){break}A=t.length;if(F[D]==null){for(m=0;m<z;++m){t.push(F[D+m])}D+=z}else{if(B>=y.length){if(!u){for(m=0;m<z;++m){t.push(F[D+m])}}D+=z}else{if(y[B]==null){for(m=0;m<z;++m){t.push(null)}E=true;B+=h}else{x=F[D+q];w=F[D+H];J=y[B+q];I=y[B+H];r=0;if(x==J){for(m=0;m<z;++m){t.push(F[D+m])}t[A+H]+=I;r=I;D+=z;B+=h}else{if(x>J){if(u&&D>0&&F[D-z]!=null){k=w+(F[D-z+H]-w)*(J-x)/(F[D-z+q]-x);t.push(J);t.push(k+I);for(m=2;m<z;++m){t.push(F[D+m])}r=I}B+=h}else{if(E&&u){D+=z;continue}for(m=0;m<z;++m){t.push(F[D+m])}if(u&&B>0&&y[B-h]!=null){r=I+(y[B-h+H]-I)*(x-J)/(y[B-h+q]-J)}t[A+H]+=r;D+=z}}E=false;if(A!=t.length&&o){t[A+2]+=r}}}}if(n&&A!=t.length&&A>0&&t[A]!=null&&t[A]!=t[A-z]&&t[A+1]!=t[A-z+1]){for(m=0;m<z;++m){t[A+z+m]=t[A+m]}t[A+1]=t[A-z+1]}}g.points=t}f.hooks.processDatapoints.push(e)}b.plot.plugins.push({init:c,options:a,name:"stack",version:"1.2"})})(jQuery);
\ No newline at end of file
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){var options={series:{stack:null}};function init(plot){function findMatchingSeries(s,allseries){var res=null;for(var i=0;i<allseries.length;++i){if(s==allseries[i])break;if(allseries[i].stack==s.stack)res=allseries[i]}return res}function stackData(plot,s,datapoints){if(s.stack==null||s.stack===false)return;var other=findMatchingSeries(s,plot.getData());if(!other)return;var ps=datapoints.pointsize,points=datapoints.points,otherps=other.datapoints.pointsize,otherpoints=other.datapoints.points,newpoints=[],px,py,intery,qx,qy,bottom,withlines=s.lines.show,horizontal=s.bars.horizontal,withbottom=ps>2&&(horizontal?datapoints.format[2].x:datapoints.format[2].y),withsteps=withlines&&s.lines.steps,fromgap=true,keyOffset=horizontal?1:0,accumulateOffset=horizontal?0:1,i=0,j=0,l,m;while(true){if(i>=points.length)break;l=newpoints.length;if(points[i]==null){for(m=0;m<ps;++m)newpoints.push(points[i+m]);i+=ps}else if(j>=otherpoints.length){if(!withlines){for(m=0;m<ps;++m)newpoints.push(points[i+m])}i+=ps}else if(otherpoints[j]==null){for(m=0;m<ps;++m)newpoints.push(null);fromgap=true;j+=otherps}else{px=points[i+keyOffset];py=points[i+accumulateOffset];qx=otherpoints[j+keyOffset];qy=otherpoints[j+accumulateOffset];bottom=0;if(px==qx){for(m=0;m<ps;++m)newpoints.push(points[i+m]);newpoints[l+accumulateOffset]+=qy;bottom=qy;i+=ps;j+=otherps}else if(px>qx){if(withlines&&i>0&&points[i-ps]!=null){intery=py+(points[i-ps+accumulateOffset]-py)*(qx-px)/(points[i-ps+keyOffset]-px);newpoints.push(qx);newpoints.push(intery+qy);for(m=2;m<ps;++m)newpoints.push(points[i+m]);bottom=qy}j+=otherps}else{if(fromgap&&withlines){i+=ps;continue}for(m=0;m<ps;++m)newpoints.push(points[i+m]);if(withlines&&j>0&&otherpoints[j-otherps]!=null)bottom=qy+(otherpoints[j-otherps+accumulateOffset]-qy)*(px-qx)/(otherpoints[j-otherps+keyOffset]-qx);newpoints[l+accumulateOffset]+=bottom;i+=ps}fromgap=false;if(l!=newpoints.length&&withbottom)newpoints[l+2]+=bottom}if(withsteps&&l!=newpoints.length&&l>0&&newpoints[l]!=null&&newpoints[l]!=newpoints[l-ps]&&newpoints[l+1]!=newpoints[l-ps+1]){for(m=0;m<ps;++m)newpoints[l+ps+m]=newpoints[l+m];newpoints[l+1]=newpoints[l-ps+1]}}datapoints.points=newpoints}plot.hooks.processDatapoints.push(stackData)}$.plot.plugins.push({init:init,options:options,name:"stack",version:"1.2"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.symbol.js b/pandora_console/include/graphs/flot/jquery.flot.symbol.js
new file mode 100644
index 0000000000..79f634971b
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.symbol.js
@@ -0,0 +1,71 @@
+/* Flot plugin that adds some extra symbols for plotting points.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+The symbols are accessed as strings through the standard symbol options:
+
+	series: {
+		points: {
+			symbol: "square" // or "diamond", "triangle", "cross"
+		}
+	}
+
+*/
+
+(function ($) {
+    function processRawData(plot, series, datapoints) {
+        // we normalize the area of each symbol so it is approximately the
+        // same as a circle of the given radius
+
+        var handlers = {
+            square: function (ctx, x, y, radius, shadow) {
+                // pi * r^2 = (2s)^2  =>  s = r * sqrt(pi)/2
+                var size = radius * Math.sqrt(Math.PI) / 2;
+                ctx.rect(x - size, y - size, size + size, size + size);
+            },
+            diamond: function (ctx, x, y, radius, shadow) {
+                // pi * r^2 = 2s^2  =>  s = r * sqrt(pi/2)
+                var size = radius * Math.sqrt(Math.PI / 2);
+                ctx.moveTo(x - size, y);
+                ctx.lineTo(x, y - size);
+                ctx.lineTo(x + size, y);
+                ctx.lineTo(x, y + size);
+                ctx.lineTo(x - size, y);
+            },
+            triangle: function (ctx, x, y, radius, shadow) {
+                // pi * r^2 = 1/2 * s^2 * sin (pi / 3)  =>  s = r * sqrt(2 * pi / sin(pi / 3))
+                var size = radius * Math.sqrt(2 * Math.PI / Math.sin(Math.PI / 3));
+                var height = size * Math.sin(Math.PI / 3);
+                ctx.moveTo(x - size/2, y + height/2);
+                ctx.lineTo(x + size/2, y + height/2);
+                if (!shadow) {
+                    ctx.lineTo(x, y - height/2);
+                    ctx.lineTo(x - size/2, y + height/2);
+                }
+            },
+            cross: function (ctx, x, y, radius, shadow) {
+                // pi * r^2 = (2s)^2  =>  s = r * sqrt(pi)/2
+                var size = radius * Math.sqrt(Math.PI) / 2;
+                ctx.moveTo(x - size, y - size);
+                ctx.lineTo(x + size, y + size);
+                ctx.moveTo(x - size, y + size);
+                ctx.lineTo(x + size, y - size);
+            }
+        };
+
+        var s = series.points.symbol;
+        if (handlers[s])
+            series.points.symbol = handlers[s];
+    }
+    
+    function init(plot) {
+        plot.hooks.processDatapoints.push(processRawData);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        name: 'symbols',
+        version: '1.0'
+    });
+})(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.symbol.min.js b/pandora_console/include/graphs/flot/jquery.flot.symbol.min.js
index 272e003ab4..f4a3430136 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.symbol.min.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.symbol.min.js
@@ -1 +1,7 @@
-(function(b){function a(h,e,g){var d={square:function(k,j,n,i,m){var l=i*Math.sqrt(Math.PI)/2;k.rect(j-l,n-l,l+l,l+l)},diamond:function(k,j,n,i,m){var l=i*Math.sqrt(Math.PI/2);k.moveTo(j-l,n);k.lineTo(j,n-l);k.lineTo(j+l,n);k.lineTo(j,n+l);k.lineTo(j-l,n)},triangle:function(l,k,o,j,n){var m=j*Math.sqrt(2*Math.PI/Math.sin(Math.PI/3));var i=m*Math.sin(Math.PI/3);l.moveTo(k-m/2,o+i/2);l.lineTo(k+m/2,o+i/2);if(!n){l.lineTo(k,o-i/2);l.lineTo(k-m/2,o+i/2)}},cross:function(k,j,n,i,m){var l=i*Math.sqrt(Math.PI)/2;k.moveTo(j-l,n-l);k.lineTo(j+l,n+l);k.moveTo(j-l,n+l);k.lineTo(j+l,n-l)}};var f=e.points.symbol;if(d[f]){e.points.symbol=d[f]}}function c(d){d.hooks.processDatapoints.push(a)}b.plot.plugins.push({init:c,name:"symbols",version:"1.0"})})(jQuery);
\ No newline at end of file
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){function processRawData(plot,series,datapoints){var handlers={square:function(ctx,x,y,radius,shadow){var size=radius*Math.sqrt(Math.PI)/2;ctx.rect(x-size,y-size,size+size,size+size)},diamond:function(ctx,x,y,radius,shadow){var size=radius*Math.sqrt(Math.PI/2);ctx.moveTo(x-size,y);ctx.lineTo(x,y-size);ctx.lineTo(x+size,y);ctx.lineTo(x,y+size);ctx.lineTo(x-size,y)},triangle:function(ctx,x,y,radius,shadow){var size=radius*Math.sqrt(2*Math.PI/Math.sin(Math.PI/3));var height=size*Math.sin(Math.PI/3);ctx.moveTo(x-size/2,y+height/2);ctx.lineTo(x+size/2,y+height/2);if(!shadow){ctx.lineTo(x,y-height/2);ctx.lineTo(x-size/2,y+height/2)}},cross:function(ctx,x,y,radius,shadow){var size=radius*Math.sqrt(Math.PI)/2;ctx.moveTo(x-size,y-size);ctx.lineTo(x+size,y+size);ctx.moveTo(x-size,y+size);ctx.lineTo(x+size,y-size)}};var s=series.points.symbol;if(handlers[s])series.points.symbol=handlers[s]}function init(plot){plot.hooks.processDatapoints.push(processRawData)}$.plot.plugins.push({init:init,name:"symbols",version:"1.0"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.threshold.js b/pandora_console/include/graphs/flot/jquery.flot.threshold.js
index fa79f79877..8c99c401d8 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.threshold.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.threshold.js
@@ -1,39 +1,45 @@
-/*
-Flot plugin for thresholding data. Controlled through the option
-"threshold" in either the global series options
+/* Flot plugin for thresholding data.
 
-  series: {
-    threshold: {
-      below: number
-      color: colorspec
-    }
-  }
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
 
-or in a specific series
+The plugin supports these options:
 
-  $.plot($("#placeholder"), [{ data: [ ... ], threshold: { ... }}])
+	series: {
+		threshold: {
+			below: number
+			color: colorspec
+		}
+	}
 
-An array can be passed for multiple thresholding
- 
-  threshold: [{
-    below: number1
-    color: color1
-  },{
-    below: number2
-    color: color2
-  }]
+It can also be applied to a single series, like this:
 
-These multiple threshold objects can be passed in any order since they
-are sorted by the processing function.
- 
-The data points below "below" are drawn with the specified color. This
-makes it easy to mark points below 0, e.g. for budget data.
+	$.plot( $("#placeholder"), [{
+		data: [ ... ],
+		threshold: { ... }
+	}])
+
+An array can be passed for multiple thresholding, like this:
+
+	threshold: [{
+		below: number1
+		color: color1
+	},{
+		below: number2
+		color: color2
+	}]
+
+These multiple threshold objects can be passed in any order since they are
+sorted by the processing function.
+
+The data points below "below" are drawn with the specified color. This makes
+it easy to mark points below 0, e.g. for budget data.
+
+Internally, the plugin works by splitting the data into two series, above and
+below the threshold. The extra series below the threshold will have its label
+cleared and the special "originSeries" attribute set to the original series.
+You may need to check for this in hover events.
 
-Internally, the plugin works by splitting the data into two series,
-above and below the threshold. The extra series below the threshold
-will have its label cleared and the special "originSeries" attribute
-set to the original series. You may need to check for this in hover
-events.
 */
 
 (function ($) {
@@ -46,21 +52,22 @@ events.
             var ps = datapoints.pointsize, i, x, y, p, prevp,
                 thresholded = $.extend({}, s); // note: shallow copy
 
-            thresholded.datapoints = { points: [], pointsize: ps };
+            thresholded.datapoints = { points: [], pointsize: ps, format: datapoints.format };
             thresholded.label = null;
             thresholded.color = color;
             thresholded.threshold = null;
             thresholded.originSeries = s;
             thresholded.data = [];
-
-			var origpoints = datapoints.points,
+ 
+            var origpoints = datapoints.points,
                 addCrossingPoints = s.lines.show;
 
-            threspoints = [];
-            newpoints = [];
+            var threspoints = [];
+            var newpoints = [];
+            var m;
 
             for (i = 0; i < origpoints.length; i += ps) {
-                x = origpoints[i]
+                x = origpoints[i];
                 y = origpoints[i + 1];
 
                 prevp = p;
@@ -71,7 +78,7 @@ events.
 
                 if (addCrossingPoints && prevp != p && x != null
                     && i > 0 && origpoints[i - ps] != null) {
-                    var interx = (x - origpoints[i - ps]) / (y - origpoints[i - ps + 1]) * (below - y) + x;
+                    var interx = x + (below - y) * (x - origpoints[i - ps]) / (y - origpoints[i - ps + 1]);
                     prevp.push(interx);
                     prevp.push(below);
                     for (m = 2; m < ps; ++m)
@@ -89,25 +96,27 @@ events.
 
                 p.push(x);
                 p.push(y);
-                if (thresholded.lines.fill) {
-					p.push(0)
-				}
+                for (m = 2; m < ps; ++m)
+                    p.push(origpoints[i + m]);
             }
 
             datapoints.points = newpoints;
             thresholded.datapoints.points = threspoints;
             
-            if (thresholded.datapoints.points.length > 0)
-                plot.getData().push(thresholded);
+            if (thresholded.datapoints.points.length > 0) {
+                var origIndex = $.inArray(s, plot.getData());
+                // Insert newly-generated series right after original one (to prevent it from becoming top-most)
+                plot.getData().splice(origIndex + 1, 0, thresholded);
+            }
                 
             // FIXME: there are probably some edge cases left in bars
         }
         
-        function iterateThresholds(plot, s, datapoints) {
-            if(!s.threshold)
+        function processThresholds(plot, s, datapoints) {
+            if (!s.threshold)
                 return;
             
-            if(s.threshold instanceof Array) {
+            if (s.threshold instanceof Array) {
                 s.threshold.sort(function(a, b) {
                     return a.below - b.below;
                 });
@@ -115,18 +124,19 @@ events.
                 $(s.threshold).each(function(i, th) {
                     thresholdData(plot, s, datapoints, th.below, th.color);
                 });
-            } else {
+            }
+            else {
                 thresholdData(plot, s, datapoints, s.threshold.below, s.threshold.color);
             }
         }
         
-        plot.hooks.processDatapoints.push(iterateThresholds);
+        plot.hooks.processDatapoints.push(processThresholds);
     }
     
     $.plot.plugins.push({
         init: init,
         options: options,
         name: 'threshold',
-        version: '1.0'
+        version: '1.2'
     });
 })(jQuery);
diff --git a/pandora_console/include/graphs/flot/jquery.flot.threshold.min.js b/pandora_console/include/graphs/flot/jquery.flot.threshold.min.js
new file mode 100644
index 0000000000..ce93e0f480
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.threshold.min.js
@@ -0,0 +1,7 @@
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){var options={series:{threshold:null}};function init(plot){function thresholdData(plot,s,datapoints,below,color){var ps=datapoints.pointsize,i,x,y,p,prevp,thresholded=$.extend({},s);thresholded.datapoints={points:[],pointsize:ps,format:datapoints.format};thresholded.label=null;thresholded.color=color;thresholded.threshold=null;thresholded.originSeries=s;thresholded.data=[];var origpoints=datapoints.points,addCrossingPoints=s.lines.show;var threspoints=[];var newpoints=[];var m;for(i=0;i<origpoints.length;i+=ps){x=origpoints[i];y=origpoints[i+1];prevp=p;if(y<below)p=threspoints;else p=newpoints;if(addCrossingPoints&&prevp!=p&&x!=null&&i>0&&origpoints[i-ps]!=null){var interx=x+(below-y)*(x-origpoints[i-ps])/(y-origpoints[i-ps+1]);prevp.push(interx);prevp.push(below);for(m=2;m<ps;++m)prevp.push(origpoints[i+m]);p.push(null);p.push(null);for(m=2;m<ps;++m)p.push(origpoints[i+m]);p.push(interx);p.push(below);for(m=2;m<ps;++m)p.push(origpoints[i+m])}p.push(x);p.push(y);for(m=2;m<ps;++m)p.push(origpoints[i+m])}datapoints.points=newpoints;thresholded.datapoints.points=threspoints;if(thresholded.datapoints.points.length>0){var origIndex=$.inArray(s,plot.getData());plot.getData().splice(origIndex+1,0,thresholded)}}function processThresholds(plot,s,datapoints){if(!s.threshold)return;if(s.threshold instanceof Array){s.threshold.sort(function(a,b){return a.below-b.below});$(s.threshold).each(function(i,th){thresholdData(plot,s,datapoints,th.below,th.color)})}else{thresholdData(plot,s,datapoints,s.threshold.below,s.threshold.color)}}plot.hooks.processDatapoints.push(processThresholds)}$.plot.plugins.push({init:init,options:options,name:"threshold",version:"1.2"})})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.time.min.js b/pandora_console/include/graphs/flot/jquery.flot.time.min.js
new file mode 100644
index 0000000000..690eb68255
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.time.min.js
@@ -0,0 +1,7 @@
+/* Javascript plotting library for jQuery, version 0.8.3.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+*/
+(function($){var options={xaxis:{timezone:null,timeformat:null,twelveHourClock:false,monthNames:null}};function floorInBase(n,base){return base*Math.floor(n/base)}function formatDate(d,fmt,monthNames,dayNames){if(typeof d.strftime=="function"){return d.strftime(fmt)}var leftPad=function(n,pad){n=""+n;pad=""+(pad==null?"0":pad);return n.length==1?pad+n:n};var r=[];var escape=false;var hours=d.getHours();var isAM=hours<12;if(monthNames==null){monthNames=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]}if(dayNames==null){dayNames=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]}var hours12;if(hours>12){hours12=hours-12}else if(hours==0){hours12=12}else{hours12=hours}for(var i=0;i<fmt.length;++i){var c=fmt.charAt(i);if(escape){switch(c){case"a":c=""+dayNames[d.getDay()];break;case"b":c=""+monthNames[d.getMonth()];break;case"d":c=leftPad(d.getDate());break;case"e":c=leftPad(d.getDate()," ");break;case"h":case"H":c=leftPad(hours);break;case"I":c=leftPad(hours12);break;case"l":c=leftPad(hours12," ");break;case"m":c=leftPad(d.getMonth()+1);break;case"M":c=leftPad(d.getMinutes());break;case"q":c=""+(Math.floor(d.getMonth()/3)+1);break;case"S":c=leftPad(d.getSeconds());break;case"y":c=leftPad(d.getFullYear()%100);break;case"Y":c=""+d.getFullYear();break;case"p":c=isAM?""+"am":""+"pm";break;case"P":c=isAM?""+"AM":""+"PM";break;case"w":c=""+d.getDay();break}r.push(c);escape=false}else{if(c=="%"){escape=true}else{r.push(c)}}}return r.join("")}function makeUtcWrapper(d){function addProxyMethod(sourceObj,sourceMethod,targetObj,targetMethod){sourceObj[sourceMethod]=function(){return targetObj[targetMethod].apply(targetObj,arguments)}}var utc={date:d};if(d.strftime!=undefined){addProxyMethod(utc,"strftime",d,"strftime")}addProxyMethod(utc,"getTime",d,"getTime");addProxyMethod(utc,"setTime",d,"setTime");var props=["Date","Day","FullYear","Hours","Milliseconds","Minutes","Month","Seconds"];for(var p=0;p<props.length;p++){addProxyMethod(utc,"get"+props[p],d,"getUTC"+props[p]);addProxyMethod(utc,"set"+props[p],d,"setUTC"+props[p])}return utc}function dateGenerator(ts,opts){if(opts.timezone=="browser"){return new Date(ts)}else if(!opts.timezone||opts.timezone=="utc"){return makeUtcWrapper(new Date(ts))}else if(typeof timezoneJS!="undefined"&&typeof timezoneJS.Date!="undefined"){var d=new timezoneJS.Date;d.setTimezone(opts.timezone);d.setTime(ts);return d}else{return makeUtcWrapper(new Date(ts))}}var timeUnitSize={second:1e3,minute:60*1e3,hour:60*60*1e3,day:24*60*60*1e3,month:30*24*60*60*1e3,quarter:3*30*24*60*60*1e3,year:365.2425*24*60*60*1e3};var baseSpec=[[1,"second"],[2,"second"],[5,"second"],[10,"second"],[30,"second"],[1,"minute"],[2,"minute"],[5,"minute"],[10,"minute"],[30,"minute"],[1,"hour"],[2,"hour"],[4,"hour"],[8,"hour"],[12,"hour"],[1,"day"],[2,"day"],[3,"day"],[.25,"month"],[.5,"month"],[1,"month"],[2,"month"]];var specMonths=baseSpec.concat([[3,"month"],[6,"month"],[1,"year"]]);var specQuarters=baseSpec.concat([[1,"quarter"],[2,"quarter"],[1,"year"]]);function init(plot){plot.hooks.processOptions.push(function(plot,options){$.each(plot.getAxes(),function(axisName,axis){var opts=axis.options;if(opts.mode=="time"){axis.tickGenerator=function(axis){var ticks=[];var d=dateGenerator(axis.min,opts);var minSize=0;var spec=opts.tickSize&&opts.tickSize[1]==="quarter"||opts.minTickSize&&opts.minTickSize[1]==="quarter"?specQuarters:specMonths;if(opts.minTickSize!=null){if(typeof opts.tickSize=="number"){minSize=opts.tickSize}else{minSize=opts.minTickSize[0]*timeUnitSize[opts.minTickSize[1]]}}for(var i=0;i<spec.length-1;++i){if(axis.delta<(spec[i][0]*timeUnitSize[spec[i][1]]+spec[i+1][0]*timeUnitSize[spec[i+1][1]])/2&&spec[i][0]*timeUnitSize[spec[i][1]]>=minSize){break}}var size=spec[i][0];var unit=spec[i][1];if(unit=="year"){if(opts.minTickSize!=null&&opts.minTickSize[1]=="year"){size=Math.floor(opts.minTickSize[0])}else{var magn=Math.pow(10,Math.floor(Math.log(axis.delta/timeUnitSize.year)/Math.LN10));var norm=axis.delta/timeUnitSize.year/magn;if(norm<1.5){size=1}else if(norm<3){size=2}else if(norm<7.5){size=5}else{size=10}size*=magn}if(size<1){size=1}}axis.tickSize=opts.tickSize||[size,unit];var tickSize=axis.tickSize[0];unit=axis.tickSize[1];var step=tickSize*timeUnitSize[unit];if(unit=="second"){d.setSeconds(floorInBase(d.getSeconds(),tickSize))}else if(unit=="minute"){d.setMinutes(floorInBase(d.getMinutes(),tickSize))}else if(unit=="hour"){d.setHours(floorInBase(d.getHours(),tickSize))}else if(unit=="month"){d.setMonth(floorInBase(d.getMonth(),tickSize))}else if(unit=="quarter"){d.setMonth(3*floorInBase(d.getMonth()/3,tickSize))}else if(unit=="year"){d.setFullYear(floorInBase(d.getFullYear(),tickSize))}d.setMilliseconds(0);if(step>=timeUnitSize.minute){d.setSeconds(0)}if(step>=timeUnitSize.hour){d.setMinutes(0)}if(step>=timeUnitSize.day){d.setHours(0)}if(step>=timeUnitSize.day*4){d.setDate(1)}if(step>=timeUnitSize.month*2){d.setMonth(floorInBase(d.getMonth(),3))}if(step>=timeUnitSize.quarter*2){d.setMonth(floorInBase(d.getMonth(),6))}if(step>=timeUnitSize.year){d.setMonth(0)}var carry=0;var v=Number.NaN;var prev;do{prev=v;v=d.getTime();ticks.push(v);if(unit=="month"||unit=="quarter"){if(tickSize<1){d.setDate(1);var start=d.getTime();d.setMonth(d.getMonth()+(unit=="quarter"?3:1));var end=d.getTime();d.setTime(v+carry*timeUnitSize.hour+(end-start)*tickSize);carry=d.getHours();d.setHours(0)}else{d.setMonth(d.getMonth()+tickSize*(unit=="quarter"?3:1))}}else if(unit=="year"){d.setFullYear(d.getFullYear()+tickSize)}else{d.setTime(v+step)}}while(v<axis.max&&v!=prev);return ticks};axis.tickFormatter=function(v,axis){var d=dateGenerator(v,axis.options);if(opts.timeformat!=null){return formatDate(d,opts.timeformat,opts.monthNames,opts.dayNames)}var useQuarters=axis.options.tickSize&&axis.options.tickSize[1]=="quarter"||axis.options.minTickSize&&axis.options.minTickSize[1]=="quarter";var t=axis.tickSize[0]*timeUnitSize[axis.tickSize[1]];var span=axis.max-axis.min;var suffix=opts.twelveHourClock?" %p":"";var hourCode=opts.twelveHourClock?"%I":"%H";var fmt;if(t<timeUnitSize.minute){fmt=hourCode+":%M:%S"+suffix}else if(t<timeUnitSize.day){if(span<2*timeUnitSize.day){fmt=hourCode+":%M"+suffix}else{fmt="%b %d "+hourCode+":%M"+suffix}}else if(t<timeUnitSize.month){fmt="%b %d"}else if(useQuarters&&t<timeUnitSize.quarter||!useQuarters&&t<timeUnitSize.year){if(span<timeUnitSize.year){fmt="%b"}else{fmt="%b %Y"}}else if(useQuarters&&t<timeUnitSize.year){if(span<timeUnitSize.year){fmt="Q%q"}else{fmt="Q%q %Y"}}else{fmt="%Y"}var rt=formatDate(d,fmt,opts.monthNames,opts.dayNames);return rt}}})})}$.plot.plugins.push({init:init,options:options,name:"time",version:"1.0"});$.plot.formatDate=formatDate;$.plot.dateGenerator=dateGenerator})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.js b/pandora_console/include/graphs/flot/jquery.js
new file mode 100644
index 0000000000..8c24ffc610
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.js
@@ -0,0 +1,9472 @@
+/*!
+ * jQuery JavaScript Library v1.8.3
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: Tue Nov 13 2012 08:20:33 GMT-0500 (Eastern Standard Time)
+ */
+(function( window, undefined ) {
+var
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// The deferred used on DOM ready
+	readyList,
+
+	// Use the correct document accordingly with window argument (sandbox)
+	document = window.document,
+	location = window.location,
+	navigator = window.navigator,
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// Save a reference to some core methods
+	core_push = Array.prototype.push,
+	core_slice = Array.prototype.slice,
+	core_indexOf = Array.prototype.indexOf,
+	core_toString = Object.prototype.toString,
+	core_hasOwn = Object.prototype.hasOwnProperty,
+	core_trim = String.prototype.trim,
+
+	// Define a local copy of jQuery
+	jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context, rootjQuery );
+	},
+
+	// Used for matching numbers
+	core_pnum = /[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,
+
+	// Used for detecting and trimming whitespace
+	core_rnotwhite = /\S/,
+	core_rspace = /\s+/,
+
+	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
+	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+	// A simple way to check for HTML strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	rquickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
+
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,
+
+	// Matches dashed string for camelizing
+	rmsPrefix = /^-ms-/,
+	rdashAlpha = /-([\da-z])/gi,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return ( letter + "" ).toUpperCase();
+	},
+
+	// The ready event handler and self cleanup method
+	DOMContentLoaded = function() {
+		if ( document.addEventListener ) {
+			document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+			jQuery.ready();
+		} else if ( document.readyState === "complete" ) {
+			// we're here because readyState === "complete" in oldIE
+			// which is good enough for us to call the dom ready!
+			document.detachEvent( "onreadystatechange", DOMContentLoaded );
+			jQuery.ready();
+		}
+	},
+
+	// [[Class]] -> type pairs
+	class2type = {};
+
+jQuery.fn = jQuery.prototype = {
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
+		var match, elem, ret, doc;
+
+		// Handle $(""), $(null), $(undefined), $(false)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle $(DOMElement)
+		if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = rquickExpr.exec( selector );
+			}
+
+			// Match html or make sure no context is specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
+					doc = ( context && context.nodeType ? context.ownerDocument || context : document );
+
+					// scripts is true for back-compat
+					selector = jQuery.parseHTML( match[1], doc, true );
+					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
+						this.attr.call( selector, context, true );
+					}
+
+					return jQuery.merge( this, selector );
+
+				// HANDLE: $(#id)
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || rootjQuery ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
+
+		if ( selector.selector !== undefined ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	},
+
+	// Start with an empty selector
+	selector: "",
+
+	// The current version of jQuery being used
+	jquery: "1.8.3",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	// The number of elements contained in the matched element set
+	size: function() {
+		return this.length;
+	},
+
+	toArray: function() {
+		return core_slice.call( this );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num == null ?
+
+			// Return a 'clean' array
+			this.toArray() :
+
+			// Return just the object
+			( num < 0 ? this[ this.length + num ] : this[ num ] );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems, name, selector ) {
+
+		// Build a new jQuery matched element set
+		var ret = jQuery.merge( this.constructor(), elems );
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+
+		ret.context = this.context;
+
+		if ( name === "find" ) {
+			ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
+		} else if ( name ) {
+			ret.selector = this.selector + "." + name + "(" + selector + ")";
+		}
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+
+	ready: function( fn ) {
+		// Add the callback
+		jQuery.ready.promise().done( fn );
+
+		return this;
+	},
+
+	eq: function( i ) {
+		i = +i;
+		return i === -1 ?
+			this.slice( i ) :
+			this.slice( i, i + 1 );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	slice: function() {
+		return this.pushStack( core_slice.apply( this, arguments ),
+			"slice", core_slice.call(arguments).join(",") );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: core_push,
+	sort: [].sort,
+	splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( length === i ) {
+		target = this;
+		--i;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	noConflict: function( deep ) {
+		if ( window.$ === jQuery ) {
+			window.$ = _$;
+		}
+
+		if ( deep && window.jQuery === jQuery ) {
+			window.jQuery = _jQuery;
+		}
+
+		return jQuery;
+	},
+
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+
+		// Abort if there are pending holds or we're already ready
+		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+			return;
+		}
+
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( !document.body ) {
+			return setTimeout( jQuery.ready, 1 );
+		}
+
+		// Remember that the DOM is ready
+		jQuery.isReady = true;
+
+		// If a normal DOM Ready event fired, decrement, and wait if need be
+		if ( wait !== true && --jQuery.readyWait > 0 ) {
+			return;
+		}
+
+		// If there are functions bound, to execute
+		readyList.resolveWith( document, [ jQuery ] );
+
+		// Trigger any bound ready events
+		if ( jQuery.fn.trigger ) {
+			jQuery( document ).trigger("ready").off("ready");
+		}
+	},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	isWindow: function( obj ) {
+		return obj != null && obj == obj.window;
+	},
+
+	isNumeric: function( obj ) {
+		return !isNaN( parseFloat(obj) ) && isFinite( obj );
+	},
+
+	type: function( obj ) {
+		return obj == null ?
+			String( obj ) :
+			class2type[ core_toString.call(obj) ] || "object";
+	},
+
+	isPlainObject: function( obj ) {
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		try {
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!core_hasOwn.call(obj, "constructor") &&
+				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+				return false;
+			}
+		} catch ( e ) {
+			// IE8,9 Will throw exceptions on certain host objects #9897
+			return false;
+		}
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+
+		var key;
+		for ( key in obj ) {}
+
+		return key === undefined || core_hasOwn.call( obj, key );
+	},
+
+	isEmptyObject: function( obj ) {
+		var name;
+		for ( name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	error: function( msg ) {
+		throw new Error( msg );
+	},
+
+	// data: string of html
+	// context (optional): If specified, the fragment will be created in this context, defaults to document
+	// scripts (optional): If true, will include scripts passed in the html string
+	parseHTML: function( data, context, scripts ) {
+		var parsed;
+		if ( !data || typeof data !== "string" ) {
+			return null;
+		}
+		if ( typeof context === "boolean" ) {
+			scripts = context;
+			context = 0;
+		}
+		context = context || document;
+
+		// Single tag
+		if ( (parsed = rsingleTag.exec( data )) ) {
+			return [ context.createElement( parsed[1] ) ];
+		}
+
+		parsed = jQuery.buildFragment( [ data ], context, scripts ? null : [] );
+		return jQuery.merge( [],
+			(parsed.cacheable ? jQuery.clone( parsed.fragment ) : parsed.fragment).childNodes );
+	},
+
+	parseJSON: function( data ) {
+		if ( !data || typeof data !== "string") {
+			return null;
+		}
+
+		// Make sure leading/trailing whitespace is removed (IE can't handle it)
+		data = jQuery.trim( data );
+
+		// Attempt to parse using the native JSON parser first
+		if ( window.JSON && window.JSON.parse ) {
+			return window.JSON.parse( data );
+		}
+
+		// Make sure the incoming data is actual JSON
+		// Logic borrowed from http://json.org/json2.js
+		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+			.replace( rvalidtokens, "]" )
+			.replace( rvalidbraces, "")) ) {
+
+			return ( new Function( "return " + data ) )();
+
+		}
+		jQuery.error( "Invalid JSON: " + data );
+	},
+
+	// Cross-browser xml parsing
+	parseXML: function( data ) {
+		var xml, tmp;
+		if ( !data || typeof data !== "string" ) {
+			return null;
+		}
+		try {
+			if ( window.DOMParser ) { // Standard
+				tmp = new DOMParser();
+				xml = tmp.parseFromString( data , "text/xml" );
+			} else { // IE
+				xml = new ActiveXObject( "Microsoft.XMLDOM" );
+				xml.async = "false";
+				xml.loadXML( data );
+			}
+		} catch( e ) {
+			xml = undefined;
+		}
+		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+		return xml;
+	},
+
+	noop: function() {},
+
+	// Evaluates a script in a global context
+	// Workarounds based on findings by Jim Driscoll
+	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+	globalEval: function( data ) {
+		if ( data && core_rnotwhite.test( data ) ) {
+			// We use execScript on Internet Explorer
+			// We use an anonymous function so that context is window
+			// rather than jQuery in Firefox
+			( window.execScript || function( data ) {
+				window[ "eval" ].call( window, data );
+			} )( data );
+		}
+	},
+
+	// Convert dashed to camelCase; used by the css and data modules
+	// Microsoft forgot to hump their vendor prefix (#9572)
+	camelCase: function( string ) {
+		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+	},
+
+	// args is for internal usage only
+	each: function( obj, callback, args ) {
+		var name,
+			i = 0,
+			length = obj.length,
+			isObj = length === undefined || jQuery.isFunction( obj );
+
+		if ( args ) {
+			if ( isObj ) {
+				for ( name in obj ) {
+					if ( callback.apply( obj[ name ], args ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.apply( obj[ i++ ], args ) === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isObj ) {
+				for ( name in obj ) {
+					if ( callback.call( obj[ name ], name, obj[ name ] ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.call( obj[ i ], i, obj[ i++ ] ) === false ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return obj;
+	},
+
+	// Use native String.trim function wherever possible
+	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
+		function( text ) {
+			return text == null ?
+				"" :
+				core_trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				( text + "" ).replace( rtrim, "" );
+		},
+
+	// results is for internal usage only
+	makeArray: function( arr, results ) {
+		var type,
+			ret = results || [];
+
+		if ( arr != null ) {
+			// The window, strings (and functions) also have 'length'
+			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
+			type = jQuery.type( arr );
+
+			if ( arr.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( arr ) ) {
+				core_push.call( ret, arr );
+			} else {
+				jQuery.merge( ret, arr );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, arr, i ) {
+		var len;
+
+		if ( arr ) {
+			if ( core_indexOf ) {
+				return core_indexOf.call( arr, elem, i );
+			}
+
+			len = arr.length;
+			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+
+			for ( ; i < len; i++ ) {
+				// Skip accessing in sparse arrays
+				if ( i in arr && arr[ i ] === elem ) {
+					return i;
+				}
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var l = second.length,
+			i = first.length,
+			j = 0;
+
+		if ( typeof l === "number" ) {
+			for ( ; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, inv ) {
+		var retVal,
+			ret = [],
+			i = 0,
+			length = elems.length;
+		inv = !!inv;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( ; i < length; i++ ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
+				ret.push( elems[ i ] );
+			}
+		}
+
+		return ret;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var value, key,
+			ret = [],
+			i = 0,
+			length = elems.length,
+			// jquery objects are treated as arrays
+			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
+
+		// Go through the array, translating each of the items to their
+		if ( isArray ) {
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( key in elems ) {
+				value = callback( elems[ key ], key, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+		}
+
+		// Flatten any nested arrays
+		return ret.concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		var tmp, args, proxy;
+
+		if ( typeof context === "string" ) {
+			tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
+		}
+
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
+		}
+
+		// Simulated bind
+		args = core_slice.call( arguments, 2 );
+		proxy = function() {
+			return fn.apply( context, args.concat( core_slice.call( arguments ) ) );
+		};
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+		return proxy;
+	},
+
+	// Multifunctional method to get and set values of a collection
+	// The value/s can optionally be executed if it's a function
+	access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
+		var exec,
+			bulk = key == null,
+			i = 0,
+			length = elems.length;
+
+		// Sets many values
+		if ( key && typeof key === "object" ) {
+			for ( i in key ) {
+				jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
+			}
+			chainable = 1;
+
+		// Sets one value
+		} else if ( value !== undefined ) {
+			// Optionally, function values get executed if exec is true
+			exec = pass === undefined && jQuery.isFunction( value );
+
+			if ( bulk ) {
+				// Bulk operations only iterate when executing function values
+				if ( exec ) {
+					exec = fn;
+					fn = function( elem, key, value ) {
+						return exec.call( jQuery( elem ), value );
+					};
+
+				// Otherwise they run against the entire set
+				} else {
+					fn.call( elems, value );
+					fn = null;
+				}
+			}
+
+			if ( fn ) {
+				for (; i < length; i++ ) {
+					fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+				}
+			}
+
+			chainable = 1;
+		}
+
+		return chainable ?
+			elems :
+
+			// Gets
+			bulk ?
+				fn.call( elems ) :
+				length ? fn( elems[0], key ) : emptyGet;
+	},
+
+	now: function() {
+		return ( new Date() ).getTime();
+	}
+});
+
+jQuery.ready.promise = function( obj ) {
+	if ( !readyList ) {
+
+		readyList = jQuery.Deferred();
+
+		// Catch cases where $(document).ready() is called after the browser event has already occurred.
+		// we once tried to use readyState "interactive" here, but it caused issues like the one
+		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			setTimeout( jQuery.ready, 1 );
+
+		// Standards-based browsers support DOMContentLoaded
+		} else if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", jQuery.ready, false );
+
+		// If IE event model is used
+		} else {
+			// Ensure firing before onload, maybe late but safe also for iframes
+			document.attachEvent( "onreadystatechange", DOMContentLoaded );
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", jQuery.ready );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var top = false;
+
+			try {
+				top = window.frameElement == null && document.documentElement;
+			} catch(e) {}
+
+			if ( top && top.doScroll ) {
+				(function doScrollCheck() {
+					if ( !jQuery.isReady ) {
+
+						try {
+							// Use the trick by Diego Perini
+							// http://javascript.nwbox.com/IEContentLoaded/
+							top.doScroll("left");
+						} catch(e) {
+							return setTimeout( doScrollCheck, 50 );
+						}
+
+						// and execute any waiting functions
+						jQuery.ready();
+					}
+				})();
+			}
+		}
+	}
+	return readyList.promise( obj );
+};
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+// String to Object options format cache
+var optionsCache = {};
+
+// Convert String-formatted options into Object-formatted ones and store in cache
+function createOptions( options ) {
+	var object = optionsCache[ options ] = {};
+	jQuery.each( options.split( core_rspace ), function( _, flag ) {
+		object[ flag ] = true;
+	});
+	return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ *	options: an optional list of space-separated options that will change how
+ *			the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( options ) {
+
+	// Convert options from String-formatted to Object-formatted if needed
+	// (we check in cache first)
+	options = typeof options === "string" ?
+		( optionsCache[ options ] || createOptions( options ) ) :
+		jQuery.extend( {}, options );
+
+	var // Last fire value (for non-forgettable lists)
+		memory,
+		// Flag to know if list was already fired
+		fired,
+		// Flag to know if list is currently firing
+		firing,
+		// First callback to fire (used internally by add and fireWith)
+		firingStart,
+		// End of the loop when firing
+		firingLength,
+		// Index of currently firing callback (modified by remove if needed)
+		firingIndex,
+		// Actual callback list
+		list = [],
+		// Stack of fire calls for repeatable lists
+		stack = !options.once && [],
+		// Fire callbacks
+		fire = function( data ) {
+			memory = options.memory && data;
+			fired = true;
+			firingIndex = firingStart || 0;
+			firingStart = 0;
+			firingLength = list.length;
+			firing = true;
+			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
+				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
+					memory = false; // To prevent further calls using add
+					break;
+				}
+			}
+			firing = false;
+			if ( list ) {
+				if ( stack ) {
+					if ( stack.length ) {
+						fire( stack.shift() );
+					}
+				} else if ( memory ) {
+					list = [];
+				} else {
+					self.disable();
+				}
+			}
+		},
+		// Actual Callbacks object
+		self = {
+			// Add a callback or a collection of callbacks to the list
+			add: function() {
+				if ( list ) {
+					// First, we save the current length
+					var start = list.length;
+					(function add( args ) {
+						jQuery.each( args, function( _, arg ) {
+							var type = jQuery.type( arg );
+							if ( type === "function" ) {
+								if ( !options.unique || !self.has( arg ) ) {
+									list.push( arg );
+								}
+							} else if ( arg && arg.length && type !== "string" ) {
+								// Inspect recursively
+								add( arg );
+							}
+						});
+					})( arguments );
+					// Do we need to add the callbacks to the
+					// current firing batch?
+					if ( firing ) {
+						firingLength = list.length;
+					// With memory, if we're not firing then
+					// we should call right away
+					} else if ( memory ) {
+						firingStart = start;
+						fire( memory );
+					}
+				}
+				return this;
+			},
+			// Remove a callback from the list
+			remove: function() {
+				if ( list ) {
+					jQuery.each( arguments, function( _, arg ) {
+						var index;
+						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+							list.splice( index, 1 );
+							// Handle firing indexes
+							if ( firing ) {
+								if ( index <= firingLength ) {
+									firingLength--;
+								}
+								if ( index <= firingIndex ) {
+									firingIndex--;
+								}
+							}
+						}
+					});
+				}
+				return this;
+			},
+			// Control if a given callback is in the list
+			has: function( fn ) {
+				return jQuery.inArray( fn, list ) > -1;
+			},
+			// Remove all callbacks from the list
+			empty: function() {
+				list = [];
+				return this;
+			},
+			// Have the list do nothing anymore
+			disable: function() {
+				list = stack = memory = undefined;
+				return this;
+			},
+			// Is it disabled?
+			disabled: function() {
+				return !list;
+			},
+			// Lock the list in its current state
+			lock: function() {
+				stack = undefined;
+				if ( !memory ) {
+					self.disable();
+				}
+				return this;
+			},
+			// Is it locked?
+			locked: function() {
+				return !stack;
+			},
+			// Call all callbacks with the given context and arguments
+			fireWith: function( context, args ) {
+				args = args || [];
+				args = [ context, args.slice ? args.slice() : args ];
+				if ( list && ( !fired || stack ) ) {
+					if ( firing ) {
+						stack.push( args );
+					} else {
+						fire( args );
+					}
+				}
+				return this;
+			},
+			// Call all the callbacks with the given arguments
+			fire: function() {
+				self.fireWith( this, arguments );
+				return this;
+			},
+			// To know if the callbacks have already been called at least once
+			fired: function() {
+				return !!fired;
+			}
+		};
+
+	return self;
+};
+jQuery.extend({
+
+	Deferred: function( func ) {
+		var tuples = [
+				// action, add listener, listener list, final state
+				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
+				[ "notify", "progress", jQuery.Callbacks("memory") ]
+			],
+			state = "pending",
+			promise = {
+				state: function() {
+					return state;
+				},
+				always: function() {
+					deferred.done( arguments ).fail( arguments );
+					return this;
+				},
+				then: function( /* fnDone, fnFail, fnProgress */ ) {
+					var fns = arguments;
+					return jQuery.Deferred(function( newDefer ) {
+						jQuery.each( tuples, function( i, tuple ) {
+							var action = tuple[ 0 ],
+								fn = fns[ i ];
+							// deferred[ done | fail | progress ] for forwarding actions to newDefer
+							deferred[ tuple[1] ]( jQuery.isFunction( fn ) ?
+								function() {
+									var returned = fn.apply( this, arguments );
+									if ( returned && jQuery.isFunction( returned.promise ) ) {
+										returned.promise()
+											.done( newDefer.resolve )
+											.fail( newDefer.reject )
+											.progress( newDefer.notify );
+									} else {
+										newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
+									}
+								} :
+								newDefer[ action ]
+							);
+						});
+						fns = null;
+					}).promise();
+				},
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					return obj != null ? jQuery.extend( obj, promise ) : promise;
+				}
+			},
+			deferred = {};
+
+		// Keep pipe for back-compat
+		promise.pipe = promise.then;
+
+		// Add list-specific methods
+		jQuery.each( tuples, function( i, tuple ) {
+			var list = tuple[ 2 ],
+				stateString = tuple[ 3 ];
+
+			// promise[ done | fail | progress ] = list.add
+			promise[ tuple[1] ] = list.add;
+
+			// Handle state
+			if ( stateString ) {
+				list.add(function() {
+					// state = [ resolved | rejected ]
+					state = stateString;
+
+				// [ reject_list | resolve_list ].disable; progress_list.lock
+				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
+			}
+
+			// deferred[ resolve | reject | notify ] = list.fire
+			deferred[ tuple[0] ] = list.fire;
+			deferred[ tuple[0] + "With" ] = list.fireWith;
+		});
+
+		// Make the deferred a promise
+		promise.promise( deferred );
+
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		// All done!
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( subordinate /* , ..., subordinateN */ ) {
+		var i = 0,
+			resolveValues = core_slice.call( arguments ),
+			length = resolveValues.length,
+
+			// the count of uncompleted subordinates
+			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+
+			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
+			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
+
+			// Update function for both resolve and progress values
+			updateFunc = function( i, contexts, values ) {
+				return function( value ) {
+					contexts[ i ] = this;
+					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
+					if( values === progressValues ) {
+						deferred.notifyWith( contexts, values );
+					} else if ( !( --remaining ) ) {
+						deferred.resolveWith( contexts, values );
+					}
+				};
+			},
+
+			progressValues, progressContexts, resolveContexts;
+
+		// add listeners to Deferred subordinates; treat others as resolved
+		if ( length > 1 ) {
+			progressValues = new Array( length );
+			progressContexts = new Array( length );
+			resolveContexts = new Array( length );
+			for ( ; i < length; i++ ) {
+				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
+					resolveValues[ i ].promise()
+						.done( updateFunc( i, resolveContexts, resolveValues ) )
+						.fail( deferred.reject )
+						.progress( updateFunc( i, progressContexts, progressValues ) );
+				} else {
+					--remaining;
+				}
+			}
+		}
+
+		// if we're not waiting on anything, resolve the master
+		if ( !remaining ) {
+			deferred.resolveWith( resolveContexts, resolveValues );
+		}
+
+		return deferred.promise();
+	}
+});
+jQuery.support = (function() {
+
+	var support,
+		all,
+		a,
+		select,
+		opt,
+		input,
+		fragment,
+		eventName,
+		i,
+		isSupported,
+		clickFn,
+		div = document.createElement("div");
+
+	// Setup
+	div.setAttribute( "className", "t" );
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+
+	// Support tests won't run in some limited or non-browser environments
+	all = div.getElementsByTagName("*");
+	a = div.getElementsByTagName("a")[ 0 ];
+	if ( !all || !a || !all.length ) {
+		return {};
+	}
+
+	// First batch of tests
+	select = document.createElement("select");
+	opt = select.appendChild( document.createElement("option") );
+	input = div.getElementsByTagName("input")[ 0 ];
+
+	a.style.cssText = "top:1px;float:left;opacity:.5";
+	support = {
+		// IE strips leading whitespace when .innerHTML is used
+		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
+
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		tbody: !div.getElementsByTagName("tbody").length,
+
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		htmlSerialize: !!div.getElementsByTagName("link").length,
+
+		// Get the style information from getAttribute
+		// (IE uses .cssText instead)
+		style: /top/.test( a.getAttribute("style") ),
+
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		hrefNormalized: ( a.getAttribute("href") === "/a" ),
+
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		// Use a regex to work around a WebKit issue. See #5145
+		opacity: /^0.5/.test( a.style.opacity ),
+
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		cssFloat: !!a.style.cssFloat,
+
+		// Make sure that if no value is specified for a checkbox
+		// that it defaults to "on".
+		// (WebKit defaults to "" instead)
+		checkOn: ( input.value === "on" ),
+
+		// Make sure that a selected-by-default option has a working selected property.
+		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+		optSelected: opt.selected,
+
+		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+		getSetAttribute: div.className !== "t",
+
+		// Tests for enctype support on a form (#6743)
+		enctype: !!document.createElement("form").enctype,
+
+		// Makes sure cloning an html5 element does not cause problems
+		// Where outerHTML is undefined, this still works
+		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
+
+		// jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode
+		boxModel: ( document.compatMode === "CSS1Compat" ),
+
+		// Will be defined later
+		submitBubbles: true,
+		changeBubbles: true,
+		focusinBubbles: false,
+		deleteExpando: true,
+		noCloneEvent: true,
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableMarginRight: true,
+		boxSizingReliable: true,
+		pixelPosition: false
+	};
+
+	// Make sure checked status is properly cloned
+	input.checked = true;
+	support.noCloneChecked = input.cloneNode( true ).checked;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Test to see if it's possible to delete an expando from an element
+	// Fails in Internet Explorer
+	try {
+		delete div.test;
+	} catch( e ) {
+		support.deleteExpando = false;
+	}
+
+	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
+		div.attachEvent( "onclick", clickFn = function() {
+			// Cloning a node shouldn't copy over any
+			// bound event handlers (IE does this)
+			support.noCloneEvent = false;
+		});
+		div.cloneNode( true ).fireEvent("onclick");
+		div.detachEvent( "onclick", clickFn );
+	}
+
+	// Check if a radio maintains its value
+	// after being appended to the DOM
+	input = document.createElement("input");
+	input.value = "t";
+	input.setAttribute( "type", "radio" );
+	support.radioValue = input.value === "t";
+
+	input.setAttribute( "checked", "checked" );
+
+	// #11217 - WebKit loses check when the name is after the checked attribute
+	input.setAttribute( "name", "t" );
+
+	div.appendChild( input );
+	fragment = document.createDocumentFragment();
+	fragment.appendChild( div.lastChild );
+
+	// WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	support.appendChecked = input.checked;
+
+	fragment.removeChild( input );
+	fragment.appendChild( div );
+
+	// Technique from Juriy Zaytsev
+	// http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
+	// We only care about the case where non-standard event systems
+	// are used, namely in IE. Short-circuiting here helps us to
+	// avoid an eval call (in setAttribute) which can cause CSP
+	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
+	if ( div.attachEvent ) {
+		for ( i in {
+			submit: true,
+			change: true,
+			focusin: true
+		}) {
+			eventName = "on" + i;
+			isSupported = ( eventName in div );
+			if ( !isSupported ) {
+				div.setAttribute( eventName, "return;" );
+				isSupported = ( typeof div[ eventName ] === "function" );
+			}
+			support[ i + "Bubbles" ] = isSupported;
+		}
+	}
+
+	// Run tests that need a body at doc ready
+	jQuery(function() {
+		var container, div, tds, marginDiv,
+			divReset = "padding:0;margin:0;border:0;display:block;overflow:hidden;",
+			body = document.getElementsByTagName("body")[0];
+
+		if ( !body ) {
+			// Return for frameset docs that don't have a body
+			return;
+		}
+
+		container = document.createElement("div");
+		container.style.cssText = "visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px";
+		body.insertBefore( container, body.firstChild );
+
+		// Construct the test element
+		div = document.createElement("div");
+		container.appendChild( div );
+
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		// (only IE 8 fails this test)
+		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+		tds = div.getElementsByTagName("td");
+		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
+		isSupported = ( tds[ 0 ].offsetHeight === 0 );
+
+		tds[ 0 ].style.display = "";
+		tds[ 1 ].style.display = "none";
+
+		// Check if empty table cells still have offsetWidth/Height
+		// (IE <= 8 fail this test)
+		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
+
+		// Check box-sizing and margin behavior
+		div.innerHTML = "";
+		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
+		support.boxSizing = ( div.offsetWidth === 4 );
+		support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );
+
+		// NOTE: To any future maintainer, we've window.getComputedStyle
+		// because jsdom on node.js will break without it.
+		if ( window.getComputedStyle ) {
+			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
+			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
+
+			// Check if div with explicit width and no margin-right incorrectly
+			// gets computed margin-right based on width of container. For more
+			// info see bug #3333
+			// Fails in WebKit before Feb 2011 nightlies
+			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+			marginDiv = document.createElement("div");
+			marginDiv.style.cssText = div.style.cssText = divReset;
+			marginDiv.style.marginRight = marginDiv.style.width = "0";
+			div.style.width = "1px";
+			div.appendChild( marginDiv );
+			support.reliableMarginRight =
+				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
+		}
+
+		if ( typeof div.style.zoom !== "undefined" ) {
+			// Check if natively block-level elements act like inline-block
+			// elements when setting their display to 'inline' and giving
+			// them layout
+			// (IE < 8 does this)
+			div.innerHTML = "";
+			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
+			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
+
+			// Check if elements with layout shrink-wrap their children
+			// (IE 6 does this)
+			div.style.display = "block";
+			div.style.overflow = "visible";
+			div.innerHTML = "<div></div>";
+			div.firstChild.style.width = "5px";
+			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
+
+			container.style.zoom = 1;
+		}
+
+		// Null elements to avoid leaks in IE
+		body.removeChild( container );
+		container = div = tds = marginDiv = null;
+	});
+
+	// Null elements to avoid leaks in IE
+	fragment.removeChild( div );
+	all = a = select = opt = input = fragment = div = null;
+
+	return support;
+})();
+var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
+	rmultiDash = /([A-Z])/g;
+
+jQuery.extend({
+	cache: {},
+
+	deletedIds: [],
+
+	// Remove at next major release (1.9/2.0)
+	uuid: 0,
+
+	// Unique for each copy of jQuery on the page
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
+
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"embed": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+		"applet": true
+	},
+
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
+	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var thisCache, ret,
+			internalKey = jQuery.expando,
+			getByName = typeof name === "string",
+
+			// We have to handle DOM nodes and JS objects differently because IE6-7
+			// can't GC object references properly across the DOM-JS boundary
+			isNode = elem.nodeType,
+
+			// Only DOM nodes need the global jQuery cache; JS object data is
+			// attached directly to the object so GC can occur automatically
+			cache = isNode ? jQuery.cache : elem,
+
+			// Only defining an ID for JS objects if its cache already exists allows
+			// the code to shortcut on the same path as a DOM node with no cache
+			id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
+
+		// Avoid doing any more work than we need to when trying to get data on an
+		// object that has no data at all
+		if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
+			return;
+		}
+
+		if ( !id ) {
+			// Only DOM nodes need a new unique ID for each element since their data
+			// ends up in the global cache
+			if ( isNode ) {
+				elem[ internalKey ] = id = jQuery.deletedIds.pop() || jQuery.guid++;
+			} else {
+				id = internalKey;
+			}
+		}
+
+		if ( !cache[ id ] ) {
+			cache[ id ] = {};
+
+			// Avoids exposing jQuery metadata on plain JS objects when the object
+			// is serialized using JSON.stringify
+			if ( !isNode ) {
+				cache[ id ].toJSON = jQuery.noop;
+			}
+		}
+
+		// An object can be passed to jQuery.data instead of a key/value pair; this gets
+		// shallow copied over onto the existing cache
+		if ( typeof name === "object" || typeof name === "function" ) {
+			if ( pvt ) {
+				cache[ id ] = jQuery.extend( cache[ id ], name );
+			} else {
+				cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+			}
+		}
+
+		thisCache = cache[ id ];
+
+		// jQuery data() is stored in a separate object inside the object's internal data
+		// cache in order to avoid key collisions between internal data and user-defined
+		// data.
+		if ( !pvt ) {
+			if ( !thisCache.data ) {
+				thisCache.data = {};
+			}
+
+			thisCache = thisCache.data;
+		}
+
+		if ( data !== undefined ) {
+			thisCache[ jQuery.camelCase( name ) ] = data;
+		}
+
+		// Check for both converted-to-camel and non-converted data property names
+		// If a data property was specified
+		if ( getByName ) {
+
+			// First Try to find as-is property data
+			ret = thisCache[ name ];
+
+			// Test for null|undefined property data
+			if ( ret == null ) {
+
+				// Try to find the camelCased property
+				ret = thisCache[ jQuery.camelCase( name ) ];
+			}
+		} else {
+			ret = thisCache;
+		}
+
+		return ret;
+	},
+
+	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var thisCache, i, l,
+
+			isNode = elem.nodeType,
+
+			// See jQuery.data for more information
+			cache = isNode ? jQuery.cache : elem,
+			id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+		// If there is already no cache entry for this object, there is no
+		// purpose in continuing
+		if ( !cache[ id ] ) {
+			return;
+		}
+
+		if ( name ) {
+
+			thisCache = pvt ? cache[ id ] : cache[ id ].data;
+
+			if ( thisCache ) {
+
+				// Support array or space separated string names for data keys
+				if ( !jQuery.isArray( name ) ) {
+
+					// try the string as a key before any manipulation
+					if ( name in thisCache ) {
+						name = [ name ];
+					} else {
+
+						// split the camel cased version by spaces unless a key with the spaces exists
+						name = jQuery.camelCase( name );
+						if ( name in thisCache ) {
+							name = [ name ];
+						} else {
+							name = name.split(" ");
+						}
+					}
+				}
+
+				for ( i = 0, l = name.length; i < l; i++ ) {
+					delete thisCache[ name[i] ];
+				}
+
+				// If there is no data left in the cache, we want to continue
+				// and let the cache object itself get destroyed
+				if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
+					return;
+				}
+			}
+		}
+
+		// See jQuery.data for more information
+		if ( !pvt ) {
+			delete cache[ id ].data;
+
+			// Don't destroy the parent cache unless the internal data object
+			// had been the only thing left in it
+			if ( !isEmptyDataObject( cache[ id ] ) ) {
+				return;
+			}
+		}
+
+		// Destroy the cache
+		if ( isNode ) {
+			jQuery.cleanData( [ elem ], true );
+
+		// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
+		} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
+			delete cache[ id ];
+
+		// When all else fails, null
+		} else {
+			cache[ id ] = null;
+		}
+	},
+
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return jQuery.data( elem, name, data, true );
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+		// nodes accept data unless otherwise specified; rejection can be conditional
+		return !noData || noData !== true && elem.getAttribute("classid") === noData;
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var parts, part, attr, name, l,
+			elem = this[0],
+			i = 0,
+			data = null;
+
+		// Gets all values
+		if ( key === undefined ) {
+			if ( this.length ) {
+				data = jQuery.data( elem );
+
+				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
+					attr = elem.attributes;
+					for ( l = attr.length; i < l; i++ ) {
+						name = attr[i].name;
+
+						if ( !name.indexOf( "data-" ) ) {
+							name = jQuery.camelCase( name.substring(5) );
+
+							dataAttr( elem, name, data[ name ] );
+						}
+					}
+					jQuery._data( elem, "parsedAttrs", true );
+				}
+			}
+
+			return data;
+		}
+
+		// Sets multiple values
+		if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		parts = key.split( ".", 2 );
+		parts[1] = parts[1] ? "." + parts[1] : "";
+		part = parts[1] + "!";
+
+		return jQuery.access( this, function( value ) {
+
+			if ( value === undefined ) {
+				data = this.triggerHandler( "getData" + part, [ parts[0] ] );
+
+				// Try to fetch any internally stored data first
+				if ( data === undefined && elem ) {
+					data = jQuery.data( elem, key );
+					data = dataAttr( elem, key, data );
+				}
+
+				return data === undefined && parts[1] ?
+					this.data( parts[0] ) :
+					data;
+			}
+
+			parts[1] = value;
+			this.each(function() {
+				var self = jQuery( this );
+
+				self.triggerHandler( "setData" + part, parts );
+				jQuery.data( this, key, value );
+				self.triggerHandler( "changeData" + part, parts );
+			});
+		}, null, value, arguments.length > 1, null, false );
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+
+		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+				data === "false" ? false :
+				data === "null" ? null :
+				// Only convert to a number if it doesn't change the string
+				+data + "" === data ? +data :
+				rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+	var name;
+	for ( name in obj ) {
+
+		// if the public data object is empty, the private is still empty
+		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
+			continue;
+		}
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+jQuery.extend({
+	queue: function( elem, type, data ) {
+		var queue;
+
+		if ( elem ) {
+			type = ( type || "fx" ) + "queue";
+			queue = jQuery._data( elem, type );
+
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !queue || jQuery.isArray(data) ) {
+					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
+				} else {
+					queue.push( data );
+				}
+			}
+			return queue || [];
+		}
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			startLength = queue.length,
+			fn = queue.shift(),
+			hooks = jQuery._queueHooks( elem, type ),
+			next = function() {
+				jQuery.dequeue( elem, type );
+			};
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+			startLength--;
+		}
+
+		if ( fn ) {
+
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift( "inprogress" );
+			}
+
+			// clear up the last queue stop function
+			delete hooks.stop;
+			fn.call( elem, next, hooks );
+		}
+
+		if ( !startLength && hooks ) {
+			hooks.empty.fire();
+		}
+	},
+
+	// not intended for public consumption - generates a queueHooks object, or returns the current one
+	_queueHooks: function( elem, type ) {
+		var key = type + "queueHooks";
+		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
+			empty: jQuery.Callbacks("once memory").add(function() {
+				jQuery.removeData( elem, type + "queue", true );
+				jQuery.removeData( elem, key, true );
+			})
+		});
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		var setter = 2;
+
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+			setter--;
+		}
+
+		if ( arguments.length < setter ) {
+			return jQuery.queue( this[0], type );
+		}
+
+		return data === undefined ?
+			this :
+			this.each(function() {
+				var queue = jQuery.queue( this, type, data );
+
+				// ensure a hooks for this queue
+				jQuery._queueHooks( this, type );
+
+				if ( type === "fx" && queue[0] !== "inprogress" ) {
+					jQuery.dequeue( this, type );
+				}
+			});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+	// Based off of the plugin by Clint Helfers, with permission.
+	// http://blindsignals.com/index.php/2009/07/jquery-delay/
+	delay: function( time, type ) {
+		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+		type = type || "fx";
+
+		return this.queue( type, function( next, hooks ) {
+			var timeout = setTimeout( next, time );
+			hooks.stop = function() {
+				clearTimeout( timeout );
+			};
+		});
+	},
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	},
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, obj ) {
+		var tmp,
+			count = 1,
+			defer = jQuery.Deferred(),
+			elements = this,
+			i = this.length,
+			resolve = function() {
+				if ( !( --count ) ) {
+					defer.resolveWith( elements, [ elements ] );
+				}
+			};
+
+		if ( typeof type !== "string" ) {
+			obj = type;
+			type = undefined;
+		}
+		type = type || "fx";
+
+		while( i-- ) {
+			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
+			if ( tmp && tmp.empty ) {
+				count++;
+				tmp.empty.add( resolve );
+			}
+		}
+		resolve();
+		return defer.promise( obj );
+	}
+});
+var nodeHook, boolHook, fixSpecified,
+	rclass = /[\t\r\n]/g,
+	rreturn = /\r/g,
+	rtype = /^(?:button|input)$/i,
+	rfocusable = /^(?:button|input|object|select|textarea)$/i,
+	rclickable = /^a(?:rea|)$/i,
+	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+	getSetAttribute = jQuery.support.getSetAttribute;
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
+	},
+
+	removeAttr: function( name ) {
+		return this.each(function() {
+			jQuery.removeAttr( this, name );
+		});
+	},
+
+	prop: function( name, value ) {
+		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each(function() {
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch( e ) {}
+		});
+	},
+
+	addClass: function( value ) {
+		var classNames, i, l, elem,
+			setClass, c, cl;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).addClass( value.call(this, j, this.className) );
+			});
+		}
+
+		if ( value && typeof value === "string" ) {
+			classNames = value.split( core_rspace );
+
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
+
+				if ( elem.nodeType === 1 ) {
+					if ( !elem.className && classNames.length === 1 ) {
+						elem.className = value;
+
+					} else {
+						setClass = " " + elem.className + " ";
+
+						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
+							if ( setClass.indexOf( " " + classNames[ c ] + " " ) < 0 ) {
+								setClass += classNames[ c ] + " ";
+							}
+						}
+						elem.className = jQuery.trim( setClass );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var removes, className, elem, c, cl, i, l;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).removeClass( value.call(this, j, this.className) );
+			});
+		}
+		if ( (value && typeof value === "string") || value === undefined ) {
+			removes = ( value || "" ).split( core_rspace );
+
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
+				if ( elem.nodeType === 1 && elem.className ) {
+
+					className = (" " + elem.className + " ").replace( rclass, " " );
+
+					// loop over each item in the removal list
+					for ( c = 0, cl = removes.length; c < cl; c++ ) {
+						// Remove until there is nothing to remove,
+						while ( className.indexOf(" " + removes[ c ] + " ") >= 0 ) {
+							className = className.replace( " " + removes[ c ] + " " , " " );
+						}
+					}
+					elem.className = value ? jQuery.trim( className ) : "";
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( i ) {
+				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					state = stateVal,
+					classNames = value.split( core_rspace );
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space separated list
+					state = isBool ? state : !self.hasClass( className );
+					self[ state ? "addClass" : "removeClass" ]( className );
+				}
+
+			} else if ( type === "undefined" || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery._data( this, "__className__", this.className );
+				}
+
+				// toggle whole className
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ",
+			i = 0,
+			l = this.length;
+		for ( ; i < l; i++ ) {
+			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	val: function( value ) {
+		var hooks, ret, isFunction,
+			elem = this[0];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				return typeof ret === "string" ?
+					// handle most common string cases
+					ret.replace(rreturn, "") :
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
+			}
+
+			return;
+		}
+
+		isFunction = jQuery.isFunction( value );
+
+		return this.each(function( i ) {
+			var val,
+				self = jQuery(this);
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call( this, i, self.val() );
+			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map(val, function ( value ) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				// attributes.value is undefined in Blackberry 4.7 but
+				// uses .value. See #6932
+				var val = elem.attributes.value;
+				return !val || val.specified ? elem.value : elem.text;
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, option,
+					options = elem.options,
+					index = elem.selectedIndex,
+					one = elem.type === "select-one" || index < 0,
+					values = one ? null : [],
+					max = one ? index + 1 : options.length,
+					i = index < 0 ?
+						max :
+						one ? index : 0;
+
+				// Loop through all the selected options
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// oldIE doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+							// Don't return options that are disabled or in a disabled optgroup
+							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
+							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var values = jQuery.makeArray( value );
+
+				jQuery(elem).find("option").each(function() {
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+				});
+
+				if ( !values.length ) {
+					elem.selectedIndex = -1;
+				}
+				return values;
+			}
+		}
+	},
+
+	// Unused in 1.8, left in so attrFn-stabbers won't die; remove in 1.9
+	attrFn: {},
+
+	attr: function( elem, name, value, pass ) {
+		var ret, hooks, notxml,
+			nType = elem.nodeType;
+
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		if ( pass && jQuery.isFunction( jQuery.fn[ name ] ) ) {
+			return jQuery( elem )[ name ]( value );
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === "undefined" ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		// All attributes are lowercase
+		// Grab necessary hook if one is defined
+		if ( notxml ) {
+			name = name.toLowerCase();
+			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
+		}
+
+		if ( value !== undefined ) {
+
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+				return;
+
+			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				elem.setAttribute( name, value + "" );
+				return value;
+			}
+
+		} else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
+			return ret;
+
+		} else {
+
+			ret = elem.getAttribute( name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return ret === null ?
+				undefined :
+				ret;
+		}
+	},
+
+	removeAttr: function( elem, value ) {
+		var propName, attrNames, name, isBool,
+			i = 0;
+
+		if ( value && elem.nodeType === 1 ) {
+
+			attrNames = value.split( core_rspace );
+
+			for ( ; i < attrNames.length; i++ ) {
+				name = attrNames[ i ];
+
+				if ( name ) {
+					propName = jQuery.propFix[ name ] || name;
+					isBool = rboolean.test( name );
+
+					// See #9699 for explanation of this approach (setting first, then removal)
+					// Do not do this for boolean attributes (see #10870)
+					if ( !isBool ) {
+						jQuery.attr( elem, name, "" );
+					}
+					elem.removeAttribute( getSetAttribute ? name : propName );
+
+					// Set corresponding property to false for boolean attributes
+					if ( isBool && propName in elem ) {
+						elem[ propName ] = false;
+					}
+				}
+			}
+		}
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				// We can't allow the type property to be changed (since it causes problems in IE)
+				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
+					jQuery.error( "type property can't be changed" );
+				} else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
+					// Setting the type on a radio button after the value resets the value in IE6-9
+					// Reset value to it's default in case type is set after value
+					// This is for element creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		},
+		// Use the value property for back compat
+		// Use the nodeHook for button elements in IE6/7 (#1954)
+		value: {
+			get: function( elem, name ) {
+				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
+					return nodeHook.get( elem, name );
+				}
+				return name in elem ?
+					elem.value :
+					null;
+			},
+			set: function( elem, value, name ) {
+				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
+					return nodeHook.set( elem, value, name );
+				}
+				// Does not return so that setAttribute is also used
+				elem.value = value;
+			}
+		}
+	},
+
+	propFix: {
+		tabindex: "tabIndex",
+		readonly: "readOnly",
+		"for": "htmlFor",
+		"class": "className",
+		maxlength: "maxLength",
+		cellspacing: "cellSpacing",
+		cellpadding: "cellPadding",
+		rowspan: "rowSpan",
+		colspan: "colSpan",
+		usemap: "useMap",
+		frameborder: "frameBorder",
+		contenteditable: "contentEditable"
+	},
+
+	prop: function( elem, name, value ) {
+		var ret, hooks, notxml,
+			nType = elem.nodeType;
+
+		// don't get/set properties on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		if ( notxml ) {
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				return ( elem[ name ] = value );
+			}
+
+		} else {
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+				return ret;
+
+			} else {
+				return elem[ name ];
+			}
+		}
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				var attributeNode = elem.getAttributeNode("tabindex");
+
+				return attributeNode && attributeNode.specified ?
+					parseInt( attributeNode.value, 10 ) :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
+		}
+	}
+});
+
+// Hook for boolean attributes
+boolHook = {
+	get: function( elem, name ) {
+		// Align boolean attributes with corresponding properties
+		// Fall back to attribute presence where some booleans are not supported
+		var attrNode,
+			property = jQuery.prop( elem, name );
+		return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
+			name.toLowerCase() :
+			undefined;
+	},
+	set: function( elem, value, name ) {
+		var propName;
+		if ( value === false ) {
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else {
+			// value is true since we know at this point it's type boolean and not false
+			// Set boolean attributes to the same name and set the DOM property
+			propName = jQuery.propFix[ name ] || name;
+			if ( propName in elem ) {
+				// Only set the IDL specifically if it already exists on the element
+				elem[ propName ] = true;
+			}
+
+			elem.setAttribute( name, name.toLowerCase() );
+		}
+		return name;
+	}
+};
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+	fixSpecified = {
+		name: true,
+		id: true,
+		coords: true
+	};
+
+	// Use this for any attribute in IE6/7
+	// This fixes almost every IE6/7 issue
+	nodeHook = jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret;
+			ret = elem.getAttributeNode( name );
+			return ret && ( fixSpecified[ name ] ? ret.value !== "" : ret.specified ) ?
+				ret.value :
+				undefined;
+		},
+		set: function( elem, value, name ) {
+			// Set the existing or create a new attribute node
+			var ret = elem.getAttributeNode( name );
+			if ( !ret ) {
+				ret = document.createAttribute( name );
+				elem.setAttributeNode( ret );
+			}
+			return ( ret.value = value + "" );
+		}
+	};
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each([ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		});
+	});
+
+	// Set contenteditable to false on removals(#10429)
+	// Setting to empty string throws an error as an invalid value
+	jQuery.attrHooks.contenteditable = {
+		get: nodeHook.get,
+		set: function( elem, value, name ) {
+			if ( value === "" ) {
+				value = "false";
+			}
+			nodeHook.set( elem, value, name );
+		}
+	};
+}
+
+
+// Some attributes require a special call on IE
+if ( !jQuery.support.hrefNormalized ) {
+	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			get: function( elem ) {
+				var ret = elem.getAttribute( name, 2 );
+				return ret === null ? undefined : ret;
+			}
+		});
+	});
+}
+
+if ( !jQuery.support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+			// Return undefined in the case of empty string
+			// Normalize to lowercase since IE uppercases css property names
+			return elem.style.cssText.toLowerCase() || undefined;
+		},
+		set: function( elem, value ) {
+			return ( elem.style.cssText = value + "" );
+		}
+	};
+}
+
+// Safari mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !jQuery.support.optSelected ) {
+	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
+		}
+	});
+}
+
+// IE6/7 call enctype encoding
+if ( !jQuery.support.enctype ) {
+	jQuery.propFix.enctype = "encoding";
+}
+
+// Radios and checkboxes getter/setter
+if ( !jQuery.support.checkOn ) {
+	jQuery.each([ "radio", "checkbox" ], function() {
+		jQuery.valHooks[ this ] = {
+			get: function( elem ) {
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				return elem.getAttribute("value") === null ? "on" : elem.value;
+			}
+		};
+	});
+}
+jQuery.each([ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+			}
+		}
+	});
+});
+var rformElems = /^(?:textarea|input|select)$/i,
+	rtypenamespace = /^([^\.]*|)(?:\.(.+)|)$/,
+	rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
+	rkeyEvent = /^key/,
+	rmouseEvent = /^(?:mouse|contextmenu)|click/,
+	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+	hoverHack = function( events ) {
+		return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
+	};
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+	add: function( elem, types, handler, data, selector ) {
+
+		var elemData, eventHandle, events,
+			t, tns, type, namespaces, handleObj,
+			handleObjIn, handlers, special;
+
+		// Don't attach events to noData or text/comment nodes (allow plain objects tho)
+		if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) {
+			return;
+		}
+
+		// Caller can pass in an object of custom data in lieu of the handler
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+			selector = handleObjIn.selector;
+		}
+
+		// Make sure that the handler has a unique ID, used to find/remove it later
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure and main handler, if this is the first
+		events = elemData.events;
+		if ( !events ) {
+			elemData.events = events = {};
+		}
+		eventHandle = elemData.handle;
+		if ( !eventHandle ) {
+			elemData.handle = eventHandle = function( e ) {
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
+					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+			eventHandle.elem = elem;
+		}
+
+		// Handle multiple events separated by a space
+		// jQuery(...).bind("mouseover mouseout", fn);
+		types = jQuery.trim( hoverHack(types) ).split( " " );
+		for ( t = 0; t < types.length; t++ ) {
+
+			tns = rtypenamespace.exec( types[t] ) || [];
+			type = tns[1];
+			namespaces = ( tns[2] || "" ).split( "." ).sort();
+
+			// If event changes its type, use the special event handlers for the changed type
+			special = jQuery.event.special[ type ] || {};
+
+			// If selector defined, determine special event api type, otherwise given type
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+
+			// Update special based on newly reset type
+			special = jQuery.event.special[ type ] || {};
+
+			// handleObj is passed to all event handlers
+			handleObj = jQuery.extend({
+				type: type,
+				origType: tns[1],
+				data: data,
+				handler: handler,
+				guid: handler.guid,
+				selector: selector,
+				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+				namespace: namespaces.join(".")
+			}, handleObjIn );
+
+			// Init the event handler queue if we're the first
+			handlers = events[ type ];
+			if ( !handlers ) {
+				handlers = events[ type ] = [];
+				handlers.delegateCount = 0;
+
+				// Only use addEventListener/attachEvent if the special events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add to the element's handler list, delegates in front
+			if ( selector ) {
+				handlers.splice( handlers.delegateCount++, 0, handleObj );
+			} else {
+				handlers.push( handleObj );
+			}
+
+			// Keep track of which events have ever been used, for event optimization
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	global: {},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, selector, mappedTypes ) {
+
+		var t, tns, type, origType, namespaces, origCount,
+			j, events, special, eventType, handleObj,
+			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
+
+		if ( !elemData || !(events = elemData.events) ) {
+			return;
+		}
+
+		// Once for each type.namespace in types; type may be omitted
+		types = jQuery.trim( hoverHack( types || "" ) ).split(" ");
+		for ( t = 0; t < types.length; t++ ) {
+			tns = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tns[1];
+			namespaces = tns[2];
+
+			// Unbind all events (on this namespace, if provided) for the element
+			if ( !type ) {
+				for ( type in events ) {
+					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+				}
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+			type = ( selector? special.delegateType : special.bindType ) || type;
+			eventType = events[ type ] || [];
+			origCount = eventType.length;
+			namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.|)") + "(\\.|$)") : null;
+
+			// Remove matching events
+			for ( j = 0; j < eventType.length; j++ ) {
+				handleObj = eventType[ j ];
+
+				if ( ( mappedTypes || origType === handleObj.origType ) &&
+					 ( !handler || handler.guid === handleObj.guid ) &&
+					 ( !namespaces || namespaces.test( handleObj.namespace ) ) &&
+					 ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+					eventType.splice( j--, 1 );
+
+					if ( handleObj.selector ) {
+						eventType.delegateCount--;
+					}
+					if ( special.remove ) {
+						special.remove.call( elem, handleObj );
+					}
+				}
+			}
+
+			// Remove generic event handler if we removed something and no more handlers exist
+			// (avoids potential for endless recursion during removal of special event handlers)
+			if ( eventType.length === 0 && origCount !== eventType.length ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			delete elemData.handle;
+
+			// removeData also checks for emptiness and clears the expando if empty
+			// so use it instead of delete
+			jQuery.removeData( elem, "events", true );
+		}
+	},
+
+	// Events that are safe to short-circuit if no handlers are attached.
+	// Native DOM events should not be added, they may have inline handlers.
+	customEvent: {
+		"getData": true,
+		"setData": true,
+		"changeData": true
+	},
+
+	trigger: function( event, data, elem, onlyHandlers ) {
+		// Don't do events on text and comment nodes
+		if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) {
+			return;
+		}
+
+		// Event object or event type
+		var cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType,
+			type = event.type || event,
+			namespaces = [];
+
+		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+			return;
+		}
+
+		if ( type.indexOf( "!" ) >= 0 ) {
+			// Exclusive events trigger only for the exact event (no namespaces)
+			type = type.slice(0, -1);
+			exclusive = true;
+		}
+
+		if ( type.indexOf( "." ) >= 0 ) {
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split(".");
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+
+		if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
+			// No jQuery handlers for this event type, and it can't have inline handlers
+			return;
+		}
+
+		// Caller can pass in an Event, Object, or just an event type string
+		event = typeof event === "object" ?
+			// jQuery.Event object
+			event[ jQuery.expando ] ? event :
+			// Object literal
+			new jQuery.Event( type, event ) :
+			// Just the event type (string)
+			new jQuery.Event( type );
+
+		event.type = type;
+		event.isTrigger = true;
+		event.exclusive = exclusive;
+		event.namespace = namespaces.join( "." );
+		event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)") : null;
+		ontype = type.indexOf( ":" ) < 0 ? "on" + type : "";
+
+		// Handle a global trigger
+		if ( !elem ) {
+
+			// TODO: Stop taunting the data cache; remove global events and always attach to document
+			cache = jQuery.cache;
+			for ( i in cache ) {
+				if ( cache[ i ].events && cache[ i ].events[ type ] ) {
+					jQuery.event.trigger( event, data, cache[ i ].handle.elem, true );
+				}
+			}
+			return;
+		}
+
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
+			event.target = elem;
+		}
+
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data != null ? jQuery.makeArray( data ) : [];
+		data.unshift( event );
+
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
+		}
+
+		// Determine event propagation path in advance, per W3C events spec (#9951)
+		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+		eventPath = [[ elem, special.bindType || type ]];
+		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+			bubbleType = special.delegateType || type;
+			cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode;
+			for ( old = elem; cur; cur = cur.parentNode ) {
+				eventPath.push([ cur, bubbleType ]);
+				old = cur;
+			}
+
+			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+			if ( old === (elem.ownerDocument || document) ) {
+				eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]);
+			}
+		}
+
+		// Fire handlers on the event path
+		for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) {
+
+			cur = eventPath[i][0];
+			event.type = eventPath[i][1];
+
+			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
+			// Note that this is a bare JS function and not a jQuery handler
+			handle = ontype && cur[ ontype ];
+			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
+				event.preventDefault();
+			}
+		}
+		event.type = type;
+
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
+				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
+
+				// Call a native DOM method on the target with the same name name as the event.
+				// Can't use an .isFunction() check here because IE6/7 fails that test.
+				// Don't do default actions on window, that's where global variables be (#6170)
+				// IE<9 dies on focus/blur to hidden element (#1486)
+				if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) {
+
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					old = elem[ ontype ];
+
+					if ( old ) {
+						elem[ ontype ] = null;
+					}
+
+					// Prevent re-triggering of the same event, since we already bubbled it above
+					jQuery.event.triggered = type;
+					elem[ type ]();
+					jQuery.event.triggered = undefined;
+
+					if ( old ) {
+						elem[ ontype ] = old;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	dispatch: function( event ) {
+
+		// Make a writable jQuery.Event from the native event object
+		event = jQuery.event.fix( event || window.event );
+
+		var i, j, cur, ret, selMatch, matched, matches, handleObj, sel, related,
+			handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
+			delegateCount = handlers.delegateCount,
+			args = core_slice.call( arguments ),
+			run_all = !event.exclusive && !event.namespace,
+			special = jQuery.event.special[ event.type ] || {},
+			handlerQueue = [];
+
+		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+		args[0] = event;
+		event.delegateTarget = this;
+
+		// Call the preDispatch hook for the mapped type, and let it bail if desired
+		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+			return;
+		}
+
+		// Determine handlers that should run if there are delegated events
+		// Avoid non-left-click bubbling in Firefox (#3861)
+		if ( delegateCount && !(event.button && event.type === "click") ) {
+
+			for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
+
+				// Don't process clicks (ONLY) on disabled elements (#6911, #8165, #11382, #11764)
+				if ( cur.disabled !== true || event.type !== "click" ) {
+					selMatch = {};
+					matches = [];
+					for ( i = 0; i < delegateCount; i++ ) {
+						handleObj = handlers[ i ];
+						sel = handleObj.selector;
+
+						if ( selMatch[ sel ] === undefined ) {
+							selMatch[ sel ] = handleObj.needsContext ?
+								jQuery( sel, this ).index( cur ) >= 0 :
+								jQuery.find( sel, this, null, [ cur ] ).length;
+						}
+						if ( selMatch[ sel ] ) {
+							matches.push( handleObj );
+						}
+					}
+					if ( matches.length ) {
+						handlerQueue.push({ elem: cur, matches: matches });
+					}
+				}
+			}
+		}
+
+		// Add the remaining (directly-bound) handlers
+		if ( handlers.length > delegateCount ) {
+			handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) });
+		}
+
+		// Run delegates first; they may want to stop propagation beneath us
+		for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
+			matched = handlerQueue[ i ];
+			event.currentTarget = matched.elem;
+
+			for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) {
+				handleObj = matched.matches[ j ];
+
+				// Triggered event must either 1) be non-exclusive and have no namespace, or
+				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+				if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) {
+
+					event.data = handleObj.data;
+					event.handleObj = handleObj;
+
+					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
+							.apply( matched.elem, args );
+
+					if ( ret !== undefined ) {
+						event.result = ret;
+						if ( ret === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+		}
+
+		// Call the postDispatch hook for the mapped type
+		if ( special.postDispatch ) {
+			special.postDispatch.call( this, event );
+		}
+
+		return event.result;
+	},
+
+	// Includes some event props shared by KeyEvent and MouseEvent
+	// *** attrChange attrName relatedNode srcElement  are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
+	props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+
+	fixHooks: {},
+
+	keyHooks: {
+		props: "char charCode key keyCode".split(" "),
+		filter: function( event, original ) {
+
+			// Add which for key events
+			if ( event.which == null ) {
+				event.which = original.charCode != null ? original.charCode : original.keyCode;
+			}
+
+			return event;
+		}
+	},
+
+	mouseHooks: {
+		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+		filter: function( event, original ) {
+			var eventDoc, doc, body,
+				button = original.button,
+				fromElement = original.fromElement;
+
+			// Calculate pageX/Y if missing and clientX/Y available
+			if ( event.pageX == null && original.clientX != null ) {
+				eventDoc = event.target.ownerDocument || document;
+				doc = eventDoc.documentElement;
+				body = eventDoc.body;
+
+				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
+				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+			}
+
+			// Add relatedTarget, if necessary
+			if ( !event.relatedTarget && fromElement ) {
+				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+			}
+
+			// Add which for click: 1 === left; 2 === middle; 3 === right
+			// Note: button is not normalized, so don't use it
+			if ( !event.which && button !== undefined ) {
+				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+			}
+
+			return event;
+		}
+	},
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// Create a writable copy of the event object and normalize some properties
+		var i, prop,
+			originalEvent = event,
+			fixHook = jQuery.event.fixHooks[ event.type ] || {},
+			copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+
+		event = jQuery.Event( originalEvent );
+
+		for ( i = copy.length; i; ) {
+			prop = copy[ --i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
+		if ( !event.target ) {
+			event.target = originalEvent.srcElement || document;
+		}
+
+		// Target should not be a text node (#504, Safari)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328; IE6/7/8)
+		event.metaKey = !!event.metaKey;
+
+		return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
+	},
+
+	special: {
+		load: {
+			// Prevent triggered image.load events from bubbling to window.load
+			noBubble: true
+		},
+
+		focus: {
+			delegateType: "focusin"
+		},
+		blur: {
+			delegateType: "focusout"
+		},
+
+		beforeunload: {
+			setup: function( data, namespaces, eventHandle ) {
+				// We only want to do this special case on windows
+				if ( jQuery.isWindow( this ) ) {
+					this.onbeforeunload = eventHandle;
+				}
+			},
+
+			teardown: function( namespaces, eventHandle ) {
+				if ( this.onbeforeunload === eventHandle ) {
+					this.onbeforeunload = null;
+				}
+			}
+		}
+	},
+
+	simulate: function( type, elem, event, bubble ) {
+		// Piggyback on a donor event to simulate a different one.
+		// Fake originalEvent to avoid donor's stopPropagation, but if the
+		// simulated event prevents default then we do the same on the donor.
+		var e = jQuery.extend(
+			new jQuery.Event(),
+			event,
+			{ type: type,
+				isSimulated: true,
+				originalEvent: {}
+			}
+		);
+		if ( bubble ) {
+			jQuery.event.trigger( e, null, elem );
+		} else {
+			jQuery.event.dispatch.call( elem, e );
+		}
+		if ( e.isDefaultPrevented() ) {
+			event.preventDefault();
+		}
+	}
+};
+
+// Some plugins are using, but it's undocumented/deprecated and will be removed.
+// The 1.7 special event interface should provide all the hooks needed now.
+jQuery.event.handle = jQuery.event.dispatch;
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
+	function( elem, type, handle ) {
+		var name = "on" + type;
+
+		if ( elem.detachEvent ) {
+
+			// #8545, #7054, preventing memory leaks for custom events in IE6-8
+			// detachEvent needed property on element, by name of that event, to properly expose it to GC
+			if ( typeof elem[ name ] === "undefined" ) {
+				elem[ name ] = null;
+			}
+
+			elem.detachEvent( name, handle );
+		}
+	};
+
+jQuery.Event = function( src, props ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !(this instanceof jQuery.Event) ) {
+		return new jQuery.Event( src, props );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
+			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// Create a timestamp if incoming event doesn't have one
+	this.timeStamp = src && src.timeStamp || jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+function returnFalse() {
+	return false;
+}
+function returnTrue() {
+	return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	preventDefault: function() {
+		this.isDefaultPrevented = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+
+		// if preventDefault exists run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// otherwise set the returnValue property of the original event to false (IE)
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		this.isPropagationStopped = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		// if stopPropagation exists run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+		// otherwise set the cancelBubble property of the original event to true (IE)
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	},
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse
+};
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		delegateType: fix,
+		bindType: fix,
+
+		handle: function( event ) {
+			var ret,
+				target = this,
+				related = event.relatedTarget,
+				handleObj = event.handleObj,
+				selector = handleObj.selector;
+
+			// For mousenter/leave call the handler if related is outside the target.
+			// NB: No relatedTarget if the mouse left/entered the browser window
+			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+				event.type = handleObj.origType;
+				ret = handleObj.handler.apply( this, arguments );
+				event.type = fix;
+			}
+			return ret;
+		}
+	};
+});
+
+// IE submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Lazy-add a submit handler when a descendant form may potentially be submitted
+			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+				// Node name check avoids a VML-related crash in IE (#9807)
+				var elem = e.target,
+					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
+				if ( form && !jQuery._data( form, "_submit_attached" ) ) {
+					jQuery.event.add( form, "submit._submit", function( event ) {
+						event._submit_bubble = true;
+					});
+					jQuery._data( form, "_submit_attached", true );
+				}
+			});
+			// return undefined since we don't need an event listener
+		},
+
+		postDispatch: function( event ) {
+			// If form was submitted by the user, bubble the event up the tree
+			if ( event._submit_bubble ) {
+				delete event._submit_bubble;
+				if ( this.parentNode && !event.isTrigger ) {
+					jQuery.event.simulate( "submit", this.parentNode, event, true );
+				}
+			}
+		},
+
+		teardown: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+			jQuery.event.remove( this, "._submit" );
+		}
+	};
+}
+
+// IE change delegation and checkbox/radio fix
+if ( !jQuery.support.changeBubbles ) {
+
+	jQuery.event.special.change = {
+
+		setup: function() {
+
+			if ( rformElems.test( this.nodeName ) ) {
+				// IE doesn't fire change on a check/radio until blur; trigger it on click
+				// after a propertychange. Eat the blur-change in special.change.handle.
+				// This still fires onchange a second time for check/radio after blur.
+				if ( this.type === "checkbox" || this.type === "radio" ) {
+					jQuery.event.add( this, "propertychange._change", function( event ) {
+						if ( event.originalEvent.propertyName === "checked" ) {
+							this._just_changed = true;
+						}
+					});
+					jQuery.event.add( this, "click._change", function( event ) {
+						if ( this._just_changed && !event.isTrigger ) {
+							this._just_changed = false;
+						}
+						// Allow triggered, simulated change events (#11500)
+						jQuery.event.simulate( "change", this, event, true );
+					});
+				}
+				return false;
+			}
+			// Delegated event; lazy-add a change handler on descendant inputs
+			jQuery.event.add( this, "beforeactivate._change", function( e ) {
+				var elem = e.target;
+
+				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "_change_attached" ) ) {
+					jQuery.event.add( elem, "change._change", function( event ) {
+						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
+							jQuery.event.simulate( "change", this.parentNode, event, true );
+						}
+					});
+					jQuery._data( elem, "_change_attached", true );
+				}
+			});
+		},
+
+		handle: function( event ) {
+			var elem = event.target;
+
+			// Swallow native change events from checkbox/radio, we already triggered them above
+			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
+				return event.handleObj.handler.apply( this, arguments );
+			}
+		},
+
+		teardown: function() {
+			jQuery.event.remove( this, "._change" );
+
+			return !rformElems.test( this.nodeName );
+		}
+	};
+}
+
+// Create "bubbling" focus and blur events
+if ( !jQuery.support.focusinBubbles ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler while someone wants focusin/focusout
+		var attaches = 0,
+			handler = function( event ) {
+				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+			};
+
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				if ( attaches++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
+			},
+			teardown: function() {
+				if ( --attaches === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
+			}
+		};
+	});
+}
+
+jQuery.fn.extend({
+
+	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+		var origFn, type;
+
+		// Types can be a map of types/handlers
+		if ( typeof types === "object" ) {
+			// ( types-Object, selector, data )
+			if ( typeof selector !== "string" ) { // && selector != null
+				// ( types-Object, data )
+				data = data || selector;
+				selector = undefined;
+			}
+			for ( type in types ) {
+				this.on( type, selector, data, types[ type ], one );
+			}
+			return this;
+		}
+
+		if ( data == null && fn == null ) {
+			// ( types, fn )
+			fn = selector;
+			data = selector = undefined;
+		} else if ( fn == null ) {
+			if ( typeof selector === "string" ) {
+				// ( types, selector, fn )
+				fn = data;
+				data = undefined;
+			} else {
+				// ( types, data, fn )
+				fn = data;
+				data = selector;
+				selector = undefined;
+			}
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		} else if ( !fn ) {
+			return this;
+		}
+
+		if ( one === 1 ) {
+			origFn = fn;
+			fn = function( event ) {
+				// Can use an empty set, since event contains the info
+				jQuery().off( event );
+				return origFn.apply( this, arguments );
+			};
+			// Use same guid so caller can remove using origFn
+			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+		}
+		return this.each( function() {
+			jQuery.event.add( this, types, fn, data, selector );
+		});
+	},
+	one: function( types, selector, data, fn ) {
+		return this.on( types, selector, data, fn, 1 );
+	},
+	off: function( types, selector, fn ) {
+		var handleObj, type;
+		if ( types && types.preventDefault && types.handleObj ) {
+			// ( event )  dispatched jQuery.Event
+			handleObj = types.handleObj;
+			jQuery( types.delegateTarget ).off(
+				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+				handleObj.selector,
+				handleObj.handler
+			);
+			return this;
+		}
+		if ( typeof types === "object" ) {
+			// ( types-object [, selector] )
+			for ( type in types ) {
+				this.off( type, selector, types[ type ] );
+			}
+			return this;
+		}
+		if ( selector === false || typeof selector === "function" ) {
+			// ( types [, fn] )
+			fn = selector;
+			selector = undefined;
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		}
+		return this.each(function() {
+			jQuery.event.remove( this, types, fn, selector );
+		});
+	},
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
+	live: function( types, data, fn ) {
+		jQuery( this.context ).on( types, this.selector, data, fn );
+		return this;
+	},
+	die: function( types, fn ) {
+		jQuery( this.context ).off( types, this.selector || "**", fn );
+		return this;
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
+	},
+
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+	triggerHandler: function( type, data ) {
+		if ( this[0] ) {
+			return jQuery.event.trigger( type, data, this[0], true );
+		}
+	},
+
+	toggle: function( fn ) {
+		// Save reference to arguments for access in closure
+		var args = arguments,
+			guid = fn.guid || jQuery.guid++,
+			i = 0,
+			toggler = function( event ) {
+				// Figure out which function to execute
+				var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+				jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+				// Make sure that clicks stop
+				event.preventDefault();
+
+				// and execute the function
+				return args[ lastToggle ].apply( this, arguments ) || false;
+			};
+
+		// link all the functions, so any of them can unbind this click handler
+		toggler.guid = guid;
+		while ( i < args.length ) {
+			args[ i++ ].guid = guid;
+		}
+
+		return this.click( toggler );
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+});
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		if ( fn == null ) {
+			fn = data;
+			data = null;
+		}
+
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+
+	if ( rkeyEvent.test( name ) ) {
+		jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
+	}
+
+	if ( rmouseEvent.test( name ) ) {
+		jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
+	}
+});
+/*!
+ * Sizzle CSS Selector Engine
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://sizzlejs.com/
+ */
+(function( window, undefined ) {
+
+var cachedruns,
+	assertGetIdNotName,
+	Expr,
+	getText,
+	isXML,
+	contains,
+	compile,
+	sortOrder,
+	hasDuplicate,
+	outermostContext,
+
+	baseHasDuplicate = true,
+	strundefined = "undefined",
+
+	expando = ( "sizcache" + Math.random() ).replace( ".", "" ),
+
+	Token = String,
+	document = window.document,
+	docElem = document.documentElement,
+	dirruns = 0,
+	done = 0,
+	pop = [].pop,
+	push = [].push,
+	slice = [].slice,
+	// Use a stripped-down indexOf if a native one is unavailable
+	indexOf = [].indexOf || function( elem ) {
+		var i = 0,
+			len = this.length;
+		for ( ; i < len; i++ ) {
+			if ( this[i] === elem ) {
+				return i;
+			}
+		}
+		return -1;
+	},
+
+	// Augment a function for special use by Sizzle
+	markFunction = function( fn, value ) {
+		fn[ expando ] = value == null || value;
+		return fn;
+	},
+
+	createCache = function() {
+		var cache = {},
+			keys = [];
+
+		return markFunction(function( key, value ) {
+			// Only keep the most recent entries
+			if ( keys.push( key ) > Expr.cacheLength ) {
+				delete cache[ keys.shift() ];
+			}
+
+			// Retrieve with (key + " ") to avoid collision with native Object.prototype properties (see Issue #157)
+			return (cache[ key + " " ] = value);
+		}, cache );
+	},
+
+	classCache = createCache(),
+	tokenCache = createCache(),
+	compilerCache = createCache(),
+
+	// Regex
+
+	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+	whitespace = "[\\x20\\t\\r\\n\\f]",
+	// http://www.w3.org/TR/css3-syntax/#characters
+	characterEncoding = "(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",
+
+	// Loosely modeled on CSS identifier characters
+	// An unquoted value should be a CSS identifier (http://www.w3.org/TR/css3-selectors/#attribute-selectors)
+	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+	identifier = characterEncoding.replace( "w", "w#" ),
+
+	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
+	operators = "([*^$|!~]?=)",
+	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
+		"*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
+
+	// Prefer arguments not in parens/brackets,
+	//   then attribute selectors and non-pseudos (denoted by :),
+	//   then anything else
+	// These preferences are here to reduce the number of selectors
+	//   needing tokenize in the PSEUDO preFilter
+	pseudos = ":(" + characterEncoding + ")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:" + attributes + ")|[^:]|\\\\.)*|.*))\\)|)",
+
+	// For matchExpr.POS and matchExpr.needsContext
+	pos = ":(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
+		"*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)",
+
+	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+
+	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ),
+	rpseudo = new RegExp( pseudos ),
+
+	// Easily-parseable/retrievable ID or TAG or CLASS selectors
+	rquickExpr = /^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,
+
+	rnot = /^:not/,
+	rsibling = /[\x20\t\r\n\f]*[+~]/,
+	rendsWithNot = /:not\($/,
+
+	rheader = /h\d/i,
+	rinputs = /input|select|textarea|button/i,
+
+	rbackslash = /\\(?!\\)/g,
+
+	matchExpr = {
+		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
+		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
+		"NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ),
+		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
+		"ATTR": new RegExp( "^" + attributes ),
+		"PSEUDO": new RegExp( "^" + pseudos ),
+		"POS": new RegExp( pos, "i" ),
+		"CHILD": new RegExp( "^:(only|nth|first|last)-child(?:\\(" + whitespace +
+			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		// For use in libraries implementing .is()
+		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|" + pos, "i" )
+	},
+
+	// Support
+
+	// Used for testing something on an element
+	assert = function( fn ) {
+		var div = document.createElement("div");
+
+		try {
+			return fn( div );
+		} catch (e) {
+			return false;
+		} finally {
+			// release memory in IE
+			div = null;
+		}
+	},
+
+	// Check if getElementsByTagName("*") returns only elements
+	assertTagNameNoComments = assert(function( div ) {
+		div.appendChild( document.createComment("") );
+		return !div.getElementsByTagName("*").length;
+	}),
+
+	// Check if getAttribute returns normalized href attributes
+	assertHrefNotNormalized = assert(function( div ) {
+		div.innerHTML = "<a href='#'></a>";
+		return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
+			div.firstChild.getAttribute("href") === "#";
+	}),
+
+	// Check if attributes should be retrieved by attribute nodes
+	assertAttributes = assert(function( div ) {
+		div.innerHTML = "<select></select>";
+		var type = typeof div.lastChild.getAttribute("multiple");
+		// IE8 returns a string for some attributes even when not present
+		return type !== "boolean" && type !== "string";
+	}),
+
+	// Check if getElementsByClassName can be trusted
+	assertUsableClassName = assert(function( div ) {
+		// Opera can't find a second classname (in 9.6)
+		div.innerHTML = "<div class='hidden e'></div><div class='hidden'></div>";
+		if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) {
+			return false;
+		}
+
+		// Safari 3.2 caches class attributes and doesn't catch changes
+		div.lastChild.className = "e";
+		return div.getElementsByClassName("e").length === 2;
+	}),
+
+	// Check if getElementById returns elements by name
+	// Check if getElementsByName privileges form controls or returns elements by ID
+	assertUsableName = assert(function( div ) {
+		// Inject content
+		div.id = expando + 0;
+		div.innerHTML = "<a name='" + expando + "'></a><div name='" + expando + "'></div>";
+		docElem.insertBefore( div, docElem.firstChild );
+
+		// Test
+		var pass = document.getElementsByName &&
+			// buggy browsers will return fewer than the correct 2
+			document.getElementsByName( expando ).length === 2 +
+			// buggy browsers will return more than the correct 0
+			document.getElementsByName( expando + 0 ).length;
+		assertGetIdNotName = !document.getElementById( expando );
+
+		// Cleanup
+		docElem.removeChild( div );
+
+		return pass;
+	});
+
+// If slice is not available, provide a backup
+try {
+	slice.call( docElem.childNodes, 0 )[0].nodeType;
+} catch ( e ) {
+	slice = function( i ) {
+		var elem,
+			results = [];
+		for ( ; (elem = this[i]); i++ ) {
+			results.push( elem );
+		}
+		return results;
+	};
+}
+
+function Sizzle( selector, context, results, seed ) {
+	results = results || [];
+	context = context || document;
+	var match, elem, xml, m,
+		nodeType = context.nodeType;
+
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	if ( nodeType !== 1 && nodeType !== 9 ) {
+		return [];
+	}
+
+	xml = isXML( context );
+
+	if ( !xml && !seed ) {
+		if ( (match = rquickExpr.exec( selector )) ) {
+			// Speed-up: Sizzle("#ID")
+			if ( (m = match[1]) ) {
+				if ( nodeType === 9 ) {
+					elem = context.getElementById( m );
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE, Opera, and Webkit return items
+						// by name instead of ID
+						if ( elem.id === m ) {
+							results.push( elem );
+							return results;
+						}
+					} else {
+						return results;
+					}
+				} else {
+					// Context is not a document
+					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
+						contains( context, elem ) && elem.id === m ) {
+						results.push( elem );
+						return results;
+					}
+				}
+
+			// Speed-up: Sizzle("TAG")
+			} else if ( match[2] ) {
+				push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) );
+				return results;
+
+			// Speed-up: Sizzle(".CLASS")
+			} else if ( (m = match[3]) && assertUsableClassName && context.getElementsByClassName ) {
+				push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
+				return results;
+			}
+		}
+	}
+
+	// All others
+	return select( selector.replace( rtrim, "$1" ), context, results, seed, xml );
+}
+
+Sizzle.matches = function( expr, elements ) {
+	return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+	return Sizzle( expr, null, null, [ elem ] ).length > 0;
+};
+
+// Returns a function to use in pseudos for input types
+function createInputPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return name === "input" && elem.type === type;
+	};
+}
+
+// Returns a function to use in pseudos for buttons
+function createButtonPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return (name === "input" || name === "button") && elem.type === type;
+	};
+}
+
+// Returns a function to use in pseudos for positionals
+function createPositionalPseudo( fn ) {
+	return markFunction(function( argument ) {
+		argument = +argument;
+		return markFunction(function( seed, matches ) {
+			var j,
+				matchIndexes = fn( [], seed.length, argument ),
+				i = matchIndexes.length;
+
+			// Match elements found at the specified indexes
+			while ( i-- ) {
+				if ( seed[ (j = matchIndexes[i]) ] ) {
+					seed[j] = !(matches[j] = seed[j]);
+				}
+			}
+		});
+	});
+}
+
+/**
+ * Utility function for retrieving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+getText = Sizzle.getText = function( elem ) {
+	var node,
+		ret = "",
+		i = 0,
+		nodeType = elem.nodeType;
+
+	if ( nodeType ) {
+		if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+			// Use textContent for elements
+			// innerText usage removed for consistency of new lines (see #11153)
+			if ( typeof elem.textContent === "string" ) {
+				return elem.textContent;
+			} else {
+				// Traverse its children
+				for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+					ret += getText( elem );
+				}
+			}
+		} else if ( nodeType === 3 || nodeType === 4 ) {
+			return elem.nodeValue;
+		}
+		// Do not include comment or processing instruction nodes
+	} else {
+
+		// If no nodeType, this is expected to be an array
+		for ( ; (node = elem[i]); i++ ) {
+			// Do not traverse comment nodes
+			ret += getText( node );
+		}
+	}
+	return ret;
+};
+
+isXML = Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833)
+	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+// Element contains another
+contains = Sizzle.contains = docElem.contains ?
+	function( a, b ) {
+		var adown = a.nodeType === 9 ? a.documentElement : a,
+			bup = b && b.parentNode;
+		return a === bup || !!( bup && bup.nodeType === 1 && adown.contains && adown.contains(bup) );
+	} :
+	docElem.compareDocumentPosition ?
+	function( a, b ) {
+		return b && !!( a.compareDocumentPosition( b ) & 16 );
+	} :
+	function( a, b ) {
+		while ( (b = b.parentNode) ) {
+			if ( b === a ) {
+				return true;
+			}
+		}
+		return false;
+	};
+
+Sizzle.attr = function( elem, name ) {
+	var val,
+		xml = isXML( elem );
+
+	if ( !xml ) {
+		name = name.toLowerCase();
+	}
+	if ( (val = Expr.attrHandle[ name ]) ) {
+		return val( elem );
+	}
+	if ( xml || assertAttributes ) {
+		return elem.getAttribute( name );
+	}
+	val = elem.getAttributeNode( name );
+	return val ?
+		typeof elem[ name ] === "boolean" ?
+			elem[ name ] ? name : null :
+			val.specified ? val.value : null :
+		null;
+};
+
+Expr = Sizzle.selectors = {
+
+	// Can be adjusted by the user
+	cacheLength: 50,
+
+	createPseudo: markFunction,
+
+	match: matchExpr,
+
+	// IE6/7 return a modified href
+	attrHandle: assertHrefNotNormalized ?
+		{} :
+		{
+			"href": function( elem ) {
+				return elem.getAttribute( "href", 2 );
+			},
+			"type": function( elem ) {
+				return elem.getAttribute("type");
+			}
+		},
+
+	find: {
+		"ID": assertGetIdNotName ?
+			function( id, context, xml ) {
+				if ( typeof context.getElementById !== strundefined && !xml ) {
+					var m = context.getElementById( id );
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					return m && m.parentNode ? [m] : [];
+				}
+			} :
+			function( id, context, xml ) {
+				if ( typeof context.getElementById !== strundefined && !xml ) {
+					var m = context.getElementById( id );
+
+					return m ?
+						m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
+							[m] :
+							undefined :
+						[];
+				}
+			},
+
+		"TAG": assertTagNameNoComments ?
+			function( tag, context ) {
+				if ( typeof context.getElementsByTagName !== strundefined ) {
+					return context.getElementsByTagName( tag );
+				}
+			} :
+			function( tag, context ) {
+				var results = context.getElementsByTagName( tag );
+
+				// Filter out possible comments
+				if ( tag === "*" ) {
+					var elem,
+						tmp = [],
+						i = 0;
+
+					for ( ; (elem = results[i]); i++ ) {
+						if ( elem.nodeType === 1 ) {
+							tmp.push( elem );
+						}
+					}
+
+					return tmp;
+				}
+				return results;
+			},
+
+		"NAME": assertUsableName && function( tag, context ) {
+			if ( typeof context.getElementsByName !== strundefined ) {
+				return context.getElementsByName( name );
+			}
+		},
+
+		"CLASS": assertUsableClassName && function( className, context, xml ) {
+			if ( typeof context.getElementsByClassName !== strundefined && !xml ) {
+				return context.getElementsByClassName( className );
+			}
+		}
+	},
+
+	relative: {
+		">": { dir: "parentNode", first: true },
+		" ": { dir: "parentNode" },
+		"+": { dir: "previousSibling", first: true },
+		"~": { dir: "previousSibling" }
+	},
+
+	preFilter: {
+		"ATTR": function( match ) {
+			match[1] = match[1].replace( rbackslash, "" );
+
+			// Move the given value to match[3] whether quoted or unquoted
+			match[3] = ( match[4] || match[5] || "" ).replace( rbackslash, "" );
+
+			if ( match[2] === "~=" ) {
+				match[3] = " " + match[3] + " ";
+			}
+
+			return match.slice( 0, 4 );
+		},
+
+		"CHILD": function( match ) {
+			/* matches from matchExpr["CHILD"]
+				1 type (only|nth|...)
+				2 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+				3 xn-component of xn+y argument ([+-]?\d*n|)
+				4 sign of xn-component
+				5 x of xn-component
+				6 sign of y-component
+				7 y of y-component
+			*/
+			match[1] = match[1].toLowerCase();
+
+			if ( match[1] === "nth" ) {
+				// nth-child requires argument
+				if ( !match[2] ) {
+					Sizzle.error( match[0] );
+				}
+
+				// numeric x and y parameters for Expr.filter.CHILD
+				// remember that false/true cast respectively to 0/1
+				match[3] = +( match[3] ? match[4] + (match[5] || 1) : 2 * ( match[2] === "even" || match[2] === "odd" ) );
+				match[4] = +( ( match[6] + match[7] ) || match[2] === "odd" );
+
+			// other types prohibit arguments
+			} else if ( match[2] ) {
+				Sizzle.error( match[0] );
+			}
+
+			return match;
+		},
+
+		"PSEUDO": function( match ) {
+			var unquoted, excess;
+			if ( matchExpr["CHILD"].test( match[0] ) ) {
+				return null;
+			}
+
+			if ( match[3] ) {
+				match[2] = match[3];
+			} else if ( (unquoted = match[4]) ) {
+				// Only check arguments that contain a pseudo
+				if ( rpseudo.test(unquoted) &&
+					// Get excess from tokenize (recursively)
+					(excess = tokenize( unquoted, true )) &&
+					// advance to the next closing parenthesis
+					(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+					// excess is a negative index
+					unquoted = unquoted.slice( 0, excess );
+					match[0] = match[0].slice( 0, excess );
+				}
+				match[2] = unquoted;
+			}
+
+			// Return only captures needed by the pseudo filter method (type and argument)
+			return match.slice( 0, 3 );
+		}
+	},
+
+	filter: {
+		"ID": assertGetIdNotName ?
+			function( id ) {
+				id = id.replace( rbackslash, "" );
+				return function( elem ) {
+					return elem.getAttribute("id") === id;
+				};
+			} :
+			function( id ) {
+				id = id.replace( rbackslash, "" );
+				return function( elem ) {
+					var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+					return node && node.value === id;
+				};
+			},
+
+		"TAG": function( nodeName ) {
+			if ( nodeName === "*" ) {
+				return function() { return true; };
+			}
+			nodeName = nodeName.replace( rbackslash, "" ).toLowerCase();
+
+			return function( elem ) {
+				return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+			};
+		},
+
+		"CLASS": function( className ) {
+			var pattern = classCache[ expando ][ className + " " ];
+
+			return pattern ||
+				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+				classCache( className, function( elem ) {
+					return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
+				});
+		},
+
+		"ATTR": function( name, operator, check ) {
+			return function( elem, context ) {
+				var result = Sizzle.attr( elem, name );
+
+				if ( result == null ) {
+					return operator === "!=";
+				}
+				if ( !operator ) {
+					return true;
+				}
+
+				result += "";
+
+				return operator === "=" ? result === check :
+					operator === "!=" ? result !== check :
+					operator === "^=" ? check && result.indexOf( check ) === 0 :
+					operator === "*=" ? check && result.indexOf( check ) > -1 :
+					operator === "$=" ? check && result.substr( result.length - check.length ) === check :
+					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
+					operator === "|=" ? result === check || result.substr( 0, check.length + 1 ) === check + "-" :
+					false;
+			};
+		},
+
+		"CHILD": function( type, argument, first, last ) {
+
+			if ( type === "nth" ) {
+				return function( elem ) {
+					var node, diff,
+						parent = elem.parentNode;
+
+					if ( first === 1 && last === 0 ) {
+						return true;
+					}
+
+					if ( parent ) {
+						diff = 0;
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								diff++;
+								if ( elem === node ) {
+									break;
+								}
+							}
+						}
+					}
+
+					// Incorporate the offset (or cast to NaN), then check against cycle size
+					diff -= last;
+					return diff === first || ( diff % first === 0 && diff / first >= 0 );
+				};
+			}
+
+			return function( elem ) {
+				var node = elem;
+
+				switch ( type ) {
+					case "only":
+					case "first":
+						while ( (node = node.previousSibling) ) {
+							if ( node.nodeType === 1 ) {
+								return false;
+							}
+						}
+
+						if ( type === "first" ) {
+							return true;
+						}
+
+						node = elem;
+
+						/* falls through */
+					case "last":
+						while ( (node = node.nextSibling) ) {
+							if ( node.nodeType === 1 ) {
+								return false;
+							}
+						}
+
+						return true;
+				}
+			};
+		},
+
+		"PSEUDO": function( pseudo, argument ) {
+			// pseudo-class names are case-insensitive
+			// http://www.w3.org/TR/selectors/#pseudo-classes
+			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+			// Remember that setFilters inherits from pseudos
+			var args,
+				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+					Sizzle.error( "unsupported pseudo: " + pseudo );
+
+			// The user may use createPseudo to indicate that
+			// arguments are needed to create the filter function
+			// just as Sizzle does
+			if ( fn[ expando ] ) {
+				return fn( argument );
+			}
+
+			// But maintain support for old signatures
+			if ( fn.length > 1 ) {
+				args = [ pseudo, pseudo, "", argument ];
+				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+					markFunction(function( seed, matches ) {
+						var idx,
+							matched = fn( seed, argument ),
+							i = matched.length;
+						while ( i-- ) {
+							idx = indexOf.call( seed, matched[i] );
+							seed[ idx ] = !( matches[ idx ] = matched[i] );
+						}
+					}) :
+					function( elem ) {
+						return fn( elem, 0, args );
+					};
+			}
+
+			return fn;
+		}
+	},
+
+	pseudos: {
+		"not": markFunction(function( selector ) {
+			// Trim the selector passed to compile
+			// to avoid treating leading and trailing
+			// spaces as combinators
+			var input = [],
+				results = [],
+				matcher = compile( selector.replace( rtrim, "$1" ) );
+
+			return matcher[ expando ] ?
+				markFunction(function( seed, matches, context, xml ) {
+					var elem,
+						unmatched = matcher( seed, null, xml, [] ),
+						i = seed.length;
+
+					// Match elements unmatched by `matcher`
+					while ( i-- ) {
+						if ( (elem = unmatched[i]) ) {
+							seed[i] = !(matches[i] = elem);
+						}
+					}
+				}) :
+				function( elem, context, xml ) {
+					input[0] = elem;
+					matcher( input, null, xml, results );
+					return !results.pop();
+				};
+		}),
+
+		"has": markFunction(function( selector ) {
+			return function( elem ) {
+				return Sizzle( selector, elem ).length > 0;
+			};
+		}),
+
+		"contains": markFunction(function( text ) {
+			return function( elem ) {
+				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+			};
+		}),
+
+		"enabled": function( elem ) {
+			return elem.disabled === false;
+		},
+
+		"disabled": function( elem ) {
+			return elem.disabled === true;
+		},
+
+		"checked": function( elem ) {
+			// In CSS3, :checked should return both checked and selected elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			var nodeName = elem.nodeName.toLowerCase();
+			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+		},
+
+		"selected": function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
+			return elem.selected === true;
+		},
+
+		"parent": function( elem ) {
+			return !Expr.pseudos["empty"]( elem );
+		},
+
+		"empty": function( elem ) {
+			// http://www.w3.org/TR/selectors/#empty-pseudo
+			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
+			//   not comment, processing instructions, or others
+			// Thanks to Diego Perini for the nodeName shortcut
+			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
+			var nodeType;
+			elem = elem.firstChild;
+			while ( elem ) {
+				if ( elem.nodeName > "@" || (nodeType = elem.nodeType) === 3 || nodeType === 4 ) {
+					return false;
+				}
+				elem = elem.nextSibling;
+			}
+			return true;
+		},
+
+		"header": function( elem ) {
+			return rheader.test( elem.nodeName );
+		},
+
+		"text": function( elem ) {
+			var type, attr;
+			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
+			// use getAttribute instead to test this case
+			return elem.nodeName.toLowerCase() === "input" &&
+				(type = elem.type) === "text" &&
+				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === type );
+		},
+
+		// Input types
+		"radio": createInputPseudo("radio"),
+		"checkbox": createInputPseudo("checkbox"),
+		"file": createInputPseudo("file"),
+		"password": createInputPseudo("password"),
+		"image": createInputPseudo("image"),
+
+		"submit": createButtonPseudo("submit"),
+		"reset": createButtonPseudo("reset"),
+
+		"button": function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && elem.type === "button" || name === "button";
+		},
+
+		"input": function( elem ) {
+			return rinputs.test( elem.nodeName );
+		},
+
+		"focus": function( elem ) {
+			var doc = elem.ownerDocument;
+			return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+		},
+
+		"active": function( elem ) {
+			return elem === elem.ownerDocument.activeElement;
+		},
+
+		// Positional types
+		"first": createPositionalPseudo(function() {
+			return [ 0 ];
+		}),
+
+		"last": createPositionalPseudo(function( matchIndexes, length ) {
+			return [ length - 1 ];
+		}),
+
+		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			return [ argument < 0 ? argument + length : argument ];
+		}),
+
+		"even": createPositionalPseudo(function( matchIndexes, length ) {
+			for ( var i = 0; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+			for ( var i = 1; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			for ( var i = argument < 0 ? argument + length : argument; --i >= 0; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			for ( var i = argument < 0 ? argument + length : argument; ++i < length; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		})
+	}
+};
+
+function siblingCheck( a, b, ret ) {
+	if ( a === b ) {
+		return ret;
+	}
+
+	var cur = a.nextSibling;
+
+	while ( cur ) {
+		if ( cur === b ) {
+			return -1;
+		}
+
+		cur = cur.nextSibling;
+	}
+
+	return 1;
+}
+
+sortOrder = docElem.compareDocumentPosition ?
+	function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		return ( !a.compareDocumentPosition || !b.compareDocumentPosition ?
+			a.compareDocumentPosition :
+			a.compareDocumentPosition(b) & 4
+		) ? -1 : 1;
+	} :
+	function( a, b ) {
+		// The nodes are identical, we can exit early
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// Fallback to using sourceIndex (in IE) if it's available on both nodes
+		} else if ( a.sourceIndex && b.sourceIndex ) {
+			return a.sourceIndex - b.sourceIndex;
+		}
+
+		var al, bl,
+			ap = [],
+			bp = [],
+			aup = a.parentNode,
+			bup = b.parentNode,
+			cur = aup;
+
+		// If the nodes are siblings (or identical) we can do a quick check
+		if ( aup === bup ) {
+			return siblingCheck( a, b );
+
+		// If no parents were found then the nodes are disconnected
+		} else if ( !aup ) {
+			return -1;
+
+		} else if ( !bup ) {
+			return 1;
+		}
+
+		// Otherwise they're somewhere else in the tree so we need
+		// to build up a full list of the parentNodes for comparison
+		while ( cur ) {
+			ap.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		cur = bup;
+
+		while ( cur ) {
+			bp.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		al = ap.length;
+		bl = bp.length;
+
+		// Start walking down the tree looking for a discrepancy
+		for ( var i = 0; i < al && i < bl; i++ ) {
+			if ( ap[i] !== bp[i] ) {
+				return siblingCheck( ap[i], bp[i] );
+			}
+		}
+
+		// We ended someplace up the tree so do a sibling check
+		return i === al ?
+			siblingCheck( a, bp[i], -1 ) :
+			siblingCheck( ap[i], b, 1 );
+	};
+
+// Always assume the presence of duplicates if sort doesn't
+// pass them to our comparison function (as in Google Chrome).
+[0, 0].sort( sortOrder );
+baseHasDuplicate = !hasDuplicate;
+
+// Document sorting and removing duplicates
+Sizzle.uniqueSort = function( results ) {
+	var elem,
+		duplicates = [],
+		i = 1,
+		j = 0;
+
+	hasDuplicate = baseHasDuplicate;
+	results.sort( sortOrder );
+
+	if ( hasDuplicate ) {
+		for ( ; (elem = results[i]); i++ ) {
+			if ( elem === results[ i - 1 ] ) {
+				j = duplicates.push( i );
+			}
+		}
+		while ( j-- ) {
+			results.splice( duplicates[ j ], 1 );
+		}
+	}
+
+	return results;
+};
+
+Sizzle.error = function( msg ) {
+	throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+function tokenize( selector, parseOnly ) {
+	var matched, match, tokens, type,
+		soFar, groups, preFilters,
+		cached = tokenCache[ expando ][ selector + " " ];
+
+	if ( cached ) {
+		return parseOnly ? 0 : cached.slice( 0 );
+	}
+
+	soFar = selector;
+	groups = [];
+	preFilters = Expr.preFilter;
+
+	while ( soFar ) {
+
+		// Comma and first run
+		if ( !matched || (match = rcomma.exec( soFar )) ) {
+			if ( match ) {
+				// Don't consume trailing commas as valid
+				soFar = soFar.slice( match[0].length ) || soFar;
+			}
+			groups.push( tokens = [] );
+		}
+
+		matched = false;
+
+		// Combinators
+		if ( (match = rcombinators.exec( soFar )) ) {
+			tokens.push( matched = new Token( match.shift() ) );
+			soFar = soFar.slice( matched.length );
+
+			// Cast descendant combinators to space
+			matched.type = match[0].replace( rtrim, " " );
+		}
+
+		// Filters
+		for ( type in Expr.filter ) {
+			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+				(match = preFilters[ type ]( match ))) ) {
+
+				tokens.push( matched = new Token( match.shift() ) );
+				soFar = soFar.slice( matched.length );
+				matched.type = type;
+				matched.matches = match;
+			}
+		}
+
+		if ( !matched ) {
+			break;
+		}
+	}
+
+	// Return the length of the invalid excess
+	// if we're just parsing
+	// Otherwise, throw an error or return tokens
+	return parseOnly ?
+		soFar.length :
+		soFar ?
+			Sizzle.error( selector ) :
+			// Cache the tokens
+			tokenCache( selector, groups ).slice( 0 );
+}
+
+function addCombinator( matcher, combinator, base ) {
+	var dir = combinator.dir,
+		checkNonElements = base && combinator.dir === "parentNode",
+		doneName = done++;
+
+	return combinator.first ?
+		// Check against closest ancestor/preceding element
+		function( elem, context, xml ) {
+			while ( (elem = elem[ dir ]) ) {
+				if ( checkNonElements || elem.nodeType === 1  ) {
+					return matcher( elem, context, xml );
+				}
+			}
+		} :
+
+		// Check against all ancestor/preceding elements
+		function( elem, context, xml ) {
+			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+			if ( !xml ) {
+				var cache,
+					dirkey = dirruns + " " + doneName + " ",
+					cachedkey = dirkey + cachedruns;
+				while ( (elem = elem[ dir ]) ) {
+					if ( checkNonElements || elem.nodeType === 1 ) {
+						if ( (cache = elem[ expando ]) === cachedkey ) {
+							return elem.sizset;
+						} else if ( typeof cache === "string" && cache.indexOf(dirkey) === 0 ) {
+							if ( elem.sizset ) {
+								return elem;
+							}
+						} else {
+							elem[ expando ] = cachedkey;
+							if ( matcher( elem, context, xml ) ) {
+								elem.sizset = true;
+								return elem;
+							}
+							elem.sizset = false;
+						}
+					}
+				}
+			} else {
+				while ( (elem = elem[ dir ]) ) {
+					if ( checkNonElements || elem.nodeType === 1 ) {
+						if ( matcher( elem, context, xml ) ) {
+							return elem;
+						}
+					}
+				}
+			}
+		};
+}
+
+function elementMatcher( matchers ) {
+	return matchers.length > 1 ?
+		function( elem, context, xml ) {
+			var i = matchers.length;
+			while ( i-- ) {
+				if ( !matchers[i]( elem, context, xml ) ) {
+					return false;
+				}
+			}
+			return true;
+		} :
+		matchers[0];
+}
+
+function condense( unmatched, map, filter, context, xml ) {
+	var elem,
+		newUnmatched = [],
+		i = 0,
+		len = unmatched.length,
+		mapped = map != null;
+
+	for ( ; i < len; i++ ) {
+		if ( (elem = unmatched[i]) ) {
+			if ( !filter || filter( elem, context, xml ) ) {
+				newUnmatched.push( elem );
+				if ( mapped ) {
+					map.push( i );
+				}
+			}
+		}
+	}
+
+	return newUnmatched;
+}
+
+function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+	if ( postFilter && !postFilter[ expando ] ) {
+		postFilter = setMatcher( postFilter );
+	}
+	if ( postFinder && !postFinder[ expando ] ) {
+		postFinder = setMatcher( postFinder, postSelector );
+	}
+	return markFunction(function( seed, results, context, xml ) {
+		var temp, i, elem,
+			preMap = [],
+			postMap = [],
+			preexisting = results.length,
+
+			// Get initial elements from seed or context
+			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+			// Prefilter to get matcher input, preserving a map for seed-results synchronization
+			matcherIn = preFilter && ( seed || !selector ) ?
+				condense( elems, preMap, preFilter, context, xml ) :
+				elems,
+
+			matcherOut = matcher ?
+				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+					// ...intermediate processing is necessary
+					[] :
+
+					// ...otherwise use results directly
+					results :
+				matcherIn;
+
+		// Find primary matches
+		if ( matcher ) {
+			matcher( matcherIn, matcherOut, context, xml );
+		}
+
+		// Apply postFilter
+		if ( postFilter ) {
+			temp = condense( matcherOut, postMap );
+			postFilter( temp, [], context, xml );
+
+			// Un-match failing elements by moving them back to matcherIn
+			i = temp.length;
+			while ( i-- ) {
+				if ( (elem = temp[i]) ) {
+					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				}
+			}
+		}
+
+		if ( seed ) {
+			if ( postFinder || preFilter ) {
+				if ( postFinder ) {
+					// Get the final matcherOut by condensing this intermediate into postFinder contexts
+					temp = [];
+					i = matcherOut.length;
+					while ( i-- ) {
+						if ( (elem = matcherOut[i]) ) {
+							// Restore matcherIn since elem is not yet a final match
+							temp.push( (matcherIn[i] = elem) );
+						}
+					}
+					postFinder( null, (matcherOut = []), temp, xml );
+				}
+
+				// Move matched elements from seed to results to keep them synchronized
+				i = matcherOut.length;
+				while ( i-- ) {
+					if ( (elem = matcherOut[i]) &&
+						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+
+						seed[temp] = !(results[temp] = elem);
+					}
+				}
+			}
+
+		// Add elements to results, through postFinder if defined
+		} else {
+			matcherOut = condense(
+				matcherOut === results ?
+					matcherOut.splice( preexisting, matcherOut.length ) :
+					matcherOut
+			);
+			if ( postFinder ) {
+				postFinder( null, results, matcherOut, xml );
+			} else {
+				push.apply( results, matcherOut );
+			}
+		}
+	});
+}
+
+function matcherFromTokens( tokens ) {
+	var checkContext, matcher, j,
+		len = tokens.length,
+		leadingRelative = Expr.relative[ tokens[0].type ],
+		implicitRelative = leadingRelative || Expr.relative[" "],
+		i = leadingRelative ? 1 : 0,
+
+		// The foundational matcher ensures that elements are reachable from top-level context(s)
+		matchContext = addCombinator( function( elem ) {
+			return elem === checkContext;
+		}, implicitRelative, true ),
+		matchAnyContext = addCombinator( function( elem ) {
+			return indexOf.call( checkContext, elem ) > -1;
+		}, implicitRelative, true ),
+		matchers = [ function( elem, context, xml ) {
+			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+				(checkContext = context).nodeType ?
+					matchContext( elem, context, xml ) :
+					matchAnyContext( elem, context, xml ) );
+		} ];
+
+	for ( ; i < len; i++ ) {
+		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+			matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ];
+		} else {
+			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+
+			// Return special upon seeing a positional matcher
+			if ( matcher[ expando ] ) {
+				// Find the next relative operator (if any) for proper handling
+				j = ++i;
+				for ( ; j < len; j++ ) {
+					if ( Expr.relative[ tokens[j].type ] ) {
+						break;
+					}
+				}
+				return setMatcher(
+					i > 1 && elementMatcher( matchers ),
+					i > 1 && tokens.slice( 0, i - 1 ).join("").replace( rtrim, "$1" ),
+					matcher,
+					i < j && matcherFromTokens( tokens.slice( i, j ) ),
+					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && tokens.join("")
+				);
+			}
+			matchers.push( matcher );
+		}
+	}
+
+	return elementMatcher( matchers );
+}
+
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+	var bySet = setMatchers.length > 0,
+		byElement = elementMatchers.length > 0,
+		superMatcher = function( seed, context, xml, results, expandContext ) {
+			var elem, j, matcher,
+				setMatched = [],
+				matchedCount = 0,
+				i = "0",
+				unmatched = seed && [],
+				outermost = expandContext != null,
+				contextBackup = outermostContext,
+				// We must always have either seed elements or context
+				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
+				// Nested matchers should use non-integer dirruns
+				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.E);
+
+			if ( outermost ) {
+				outermostContext = context !== document && context;
+				cachedruns = superMatcher.el;
+			}
+
+			// Add elements passing elementMatchers directly to results
+			for ( ; (elem = elems[i]) != null; i++ ) {
+				if ( byElement && elem ) {
+					for ( j = 0; (matcher = elementMatchers[j]); j++ ) {
+						if ( matcher( elem, context, xml ) ) {
+							results.push( elem );
+							break;
+						}
+					}
+					if ( outermost ) {
+						dirruns = dirrunsUnique;
+						cachedruns = ++superMatcher.el;
+					}
+				}
+
+				// Track unmatched elements for set filters
+				if ( bySet ) {
+					// They will have gone through all possible matchers
+					if ( (elem = !matcher && elem) ) {
+						matchedCount--;
+					}
+
+					// Lengthen the array for every element, matched or not
+					if ( seed ) {
+						unmatched.push( elem );
+					}
+				}
+			}
+
+			// Apply set filters to unmatched elements
+			matchedCount += i;
+			if ( bySet && i !== matchedCount ) {
+				for ( j = 0; (matcher = setMatchers[j]); j++ ) {
+					matcher( unmatched, setMatched, context, xml );
+				}
+
+				if ( seed ) {
+					// Reintegrate element matches to eliminate the need for sorting
+					if ( matchedCount > 0 ) {
+						while ( i-- ) {
+							if ( !(unmatched[i] || setMatched[i]) ) {
+								setMatched[i] = pop.call( results );
+							}
+						}
+					}
+
+					// Discard index placeholder values to get only actual matches
+					setMatched = condense( setMatched );
+				}
+
+				// Add matches to results
+				push.apply( results, setMatched );
+
+				// Seedless set matches succeeding multiple successful matchers stipulate sorting
+				if ( outermost && !seed && setMatched.length > 0 &&
+					( matchedCount + setMatchers.length ) > 1 ) {
+
+					Sizzle.uniqueSort( results );
+				}
+			}
+
+			// Override manipulation of globals by nested matchers
+			if ( outermost ) {
+				dirruns = dirrunsUnique;
+				outermostContext = contextBackup;
+			}
+
+			return unmatched;
+		};
+
+	superMatcher.el = 0;
+	return bySet ?
+		markFunction( superMatcher ) :
+		superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
+	var i,
+		setMatchers = [],
+		elementMatchers = [],
+		cached = compilerCache[ expando ][ selector + " " ];
+
+	if ( !cached ) {
+		// Generate a function of recursive functions that can be used to check each element
+		if ( !group ) {
+			group = tokenize( selector );
+		}
+		i = group.length;
+		while ( i-- ) {
+			cached = matcherFromTokens( group[i] );
+			if ( cached[ expando ] ) {
+				setMatchers.push( cached );
+			} else {
+				elementMatchers.push( cached );
+			}
+		}
+
+		// Cache the compiled function
+		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+	}
+	return cached;
+};
+
+function multipleContexts( selector, contexts, results ) {
+	var i = 0,
+		len = contexts.length;
+	for ( ; i < len; i++ ) {
+		Sizzle( selector, contexts[i], results );
+	}
+	return results;
+}
+
+function select( selector, context, results, seed, xml ) {
+	var i, tokens, token, type, find,
+		match = tokenize( selector ),
+		j = match.length;
+
+	if ( !seed ) {
+		// Try to minimize operations if there is only one group
+		if ( match.length === 1 ) {
+
+			// Take a shortcut and set the context if the root selector is an ID
+			tokens = match[0] = match[0].slice( 0 );
+			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+					context.nodeType === 9 && !xml &&
+					Expr.relative[ tokens[1].type ] ) {
+
+				context = Expr.find["ID"]( token.matches[0].replace( rbackslash, "" ), context, xml )[0];
+				if ( !context ) {
+					return results;
+				}
+
+				selector = selector.slice( tokens.shift().length );
+			}
+
+			// Fetch a seed set for right-to-left matching
+			for ( i = matchExpr["POS"].test( selector ) ? -1 : tokens.length - 1; i >= 0; i-- ) {
+				token = tokens[i];
+
+				// Abort if we hit a combinator
+				if ( Expr.relative[ (type = token.type) ] ) {
+					break;
+				}
+				if ( (find = Expr.find[ type ]) ) {
+					// Search, expanding context for leading sibling combinators
+					if ( (seed = find(
+						token.matches[0].replace( rbackslash, "" ),
+						rsibling.test( tokens[0].type ) && context.parentNode || context,
+						xml
+					)) ) {
+
+						// If seed is empty or no tokens remain, we can return early
+						tokens.splice( i, 1 );
+						selector = seed.length && tokens.join("");
+						if ( !selector ) {
+							push.apply( results, slice.call( seed, 0 ) );
+							return results;
+						}
+
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	// Compile and execute a filtering function
+	// Provide `match` to avoid retokenization if we modified the selector above
+	compile( selector, match )(
+		seed,
+		context,
+		xml,
+		results,
+		rsibling.test( selector )
+	);
+	return results;
+}
+
+if ( document.querySelectorAll ) {
+	(function() {
+		var disconnectedMatch,
+			oldSelect = select,
+			rescape = /'|\\/g,
+			rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
+
+			// qSa(:focus) reports false when true (Chrome 21), no need to also add to buggyMatches since matches checks buggyQSA
+			// A support test would require too much code (would include document ready)
+			rbuggyQSA = [ ":focus" ],
+
+			// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+			// A support test would require too much code (would include document ready)
+			// just skip matchesSelector for :active
+			rbuggyMatches = [ ":active" ],
+			matches = docElem.matchesSelector ||
+				docElem.mozMatchesSelector ||
+				docElem.webkitMatchesSelector ||
+				docElem.oMatchesSelector ||
+				docElem.msMatchesSelector;
+
+		// Build QSA regex
+		// Regex strategy adopted from Diego Perini
+		assert(function( div ) {
+			// Select is set to empty string on purpose
+			// This is to test IE's treatment of not explictly
+			// setting a boolean content attribute,
+			// since its presence should be enough
+			// http://bugs.jquery.com/ticket/12359
+			div.innerHTML = "<select><option selected=''></option></select>";
+
+			// IE8 - Some boolean attributes are not treated correctly
+			if ( !div.querySelectorAll("[selected]").length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
+			}
+
+			// Webkit/Opera - :checked should return selected option elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			// IE8 throws error here (do not put tests after this one)
+			if ( !div.querySelectorAll(":checked").length ) {
+				rbuggyQSA.push(":checked");
+			}
+		});
+
+		assert(function( div ) {
+
+			// Opera 10-12/IE9 - ^= $= *= and empty values
+			// Should not select anything
+			div.innerHTML = "<p test=''></p>";
+			if ( div.querySelectorAll("[test^='']").length ) {
+				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
+			}
+
+			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+			// IE8 throws error here (do not put tests after this one)
+			div.innerHTML = "<input type='hidden'/>";
+			if ( !div.querySelectorAll(":enabled").length ) {
+				rbuggyQSA.push(":enabled", ":disabled");
+			}
+		});
+
+		// rbuggyQSA always contains :focus, so no need for a length check
+		rbuggyQSA = /* rbuggyQSA.length && */ new RegExp( rbuggyQSA.join("|") );
+
+		select = function( selector, context, results, seed, xml ) {
+			// Only use querySelectorAll when not filtering,
+			// when this is not xml,
+			// and when no QSA bugs apply
+			if ( !seed && !xml && !rbuggyQSA.test( selector ) ) {
+				var groups, i,
+					old = true,
+					nid = expando,
+					newContext = context,
+					newSelector = context.nodeType === 9 && selector;
+
+				// qSA works strangely on Element-rooted queries
+				// We can work around this by specifying an extra ID on the root
+				// and working up from there (Thanks to Andrew Dupont for the technique)
+				// IE 8 doesn't work on object elements
+				if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+					groups = tokenize( selector );
+
+					if ( (old = context.getAttribute("id")) ) {
+						nid = old.replace( rescape, "\\$&" );
+					} else {
+						context.setAttribute( "id", nid );
+					}
+					nid = "[id='" + nid + "'] ";
+
+					i = groups.length;
+					while ( i-- ) {
+						groups[i] = nid + groups[i].join("");
+					}
+					newContext = rsibling.test( selector ) && context.parentNode || context;
+					newSelector = groups.join(",");
+				}
+
+				if ( newSelector ) {
+					try {
+						push.apply( results, slice.call( newContext.querySelectorAll(
+							newSelector
+						), 0 ) );
+						return results;
+					} catch(qsaError) {
+					} finally {
+						if ( !old ) {
+							context.removeAttribute("id");
+						}
+					}
+				}
+			}
+
+			return oldSelect( selector, context, results, seed, xml );
+		};
+
+		if ( matches ) {
+			assert(function( div ) {
+				// Check to see if it's possible to do matchesSelector
+				// on a disconnected node (IE 9)
+				disconnectedMatch = matches.call( div, "div" );
+
+				// This should fail with an exception
+				// Gecko does not error, returns false instead
+				try {
+					matches.call( div, "[test!='']:sizzle" );
+					rbuggyMatches.push( "!=", pseudos );
+				} catch ( e ) {}
+			});
+
+			// rbuggyMatches always contains :active and :focus, so no need for a length check
+			rbuggyMatches = /* rbuggyMatches.length && */ new RegExp( rbuggyMatches.join("|") );
+
+			Sizzle.matchesSelector = function( elem, expr ) {
+				// Make sure that attribute selectors are quoted
+				expr = expr.replace( rattributeQuotes, "='$1']" );
+
+				// rbuggyMatches always contains :active, so no need for an existence check
+				if ( !isXML( elem ) && !rbuggyMatches.test( expr ) && !rbuggyQSA.test( expr ) ) {
+					try {
+						var ret = matches.call( elem, expr );
+
+						// IE 9's matchesSelector returns false on disconnected nodes
+						if ( ret || disconnectedMatch ||
+								// As well, disconnected nodes are said to be in a document
+								// fragment in IE 9
+								elem.document && elem.document.nodeType !== 11 ) {
+							return ret;
+						}
+					} catch(e) {}
+				}
+
+				return Sizzle( expr, null, null, [ elem ] ).length > 0;
+			};
+		}
+	})();
+}
+
+// Deprecated
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Back-compat
+function setFilters() {}
+Expr.filters = setFilters.prototype = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+// Override sizzle attribute retrieval
+Sizzle.attr = jQuery.attr;
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.pseudos;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})( window );
+var runtil = /Until$/,
+	rparentsprev = /^(?:parents|prev(?:Until|All))/,
+	isSimple = /^.[^:#\[\.,]*$/,
+	rneedsContext = jQuery.expr.match.needsContext,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var i, l, length, n, r, ret,
+			self = this;
+
+		if ( typeof selector !== "string" ) {
+			return jQuery( selector ).filter(function() {
+				for ( i = 0, l = self.length; i < l; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			});
+		}
+
+		ret = this.pushStack( "", "find", selector );
+
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			length = ret.length;
+			jQuery.find( selector, this[i], ret );
+
+			if ( i > 0 ) {
+				// Make sure that the results are unique
+				for ( n = length; n < ret.length; n++ ) {
+					for ( r = 0; r < length; r++ ) {
+						if ( ret[r] === ret[n] ) {
+							ret.splice(n--, 1);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	has: function( target ) {
+		var i,
+			targets = jQuery( target, this ),
+			len = targets.length;
+
+		return this.filter(function() {
+			for ( i = 0; i < len; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector, false), "not", selector);
+	},
+
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector, true), "filter", selector );
+	},
+
+	is: function( selector ) {
+		return !!selector && (
+			typeof selector === "string" ?
+				// If this is a positional/relative selector, check membership in the returned set
+				// so $("p:first").is("p:last") won't return true for a doc with two "p".
+				rneedsContext.test( selector ) ?
+					jQuery( selector, this.context ).index( this[0] ) >= 0 :
+					jQuery.filter( selector, this ).length > 0 :
+				this.filter( selector ).length > 0 );
+	},
+
+	closest: function( selectors, context ) {
+		var cur,
+			i = 0,
+			l = this.length,
+			ret = [],
+			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( ; i < l; i++ ) {
+			cur = this[i];
+
+			while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+					ret.push( cur );
+					break;
+				}
+				cur = cur.parentNode;
+			}
+		}
+
+		ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
+
+		return this.pushStack( ret, "closest", selectors );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1;
+		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[0], jQuery( elem ) );
+		}
+
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		var set = typeof selector === "string" ?
+				jQuery( selector, context ) :
+				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
+			all = jQuery.merge( this.get(), set );
+
+		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+			all :
+			jQuery.unique( all ) );
+	},
+
+	addBack: function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter(selector)
+		);
+	}
+});
+
+jQuery.fn.andSelf = jQuery.fn.addBack;
+
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+	return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
+function sibling( cur, dir ) {
+	do {
+		cur = cur[ dir ];
+	} while ( cur && cur.nodeType !== 1 );
+
+	return cur;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return sibling( elem, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return sibling( elem, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.merge( [], elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+
+		if ( !runtil.test( name ) ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
+
+		if ( this.length > 1 && rparentsprev.test( name ) ) {
+			ret = ret.reverse();
+		}
+
+		return this.pushStack( ret, name, core_slice.call( arguments ).join(",") );
+	};
+});
+
+jQuery.extend({
+	filter: function( expr, elems, not ) {
+		if ( not ) {
+			expr = ":not(" + expr + ")";
+		}
+
+		return elems.length === 1 ?
+			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+			jQuery.find.matches(expr, elems);
+	},
+
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+
+	// Can't pass null or undefined to indexOf in Firefox 4
+	// Set to 0 to skip string check
+	qualifier = qualifier || 0;
+
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return ( elem === qualifier ) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem, i ) {
+		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
+	});
+}
+function createSafeFragment( document ) {
+	var list = nodeNames.split( "|" ),
+	safeFrag = document.createDocumentFragment();
+
+	if ( safeFrag.createElement ) {
+		while ( list.length ) {
+			safeFrag.createElement(
+				list.pop()
+			);
+		}
+	}
+	return safeFrag;
+}
+
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
+		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
+	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnoInnerhtml = /<(?:script|style|link)/i,
+	rnocache = /<(?:script|object|embed|option|style)/i,
+	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
+	rcheckableType = /^(?:checkbox|radio)$/,
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptType = /\/(java|ecma)script/i,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		area: [ 1, "<map>", "</map>" ],
+		_default: [ 0, "", "" ]
+	},
+	safeFragment = createSafeFragment( document ),
+	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
+// unless wrapped in a div with non-breaking characters in front of it.
+if ( !jQuery.support.htmlSerialize ) {
+	wrapMap._default = [ 1, "X<div>", "</div>" ];
+}
+
+jQuery.fn.extend({
+	text: function( value ) {
+		return jQuery.access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
+		}, null, value, arguments.length );
+	},
+
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each(function(i) {
+			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	},
+
+	append: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 ) {
+				this.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 ) {
+				this.insertBefore( elem, this.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		if ( !isDisconnected( this[0] ) ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this );
+			});
+		}
+
+		if ( arguments.length ) {
+			var set = jQuery.clean( arguments );
+			return this.pushStack( jQuery.merge( set, this ), "before", this.selector );
+		}
+	},
+
+	after: function() {
+		if ( !isDisconnected( this[0] ) ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			});
+		}
+
+		if ( arguments.length ) {
+			var set = jQuery.clean( arguments );
+			return this.pushStack( jQuery.merge( this, set ), "after", this.selector );
+		}
+	},
+
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		var elem,
+			i = 0;
+
+		for ( ; (elem = this[i]) != null; i++ ) {
+			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
+				if ( !keepData && elem.nodeType === 1 ) {
+					jQuery.cleanData( elem.getElementsByTagName("*") );
+					jQuery.cleanData( [ elem ] );
+				}
+
+				if ( elem.parentNode ) {
+					elem.parentNode.removeChild( elem );
+				}
+			}
+		}
+
+		return this;
+	},
+
+	empty: function() {
+		var elem,
+			i = 0;
+
+		for ( ; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( elem.getElementsByTagName("*") );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function () {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
+	},
+
+	html: function( value ) {
+		return jQuery.access( this, function( value ) {
+			var elem = this[0] || {},
+				i = 0,
+				l = this.length;
+
+			if ( value === undefined ) {
+				return elem.nodeType === 1 ?
+					elem.innerHTML.replace( rinlinejQuery, "" ) :
+					undefined;
+			}
+
+			// See if we can take a shortcut and just use innerHTML
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
+				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
+
+				value = value.replace( rxhtmlTag, "<$1></$2>" );
+
+				try {
+					for (; i < l; i++ ) {
+						// Remove element nodes and prevent memory leaks
+						elem = this[i] || {};
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( elem.getElementsByTagName( "*" ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch(e) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
+	},
+
+	replaceWith: function( value ) {
+		if ( !isDisconnected( this[0] ) ) {
+			// Make sure that the elements are removed from the DOM before they are inserted
+			// this can help fix replacing a parent with child elements
+			if ( jQuery.isFunction( value ) ) {
+				return this.each(function(i) {
+					var self = jQuery(this), old = self.html();
+					self.replaceWith( value.call( this, i, old ) );
+				});
+			}
+
+			if ( typeof value !== "string" ) {
+				value = jQuery( value ).detach();
+			}
+
+			return this.each(function() {
+				var next = this.nextSibling,
+					parent = this.parentNode;
+
+				jQuery( this ).remove();
+
+				if ( next ) {
+					jQuery(next).before( value );
+				} else {
+					jQuery(parent).append( value );
+				}
+			});
+		}
+
+		return this.length ?
+			this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
+			this;
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, table, callback ) {
+
+		// Flatten any nested arrays
+		args = [].concat.apply( [], args );
+
+		var results, first, fragment, iNoClone,
+			i = 0,
+			value = args[0],
+			scripts = [],
+			l = this.length;
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( !jQuery.support.checkClone && l > 1 && typeof value === "string" && rchecked.test( value ) ) {
+			return this.each(function() {
+				jQuery(this).domManip( args, table, callback );
+			});
+		}
+
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				args[0] = value.call( this, i, table ? self.html() : undefined );
+				self.domManip( args, table, callback );
+			});
+		}
+
+		if ( this[0] ) {
+			results = jQuery.buildFragment( args, this, scripts );
+			fragment = results.fragment;
+			first = fragment.firstChild;
+
+			if ( fragment.childNodes.length === 1 ) {
+				fragment = first;
+			}
+
+			if ( first ) {
+				table = table && jQuery.nodeName( first, "tr" );
+
+				// Use the original fragment for the last item instead of the first because it can end up
+				// being emptied incorrectly in certain situations (#8070).
+				// Fragments from the fragment cache must always be cloned and never used in place.
+				for ( iNoClone = results.cacheable || l - 1; i < l; i++ ) {
+					callback.call(
+						table && jQuery.nodeName( this[i], "table" ) ?
+							findOrAppend( this[i], "tbody" ) :
+							this[i],
+						i === iNoClone ?
+							fragment :
+							jQuery.clone( fragment, true, true )
+					);
+				}
+			}
+
+			// Fix #11809: Avoid leaking memory
+			fragment = first = null;
+
+			if ( scripts.length ) {
+				jQuery.each( scripts, function( i, elem ) {
+					if ( elem.src ) {
+						if ( jQuery.ajax ) {
+							jQuery.ajax({
+								url: elem.src,
+								type: "GET",
+								dataType: "script",
+								async: false,
+								global: false,
+								"throws": true
+							});
+						} else {
+							jQuery.error("no ajax");
+						}
+					} else {
+						jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "" ) );
+					}
+
+					if ( elem.parentNode ) {
+						elem.parentNode.removeChild( elem );
+					}
+				});
+			}
+		}
+
+		return this;
+	}
+});
+
+function findOrAppend( elem, tag ) {
+	return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
+}
+
+function cloneCopyEvent( src, dest ) {
+
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var type, i, l,
+		oldData = jQuery._data( src ),
+		curData = jQuery._data( dest, oldData ),
+		events = oldData.events;
+
+	if ( events ) {
+		delete curData.handle;
+		curData.events = {};
+
+		for ( type in events ) {
+			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+				jQuery.event.add( dest, type, events[ type ][ i ] );
+			}
+		}
+	}
+
+	// make the cloned public data object a copy from the original
+	if ( curData.data ) {
+		curData.data = jQuery.extend( {}, curData.data );
+	}
+}
+
+function cloneFixAttributes( src, dest ) {
+	var nodeName;
+
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	// clearAttributes removes the attributes, which we don't want,
+	// but also removes the attachEvent events, which we *do* want
+	if ( dest.clearAttributes ) {
+		dest.clearAttributes();
+	}
+
+	// mergeAttributes, in contrast, only merges back on the
+	// original attributes, not the events
+	if ( dest.mergeAttributes ) {
+		dest.mergeAttributes( src );
+	}
+
+	nodeName = dest.nodeName.toLowerCase();
+
+	if ( nodeName === "object" ) {
+		// IE6-10 improperly clones children of object elements using classid.
+		// IE10 throws NoModificationAllowedError if parent is null, #12132.
+		if ( dest.parentNode ) {
+			dest.outerHTML = src.outerHTML;
+		}
+
+		// This path appears unavoidable for IE9. When cloning an object
+		// element in IE9, the outerHTML strategy above is not sufficient.
+		// If the src has innerHTML and the destination does not,
+		// copy the src.innerHTML into the dest.innerHTML. #10324
+		if ( jQuery.support.html5Clone && (src.innerHTML && !jQuery.trim(dest.innerHTML)) ) {
+			dest.innerHTML = src.innerHTML;
+		}
+
+	} else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+
+		dest.defaultChecked = dest.checked = src.checked;
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+
+	// IE blanks contents when cloning scripts
+	} else if ( nodeName === "script" && dest.text !== src.text ) {
+		dest.text = src.text;
+	}
+
+	// Event data gets referenced instead of copied if the expando
+	// gets copied too
+	dest.removeAttribute( jQuery.expando );
+}
+
+jQuery.buildFragment = function( args, context, scripts ) {
+	var fragment, cacheable, cachehit,
+		first = args[ 0 ];
+
+	// Set context from what may come in as undefined or a jQuery collection or a node
+	// Updated to fix #12266 where accessing context[0] could throw an exception in IE9/10 &
+	// also doubles as fix for #8950 where plain objects caused createDocumentFragment exception
+	context = context || document;
+	context = !context.nodeType && context[0] || context;
+	context = context.ownerDocument || context;
+
+	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
+	// Cloning options loses the selected state, so don't cache them
+	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+	// Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
+	if ( args.length === 1 && typeof first === "string" && first.length < 512 && context === document &&
+		first.charAt(0) === "<" && !rnocache.test( first ) &&
+		(jQuery.support.checkClone || !rchecked.test( first )) &&
+		(jQuery.support.html5Clone || !rnoshimcache.test( first )) ) {
+
+		// Mark cacheable and look for a hit
+		cacheable = true;
+		fragment = jQuery.fragments[ first ];
+		cachehit = fragment !== undefined;
+	}
+
+	if ( !fragment ) {
+		fragment = context.createDocumentFragment();
+		jQuery.clean( args, context, fragment, scripts );
+
+		// Update the cache, but only store false
+		// unless this is a second parsing of the same content
+		if ( cacheable ) {
+			jQuery.fragments[ first ] = cachehit && fragment;
+		}
+	}
+
+	return { fragment: fragment, cacheable: cacheable };
+};
+
+jQuery.fragments = {};
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var elems,
+			i = 0,
+			ret = [],
+			insert = jQuery( selector ),
+			l = insert.length,
+			parent = this.length === 1 && this[0].parentNode;
+
+		if ( (parent == null || parent && parent.nodeType === 11 && parent.childNodes.length === 1) && l === 1 ) {
+			insert[ original ]( this[0] );
+			return this;
+		} else {
+			for ( ; i < l; i++ ) {
+				elems = ( i > 0 ? this.clone(true) : this ).get();
+				jQuery( insert[i] )[ original ]( elems );
+				ret = ret.concat( elems );
+			}
+
+			return this.pushStack( ret, name, insert.selector );
+		}
+	};
+});
+
+function getAll( elem ) {
+	if ( typeof elem.getElementsByTagName !== "undefined" ) {
+		return elem.getElementsByTagName( "*" );
+
+	} else if ( typeof elem.querySelectorAll !== "undefined" ) {
+		return elem.querySelectorAll( "*" );
+
+	} else {
+		return [];
+	}
+}
+
+// Used in clean, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+	if ( rcheckableType.test( elem.type ) ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+
+jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var srcElements,
+			destElements,
+			i,
+			clone;
+
+		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+			clone = elem.cloneNode( true );
+
+		// IE<=8 does not properly clone detached, unknown element nodes
+		} else {
+			fragmentDiv.innerHTML = elem.outerHTML;
+			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
+		}
+
+		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+			// IE copies events bound via attachEvent when using cloneNode.
+			// Calling detachEvent on the clone will also remove the events
+			// from the original. In order to get around this, we use some
+			// proprietary methods to clear the events. Thanks to MooTools
+			// guys for this hotness.
+
+			cloneFixAttributes( elem, clone );
+
+			// Using Sizzle here is crazy slow, so we use getElementsByTagName instead
+			srcElements = getAll( elem );
+			destElements = getAll( clone );
+
+			// Weird iteration because IE will replace the length property
+			// with an element if you are cloning the body and one of the
+			// elements on the page has a name or id of "length"
+			for ( i = 0; srcElements[i]; ++i ) {
+				// Ensure that the destination node is not null; Fixes #9587
+				if ( destElements[i] ) {
+					cloneFixAttributes( srcElements[i], destElements[i] );
+				}
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			cloneCopyEvent( elem, clone );
+
+			if ( deepDataAndEvents ) {
+				srcElements = getAll( elem );
+				destElements = getAll( clone );
+
+				for ( i = 0; srcElements[i]; ++i ) {
+					cloneCopyEvent( srcElements[i], destElements[i] );
+				}
+			}
+		}
+
+		srcElements = destElements = null;
+
+		// Return the cloned set
+		return clone;
+	},
+
+	clean: function( elems, context, fragment, scripts ) {
+		var i, j, elem, tag, wrap, depth, div, hasBody, tbody, len, handleScript, jsTags,
+			safe = context === document && safeFragment,
+			ret = [];
+
+		// Ensure that context is a document
+		if ( !context || typeof context.createDocumentFragment === "undefined" ) {
+			context = document;
+		}
+
+		// Use the already-created safe fragment if context permits
+		for ( i = 0; (elem = elems[i]) != null; i++ ) {
+			if ( typeof elem === "number" ) {
+				elem += "";
+			}
+
+			if ( !elem ) {
+				continue;
+			}
+
+			// Convert html string into DOM nodes
+			if ( typeof elem === "string" ) {
+				if ( !rhtml.test( elem ) ) {
+					elem = context.createTextNode( elem );
+				} else {
+					// Ensure a safe container in which to render the html
+					safe = safe || createSafeFragment( context );
+					div = context.createElement("div");
+					safe.appendChild( div );
+
+					// Fix "XHTML"-style tags in all browsers
+					elem = elem.replace(rxhtmlTag, "<$1></$2>");
+
+					// Go to html and back, then peel off extra wrappers
+					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
+					wrap = wrapMap[ tag ] || wrapMap._default;
+					depth = wrap[0];
+					div.innerHTML = wrap[1] + elem + wrap[2];
+
+					// Move to the right depth
+					while ( depth-- ) {
+						div = div.lastChild;
+					}
+
+					// Remove IE's autoinserted <tbody> from table fragments
+					if ( !jQuery.support.tbody ) {
+
+						// String was a <table>, *may* have spurious <tbody>
+						hasBody = rtbody.test(elem);
+							tbody = tag === "table" && !hasBody ?
+								div.firstChild && div.firstChild.childNodes :
+
+								// String was a bare <thead> or <tfoot>
+								wrap[1] === "<table>" && !hasBody ?
+									div.childNodes :
+									[];
+
+						for ( j = tbody.length - 1; j >= 0 ; --j ) {
+							if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+								tbody[ j ].parentNode.removeChild( tbody[ j ] );
+							}
+						}
+					}
+
+					// IE completely kills leading whitespace when innerHTML is used
+					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+						div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+					}
+
+					elem = div.childNodes;
+
+					// Take out of fragment container (we need a fresh div each time)
+					div.parentNode.removeChild( div );
+				}
+			}
+
+			if ( elem.nodeType ) {
+				ret.push( elem );
+			} else {
+				jQuery.merge( ret, elem );
+			}
+		}
+
+		// Fix #11356: Clear elements from safeFragment
+		if ( div ) {
+			elem = div = safe = null;
+		}
+
+		// Reset defaultChecked for any radios and checkboxes
+		// about to be appended to the DOM in IE 6/7 (#8060)
+		if ( !jQuery.support.appendChecked ) {
+			for ( i = 0; (elem = ret[i]) != null; i++ ) {
+				if ( jQuery.nodeName( elem, "input" ) ) {
+					fixDefaultChecked( elem );
+				} else if ( typeof elem.getElementsByTagName !== "undefined" ) {
+					jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
+				}
+			}
+		}
+
+		// Append elements to a provided document fragment
+		if ( fragment ) {
+			// Special handling of each script element
+			handleScript = function( elem ) {
+				// Check if we consider it executable
+				if ( !elem.type || rscriptType.test( elem.type ) ) {
+					// Detach the script and store it in the scripts array (if provided) or the fragment
+					// Return truthy to indicate that it has been handled
+					return scripts ?
+						scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
+						fragment.appendChild( elem );
+				}
+			};
+
+			for ( i = 0; (elem = ret[i]) != null; i++ ) {
+				// Check if we're done after handling an executable script
+				if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
+					// Append to fragment and handle embedded scripts
+					fragment.appendChild( elem );
+					if ( typeof elem.getElementsByTagName !== "undefined" ) {
+						// handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
+						jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
+
+						// Splice the scripts into ret after their former ancestor and advance our index beyond them
+						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
+						i += jsTags.length;
+					}
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	cleanData: function( elems, /* internal */ acceptData ) {
+		var data, id, elem, type,
+			i = 0,
+			internalKey = jQuery.expando,
+			cache = jQuery.cache,
+			deleteExpando = jQuery.support.deleteExpando,
+			special = jQuery.event.special;
+
+		for ( ; (elem = elems[i]) != null; i++ ) {
+
+			if ( acceptData || jQuery.acceptData( elem ) ) {
+
+				id = elem[ internalKey ];
+				data = id && cache[ id ];
+
+				if ( data ) {
+					if ( data.events ) {
+						for ( type in data.events ) {
+							if ( special[ type ] ) {
+								jQuery.event.remove( elem, type );
+
+							// This is a shortcut to avoid jQuery.event.remove's overhead
+							} else {
+								jQuery.removeEvent( elem, type, data.handle );
+							}
+						}
+					}
+
+					// Remove cache only if it was not already removed by jQuery.event.remove
+					if ( cache[ id ] ) {
+
+						delete cache[ id ];
+
+						// IE does not allow us to delete expando properties from nodes,
+						// nor does it have a removeAttribute function on Document nodes;
+						// we must handle all of these cases
+						if ( deleteExpando ) {
+							delete elem[ internalKey ];
+
+						} else if ( elem.removeAttribute ) {
+							elem.removeAttribute( internalKey );
+
+						} else {
+							elem[ internalKey ] = null;
+						}
+
+						jQuery.deletedIds.push( id );
+					}
+				}
+			}
+		}
+	}
+});
+// Limit scope pollution from any deprecated API
+(function() {
+
+var matched, browser;
+
+// Use of jQuery.browser is frowned upon.
+// More details: http://api.jquery.com/jQuery.browser
+// jQuery.uaMatch maintained for back-compat
+jQuery.uaMatch = function( ua ) {
+	ua = ua.toLowerCase();
+
+	var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+		/(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+		/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+		/(msie) ([\w.]+)/.exec( ua ) ||
+		ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
+		[];
+
+	return {
+		browser: match[ 1 ] || "",
+		version: match[ 2 ] || "0"
+	};
+};
+
+matched = jQuery.uaMatch( navigator.userAgent );
+browser = {};
+
+if ( matched.browser ) {
+	browser[ matched.browser ] = true;
+	browser.version = matched.version;
+}
+
+// Chrome is Webkit, but Webkit is also Safari.
+if ( browser.chrome ) {
+	browser.webkit = true;
+} else if ( browser.webkit ) {
+	browser.safari = true;
+}
+
+jQuery.browser = browser;
+
+jQuery.sub = function() {
+	function jQuerySub( selector, context ) {
+		return new jQuerySub.fn.init( selector, context );
+	}
+	jQuery.extend( true, jQuerySub, this );
+	jQuerySub.superclass = this;
+	jQuerySub.fn = jQuerySub.prototype = this();
+	jQuerySub.fn.constructor = jQuerySub;
+	jQuerySub.sub = this.sub;
+	jQuerySub.fn.init = function init( selector, context ) {
+		if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
+			context = jQuerySub( context );
+		}
+
+		return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+	};
+	jQuerySub.fn.init.prototype = jQuerySub.fn;
+	var rootjQuerySub = jQuerySub(document);
+	return jQuerySub;
+};
+
+})();
+var curCSS, iframe, iframeDoc,
+	ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity=([^)]*)/,
+	rposition = /^(top|right|bottom|left)$/,
+	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
+	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+	rmargin = /^margin/,
+	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
+	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
+	rrelNum = new RegExp( "^([-+])=(" + core_pnum + ")", "i" ),
+	elemdisplay = { BODY: "block" },
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssNormalTransform = {
+		letterSpacing: 0,
+		fontWeight: 400
+	},
+
+	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
+	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
+
+	eventsToggle = jQuery.fn.toggle;
+
+// return a css property mapped to a potentially vendor prefixed property
+function vendorPropName( style, name ) {
+
+	// shortcut for names that are not vendor prefixed
+	if ( name in style ) {
+		return name;
+	}
+
+	// check for vendor prefixed names
+	var capName = name.charAt(0).toUpperCase() + name.slice(1),
+		origName = name,
+		i = cssPrefixes.length;
+
+	while ( i-- ) {
+		name = cssPrefixes[ i ] + capName;
+		if ( name in style ) {
+			return name;
+		}
+	}
+
+	return origName;
+}
+
+function isHidden( elem, el ) {
+	elem = el || elem;
+	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
+}
+
+function showHide( elements, show ) {
+	var elem, display,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+		values[ index ] = jQuery._data( elem, "olddisplay" );
+		if ( show ) {
+			// Reset the inline display of this element to learn if it is
+			// being hidden by cascaded rules or not
+			if ( !values[ index ] && elem.style.display === "none" ) {
+				elem.style.display = "";
+			}
+
+			// Set elements which have been overridden with display: none
+			// in a stylesheet to whatever the default browser style is
+			// for such an element
+			if ( elem.style.display === "" && isHidden( elem ) ) {
+				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
+			}
+		} else {
+			display = curCSS( elem, "display" );
+
+			if ( !values[ index ] && display !== "none" ) {
+				jQuery._data( elem, "olddisplay", display );
+			}
+		}
+	}
+
+	// Set the display of most of the elements in a second loop
+	// to avoid the constant reflow
+	for ( index = 0; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
+			elem.style.display = show ? values[ index ] || "" : "none";
+		}
+	}
+
+	return elements;
+}
+
+jQuery.fn.extend({
+	css: function( name, value ) {
+		return jQuery.access( this, function( elem, name, value ) {
+			return value !== undefined ?
+				jQuery.style( elem, name, value ) :
+				jQuery.css( elem, name );
+		}, name, value, arguments.length > 1 );
+	},
+	show: function() {
+		return showHide( this, true );
+	},
+	hide: function() {
+		return showHide( this );
+	},
+	toggle: function( state, fn2 ) {
+		var bool = typeof state === "boolean";
+
+		if ( jQuery.isFunction( state ) && jQuery.isFunction( fn2 ) ) {
+			return eventsToggle.apply( this, arguments );
+		}
+
+		return this.each(function() {
+			if ( bool ? state : isHidden( this ) ) {
+				jQuery( this ).show();
+			} else {
+				jQuery( this ).hide();
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+
+				}
+			}
+		}
+	},
+
+	// Exclude the following css properties to add px
+	cssNumber: {
+		"fillOpacity": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, hooks,
+			origName = jQuery.camelCase( name ),
+			style = elem.style;
+
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// convert relative number strings (+= or -=) to relative numbers. #7345
+			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
+				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( value == null || type === "number" && isNaN( value ) ) {
+				return;
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, numeric, extra ) {
+		var val, num, hooks,
+			origName = jQuery.camelCase( name );
+
+		// Make sure that we're working with the right name
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks ) {
+			val = hooks.get( elem, true, extra );
+		}
+
+		// Otherwise, if a way to get the computed value exists, use that
+		if ( val === undefined ) {
+			val = curCSS( elem, name );
+		}
+
+		//convert "normal" to computed value
+		if ( val === "normal" && name in cssNormalTransform ) {
+			val = cssNormalTransform[ name ];
+		}
+
+		// Return, converting to number if forced or a qualifier was provided and val looks numeric
+		if ( numeric || extra !== undefined ) {
+			num = parseFloat( val );
+			return numeric || jQuery.isNumeric( num ) ? num || 0 : val;
+		}
+		return val;
+	},
+
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var ret, name,
+			old = {};
+
+		// Remember the old values, and insert the new ones
+		for ( name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		ret = callback.call( elem );
+
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+
+		return ret;
+	}
+});
+
+// NOTE: To any future maintainer, we've window.getComputedStyle
+// because jsdom on node.js will break without it.
+if ( window.getComputedStyle ) {
+	curCSS = function( elem, name ) {
+		var ret, width, minWidth, maxWidth,
+			computed = window.getComputedStyle( elem, null ),
+			style = elem.style;
+
+		if ( computed ) {
+
+			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
+			ret = computed.getPropertyValue( name ) || computed[ name ];
+
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+
+			// A tribute to the "awesome hack by Dean Edwards"
+			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
+			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
+			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
+			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+				width = style.width;
+				minWidth = style.minWidth;
+				maxWidth = style.maxWidth;
+
+				style.minWidth = style.maxWidth = style.width = ret;
+				ret = computed.width;
+
+				style.width = width;
+				style.minWidth = minWidth;
+				style.maxWidth = maxWidth;
+			}
+		}
+
+		return ret;
+	};
+} else if ( document.documentElement.currentStyle ) {
+	curCSS = function( elem, name ) {
+		var left, rsLeft,
+			ret = elem.currentStyle && elem.currentStyle[ name ],
+			style = elem.style;
+
+		// Avoid setting ret to empty string here
+		// so we don't default to auto
+		if ( ret == null && style && style[ name ] ) {
+			ret = style[ name ];
+		}
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		// but not position css attributes, as those are proportional to the parent element instead
+		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
+		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+
+			// Remember the original values
+			left = style.left;
+			rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : ret;
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = rsLeft;
+			}
+		}
+
+		return ret === "" ? "auto" : ret;
+	};
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+	var matches = rnumsplit.exec( value );
+	return matches ?
+			Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+			value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox ) {
+	var i = extra === ( isBorderBox ? "border" : "content" ) ?
+		// If we already have the right measurement, avoid augmentation
+		4 :
+		// Otherwise initialize for horizontal or vertical properties
+		name === "width" ? 1 : 0,
+
+		val = 0;
+
+	for ( ; i < 4; i += 2 ) {
+		// both box models exclude margin, so add it if we want it
+		if ( extra === "margin" ) {
+			// we use jQuery.css instead of curCSS here
+			// because of the reliableMarginRight CSS hook!
+			val += jQuery.css( elem, extra + cssExpand[ i ], true );
+		}
+
+		// From this point on we use curCSS for maximum performance (relevant in animations)
+		if ( isBorderBox ) {
+			// border-box includes padding, so remove it if we want content
+			if ( extra === "content" ) {
+				val -= parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
+			}
+
+			// at this point, extra isn't border nor margin, so remove border
+			if ( extra !== "margin" ) {
+				val -= parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
+			}
+		} else {
+			// at this point, extra isn't content, so add padding
+			val += parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
+
+			// at this point, extra isn't content nor padding, so add border
+			if ( extra !== "padding" ) {
+				val += parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
+			}
+		}
+	}
+
+	return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+	// Start with offset property, which is equivalent to the border-box value
+	var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		valueIsBorderBox = true,
+		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box";
+
+	// some non-html elements return undefined for offsetWidth, so check for null/undefined
+	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+	if ( val <= 0 || val == null ) {
+		// Fall back to computed then uncomputed css if necessary
+		val = curCSS( elem, name );
+		if ( val < 0 || val == null ) {
+			val = elem.style[ name ];
+		}
+
+		// Computed unit is not pixels. Stop here and return.
+		if ( rnumnonpx.test(val) ) {
+			return val;
+		}
+
+		// we need the check for style in case a browser which returns unreliable values
+		// for getComputedStyle silently falls back to the reliable elem.style
+		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
+
+		// Normalize "", auto, and prepare for extra
+		val = parseFloat( val ) || 0;
+	}
+
+	// use the active box-sizing model to add/subtract irrelevant styles
+	return ( val +
+		augmentWidthOrHeight(
+			elem,
+			name,
+			extra || ( isBorderBox ? "border" : "content" ),
+			valueIsBorderBox
+		)
+	) + "px";
+}
+
+
+// Try to determine the default display value of an element
+function css_defaultDisplay( nodeName ) {
+	if ( elemdisplay[ nodeName ] ) {
+		return elemdisplay[ nodeName ];
+	}
+
+	var elem = jQuery( "<" + nodeName + ">" ).appendTo( document.body ),
+		display = elem.css("display");
+	elem.remove();
+
+	// If the simple way fails,
+	// get element's real default display by attaching it to a temp iframe
+	if ( display === "none" || display === "" ) {
+		// Use the already-created iframe if possible
+		iframe = document.body.appendChild(
+			iframe || jQuery.extend( document.createElement("iframe"), {
+				frameBorder: 0,
+				width: 0,
+				height: 0
+			})
+		);
+
+		// Create a cacheable copy of the iframe document on first call.
+		// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
+		// document to it; WebKit & Firefox won't allow reusing the iframe document.
+		if ( !iframeDoc || !iframe.createElement ) {
+			iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
+			iframeDoc.write("<!doctype html><html><body>");
+			iframeDoc.close();
+		}
+
+		elem = iframeDoc.body.appendChild( iframeDoc.createElement(nodeName) );
+
+		display = curCSS( elem, "display" );
+		document.body.removeChild( iframe );
+	}
+
+	// Store the correct default display
+	elemdisplay[ nodeName ] = display;
+
+	return display;
+}
+
+jQuery.each([ "height", "width" ], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+				// certain elements can have dimension info if we invisibly show them
+				// however, it must have a current display style that would benefit from this
+				if ( elem.offsetWidth === 0 && rdisplayswap.test( curCSS( elem, "display" ) ) ) {
+					return jQuery.swap( elem, cssShow, function() {
+						return getWidthOrHeight( elem, name, extra );
+					});
+				} else {
+					return getWidthOrHeight( elem, name, extra );
+				}
+			}
+		},
+
+		set: function( elem, value, extra ) {
+			return setPositiveNumber( elem, value, extra ?
+				augmentWidthOrHeight(
+					elem,
+					name,
+					extra,
+					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box"
+				) : 0
+			);
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle,
+				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+			if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
+				style.removeAttribute ) {
+
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// if "filter:" is present at all, clearType is disabled, we want to avoid this
+				// style.removeAttribute is IE Only, but so apparently is this code path...
+				style.removeAttribute( "filter" );
+
+				// if there there is no filter style applied in a css rule, we are done
+				if ( currentStyle && !currentStyle.filter ) {
+					return;
+				}
+			}
+
+			// otherwise, set new filter values
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
+
+// These hooks cannot be added until DOM ready because the support test
+// for it is not run until after DOM ready
+jQuery(function() {
+	if ( !jQuery.support.reliableMarginRight ) {
+		jQuery.cssHooks.marginRight = {
+			get: function( elem, computed ) {
+				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+				// Work around by temporarily setting element display to inline-block
+				return jQuery.swap( elem, { "display": "inline-block" }, function() {
+					if ( computed ) {
+						return curCSS( elem, "marginRight" );
+					}
+				});
+			}
+		};
+	}
+
+	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+	// getComputedStyle returns percent when specified for top/left/bottom/right
+	// rather than make the css module depend on the offset module, we just check for it here
+	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
+		jQuery.each( [ "top", "left" ], function( i, prop ) {
+			jQuery.cssHooks[ prop ] = {
+				get: function( elem, computed ) {
+					if ( computed ) {
+						var ret = curCSS( elem, prop );
+						// if curCSS returns percentage, fallback to offset
+						return rnumnonpx.test( ret ) ? jQuery( elem ).position()[ prop ] + "px" : ret;
+					}
+				}
+			};
+		});
+	}
+
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.hidden = function( elem ) {
+		return ( elem.offsetWidth === 0 && elem.offsetHeight === 0 ) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || curCSS( elem, "display" )) === "none");
+	};
+
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
+	};
+}
+
+// These hooks are used by animate to expand properties
+jQuery.each({
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i,
+
+				// assumes a single number if not a string
+				parts = typeof value === "string" ? value.split(" ") : [ value ],
+				expanded = {};
+
+			for ( i = 0; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+
+	if ( !rmargin.test( prefix ) ) {
+		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+	}
+});
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	rselectTextarea = /^(?:select|textarea)/i;
+
+jQuery.fn.extend({
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+	serializeArray: function() {
+		return this.map(function(){
+			return this.elements ? jQuery.makeArray( this.elements ) : this;
+		})
+		.filter(function(){
+			return this.name && !this.disabled &&
+				( this.checked || rselectTextarea.test( this.nodeName ) ||
+					rinput.test( this.type ) );
+		})
+		.map(function( i, elem ){
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val, i ){
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					}) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		}).get();
+	}
+});
+
+//Serialize an array of form elements or a set of
+//key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, value ) {
+			// If value is a function, invoke it and return its value
+			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+		};
+
+	// Set traditional to true for jQuery <= 1.3.2 behavior.
+	if ( traditional === undefined ) {
+		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+	}
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		});
+
+	} else {
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
+		}
+	}
+
+	// Return the resulting serialization
+	return s.join( "&" ).replace( r20, "+" );
+};
+
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( jQuery.isArray( obj ) ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// If array item is non-scalar (array or object), encode its
+				// numeric index to resolve deserialization ambiguity issues.
+				// Note that rack (as of 1.0.0) can't currently deserialize
+				// nested arrays properly, and attempting to do so may cause
+				// a server error. Possible fixes are to modify rack's
+				// deserialization algorithm or to provide an option or flag
+				// to force array serialization to be shallow.
+				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+var
+	// Document location
+	ajaxLocParts,
+	ajaxLocation,
+
+	rhash = /#.*$/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rquery = /\?/,
+	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+	rts = /([?&])_=[^&]*/,
+	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+	allTypes = ["*/"] + ["*"];
+
+// #8138, IE may throw an exception when accessing
+// a field from window.location if document.domain has been set
+try {
+	ajaxLocation = location.href;
+} catch( e ) {
+	// Use the href attribute of an A element
+	// since IE will modify it given document.location
+	ajaxLocation = document.createElement( "a" );
+	ajaxLocation.href = "";
+	ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		var dataType, list, placeBefore,
+			dataTypes = dataTypeExpression.toLowerCase().split( core_rspace ),
+			i = 0,
+			length = dataTypes.length;
+
+		if ( jQuery.isFunction( func ) ) {
+			// For each dataType in the dataTypeExpression
+			for ( ; i < length; i++ ) {
+				dataType = dataTypes[ i ];
+				// We control if we're asked to add before
+				// any existing element
+				placeBefore = /^\+/.test( dataType );
+				if ( placeBefore ) {
+					dataType = dataType.substr( 1 ) || "*";
+				}
+				list = structure[ dataType ] = structure[ dataType ] || [];
+				// then we add to the structure accordingly
+				list[ placeBefore ? "unshift" : "push" ]( func );
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
+		dataType /* internal */, inspected /* internal */ ) {
+
+	dataType = dataType || options.dataTypes[ 0 ];
+	inspected = inspected || {};
+
+	inspected[ dataType ] = true;
+
+	var selection,
+		list = structure[ dataType ],
+		i = 0,
+		length = list ? list.length : 0,
+		executeOnly = ( structure === prefilters );
+
+	for ( ; i < length && ( executeOnly || !selection ); i++ ) {
+		selection = list[ i ]( options, originalOptions, jqXHR );
+		// If we got redirected to another dataType
+		// we try there if executing only and not done already
+		if ( typeof selection === "string" ) {
+			if ( !executeOnly || inspected[ selection ] ) {
+				selection = undefined;
+			} else {
+				options.dataTypes.unshift( selection );
+				selection = inspectPrefiltersOrTransports(
+						structure, options, originalOptions, jqXHR, selection, inspected );
+			}
+		}
+	}
+	// If we're only executing or nothing was selected
+	// we try the catchall dataType if not done already
+	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
+		selection = inspectPrefiltersOrTransports(
+				structure, options, originalOptions, jqXHR, "*", inspected );
+	}
+	// unnecessary when only executing (prefilters)
+	// but it'll be ignored by the caller in that case
+	return selection;
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+	var key, deep,
+		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+	for ( key in src ) {
+		if ( src[ key ] !== undefined ) {
+			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
+		}
+	}
+	if ( deep ) {
+		jQuery.extend( true, target, deep );
+	}
+}
+
+jQuery.fn.load = function( url, params, callback ) {
+	if ( typeof url !== "string" && _load ) {
+		return _load.apply( this, arguments );
+	}
+
+	// Don't do a request if no elements are being requested
+	if ( !this.length ) {
+		return this;
+	}
+
+	var selector, type, response,
+		self = this,
+		off = url.indexOf(" ");
+
+	if ( off >= 0 ) {
+		selector = url.slice( off, url.length );
+		url = url.slice( 0, off );
+	}
+
+	// If it's a function
+	if ( jQuery.isFunction( params ) ) {
+
+		// We assume that it's the callback
+		callback = params;
+		params = undefined;
+
+	// Otherwise, build a param string
+	} else if ( params && typeof params === "object" ) {
+		type = "POST";
+	}
+
+	// Request the remote document
+	jQuery.ajax({
+		url: url,
+
+		// if "type" variable is undefined, then "GET" method will be used
+		type: type,
+		dataType: "html",
+		data: params,
+		complete: function( jqXHR, status ) {
+			if ( callback ) {
+				self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
+			}
+		}
+	}).done(function( responseText ) {
+
+		// Save response for use in complete callback
+		response = arguments;
+
+		// See if a selector was specified
+		self.html( selector ?
+
+			// Create a dummy div to hold the results
+			jQuery("<div>")
+
+				// inject the contents of the document in, removing the scripts
+				// to avoid any 'Permission Denied' errors in IE
+				.append( responseText.replace( rscript, "" ) )
+
+				// Locate the specified elements
+				.find( selector ) :
+
+			// If not, just inject the full result
+			responseText );
+
+	});
+
+	return this;
+};
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
+	jQuery.fn[ o ] = function( f ){
+		return this.on( o, f );
+	};
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		return jQuery.ajax({
+			type: method,
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	};
+});
+
+jQuery.extend({
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function( target, settings ) {
+		if ( settings ) {
+			// Building a settings object
+			ajaxExtend( target, jQuery.ajaxSettings );
+		} else {
+			// Extending ajaxSettings
+			settings = target;
+			target = jQuery.ajaxSettings;
+		}
+		ajaxExtend( target, settings );
+		return target;
+	},
+
+	ajaxSettings: {
+		url: ajaxLocation,
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		type: "GET",
+		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+		processData: true,
+		async: true,
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		throws: false,
+		traditional: false,
+		headers: {},
+		*/
+
+		accepts: {
+			xml: "application/xml, text/xml",
+			html: "text/html",
+			text: "text/plain",
+			json: "application/json, text/javascript",
+			"*": allTypes
+		},
+
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText"
+		},
+
+		// List of data converters
+		// 1) key format is "source_type destination_type" (a single space in-between)
+		// 2) the catchall symbol "*" can be used for source_type
+		converters: {
+
+			// Convert anything to text
+			"* text": window.String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		},
+
+		// For options that shouldn't be deep extended:
+		// you can add your own custom options here if
+		// and when you create one that shouldn't be
+		// deep extended (see ajaxExtend)
+		flatOptions: {
+			context: true,
+			url: true
+		}
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var // ifModified key
+			ifModifiedKey,
+			// Response headers
+			responseHeadersString,
+			responseHeaders,
+			// transport
+			transport,
+			// timeout handle
+			timeoutTimer,
+			// Cross-domain detection vars
+			parts,
+			// To know if global events are to be dispatched
+			fireGlobals,
+			// Loop variable
+			i,
+			// Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events
+			// It's the callbackContext if one was provided in the options
+			// and if it's a DOM node or a jQuery collection
+			globalEventContext = callbackContext !== s &&
+				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
+						jQuery( callbackContext ) : jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery.Callbacks( "once memory" ),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+			// The jqXHR state
+			state = 0,
+			// Default abort message
+			strAbort = "canceled",
+			// Fake xhr
+			jqXHR = {
+
+				readyState: 0,
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					if ( !state ) {
+						var lname = name.toLowerCase();
+						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match === undefined ? null : match;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					statusText = statusText || strAbort;
+					if ( transport ) {
+						transport.abort( statusText );
+					}
+					done( 0, statusText );
+					return this;
+				}
+			};
+
+		// Callback for when everything is done
+		// It is defined here because jslint complains if it is declared
+		// at the end of the function (which would be more logical and readable)
+		function done( status, nativeStatusText, responses, headers ) {
+			var isSuccess, success, error, response, modified,
+				statusText = nativeStatusText;
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status > 0 ? 4 : 0;
+
+			// Get response data
+			if ( responses ) {
+				response = ajaxHandleResponses( s, jqXHR, responses );
+			}
+
+			// If successful, handle type chaining
+			if ( status >= 200 && status < 300 || status === 304 ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+
+					modified = jqXHR.getResponseHeader("Last-Modified");
+					if ( modified ) {
+						jQuery.lastModified[ ifModifiedKey ] = modified;
+					}
+					modified = jqXHR.getResponseHeader("Etag");
+					if ( modified ) {
+						jQuery.etag[ ifModifiedKey ] = modified;
+					}
+				}
+
+				// If not modified
+				if ( status === 304 ) {
+
+					statusText = "notmodified";
+					isSuccess = true;
+
+				// If we have data
+				} else {
+
+					isSuccess = ajaxConvert( s, response );
+					statusText = isSuccess.state;
+					success = isSuccess.data;
+					error = isSuccess.error;
+					isSuccess = !error;
+				}
+			} else {
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if ( !statusText || status ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
+						[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger( "ajaxStop" );
+				}
+			}
+		}
+
+		// Attach deferreds
+		deferred.promise( jqXHR );
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+		jqXHR.complete = completeDeferred.add;
+
+		// Status-dependent callbacks
+		jqXHR.statusCode = function( map ) {
+			if ( map ) {
+				var tmp;
+				if ( state < 2 ) {
+					for ( tmp in map ) {
+						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
+					}
+				} else {
+					tmp = map[ jqXHR.status ];
+					jqXHR.always( tmp );
+				}
+			}
+			return this;
+		};
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( core_rspace );
+
+		// A cross-domain request is in order when we have a protocol:host:port mismatch
+		if ( s.crossDomain == null ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+			);
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefilter, stop there
+		if ( state === 2 ) {
+			return jqXHR;
+		}
+
+		// We can fire global events as of now if asked to
+		fireGlobals = s.global;
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+				// #9682: remove data so that it's not used in an eventual retry
+				delete s.data;
+			}
+
+			// Get ifModifiedKey before adding the anti-cache parameter
+			ifModifiedKey = s.url;
+
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+
+				var ts = jQuery.now(),
+					// try replacing _= if it is there
+					ret = s.url.replace( rts, "$1_=" + ts );
+
+				// if nothing was replaced, add timestamp to the end
+				s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			ifModifiedKey = ifModifiedKey || s.url;
+			if ( jQuery.lastModified[ ifModifiedKey ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
+			}
+			if ( jQuery.etag[ ifModifiedKey ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
+			}
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+				// Abort if not done already and return
+				return jqXHR.abort();
+
+		}
+
+		// aborting is no longer a cancellation
+		strAbort = "abort";
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout( function(){
+					jqXHR.abort( "timeout" );
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch (e) {
+				// Propagate exception as error if not done
+				if ( state < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					throw e;
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {}
+
+});
+
+/* Handles responses to an ajax request:
+ * - sets all responseXXX fields accordingly
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+
+	var ct, type, finalDataType, firstDataType,
+		contents = s.contents,
+		dataTypes = s.dataTypes,
+		responseFields = s.responseFields;
+
+	// Fill responseXXX fields
+	for ( type in responseFields ) {
+		if ( type in responses ) {
+			jqXHR[ responseFields[type] ] = responses[ type ];
+		}
+	}
+
+	// Remove auto dataType and get content-type in the process
+	while( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+// Chain conversions given the request and the original response
+function ajaxConvert( s, response ) {
+
+	var conv, conv2, current, tmp,
+		// Work with a copy of dataTypes in case we need to modify it for conversion
+		dataTypes = s.dataTypes.slice(),
+		prev = dataTypes[ 0 ],
+		converters = {},
+		i = 0;
+
+	// Apply the dataFilter if provided
+	if ( s.dataFilter ) {
+		response = s.dataFilter( response, s.dataType );
+	}
+
+	// Create converters map with lowercased keys
+	if ( dataTypes[ 1 ] ) {
+		for ( conv in s.converters ) {
+			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+		}
+	}
+
+	// Convert to each sequential dataType, tolerating list modification
+	for ( ; (current = dataTypes[++i]); ) {
+
+		// There's only work to do if current dataType is non-auto
+		if ( current !== "*" ) {
+
+			// Convert response if prev dataType is non-auto and differs from current
+			if ( prev !== "*" && prev !== current ) {
+
+				// Seek a direct converter
+				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+				// If none found, seek a pair
+				if ( !conv ) {
+					for ( conv2 in converters ) {
+
+						// If conv2 outputs current
+						tmp = conv2.split(" ");
+						if ( tmp[ 1 ] === current ) {
+
+							// If prev can be converted to accepted input
+							conv = converters[ prev + " " + tmp[ 0 ] ] ||
+								converters[ "* " + tmp[ 0 ] ];
+							if ( conv ) {
+								// Condense equivalence converters
+								if ( conv === true ) {
+									conv = converters[ conv2 ];
+
+								// Otherwise, insert the intermediate dataType
+								} else if ( converters[ conv2 ] !== true ) {
+									current = tmp[ 0 ];
+									dataTypes.splice( i--, 0, current );
+								}
+
+								break;
+							}
+						}
+					}
+				}
+
+				// Apply converter (if not an equivalence)
+				if ( conv !== true ) {
+
+					// Unless errors are allowed to bubble, catch and return them
+					if ( conv && s["throws"] ) {
+						response = conv( response );
+					} else {
+						try {
+							response = conv( response );
+						} catch ( e ) {
+							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+						}
+					}
+				}
+			}
+
+			// Update prev for next iteration
+			prev = current;
+		}
+	}
+
+	return { state: "success", data: response };
+}
+var oldCallbacks = [],
+	rquestion = /\?/,
+	rjsonp = /(=)\?(?=&|$)|\?\?/,
+	nonce = jQuery.now();
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+		this[ callback ] = true;
+		return callback;
+	}
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var callbackName, overwritten, responseContainer,
+		data = s.data,
+		url = s.url,
+		hasCallback = s.jsonp !== false,
+		replaceInUrl = hasCallback && rjsonp.test( url ),
+		replaceInData = hasCallback && !replaceInUrl && typeof data === "string" &&
+			!( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") &&
+			rjsonp.test( data );
+
+	// Handle iff the expected data type is "jsonp" or we have a parameter to set
+	if ( s.dataTypes[ 0 ] === "jsonp" || replaceInUrl || replaceInData ) {
+
+		// Get callback name, remembering preexisting value associated with it
+		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+			s.jsonpCallback() :
+			s.jsonpCallback;
+		overwritten = window[ callbackName ];
+
+		// Insert callback into url or form data
+		if ( replaceInUrl ) {
+			s.url = url.replace( rjsonp, "$1" + callbackName );
+		} else if ( replaceInData ) {
+			s.data = data.replace( rjsonp, "$1" + callbackName );
+		} else if ( hasCallback ) {
+			s.url += ( rquestion.test( url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+		}
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( callbackName + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Install callback
+		window[ callbackName ] = function() {
+			responseContainer = arguments;
+		};
+
+		// Clean-up function (fires after converters)
+		jqXHR.always(function() {
+			// Restore preexisting value
+			window[ callbackName ] = overwritten;
+
+			// Save back as free
+			if ( s[ callbackName ] ) {
+				// make sure that re-using the options doesn't screw things around
+				s.jsonpCallback = originalSettings.jsonpCallback;
+
+				// save the callback name for future use
+				oldCallbacks.push( callbackName );
+			}
+
+			// Call if it was a function and we have a response
+			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+				overwritten( responseContainer[ 0 ] );
+			}
+
+			responseContainer = overwritten = undefined;
+		});
+
+		// Delegate to script
+		return "script";
+	}
+});
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /javascript|ecmascript/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement( "script" );
+
+				script.async = "async";
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+
+						// Remove the script
+						if ( head && script.parentNode ) {
+							head.removeChild( script );
+						}
+
+						// Dereference the script
+						script = undefined;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
+						}
+					}
+				};
+				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+				// This arises when a base node is used (#2709 and #4378).
+				head.insertBefore( script, head.firstChild );
+			},
+
+			abort: function() {
+				if ( script ) {
+					script.onload( 0, 1 );
+				}
+			}
+		};
+	}
+});
+var xhrCallbacks,
+	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
+	xhrOnUnloadAbort = window.ActiveXObject ? function() {
+		// Abort all pending requests
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( 0, 1 );
+		}
+	} : false,
+	xhrId = 0;
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+	} catch( e ) {}
+}
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+	/* Microsoft failed to properly
+	 * implement the XMLHttpRequest in IE7 (can't request local files),
+	 * so we use the ActiveXObject when it is available
+	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+	 * we need a fallback.
+	 */
+	function() {
+		return !this.isLocal && createStandardXHR() || createActiveXHR();
+	} :
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+// Determine support properties
+(function( xhr ) {
+	jQuery.extend( jQuery.support, {
+		ajax: !!xhr,
+		cors: !!xhr && ( "withCredentials" in xhr )
+	});
+})( jQuery.ajaxSettings.xhr() );
+
+// Create transport if the browser can provide an xhr
+if ( jQuery.support.ajax ) {
+
+	jQuery.ajaxTransport(function( s ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !s.crossDomain || jQuery.support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+
+					// Get a new xhr
+					var handle, i,
+						xhr = s.xhr();
+
+					// Open the socket
+					// Passing null username, generates a login popup on Opera (#2865)
+					if ( s.username ) {
+						xhr.open( s.type, s.url, s.async, s.username, s.password );
+					} else {
+						xhr.open( s.type, s.url, s.async );
+					}
+
+					// Apply custom fields if provided
+					if ( s.xhrFields ) {
+						for ( i in s.xhrFields ) {
+							xhr[ i ] = s.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( s.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( s.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
+						headers[ "X-Requested-With" ] = "XMLHttpRequest";
+					}
+
+					// Need an extra try/catch for cross domain requests in Firefox 3
+					try {
+						for ( i in headers ) {
+							xhr.setRequestHeader( i, headers[ i ] );
+						}
+					} catch( _ ) {}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( s.hasContent && s.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+
+						var status,
+							statusText,
+							responseHeaders,
+							responses,
+							xml;
+
+						// Firefox throws exceptions when accessing properties
+						// of an xhr when a network error occurred
+						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+						try {
+
+							// Was never called and is aborted or complete
+							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+								// Only called once
+								callback = undefined;
+
+								// Do not keep as active anymore
+								if ( handle ) {
+									xhr.onreadystatechange = jQuery.noop;
+									if ( xhrOnUnloadAbort ) {
+										delete xhrCallbacks[ handle ];
+									}
+								}
+
+								// If it's an abort
+								if ( isAbort ) {
+									// Abort it manually if needed
+									if ( xhr.readyState !== 4 ) {
+										xhr.abort();
+									}
+								} else {
+									status = xhr.status;
+									responseHeaders = xhr.getAllResponseHeaders();
+									responses = {};
+									xml = xhr.responseXML;
+
+									// Construct response list
+									if ( xml && xml.documentElement /* #4958 */ ) {
+										responses.xml = xml;
+									}
+
+									// When requesting binary data, IE6-9 will throw an exception
+									// on any attempt to access responseText (#11426)
+									try {
+										responses.text = xhr.responseText;
+									} catch( e ) {
+									}
+
+									// Firefox throws an exception when accessing
+									// statusText for faulty cross-domain requests
+									try {
+										statusText = xhr.statusText;
+									} catch( e ) {
+										// We normalize with Webkit giving an empty statusText
+										statusText = "";
+									}
+
+									// Filter status for non standard behaviors
+
+									// If the request is local and we have data: assume a success
+									// (success with no data won't get notified, that's the best we
+									// can do given current implementations)
+									if ( !status && s.isLocal && !s.crossDomain ) {
+										status = responses.text ? 200 : 404;
+									// IE - #1450: sometimes returns 1223 when it should be 204
+									} else if ( status === 1223 ) {
+										status = 204;
+									}
+								}
+							}
+						} catch( firefoxAccessException ) {
+							if ( !isAbort ) {
+								complete( -1, firefoxAccessException );
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, responseHeaders );
+						}
+					};
+
+					if ( !s.async ) {
+						// if we're in sync mode we fire the callback
+						callback();
+					} else if ( xhr.readyState === 4 ) {
+						// (IE6 & IE7) if it's in cache and has been
+						// retrieved directly we need to fire the callback
+						setTimeout( callback, 0 );
+					} else {
+						handle = ++xhrId;
+						if ( xhrOnUnloadAbort ) {
+							// Create the active xhrs callbacks list if needed
+							// and attach the unload handler
+							if ( !xhrCallbacks ) {
+								xhrCallbacks = {};
+								jQuery( window ).unload( xhrOnUnloadAbort );
+							}
+							// Add to list of active xhrs callbacks
+							xhrCallbacks[ handle ] = callback;
+						}
+						xhr.onreadystatechange = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback(0,1);
+					}
+				}
+			};
+		}
+	});
+}
+var fxNow, timerId,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = new RegExp( "^(?:([-+])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
+	rrun = /queueHooks$/,
+	animationPrefilters = [ defaultPrefilter ],
+	tweeners = {
+		"*": [function( prop, value ) {
+			var end, unit,
+				tween = this.createTween( prop, value ),
+				parts = rfxnum.exec( value ),
+				target = tween.cur(),
+				start = +target || 0,
+				scale = 1,
+				maxIterations = 20;
+
+			if ( parts ) {
+				end = +parts[2];
+				unit = parts[3] || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+
+				// We need to compute starting value
+				if ( unit !== "px" && start ) {
+					// Iteratively approximate from a nonzero starting point
+					// Prefer the current property, because this process will be trivial if it uses the same units
+					// Fallback to end or a simple constant
+					start = jQuery.css( tween.elem, prop, true ) || end || 1;
+
+					do {
+						// If previous iteration zeroed out, double until we get *something*
+						// Use a string for doubling factor so we don't accidentally see scale as unchanged below
+						scale = scale || ".5";
+
+						// Adjust and apply
+						start = start / scale;
+						jQuery.style( tween.elem, prop, start + unit );
+
+					// Update scale, tolerating zero or NaN from tween.cur()
+					// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
+					} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
+				}
+
+				tween.unit = unit;
+				tween.start = start;
+				// If a +=/-= token was provided, we're doing a relative animation
+				tween.end = parts[1] ? start + ( parts[1] + 1 ) * end : end;
+			}
+			return tween;
+		}]
+	};
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	setTimeout(function() {
+		fxNow = undefined;
+	}, 0 );
+	return ( fxNow = jQuery.now() );
+}
+
+function createTweens( animation, props ) {
+	jQuery.each( props, function( prop, value ) {
+		var collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
+			index = 0,
+			length = collection.length;
+		for ( ; index < length; index++ ) {
+			if ( collection[ index ].call( animation, prop, value ) ) {
+
+				// we're done with this property
+				return;
+			}
+		}
+	});
+}
+
+function Animation( elem, properties, options ) {
+	var result,
+		index = 0,
+		tweenerIndex = 0,
+		length = animationPrefilters.length,
+		deferred = jQuery.Deferred().always( function() {
+			// don't match elem in the :animated selector
+			delete tick.elem;
+		}),
+		tick = function() {
+			var currentTime = fxNow || createFxNow(),
+				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
+				index = 0,
+				length = animation.tweens.length;
+
+			for ( ; index < length ; index++ ) {
+				animation.tweens[ index ].run( percent );
+			}
+
+			deferred.notifyWith( elem, [ animation, percent, remaining ]);
+
+			if ( percent < 1 && length ) {
+				return remaining;
+			} else {
+				deferred.resolveWith( elem, [ animation ] );
+				return false;
+			}
+		},
+		animation = deferred.promise({
+			elem: elem,
+			props: jQuery.extend( {}, properties ),
+			opts: jQuery.extend( true, { specialEasing: {} }, options ),
+			originalProperties: properties,
+			originalOptions: options,
+			startTime: fxNow || createFxNow(),
+			duration: options.duration,
+			tweens: [],
+			createTween: function( prop, end, easing ) {
+				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+				animation.tweens.push( tween );
+				return tween;
+			},
+			stop: function( gotoEnd ) {
+				var index = 0,
+					// if we are going to the end, we want to run all the tweens
+					// otherwise we skip this part
+					length = gotoEnd ? animation.tweens.length : 0;
+
+				for ( ; index < length ; index++ ) {
+					animation.tweens[ index ].run( 1 );
+				}
+
+				// resolve when we played the last frame
+				// otherwise, reject
+				if ( gotoEnd ) {
+					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+				} else {
+					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+				}
+				return this;
+			}
+		}),
+		props = animation.props;
+
+	propFilter( props, animation.opts.specialEasing );
+
+	for ( ; index < length ; index++ ) {
+		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
+		if ( result ) {
+			return result;
+		}
+	}
+
+	createTweens( animation, props );
+
+	if ( jQuery.isFunction( animation.opts.start ) ) {
+		animation.opts.start.call( elem, animation );
+	}
+
+	jQuery.fx.timer(
+		jQuery.extend( tick, {
+			anim: animation,
+			queue: animation.opts.queue,
+			elem: elem
+		})
+	);
+
+	// attach callbacks from options
+	return animation.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+}
+
+function propFilter( props, specialEasing ) {
+	var index, name, easing, value, hooks;
+
+	// camelCase, specialEasing and expand cssHook pass
+	for ( index in props ) {
+		name = jQuery.camelCase( index );
+		easing = specialEasing[ name ];
+		value = props[ index ];
+		if ( jQuery.isArray( value ) ) {
+			easing = value[ 1 ];
+			value = props[ index ] = value[ 0 ];
+		}
+
+		if ( index !== name ) {
+			props[ name ] = value;
+			delete props[ index ];
+		}
+
+		hooks = jQuery.cssHooks[ name ];
+		if ( hooks && "expand" in hooks ) {
+			value = hooks.expand( value );
+			delete props[ name ];
+
+			// not quite $.extend, this wont overwrite keys already present.
+			// also - reusing 'index' from above because we have the correct "name"
+			for ( index in value ) {
+				if ( !( index in props ) ) {
+					props[ index ] = value[ index ];
+					specialEasing[ index ] = easing;
+				}
+			}
+		} else {
+			specialEasing[ name ] = easing;
+		}
+	}
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+	tweener: function( props, callback ) {
+		if ( jQuery.isFunction( props ) ) {
+			callback = props;
+			props = [ "*" ];
+		} else {
+			props = props.split(" ");
+		}
+
+		var prop,
+			index = 0,
+			length = props.length;
+
+		for ( ; index < length ; index++ ) {
+			prop = props[ index ];
+			tweeners[ prop ] = tweeners[ prop ] || [];
+			tweeners[ prop ].unshift( callback );
+		}
+	},
+
+	prefilter: function( callback, prepend ) {
+		if ( prepend ) {
+			animationPrefilters.unshift( callback );
+		} else {
+			animationPrefilters.push( callback );
+		}
+	}
+});
+
+function defaultPrefilter( elem, props, opts ) {
+	var index, prop, value, length, dataShow, toggle, tween, hooks, oldfire,
+		anim = this,
+		style = elem.style,
+		orig = {},
+		handled = [],
+		hidden = elem.nodeType && isHidden( elem );
+
+	// handle queue: false promises
+	if ( !opts.queue ) {
+		hooks = jQuery._queueHooks( elem, "fx" );
+		if ( hooks.unqueued == null ) {
+			hooks.unqueued = 0;
+			oldfire = hooks.empty.fire;
+			hooks.empty.fire = function() {
+				if ( !hooks.unqueued ) {
+					oldfire();
+				}
+			};
+		}
+		hooks.unqueued++;
+
+		anim.always(function() {
+			// doing this makes sure that the complete handler will be called
+			// before this completes
+			anim.always(function() {
+				hooks.unqueued--;
+				if ( !jQuery.queue( elem, "fx" ).length ) {
+					hooks.empty.fire();
+				}
+			});
+		});
+	}
+
+	// height/width overflow pass
+	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+		// Make sure that nothing sneaks out
+		// Record all 3 overflow attributes because IE does not
+		// change the overflow attribute when overflowX and
+		// overflowY are set to the same value
+		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+		// Set display property to inline-block for height/width
+		// animations on inline elements that are having width/height animated
+		if ( jQuery.css( elem, "display" ) === "inline" &&
+				jQuery.css( elem, "float" ) === "none" ) {
+
+			// inline-level elements accept inline-block;
+			// block-level elements need to be inline with layout
+			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
+				style.display = "inline-block";
+
+			} else {
+				style.zoom = 1;
+			}
+		}
+	}
+
+	if ( opts.overflow ) {
+		style.overflow = "hidden";
+		if ( !jQuery.support.shrinkWrapBlocks ) {
+			anim.done(function() {
+				style.overflow = opts.overflow[ 0 ];
+				style.overflowX = opts.overflow[ 1 ];
+				style.overflowY = opts.overflow[ 2 ];
+			});
+		}
+	}
+
+
+	// show/hide pass
+	for ( index in props ) {
+		value = props[ index ];
+		if ( rfxtypes.exec( value ) ) {
+			delete props[ index ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
+				continue;
+			}
+			handled.push( index );
+		}
+	}
+
+	length = handled.length;
+	if ( length ) {
+		dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
+		if ( "hidden" in dataShow ) {
+			hidden = dataShow.hidden;
+		}
+
+		// store state if its toggle - enables .stop().toggle() to "reverse"
+		if ( toggle ) {
+			dataShow.hidden = !hidden;
+		}
+		if ( hidden ) {
+			jQuery( elem ).show();
+		} else {
+			anim.done(function() {
+				jQuery( elem ).hide();
+			});
+		}
+		anim.done(function() {
+			var prop;
+			jQuery.removeData( elem, "fxshow", true );
+			for ( prop in orig ) {
+				jQuery.style( elem, prop, orig[ prop ] );
+			}
+		});
+		for ( index = 0 ; index < length ; index++ ) {
+			prop = handled[ index ];
+			tween = anim.createTween( prop, hidden ? dataShow[ prop ] : 0 );
+			orig[ prop ] = dataShow[ prop ] || jQuery.style( elem, prop );
+
+			if ( !( prop in dataShow ) ) {
+				dataShow[ prop ] = tween.start;
+				if ( hidden ) {
+					tween.end = tween.start;
+					tween.start = prop === "width" || prop === "height" ? 1 : 0;
+				}
+			}
+		}
+	}
+}
+
+function Tween( elem, options, prop, end, easing ) {
+	return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+	constructor: Tween,
+	init: function( elem, options, prop, end, easing, unit ) {
+		this.elem = elem;
+		this.prop = prop;
+		this.easing = easing || "swing";
+		this.options = options;
+		this.start = this.now = this.cur();
+		this.end = end;
+		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+	},
+	cur: function() {
+		var hooks = Tween.propHooks[ this.prop ];
+
+		return hooks && hooks.get ?
+			hooks.get( this ) :
+			Tween.propHooks._default.get( this );
+	},
+	run: function( percent ) {
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
+
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
+		}
+		this.now = ( this.end - this.start ) * eased + this.start;
+
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		if ( hooks && hooks.set ) {
+			hooks.set( this );
+		} else {
+			Tween.propHooks._default.set( this );
+		}
+		return this;
+	}
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+	_default: {
+		get: function( tween ) {
+			var result;
+
+			if ( tween.elem[ tween.prop ] != null &&
+				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
+				return tween.elem[ tween.prop ];
+			}
+
+			// passing any value as a 4th parameter to .css will automatically
+			// attempt a parseFloat and fallback to a string if the parse fails
+			// so, simple values such as "10px" are parsed to Float.
+			// complex values such as "rotate(1rad)" are returned as is.
+			result = jQuery.css( tween.elem, tween.prop, false, "" );
+			// Empty strings, null, undefined and "auto" are converted to 0.
+			return !result || result === "auto" ? 0 : result;
+		},
+		set: function( tween ) {
+			// use step hook for back compat - use cssHook if its there - use .style if its
+			// available and use plain properties where available
+			if ( jQuery.fx.step[ tween.prop ] ) {
+				jQuery.fx.step[ tween.prop ]( tween );
+			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
+				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+			} else {
+				tween.elem[ tween.prop ] = tween.now;
+			}
+		}
+	}
+};
+
+// Remove in 2.0 - this supports IE8's panic based approach
+// to setting things on disconnected nodes
+
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+	set: function( tween ) {
+		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+			tween.elem[ tween.prop ] = tween.now;
+		}
+	}
+};
+
+jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
+	var cssFn = jQuery.fn[ name ];
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return speed == null || typeof speed === "boolean" ||
+			// special check for .toggle( handler, handler, ... )
+			( !i && jQuery.isFunction( speed ) && jQuery.isFunction( easing ) ) ?
+			cssFn.apply( this, arguments ) :
+			this.animate( genFx( name, true ), speed, easing, callback );
+	};
+});
+
+jQuery.fn.extend({
+	fadeTo: function( speed, to, easing, callback ) {
+
+		// show any hidden elements after setting opacity to 0
+		return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+			// animate to the value specified
+			.end().animate({ opacity: to }, speed, easing, callback );
+	},
+	animate: function( prop, speed, easing, callback ) {
+		var empty = jQuery.isEmptyObject( prop ),
+			optall = jQuery.speed( speed, easing, callback ),
+			doAnimation = function() {
+				// Operate on a copy of prop so per-property easing won't be lost
+				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+
+				// Empty animations resolve immediately
+				if ( empty ) {
+					anim.stop( true );
+				}
+			};
+
+		return empty || optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+	stop: function( type, clearQueue, gotoEnd ) {
+		var stopQueue = function( hooks ) {
+			var stop = hooks.stop;
+			delete hooks.stop;
+			stop( gotoEnd );
+		};
+
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each(function() {
+			var dequeue = true,
+				index = type != null && type + "queueHooks",
+				timers = jQuery.timers,
+				data = jQuery._data( this );
+
+			if ( index ) {
+				if ( data[ index ] && data[ index ].stop ) {
+					stopQueue( data[ index ] );
+				}
+			} else {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+						stopQueue( data[ index ] );
+					}
+				}
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+					timers[ index ].anim.stop( gotoEnd );
+					dequeue = false;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// start the next in the queue if the last step wasn't forced
+			// timers currently will call their complete callbacks, which will dequeue
+			// but only if they were gotoEnd
+			if ( dequeue || !gotoEnd ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	}
+});
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+	var which,
+		attrs = { height: type },
+		i = 0;
+
+	// if we include width, step value is 1 to do all cssExpand values,
+	// if we don't include width, step value is 2 to skip over Left and Right
+	includeWidth = includeWidth? 1 : 0;
+	for( ; i < 4 ; i += 2 - includeWidth ) {
+		which = cssExpand[ i ];
+		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+	}
+
+	if ( includeWidth ) {
+		attrs.opacity = attrs.width = type;
+	}
+
+	return attrs;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show"),
+	slideUp: genFx("hide"),
+	slideToggle: genFx("toggle"),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.speed = function( speed, easing, fn ) {
+	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+		complete: fn || !fn && easing ||
+			jQuery.isFunction( speed ) && speed,
+		duration: speed,
+		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+	};
+
+	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+	// normalize opt.queue - true/undefined/null -> "fx"
+	if ( opt.queue == null || opt.queue === true ) {
+		opt.queue = "fx";
+	}
+
+	// Queueing
+	opt.old = opt.complete;
+
+	opt.complete = function() {
+		if ( jQuery.isFunction( opt.old ) ) {
+			opt.old.call( this );
+		}
+
+		if ( opt.queue ) {
+			jQuery.dequeue( this, opt.queue );
+		}
+	};
+
+	return opt;
+};
+
+jQuery.easing = {
+	linear: function( p ) {
+		return p;
+	},
+	swing: function( p ) {
+		return 0.5 - Math.cos( p*Math.PI ) / 2;
+	}
+};
+
+jQuery.timers = [];
+jQuery.fx = Tween.prototype.init;
+jQuery.fx.tick = function() {
+	var timer,
+		timers = jQuery.timers,
+		i = 0;
+
+	fxNow = jQuery.now();
+
+	for ( ; i < timers.length; i++ ) {
+		timer = timers[ i ];
+		// Checks the timer has not already been removed
+		if ( !timer() && timers[ i ] === timer ) {
+			timers.splice( i--, 1 );
+		}
+	}
+
+	if ( !timers.length ) {
+		jQuery.fx.stop();
+	}
+	fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+	if ( timer() && jQuery.timers.push( timer ) && !timerId ) {
+		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
+	}
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.stop = function() {
+	clearInterval( timerId );
+	timerId = null;
+};
+
+jQuery.fx.speeds = {
+	slow: 600,
+	fast: 200,
+	// Default speed
+	_default: 400
+};
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function( elem ) {
+		return jQuery.grep(jQuery.timers, function( fn ) {
+			return elem === fn.elem;
+		}).length;
+	};
+}
+var rroot = /^(?:body|html)$/i;
+
+jQuery.fn.offset = function( options ) {
+	if ( arguments.length ) {
+		return options === undefined ?
+			this :
+			this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+	}
+
+	var docElem, body, win, clientTop, clientLeft, scrollTop, scrollLeft,
+		box = { top: 0, left: 0 },
+		elem = this[ 0 ],
+		doc = elem && elem.ownerDocument;
+
+	if ( !doc ) {
+		return;
+	}
+
+	if ( (body = doc.body) === elem ) {
+		return jQuery.offset.bodyOffset( elem );
+	}
+
+	docElem = doc.documentElement;
+
+	// Make sure it's not a disconnected DOM node
+	if ( !jQuery.contains( docElem, elem ) ) {
+		return box;
+	}
+
+	// If we don't have gBCR, just use 0,0 rather than error
+	// BlackBerry 5, iOS 3 (original iPhone)
+	if ( typeof elem.getBoundingClientRect !== "undefined" ) {
+		box = elem.getBoundingClientRect();
+	}
+	win = getWindow( doc );
+	clientTop  = docElem.clientTop  || body.clientTop  || 0;
+	clientLeft = docElem.clientLeft || body.clientLeft || 0;
+	scrollTop  = win.pageYOffset || docElem.scrollTop;
+	scrollLeft = win.pageXOffset || docElem.scrollLeft;
+	return {
+		top: box.top  + scrollTop  - clientTop,
+		left: box.left + scrollLeft - clientLeft
+	};
+};
+
+jQuery.offset = {
+
+	bodyOffset: function( body ) {
+		var top = body.offsetTop,
+			left = body.offsetLeft;
+
+		if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
+			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
+		}
+
+		return { top: top, left: left };
+	},
+
+	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		var curElem = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if ( options.top != null ) {
+			props.top = ( options.top - curOffset.top ) + curTop;
+		}
+		if ( options.left != null ) {
+			props.left = ( options.left - curOffset.left ) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+
+jQuery.fn.extend({
+
+	position: function() {
+		if ( !this[0] ) {
+			return;
+		}
+
+		var elem = this[0],
+
+		// Get *real* offsetParent
+		offsetParent = this.offsetParent(),
+
+		// Get correct offsets
+		offset       = this.offset(),
+		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+		// Subtract element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+
+		// Add offsetParent borders
+		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+
+		// Subtract the two offsets
+		return {
+			top:  offset.top  - parentOffset.top,
+			left: offset.left - parentOffset.left
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || document.body;
+			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent || document.body;
+		});
+	}
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
+	var top = /Y/.test( prop );
+
+	jQuery.fn[ method ] = function( val ) {
+		return jQuery.access( this, function( elem, method, val ) {
+			var win = getWindow( elem );
+
+			if ( val === undefined ) {
+				return win ? (prop in win) ? win[ prop ] :
+					win.document.documentElement[ method ] :
+					elem[ method ];
+			}
+
+			if ( win ) {
+				win.scrollTo(
+					!top ? val : jQuery( win ).scrollLeft(),
+					 top ? val : jQuery( win ).scrollTop()
+				);
+
+			} else {
+				elem[ method ] = val;
+			}
+		}, method, val, arguments.length, null );
+	};
+});
+
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+		// margin is only for outerHeight, outerWidth
+		jQuery.fn[ funcName ] = function( margin, value ) {
+			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+			return jQuery.access( this, function( elem, type, value ) {
+				var doc;
+
+				if ( jQuery.isWindow( elem ) ) {
+					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+					// isn't a whole lot we can do. See pull request at this URL for discussion:
+					// https://github.com/jquery/jquery/pull/764
+					return elem.document.documentElement[ "client" + name ];
+				}
+
+				// Get document width or height
+				if ( elem.nodeType === 9 ) {
+					doc = elem.documentElement;
+
+					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
+					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+					return Math.max(
+						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+						elem.body[ "offset" + name ], doc[ "offset" + name ],
+						doc[ "client" + name ]
+					);
+				}
+
+				return value === undefined ?
+					// Get width or height on the element, requesting but not forcing parseFloat
+					jQuery.css( elem, type, value, extra ) :
+
+					// Set width or height on the element
+					jQuery.style( elem, type, value, extra );
+			}, type, chainable ? margin : undefined, chainable, null );
+		};
+	});
+});
+// Expose jQuery to the global object
+window.jQuery = window.$ = jQuery;
+
+// Expose jQuery as an AMD module, but only for AMD loaders that
+// understand the issues with loading multiple versions of jQuery
+// in a page that all might call define(). The loader will indicate
+// they have special allowances for multiple jQuery versions by
+// specifying define.amd.jQuery = true. Register as a named module,
+// since jQuery can be concatenated with other files that may use define,
+// but not use a proper concatenation script that understands anonymous
+// AMD modules. A named AMD is safest and most robust way to register.
+// Lowercase jquery is used because AMD module names are derived from
+// file names, and jQuery is normally delivered in a lowercase file name.
+// Do this after creating the global so that if an AMD module wants to call
+// noConflict to hide this version of jQuery, it will work.
+if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
+	define( "jquery", [], function () { return jQuery; } );
+}
+
+})( window );
diff --git a/pandora_console/include/graphs/flot/jquery.min.js b/pandora_console/include/graphs/flot/jquery.min.js
new file mode 100644
index 0000000000..ee48790811
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.min.js
@@ -0,0 +1,5 @@
+(function(window,undefined){var rootjQuery,readyList,document=window.document,location=window.location,navigator=window.navigator,_jQuery=window.jQuery,_$=window.$,core_push=Array.prototype.push,core_slice=Array.prototype.slice,core_indexOf=Array.prototype.indexOf,core_toString=Object.prototype.toString,core_hasOwn=Object.prototype.hasOwnProperty,core_trim=String.prototype.trim,jQuery=function(selector,context){return new jQuery.fn.init(selector,context,rootjQuery)},core_pnum=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,core_rnotwhite=/\S/,core_rspace=/\s+/,rtrim=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,rquickExpr=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,rsingleTag=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,rvalidchars=/^[\],:{}\s]*$/,rvalidbraces=/(?:^|:|,)(?:\s*\[)+/g,rvalidescape=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,rvalidtokens=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,rmsPrefix=/^-ms-/,rdashAlpha=/-([\da-z])/gi,fcamelCase=function(all,letter){return(letter+"").toUpperCase()},DOMContentLoaded=function(){if(document.addEventListener){document.removeEventListener("DOMContentLoaded",DOMContentLoaded,false);jQuery.ready()}else if(document.readyState==="complete"){document.detachEvent("onreadystatechange",DOMContentLoaded);jQuery.ready()}},class2type={};jQuery.fn=jQuery.prototype={constructor:jQuery,init:function(selector,context,rootjQuery){var match,elem,ret,doc;if(!selector){return this}if(selector.nodeType){this.context=this[0]=selector;this.length=1;return this}if(typeof selector==="string"){if(selector.charAt(0)==="<"&&selector.charAt(selector.length-1)===">"&&selector.length>=3){match=[null,selector,null]}else{match=rquickExpr.exec(selector)}if(match&&(match[1]||!context)){if(match[1]){context=context instanceof jQuery?context[0]:context;doc=context&&context.nodeType?context.ownerDocument||context:document;selector=jQuery.parseHTML(match[1],doc,true);if(rsingleTag.test(match[1])&&jQuery.isPlainObject(context)){this.attr.call(selector,context,true)}return jQuery.merge(this,selector)}else{elem=document.getElementById(match[2]);if(elem&&elem.parentNode){if(elem.id!==match[2]){return rootjQuery.find(selector)}this.length=1;this[0]=elem}this.context=document;this.selector=selector;return this}}else if(!context||context.jquery){return(context||rootjQuery).find(selector)}else{return this.constructor(context).find(selector)}}else if(jQuery.isFunction(selector)){return rootjQuery.ready(selector)}if(selector.selector!==undefined){this.selector=selector.selector;this.context=selector.context}return jQuery.makeArray(selector,this)},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return core_slice.call(this)},get:function(num){return num==null?this.toArray():num<0?this[this.length+num]:this[num]},pushStack:function(elems,name,selector){var ret=jQuery.merge(this.constructor(),elems);ret.prevObject=this;ret.context=this.context;if(name==="find"){ret.selector=this.selector+(this.selector?" ":"")+selector}else if(name){ret.selector=this.selector+"."+name+"("+selector+")"}return ret},each:function(callback,args){return jQuery.each(this,callback,args)},ready:function(fn){jQuery.ready.promise().done(fn);return this},eq:function(i){i=+i;return i===-1?this.slice(i):this.slice(i,i+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(core_slice.apply(this,arguments),"slice",core_slice.call(arguments).join(","))},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem)}))},end:function(){return this.prevObject||this.constructor(null)},push:core_push,sort:[].sort,splice:[].splice};jQuery.fn.init.prototype=jQuery.fn;jQuery.extend=jQuery.fn.extend=function(){var options,name,src,copy,copyIsArray,clone,target=arguments[0]||{},i=1,length=arguments.length,deep=false;if(typeof target==="boolean"){deep=target;target=arguments[1]||{};i=2}if(typeof target!=="object"&&!jQuery.isFunction(target)){target={}}if(length===i){target=this;--i}for(;i<length;i++){if((options=arguments[i])!=null){for(name in options){src=target[name];copy=options[name];if(target===copy){continue}if(deep&&copy&&(jQuery.isPlainObject(copy)||(copyIsArray=jQuery.isArray(copy)))){if(copyIsArray){copyIsArray=false;clone=src&&jQuery.isArray(src)?src:[]}else{clone=src&&jQuery.isPlainObject(src)?src:{}}target[name]=jQuery.extend(deep,clone,copy)}else if(copy!==undefined){target[name]=copy}}}}return target};jQuery.extend({noConflict:function(deep){if(window.$===jQuery){window.$=_$}if(deep&&window.jQuery===jQuery){window.jQuery=_jQuery}return jQuery},isReady:false,readyWait:1,holdReady:function(hold){if(hold){jQuery.readyWait++}else{jQuery.ready(true)}},ready:function(wait){if(wait===true?--jQuery.readyWait:jQuery.isReady){return}if(!document.body){return setTimeout(jQuery.ready,1)}jQuery.isReady=true;if(wait!==true&&--jQuery.readyWait>0){return}readyList.resolveWith(document,[jQuery]);if(jQuery.fn.trigger){jQuery(document).trigger("ready").off("ready")}},isFunction:function(obj){return jQuery.type(obj)==="function"},isArray:Array.isArray||function(obj){return jQuery.type(obj)==="array"},isWindow:function(obj){return obj!=null&&obj==obj.window},isNumeric:function(obj){return!isNaN(parseFloat(obj))&&isFinite(obj)},type:function(obj){return obj==null?String(obj):class2type[core_toString.call(obj)]||"object"},isPlainObject:function(obj){if(!obj||jQuery.type(obj)!=="object"||obj.nodeType||jQuery.isWindow(obj)){return false}try{if(obj.constructor&&!core_hasOwn.call(obj,"constructor")&&!core_hasOwn.call(obj.constructor.prototype,"isPrototypeOf")){return false}}catch(e){return false}var key;for(key in obj){}return key===undefined||core_hasOwn.call(obj,key)},isEmptyObject:function(obj){var name;for(name in obj){return false}return true},error:function(msg){throw new Error(msg)},parseHTML:function(data,context,scripts){var parsed;if(!data||typeof data!=="string"){return null}if(typeof context==="boolean"){scripts=context;context=0}context=context||document;if(parsed=rsingleTag.exec(data)){return[context.createElement(parsed[1])]}parsed=jQuery.buildFragment([data],context,scripts?null:[]);return jQuery.merge([],(parsed.cacheable?jQuery.clone(parsed.fragment):parsed.fragment).childNodes)},parseJSON:function(data){if(!data||typeof data!=="string"){return null}data=jQuery.trim(data);if(window.JSON&&window.JSON.parse){return window.JSON.parse(data)}if(rvalidchars.test(data.replace(rvalidescape,"@").replace(rvalidtokens,"]").replace(rvalidbraces,""))){return new Function("return "+data)()}jQuery.error("Invalid JSON: "+data)},parseXML:function(data){var xml,tmp;if(!data||typeof data!=="string"){return null}try{if(window.DOMParser){tmp=new DOMParser;xml=tmp.parseFromString(data,"text/xml")}else{xml=new ActiveXObject("Microsoft.XMLDOM");xml.async="false";xml.loadXML(data)}}catch(e){xml=undefined}if(!xml||!xml.documentElement||xml.getElementsByTagName("parsererror").length){jQuery.error("Invalid XML: "+data)}return xml},noop:function(){},globalEval:function(data){if(data&&core_rnotwhite.test(data)){(window.execScript||function(data){window["eval"].call(window,data)})(data)}},camelCase:function(string){return string.replace(rmsPrefix,"ms-").replace(rdashAlpha,fcamelCase)},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toLowerCase()===name.toLowerCase()},each:function(obj,callback,args){var name,i=0,length=obj.length,isObj=length===undefined||jQuery.isFunction(obj);if(args){if(isObj){for(name in obj){if(callback.apply(obj[name],args)===false){break}}}else{for(;i<length;){if(callback.apply(obj[i++],args)===false){break}}}}else{if(isObj){for(name in obj){if(callback.call(obj[name],name,obj[name])===false){break}}}else{for(;i<length;){if(callback.call(obj[i],i,obj[i++])===false){break}}}}return obj},trim:core_trim&&!core_trim.call(" ")?function(text){return text==null?"":core_trim.call(text)}:function(text){return text==null?"":(text+"").replace(rtrim,"")},makeArray:function(arr,results){var type,ret=results||[];if(arr!=null){type=jQuery.type(arr);if(arr.length==null||type==="string"||type==="function"||type==="regexp"||jQuery.isWindow(arr)){core_push.call(ret,arr)}else{jQuery.merge(ret,arr)}}return ret},inArray:function(elem,arr,i){var len;if(arr){if(core_indexOf){return core_indexOf.call(arr,elem,i)}len=arr.length;i=i?i<0?Math.max(0,len+i):i:0;for(;i<len;i++){if(i in arr&&arr[i]===elem){return i}}}return-1},merge:function(first,second){var l=second.length,i=first.length,j=0;if(typeof l==="number"){for(;j<l;j++){first[i++]=second[j]}}else{while(second[j]!==undefined){first[i++]=second[j++]}}first.length=i;return first},grep:function(elems,callback,inv){var retVal,ret=[],i=0,length=elems.length;inv=!!inv;for(;i<length;i++){retVal=!!callback(elems[i],i);if(inv!==retVal){ret.push(elems[i])}}return ret},map:function(elems,callback,arg){var value,key,ret=[],i=0,length=elems.length,isArray=elems instanceof jQuery||length!==undefined&&typeof length==="number"&&(length>0&&elems[0]&&elems[length-1]||length===0||jQuery.isArray(elems));if(isArray){for(;i<length;i++){value=callback(elems[i],i,arg);if(value!=null){ret[ret.length]=value}}}else{for(key in elems){value=callback(elems[key],key,arg);if(value!=null){ret[ret.length]=value}}}return ret.concat.apply([],ret)},guid:1,proxy:function(fn,context){var tmp,args,proxy;if(typeof context==="string"){tmp=fn[context];context=fn;fn=tmp}if(!jQuery.isFunction(fn)){return undefined}args=core_slice.call(arguments,2);proxy=function(){return fn.apply(context,args.concat(core_slice.call(arguments)))};proxy.guid=fn.guid=fn.guid||jQuery.guid++;return proxy},access:function(elems,fn,key,value,chainable,emptyGet,pass){var exec,bulk=key==null,i=0,length=elems.length;if(key&&typeof key==="object"){for(i in key){jQuery.access(elems,fn,i,key[i],1,emptyGet,value)}chainable=1}else if(value!==undefined){exec=pass===undefined&&jQuery.isFunction(value);if(bulk){if(exec){exec=fn;fn=function(elem,key,value){return exec.call(jQuery(elem),value)}}else{fn.call(elems,value);fn=null}}if(fn){for(;i<length;i++){fn(elems[i],key,exec?value.call(elems[i],i,fn(elems[i],key)):value,pass)}}chainable=1}return chainable?elems:bulk?fn.call(elems):length?fn(elems[0],key):emptyGet},now:function(){return(new Date).getTime()}});jQuery.ready.promise=function(obj){if(!readyList){readyList=jQuery.Deferred();if(document.readyState==="complete"){setTimeout(jQuery.ready,1)}else if(document.addEventListener){document.addEventListener("DOMContentLoaded",DOMContentLoaded,false);window.addEventListener("load",jQuery.ready,false)}else{document.attachEvent("onreadystatechange",DOMContentLoaded);window.attachEvent("onload",jQuery.ready);var top=false;try{top=window.frameElement==null&&document.documentElement}catch(e){}if(top&&top.doScroll){(function doScrollCheck(){if(!jQuery.isReady){try{top.doScroll("left")}catch(e){return setTimeout(doScrollCheck,50)}jQuery.ready()}})()}}}return readyList.promise(obj)};jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(i,name){class2type["[object "+name+"]"]=name.toLowerCase()});rootjQuery=jQuery(document);var optionsCache={};function createOptions(options){var object=optionsCache[options]={};jQuery.each(options.split(core_rspace),function(_,flag){object[flag]=true});return object}jQuery.Callbacks=function(options){options=typeof options==="string"?optionsCache[options]||createOptions(options):jQuery.extend({},options);var memory,fired,firing,firingStart,firingLength,firingIndex,list=[],stack=!options.once&&[],fire=function(data){memory=options.memory&&data;fired=true;firingIndex=firingStart||0;firingStart=0;firingLength=list.length;firing=true;for(;list&&firingIndex<firingLength;firingIndex++){if(list[firingIndex].apply(data[0],data[1])===false&&options.stopOnFalse){memory=false;break}}firing=false;if(list){if(stack){if(stack.length){fire(stack.shift())}}else if(memory){list=[]}else{self.disable()}}},self={add:function(){if(list){var start=list.length;(function add(args){jQuery.each(args,function(_,arg){var type=jQuery.type(arg);if(type==="function"){if(!options.unique||!self.has(arg)){list.push(arg)}}else if(arg&&arg.length&&type!=="string"){add(arg)}})})(arguments);if(firing){firingLength=list.length}else if(memory){firingStart=start;fire(memory)}}return this},remove:function(){if(list){jQuery.each(arguments,function(_,arg){var index;while((index=jQuery.inArray(arg,list,index))>-1){list.splice(index,1);if(firing){if(index<=firingLength){firingLength--}if(index<=firingIndex){firingIndex--}}}})}return this},has:function(fn){return jQuery.inArray(fn,list)>-1},empty:function(){list=[];return this},disable:function(){list=stack=memory=undefined;return this},disabled:function(){return!list},lock:function(){stack=undefined;if(!memory){self.disable()}return this},locked:function(){return!stack},fireWith:function(context,args){args=args||[];args=[context,args.slice?args.slice():args];if(list&&(!fired||stack)){if(firing){stack.push(args)}else{fire(args)}}return this},fire:function(){self.fireWith(this,arguments);return this},fired:function(){return!!fired}};return self};jQuery.extend({Deferred:function(func){var tuples=[["resolve","done",jQuery.Callbacks("once memory"),"resolved"],["reject","fail",jQuery.Callbacks("once memory"),"rejected"],["notify","progress",jQuery.Callbacks("memory")]],state="pending",promise={state:function(){return state},always:function(){deferred.done(arguments).fail(arguments);return this},then:function(){var fns=arguments;return jQuery.Deferred(function(newDefer){jQuery.each(tuples,function(i,tuple){var action=tuple[0],fn=fns[i];deferred[tuple[1]](jQuery.isFunction(fn)?function(){var returned=fn.apply(this,arguments);if(returned&&jQuery.isFunction(returned.promise)){returned.promise().done(newDefer.resolve).fail(newDefer.reject).progress(newDefer.notify)}else{newDefer[action+"With"](this===deferred?newDefer:this,[returned])}}:newDefer[action])});fns=null}).promise()},promise:function(obj){return obj!=null?jQuery.extend(obj,promise):promise}},deferred={};promise.pipe=promise.then;jQuery.each(tuples,function(i,tuple){var list=tuple[2],stateString=tuple[3];promise[tuple[1]]=list.add;if(stateString){list.add(function(){state=stateString},tuples[i^1][2].disable,tuples[2][2].lock)}deferred[tuple[0]]=list.fire;deferred[tuple[0]+"With"]=list.fireWith});promise.promise(deferred);if(func){func.call(deferred,deferred)}return deferred},when:function(subordinate){var i=0,resolveValues=core_slice.call(arguments),length=resolveValues.length,remaining=length!==1||subordinate&&jQuery.isFunction(subordinate.promise)?length:0,deferred=remaining===1?subordinate:jQuery.Deferred(),updateFunc=function(i,contexts,values){return function(value){contexts[i]=this;values[i]=arguments.length>1?core_slice.call(arguments):value;if(values===progressValues){deferred.notifyWith(contexts,values)}else if(!--remaining){deferred.resolveWith(contexts,values)}}},progressValues,progressContexts,resolveContexts;if(length>1){progressValues=new Array(length);progressContexts=new Array(length);resolveContexts=new Array(length);for(;i<length;i++){if(resolveValues[i]&&jQuery.isFunction(resolveValues[i].promise)){resolveValues[i].promise().done(updateFunc(i,resolveContexts,resolveValues)).fail(deferred.reject).progress(updateFunc(i,progressContexts,progressValues))}else{--remaining}}}if(!remaining){deferred.resolveWith(resolveContexts,resolveValues)}return deferred.promise()}});jQuery.support=function(){var support,all,a,select,opt,input,fragment,eventName,i,isSupported,clickFn,div=document.createElement("div");div.setAttribute("className","t");div.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";all=div.getElementsByTagName("*");a=div.getElementsByTagName("a")[0];if(!all||!a||!all.length){return{}}select=document.createElement("select");opt=select.appendChild(document.createElement("option"));input=div.getElementsByTagName("input")[0];a.style.cssText="top:1px;float:left;opacity:.5";support={leadingWhitespace:div.firstChild.nodeType===3,tbody:!div.getElementsByTagName("tbody").length,htmlSerialize:!!div.getElementsByTagName("link").length,style:/top/.test(a.getAttribute("style")),hrefNormalized:a.getAttribute("href")==="/a",opacity:/^0.5/.test(a.style.opacity),cssFloat:!!a.style.cssFloat,checkOn:input.value==="on",optSelected:opt.selected,getSetAttribute:div.className!=="t",enctype:!!document.createElement("form").enctype,html5Clone:document.createElement("nav").cloneNode(true).outerHTML!=="<:nav></:nav>",boxModel:document.compatMode==="CSS1Compat",submitBubbles:true,changeBubbles:true,focusinBubbles:false,deleteExpando:true,noCloneEvent:true,inlineBlockNeedsLayout:false,shrinkWrapBlocks:false,reliableMarginRight:true,boxSizingReliable:true,pixelPosition:false};input.checked=true;support.noCloneChecked=input.cloneNode(true).checked;select.disabled=true;support.optDisabled=!opt.disabled;try{delete div.test}catch(e){support.deleteExpando=false}if(!div.addEventListener&&div.attachEvent&&div.fireEvent){div.attachEvent("onclick",clickFn=function(){support.noCloneEvent=false});div.cloneNode(true).fireEvent("onclick");div.detachEvent("onclick",clickFn)}input=document.createElement("input");input.value="t";input.setAttribute("type","radio");support.radioValue=input.value==="t";input.setAttribute("checked","checked");input.setAttribute("name","t");div.appendChild(input);fragment=document.createDocumentFragment();fragment.appendChild(div.lastChild);support.checkClone=fragment.cloneNode(true).cloneNode(true).lastChild.checked;support.appendChecked=input.checked;fragment.removeChild(input);fragment.appendChild(div);if(div.attachEvent){for(i in{submit:true,change:true,focusin:true}){eventName="on"+i;isSupported=eventName in div;if(!isSupported){div.setAttribute(eventName,"return;");isSupported=typeof div[eventName]==="function"}support[i+"Bubbles"]=isSupported}}jQuery(function(){var container,div,tds,marginDiv,divReset="padding:0;margin:0;border:0;display:block;overflow:hidden;",body=document.getElementsByTagName("body")[0];if(!body){return}container=document.createElement("div");container.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px";body.insertBefore(container,body.firstChild);div=document.createElement("div");container.appendChild(div);div.innerHTML="<table><tr><td></td><td>t</td></tr></table>";tds=div.getElementsByTagName("td");tds[0].style.cssText="padding:0;margin:0;border:0;display:none";isSupported=tds[0].offsetHeight===0;tds[0].style.display="";tds[1].style.display="none";support.reliableHiddenOffsets=isSupported&&tds[0].offsetHeight===0;div.innerHTML="";div.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";support.boxSizing=div.offsetWidth===4;support.doesNotIncludeMarginInBodyOffset=body.offsetTop!==1;if(window.getComputedStyle){support.pixelPosition=(window.getComputedStyle(div,null)||{}).top!=="1%";support.boxSizingReliable=(window.getComputedStyle(div,null)||{width:"4px"}).width==="4px";marginDiv=document.createElement("div");marginDiv.style.cssText=div.style.cssText=divReset;marginDiv.style.marginRight=marginDiv.style.width="0";div.style.width="1px";div.appendChild(marginDiv);support.reliableMarginRight=!parseFloat((window.getComputedStyle(marginDiv,null)||{}).marginRight)}if(typeof div.style.zoom!=="undefined"){div.innerHTML="";div.style.cssText=divReset+"width:1px;padding:1px;display:inline;zoom:1";support.inlineBlockNeedsLayout=div.offsetWidth===3;div.style.display="block";div.style.overflow="visible";div.innerHTML="<div></div>";div.firstChild.style.width="5px";support.shrinkWrapBlocks=div.offsetWidth!==3;container.style.zoom=1}body.removeChild(container);container=div=tds=marginDiv=null});fragment.removeChild(div);all=a=select=opt=input=fragment=div=null;return support}();var rbrace=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,rmultiDash=/([A-Z])/g;jQuery.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(jQuery.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:true},hasData:function(elem){elem=elem.nodeType?jQuery.cache[elem[jQuery.expando]]:elem[jQuery.expando];return!!elem&&!isEmptyDataObject(elem)},data:function(elem,name,data,pvt){if(!jQuery.acceptData(elem)){return}var thisCache,ret,internalKey=jQuery.expando,getByName=typeof name==="string",isNode=elem.nodeType,cache=isNode?jQuery.cache:elem,id=isNode?elem[internalKey]:elem[internalKey]&&internalKey;if((!id||!cache[id]||!pvt&&!cache[id].data)&&getByName&&data===undefined){return}if(!id){if(isNode){elem[internalKey]=id=jQuery.deletedIds.pop()||jQuery.guid++}else{id=internalKey}}if(!cache[id]){cache[id]={};if(!isNode){cache[id].toJSON=jQuery.noop}}if(typeof name==="object"||typeof name==="function"){if(pvt){cache[id]=jQuery.extend(cache[id],name)}else{cache[id].data=jQuery.extend(cache[id].data,name)}}thisCache=cache[id];if(!pvt){if(!thisCache.data){thisCache.data={}}thisCache=thisCache.data}if(data!==undefined){thisCache[jQuery.camelCase(name)]=data}if(getByName){ret=thisCache[name];if(ret==null){ret=thisCache[jQuery.camelCase(name)]}}else{ret=thisCache}return ret},removeData:function(elem,name,pvt){if(!jQuery.acceptData(elem)){return}var thisCache,i,l,isNode=elem.nodeType,cache=isNode?jQuery.cache:elem,id=isNode?elem[jQuery.expando]:jQuery.expando;if(!cache[id]){return}if(name){thisCache=pvt?cache[id]:cache[id].data;if(thisCache){if(!jQuery.isArray(name)){if(name in thisCache){name=[name]}else{name=jQuery.camelCase(name);if(name in thisCache){name=[name]}else{name=name.split(" ")}}}for(i=0,l=name.length;i<l;i++){delete thisCache[name[i]]}if(!(pvt?isEmptyDataObject:jQuery.isEmptyObject)(thisCache)){return}}}if(!pvt){delete cache[id].data;if(!isEmptyDataObject(cache[id])){return}}if(isNode){jQuery.cleanData([elem],true)}else if(jQuery.support.deleteExpando||cache!=cache.window){delete cache[id]}else{cache[id]=null}},_data:function(elem,name,data){return jQuery.data(elem,name,data,true)},acceptData:function(elem){var noData=elem.nodeName&&jQuery.noData[elem.nodeName.toLowerCase()];return!noData||noData!==true&&elem.getAttribute("classid")===noData}});jQuery.fn.extend({data:function(key,value){var parts,part,attr,name,l,elem=this[0],i=0,data=null;if(key===undefined){if(this.length){data=jQuery.data(elem);if(elem.nodeType===1&&!jQuery._data(elem,"parsedAttrs")){attr=elem.attributes;for(l=attr.length;i<l;i++){name=attr[i].name;if(!name.indexOf("data-")){name=jQuery.camelCase(name.substring(5));dataAttr(elem,name,data[name])}}jQuery._data(elem,"parsedAttrs",true)}}return data}if(typeof key==="object"){return this.each(function(){jQuery.data(this,key)})}parts=key.split(".",2);parts[1]=parts[1]?"."+parts[1]:"";part=parts[1]+"!";return jQuery.access(this,function(value){if(value===undefined){data=this.triggerHandler("getData"+part,[parts[0]]);if(data===undefined&&elem){data=jQuery.data(elem,key);data=dataAttr(elem,key,data)}return data===undefined&&parts[1]?this.data(parts[0]):data}parts[1]=value;this.each(function(){var self=jQuery(this);self.triggerHandler("setData"+part,parts);jQuery.data(this,key,value);self.triggerHandler("changeData"+part,parts)})},null,value,arguments.length>1,null,false)},removeData:function(key){return this.each(function(){jQuery.removeData(this,key)})}});function dataAttr(elem,key,data){if(data===undefined&&elem.nodeType===1){var name="data-"+key.replace(rmultiDash,"-$1").toLowerCase();data=elem.getAttribute(name);if(typeof data==="string"){try{data=data==="true"?true:data==="false"?false:data==="null"?null:+data+""===data?+data:rbrace.test(data)?jQuery.parseJSON(data):data}catch(e){}jQuery.data(elem,key,data)}else{data=undefined}}return data}function isEmptyDataObject(obj){var name;for(name in obj){if(name==="data"&&jQuery.isEmptyObject(obj[name])){continue}if(name!=="toJSON"){return false}}return true}jQuery.extend({queue:function(elem,type,data){var queue;if(elem){type=(type||"fx")+"queue";queue=jQuery._data(elem,type);if(data){if(!queue||jQuery.isArray(data)){queue=jQuery._data(elem,type,jQuery.makeArray(data))}else{queue.push(data)}}return queue||[]}},dequeue:function(elem,type){type=type||"fx";var queue=jQuery.queue(elem,type),startLength=queue.length,fn=queue.shift(),hooks=jQuery._queueHooks(elem,type),next=function(){jQuery.dequeue(elem,type)};if(fn==="inprogress"){fn=queue.shift();startLength--}if(fn){if(type==="fx"){queue.unshift("inprogress")}delete hooks.stop;fn.call(elem,next,hooks)}if(!startLength&&hooks){hooks.empty.fire()}},_queueHooks:function(elem,type){var key=type+"queueHooks";return jQuery._data(elem,key)||jQuery._data(elem,key,{empty:jQuery.Callbacks("once memory").add(function(){jQuery.removeData(elem,type+"queue",true);jQuery.removeData(elem,key,true)})})}});jQuery.fn.extend({queue:function(type,data){var setter=2;if(typeof type!=="string"){data=type;type="fx";setter--}if(arguments.length<setter){return jQuery.queue(this[0],type)}return data===undefined?this:this.each(function(){var queue=jQuery.queue(this,type,data);jQuery._queueHooks(this,type);if(type==="fx"&&queue[0]!=="inprogress"){jQuery.dequeue(this,type)}})},dequeue:function(type){return this.each(function(){jQuery.dequeue(this,type)})},delay:function(time,type){time=jQuery.fx?jQuery.fx.speeds[time]||time:time;type=type||"fx";return this.queue(type,function(next,hooks){var timeout=setTimeout(next,time);hooks.stop=function(){clearTimeout(timeout)}})},clearQueue:function(type){return this.queue(type||"fx",[])},promise:function(type,obj){var tmp,count=1,defer=jQuery.Deferred(),elements=this,i=this.length,resolve=function(){if(!--count){defer.resolveWith(elements,[elements])}};if(typeof type!=="string"){obj=type;type=undefined}type=type||"fx";while(i--){tmp=jQuery._data(elements[i],type+"queueHooks");if(tmp&&tmp.empty){count++;tmp.empty.add(resolve)}}resolve();return defer.promise(obj)}});var nodeHook,boolHook,fixSpecified,rclass=/[\t\r\n]/g,rreturn=/\r/g,rtype=/^(?:button|input)$/i,rfocusable=/^(?:button|input|object|select|textarea)$/i,rclickable=/^a(?:rea|)$/i,rboolean=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,getSetAttribute=jQuery.support.getSetAttribute;jQuery.fn.extend({attr:function(name,value){return jQuery.access(this,jQuery.attr,name,value,arguments.length>1)},removeAttr:function(name){return this.each(function(){jQuery.removeAttr(this,name)})},prop:function(name,value){return jQuery.access(this,jQuery.prop,name,value,arguments.length>1)},removeProp:function(name){name=jQuery.propFix[name]||name;return this.each(function(){try{this[name]=undefined;delete this[name]}catch(e){}})},addClass:function(value){var classNames,i,l,elem,setClass,c,cl;if(jQuery.isFunction(value)){return this.each(function(j){jQuery(this).addClass(value.call(this,j,this.className))})}if(value&&typeof value==="string"){classNames=value.split(core_rspace);for(i=0,l=this.length;i<l;i++){elem=this[i];if(elem.nodeType===1){if(!elem.className&&classNames.length===1){elem.className=value}else{setClass=" "+elem.className+" ";for(c=0,cl=classNames.length;c<cl;c++){if(setClass.indexOf(" "+classNames[c]+" ")<0){setClass+=classNames[c]+" "}}elem.className=jQuery.trim(setClass)}}}}return this},removeClass:function(value){var removes,className,elem,c,cl,i,l;if(jQuery.isFunction(value)){return this.each(function(j){jQuery(this).removeClass(value.call(this,j,this.className))})}if(value&&typeof value==="string"||value===undefined){removes=(value||"").split(core_rspace);for(i=0,l=this.length;i<l;i++){elem=this[i];if(elem.nodeType===1&&elem.className){className=(" "+elem.className+" ").replace(rclass," ");for(c=0,cl=removes.length;c<cl;c++){while(className.indexOf(" "+removes[c]+" ")>=0){className=className.replace(" "+removes[c]+" "," ")}}elem.className=value?jQuery.trim(className):""}}}return this},toggleClass:function(value,stateVal){var type=typeof value,isBool=typeof stateVal==="boolean";if(jQuery.isFunction(value)){return this.each(function(i){jQuery(this).toggleClass(value.call(this,i,this.className,stateVal),stateVal)})}return this.each(function(){if(type==="string"){var className,i=0,self=jQuery(this),state=stateVal,classNames=value.split(core_rspace);while(className=classNames[i++]){state=isBool?state:!self.hasClass(className);self[state?"addClass":"removeClass"](className)}}else if(type==="undefined"||type==="boolean"){if(this.className){jQuery._data(this,"__className__",this.className)}this.className=this.className||value===false?"":jQuery._data(this,"__className__")||""}})},hasClass:function(selector){var className=" "+selector+" ",i=0,l=this.length;for(;i<l;i++){if(this[i].nodeType===1&&(" "+this[i].className+" ").replace(rclass," ").indexOf(className)>=0){return true}}return false},val:function(value){var hooks,ret,isFunction,elem=this[0];if(!arguments.length){if(elem){hooks=jQuery.valHooks[elem.type]||jQuery.valHooks[elem.nodeName.toLowerCase()];if(hooks&&"get"in hooks&&(ret=hooks.get(elem,"value"))!==undefined){return ret}ret=elem.value;return typeof ret==="string"?ret.replace(rreturn,""):ret==null?"":ret}return}isFunction=jQuery.isFunction(value);return this.each(function(i){var val,self=jQuery(this);if(this.nodeType!==1){return}if(isFunction){val=value.call(this,i,self.val())}else{val=value}if(val==null){val=""}else if(typeof val==="number"){val+=""}else if(jQuery.isArray(val)){val=jQuery.map(val,function(value){return value==null?"":value+""})}hooks=jQuery.valHooks[this.type]||jQuery.valHooks[this.nodeName.toLowerCase()];if(!hooks||!("set"in hooks)||hooks.set(this,val,"value")===undefined){this.value=val}})}});jQuery.extend({valHooks:{option:{get:function(elem){var val=elem.attributes.value;return!val||val.specified?elem.value:elem.text}},select:{get:function(elem){var value,option,options=elem.options,index=elem.selectedIndex,one=elem.type==="select-one"||index<0,values=one?null:[],max=one?index+1:options.length,i=index<0?max:one?index:0;for(;i<max;i++){option=options[i];if((option.selected||i===index)&&(jQuery.support.optDisabled?!option.disabled:option.getAttribute("disabled")===null)&&(!option.parentNode.disabled||!jQuery.nodeName(option.parentNode,"optgroup"))){value=jQuery(option).val();if(one){return value}values.push(value)}}return values},set:function(elem,value){var values=jQuery.makeArray(value);jQuery(elem).find("option").each(function(){this.selected=jQuery.inArray(jQuery(this).val(),values)>=0});if(!values.length){elem.selectedIndex=-1}return values}}},attrFn:{},attr:function(elem,name,value,pass){var ret,hooks,notxml,nType=elem.nodeType;if(!elem||nType===3||nType===8||nType===2){return}if(pass&&jQuery.isFunction(jQuery.fn[name])){return jQuery(elem)[name](value)}if(typeof elem.getAttribute==="undefined"){return jQuery.prop(elem,name,value)}notxml=nType!==1||!jQuery.isXMLDoc(elem);if(notxml){name=name.toLowerCase();hooks=jQuery.attrHooks[name]||(rboolean.test(name)?boolHook:nodeHook)}if(value!==undefined){if(value===null){jQuery.removeAttr(elem,name);return}else if(hooks&&"set"in hooks&&notxml&&(ret=hooks.set(elem,value,name))!==undefined){return ret}else{elem.setAttribute(name,value+"");return value}}else if(hooks&&"get"in hooks&&notxml&&(ret=hooks.get(elem,name))!==null){return ret}else{ret=elem.getAttribute(name);return ret===null?undefined:ret}},removeAttr:function(elem,value){var propName,attrNames,name,isBool,i=0;if(value&&elem.nodeType===1){attrNames=value.split(core_rspace);for(;i<attrNames.length;i++){name=attrNames[i];if(name){propName=jQuery.propFix[name]||name;isBool=rboolean.test(name);if(!isBool){jQuery.attr(elem,name,"")}elem.removeAttribute(getSetAttribute?name:propName);if(isBool&&propName in elem){elem[propName]=false}}}}},attrHooks:{type:{set:function(elem,value){if(rtype.test(elem.nodeName)&&elem.parentNode){jQuery.error("type property can't be changed")
+}else if(!jQuery.support.radioValue&&value==="radio"&&jQuery.nodeName(elem,"input")){var val=elem.value;elem.setAttribute("type",value);if(val){elem.value=val}return value}}},value:{get:function(elem,name){if(nodeHook&&jQuery.nodeName(elem,"button")){return nodeHook.get(elem,name)}return name in elem?elem.value:null},set:function(elem,value,name){if(nodeHook&&jQuery.nodeName(elem,"button")){return nodeHook.set(elem,value,name)}elem.value=value}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(elem,name,value){var ret,hooks,notxml,nType=elem.nodeType;if(!elem||nType===3||nType===8||nType===2){return}notxml=nType!==1||!jQuery.isXMLDoc(elem);if(notxml){name=jQuery.propFix[name]||name;hooks=jQuery.propHooks[name]}if(value!==undefined){if(hooks&&"set"in hooks&&(ret=hooks.set(elem,value,name))!==undefined){return ret}else{return elem[name]=value}}else{if(hooks&&"get"in hooks&&(ret=hooks.get(elem,name))!==null){return ret}else{return elem[name]}}},propHooks:{tabIndex:{get:function(elem){var attributeNode=elem.getAttributeNode("tabindex");return attributeNode&&attributeNode.specified?parseInt(attributeNode.value,10):rfocusable.test(elem.nodeName)||rclickable.test(elem.nodeName)&&elem.href?0:undefined}}}});boolHook={get:function(elem,name){var attrNode,property=jQuery.prop(elem,name);return property===true||typeof property!=="boolean"&&(attrNode=elem.getAttributeNode(name))&&attrNode.nodeValue!==false?name.toLowerCase():undefined},set:function(elem,value,name){var propName;if(value===false){jQuery.removeAttr(elem,name)}else{propName=jQuery.propFix[name]||name;if(propName in elem){elem[propName]=true}elem.setAttribute(name,name.toLowerCase())}return name}};if(!getSetAttribute){fixSpecified={name:true,id:true,coords:true};nodeHook=jQuery.valHooks.button={get:function(elem,name){var ret;ret=elem.getAttributeNode(name);return ret&&(fixSpecified[name]?ret.value!=="":ret.specified)?ret.value:undefined},set:function(elem,value,name){var ret=elem.getAttributeNode(name);if(!ret){ret=document.createAttribute(name);elem.setAttributeNode(ret)}return ret.value=value+""}};jQuery.each(["width","height"],function(i,name){jQuery.attrHooks[name]=jQuery.extend(jQuery.attrHooks[name],{set:function(elem,value){if(value===""){elem.setAttribute(name,"auto");return value}}})});jQuery.attrHooks.contenteditable={get:nodeHook.get,set:function(elem,value,name){if(value===""){value="false"}nodeHook.set(elem,value,name)}}}if(!jQuery.support.hrefNormalized){jQuery.each(["href","src","width","height"],function(i,name){jQuery.attrHooks[name]=jQuery.extend(jQuery.attrHooks[name],{get:function(elem){var ret=elem.getAttribute(name,2);return ret===null?undefined:ret}})})}if(!jQuery.support.style){jQuery.attrHooks.style={get:function(elem){return elem.style.cssText.toLowerCase()||undefined},set:function(elem,value){return elem.style.cssText=value+""}}}if(!jQuery.support.optSelected){jQuery.propHooks.selected=jQuery.extend(jQuery.propHooks.selected,{get:function(elem){var parent=elem.parentNode;if(parent){parent.selectedIndex;if(parent.parentNode){parent.parentNode.selectedIndex}}return null}})}if(!jQuery.support.enctype){jQuery.propFix.enctype="encoding"}if(!jQuery.support.checkOn){jQuery.each(["radio","checkbox"],function(){jQuery.valHooks[this]={get:function(elem){return elem.getAttribute("value")===null?"on":elem.value}}})}jQuery.each(["radio","checkbox"],function(){jQuery.valHooks[this]=jQuery.extend(jQuery.valHooks[this],{set:function(elem,value){if(jQuery.isArray(value)){return elem.checked=jQuery.inArray(jQuery(elem).val(),value)>=0}}})});var rformElems=/^(?:textarea|input|select)$/i,rtypenamespace=/^([^\.]*|)(?:\.(.+)|)$/,rhoverHack=/(?:^|\s)hover(\.\S+|)\b/,rkeyEvent=/^key/,rmouseEvent=/^(?:mouse|contextmenu)|click/,rfocusMorph=/^(?:focusinfocus|focusoutblur)$/,hoverHack=function(events){return jQuery.event.special.hover?events:events.replace(rhoverHack,"mouseenter$1 mouseleave$1")};jQuery.event={add:function(elem,types,handler,data,selector){var elemData,eventHandle,events,t,tns,type,namespaces,handleObj,handleObjIn,handlers,special;if(elem.nodeType===3||elem.nodeType===8||!types||!handler||!(elemData=jQuery._data(elem))){return}if(handler.handler){handleObjIn=handler;handler=handleObjIn.handler;selector=handleObjIn.selector}if(!handler.guid){handler.guid=jQuery.guid++}events=elemData.events;if(!events){elemData.events=events={}}eventHandle=elemData.handle;if(!eventHandle){elemData.handle=eventHandle=function(e){return typeof jQuery!=="undefined"&&(!e||jQuery.event.triggered!==e.type)?jQuery.event.dispatch.apply(eventHandle.elem,arguments):undefined};eventHandle.elem=elem}types=jQuery.trim(hoverHack(types)).split(" ");for(t=0;t<types.length;t++){tns=rtypenamespace.exec(types[t])||[];type=tns[1];namespaces=(tns[2]||"").split(".").sort();special=jQuery.event.special[type]||{};type=(selector?special.delegateType:special.bindType)||type;special=jQuery.event.special[type]||{};handleObj=jQuery.extend({type:type,origType:tns[1],data:data,handler:handler,guid:handler.guid,selector:selector,needsContext:selector&&jQuery.expr.match.needsContext.test(selector),namespace:namespaces.join(".")},handleObjIn);handlers=events[type];if(!handlers){handlers=events[type]=[];handlers.delegateCount=0;if(!special.setup||special.setup.call(elem,data,namespaces,eventHandle)===false){if(elem.addEventListener){elem.addEventListener(type,eventHandle,false)}else if(elem.attachEvent){elem.attachEvent("on"+type,eventHandle)}}}if(special.add){special.add.call(elem,handleObj);if(!handleObj.handler.guid){handleObj.handler.guid=handler.guid}}if(selector){handlers.splice(handlers.delegateCount++,0,handleObj)}else{handlers.push(handleObj)}jQuery.event.global[type]=true}elem=null},global:{},remove:function(elem,types,handler,selector,mappedTypes){var t,tns,type,origType,namespaces,origCount,j,events,special,eventType,handleObj,elemData=jQuery.hasData(elem)&&jQuery._data(elem);if(!elemData||!(events=elemData.events)){return}types=jQuery.trim(hoverHack(types||"")).split(" ");for(t=0;t<types.length;t++){tns=rtypenamespace.exec(types[t])||[];type=origType=tns[1];namespaces=tns[2];if(!type){for(type in events){jQuery.event.remove(elem,type+types[t],handler,selector,true)}continue}special=jQuery.event.special[type]||{};type=(selector?special.delegateType:special.bindType)||type;eventType=events[type]||[];origCount=eventType.length;namespaces=namespaces?new RegExp("(^|\\.)"+namespaces.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(j=0;j<eventType.length;j++){handleObj=eventType[j];if((mappedTypes||origType===handleObj.origType)&&(!handler||handler.guid===handleObj.guid)&&(!namespaces||namespaces.test(handleObj.namespace))&&(!selector||selector===handleObj.selector||selector==="**"&&handleObj.selector)){eventType.splice(j--,1);if(handleObj.selector){eventType.delegateCount--}if(special.remove){special.remove.call(elem,handleObj)}}}if(eventType.length===0&&origCount!==eventType.length){if(!special.teardown||special.teardown.call(elem,namespaces,elemData.handle)===false){jQuery.removeEvent(elem,type,elemData.handle)}delete events[type]}}if(jQuery.isEmptyObject(events)){delete elemData.handle;jQuery.removeData(elem,"events",true)}},customEvent:{getData:true,setData:true,changeData:true},trigger:function(event,data,elem,onlyHandlers){if(elem&&(elem.nodeType===3||elem.nodeType===8)){return}var cache,exclusive,i,cur,old,ontype,special,handle,eventPath,bubbleType,type=event.type||event,namespaces=[];if(rfocusMorph.test(type+jQuery.event.triggered)){return}if(type.indexOf("!")>=0){type=type.slice(0,-1);exclusive=true}if(type.indexOf(".")>=0){namespaces=type.split(".");type=namespaces.shift();namespaces.sort()}if((!elem||jQuery.event.customEvent[type])&&!jQuery.event.global[type]){return}event=typeof event==="object"?event[jQuery.expando]?event:new jQuery.Event(type,event):new jQuery.Event(type);event.type=type;event.isTrigger=true;event.exclusive=exclusive;event.namespace=namespaces.join(".");event.namespace_re=event.namespace?new RegExp("(^|\\.)"+namespaces.join("\\.(?:.*\\.|)")+"(\\.|$)"):null;ontype=type.indexOf(":")<0?"on"+type:"";if(!elem){cache=jQuery.cache;for(i in cache){if(cache[i].events&&cache[i].events[type]){jQuery.event.trigger(event,data,cache[i].handle.elem,true)}}return}event.result=undefined;if(!event.target){event.target=elem}data=data!=null?jQuery.makeArray(data):[];data.unshift(event);special=jQuery.event.special[type]||{};if(special.trigger&&special.trigger.apply(elem,data)===false){return}eventPath=[[elem,special.bindType||type]];if(!onlyHandlers&&!special.noBubble&&!jQuery.isWindow(elem)){bubbleType=special.delegateType||type;cur=rfocusMorph.test(bubbleType+type)?elem:elem.parentNode;for(old=elem;cur;cur=cur.parentNode){eventPath.push([cur,bubbleType]);old=cur}if(old===(elem.ownerDocument||document)){eventPath.push([old.defaultView||old.parentWindow||window,bubbleType])}}for(i=0;i<eventPath.length&&!event.isPropagationStopped();i++){cur=eventPath[i][0];event.type=eventPath[i][1];handle=(jQuery._data(cur,"events")||{})[event.type]&&jQuery._data(cur,"handle");if(handle){handle.apply(cur,data)}handle=ontype&&cur[ontype];if(handle&&jQuery.acceptData(cur)&&handle.apply&&handle.apply(cur,data)===false){event.preventDefault()}}event.type=type;if(!onlyHandlers&&!event.isDefaultPrevented()){if((!special._default||special._default.apply(elem.ownerDocument,data)===false)&&!(type==="click"&&jQuery.nodeName(elem,"a"))&&jQuery.acceptData(elem)){if(ontype&&elem[type]&&(type!=="focus"&&type!=="blur"||event.target.offsetWidth!==0)&&!jQuery.isWindow(elem)){old=elem[ontype];if(old){elem[ontype]=null}jQuery.event.triggered=type;elem[type]();jQuery.event.triggered=undefined;if(old){elem[ontype]=old}}}}return event.result},dispatch:function(event){event=jQuery.event.fix(event||window.event);var i,j,cur,ret,selMatch,matched,matches,handleObj,sel,related,handlers=(jQuery._data(this,"events")||{})[event.type]||[],delegateCount=handlers.delegateCount,args=core_slice.call(arguments),run_all=!event.exclusive&&!event.namespace,special=jQuery.event.special[event.type]||{},handlerQueue=[];args[0]=event;event.delegateTarget=this;if(special.preDispatch&&special.preDispatch.call(this,event)===false){return}if(delegateCount&&!(event.button&&event.type==="click")){for(cur=event.target;cur!=this;cur=cur.parentNode||this){if(cur.disabled!==true||event.type!=="click"){selMatch={};matches=[];for(i=0;i<delegateCount;i++){handleObj=handlers[i];sel=handleObj.selector;if(selMatch[sel]===undefined){selMatch[sel]=handleObj.needsContext?jQuery(sel,this).index(cur)>=0:jQuery.find(sel,this,null,[cur]).length}if(selMatch[sel]){matches.push(handleObj)}}if(matches.length){handlerQueue.push({elem:cur,matches:matches})}}}}if(handlers.length>delegateCount){handlerQueue.push({elem:this,matches:handlers.slice(delegateCount)})}for(i=0;i<handlerQueue.length&&!event.isPropagationStopped();i++){matched=handlerQueue[i];event.currentTarget=matched.elem;for(j=0;j<matched.matches.length&&!event.isImmediatePropagationStopped();j++){handleObj=matched.matches[j];if(run_all||!event.namespace&&!handleObj.namespace||event.namespace_re&&event.namespace_re.test(handleObj.namespace)){event.data=handleObj.data;event.handleObj=handleObj;ret=((jQuery.event.special[handleObj.origType]||{}).handle||handleObj.handler).apply(matched.elem,args);if(ret!==undefined){event.result=ret;if(ret===false){event.preventDefault();event.stopPropagation()}}}}}if(special.postDispatch){special.postDispatch.call(this,event)}return event.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(event,original){if(event.which==null){event.which=original.charCode!=null?original.charCode:original.keyCode}return event}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(event,original){var eventDoc,doc,body,button=original.button,fromElement=original.fromElement;if(event.pageX==null&&original.clientX!=null){eventDoc=event.target.ownerDocument||document;doc=eventDoc.documentElement;body=eventDoc.body;event.pageX=original.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc&&doc.clientLeft||body&&body.clientLeft||0);event.pageY=original.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc&&doc.clientTop||body&&body.clientTop||0)}if(!event.relatedTarget&&fromElement){event.relatedTarget=fromElement===event.target?original.toElement:fromElement}if(!event.which&&button!==undefined){event.which=button&1?1:button&2?3:button&4?2:0}return event}},fix:function(event){if(event[jQuery.expando]){return event}var i,prop,originalEvent=event,fixHook=jQuery.event.fixHooks[event.type]||{},copy=fixHook.props?this.props.concat(fixHook.props):this.props;event=jQuery.Event(originalEvent);for(i=copy.length;i;){prop=copy[--i];event[prop]=originalEvent[prop]}if(!event.target){event.target=originalEvent.srcElement||document}if(event.target.nodeType===3){event.target=event.target.parentNode}event.metaKey=!!event.metaKey;return fixHook.filter?fixHook.filter(event,originalEvent):event},special:{load:{noBubble:true},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(data,namespaces,eventHandle){if(jQuery.isWindow(this)){this.onbeforeunload=eventHandle}},teardown:function(namespaces,eventHandle){if(this.onbeforeunload===eventHandle){this.onbeforeunload=null}}}},simulate:function(type,elem,event,bubble){var e=jQuery.extend(new jQuery.Event,event,{type:type,isSimulated:true,originalEvent:{}});if(bubble){jQuery.event.trigger(e,null,elem)}else{jQuery.event.dispatch.call(elem,e)}if(e.isDefaultPrevented()){event.preventDefault()}}};jQuery.event.handle=jQuery.event.dispatch;jQuery.removeEvent=document.removeEventListener?function(elem,type,handle){if(elem.removeEventListener){elem.removeEventListener(type,handle,false)}}:function(elem,type,handle){var name="on"+type;if(elem.detachEvent){if(typeof elem[name]==="undefined"){elem[name]=null}elem.detachEvent(name,handle)}};jQuery.Event=function(src,props){if(!(this instanceof jQuery.Event)){return new jQuery.Event(src,props)}if(src&&src.type){this.originalEvent=src;this.type=src.type;this.isDefaultPrevented=src.defaultPrevented||src.returnValue===false||src.getPreventDefault&&src.getPreventDefault()?returnTrue:returnFalse}else{this.type=src}if(props){jQuery.extend(this,props)}this.timeStamp=src&&src.timeStamp||jQuery.now();this[jQuery.expando]=true};function returnFalse(){return false}function returnTrue(){return true}jQuery.Event.prototype={preventDefault:function(){this.isDefaultPrevented=returnTrue;var e=this.originalEvent;if(!e){return}if(e.preventDefault){e.preventDefault()}else{e.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=returnTrue;var e=this.originalEvent;if(!e){return}if(e.stopPropagation){e.stopPropagation()}e.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=returnTrue;this.stopPropagation()},isDefaultPrevented:returnFalse,isPropagationStopped:returnFalse,isImmediatePropagationStopped:returnFalse};jQuery.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(orig,fix){jQuery.event.special[orig]={delegateType:fix,bindType:fix,handle:function(event){var ret,target=this,related=event.relatedTarget,handleObj=event.handleObj,selector=handleObj.selector;if(!related||related!==target&&!jQuery.contains(target,related)){event.type=handleObj.origType;ret=handleObj.handler.apply(this,arguments);event.type=fix}return ret}}});if(!jQuery.support.submitBubbles){jQuery.event.special.submit={setup:function(){if(jQuery.nodeName(this,"form")){return false}jQuery.event.add(this,"click._submit keypress._submit",function(e){var elem=e.target,form=jQuery.nodeName(elem,"input")||jQuery.nodeName(elem,"button")?elem.form:undefined;if(form&&!jQuery._data(form,"_submit_attached")){jQuery.event.add(form,"submit._submit",function(event){event._submit_bubble=true});jQuery._data(form,"_submit_attached",true)}})},postDispatch:function(event){if(event._submit_bubble){delete event._submit_bubble;if(this.parentNode&&!event.isTrigger){jQuery.event.simulate("submit",this.parentNode,event,true)}}},teardown:function(){if(jQuery.nodeName(this,"form")){return false}jQuery.event.remove(this,"._submit")}}}if(!jQuery.support.changeBubbles){jQuery.event.special.change={setup:function(){if(rformElems.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio"){jQuery.event.add(this,"propertychange._change",function(event){if(event.originalEvent.propertyName==="checked"){this._just_changed=true}});jQuery.event.add(this,"click._change",function(event){if(this._just_changed&&!event.isTrigger){this._just_changed=false}jQuery.event.simulate("change",this,event,true)})}return false}jQuery.event.add(this,"beforeactivate._change",function(e){var elem=e.target;if(rformElems.test(elem.nodeName)&&!jQuery._data(elem,"_change_attached")){jQuery.event.add(elem,"change._change",function(event){if(this.parentNode&&!event.isSimulated&&!event.isTrigger){jQuery.event.simulate("change",this.parentNode,event,true)}});jQuery._data(elem,"_change_attached",true)}})},handle:function(event){var elem=event.target;if(this!==elem||event.isSimulated||event.isTrigger||elem.type!=="radio"&&elem.type!=="checkbox"){return event.handleObj.handler.apply(this,arguments)}},teardown:function(){jQuery.event.remove(this,"._change");return!rformElems.test(this.nodeName)}}}if(!jQuery.support.focusinBubbles){jQuery.each({focus:"focusin",blur:"focusout"},function(orig,fix){var attaches=0,handler=function(event){jQuery.event.simulate(fix,event.target,jQuery.event.fix(event),true)};jQuery.event.special[fix]={setup:function(){if(attaches++===0){document.addEventListener(orig,handler,true)}},teardown:function(){if(--attaches===0){document.removeEventListener(orig,handler,true)}}}})}jQuery.fn.extend({on:function(types,selector,data,fn,one){var origFn,type;if(typeof types==="object"){if(typeof selector!=="string"){data=data||selector;selector=undefined}for(type in types){this.on(type,selector,data,types[type],one)}return this}if(data==null&&fn==null){fn=selector;data=selector=undefined}else if(fn==null){if(typeof selector==="string"){fn=data;data=undefined}else{fn=data;data=selector;selector=undefined}}if(fn===false){fn=returnFalse}else if(!fn){return this}if(one===1){origFn=fn;fn=function(event){jQuery().off(event);return origFn.apply(this,arguments)};fn.guid=origFn.guid||(origFn.guid=jQuery.guid++)}return this.each(function(){jQuery.event.add(this,types,fn,data,selector)})},one:function(types,selector,data,fn){return this.on(types,selector,data,fn,1)},off:function(types,selector,fn){var handleObj,type;if(types&&types.preventDefault&&types.handleObj){handleObj=types.handleObj;jQuery(types.delegateTarget).off(handleObj.namespace?handleObj.origType+"."+handleObj.namespace:handleObj.origType,handleObj.selector,handleObj.handler);return this}if(typeof types==="object"){for(type in types){this.off(type,selector,types[type])}return this}if(selector===false||typeof selector==="function"){fn=selector;selector=undefined}if(fn===false){fn=returnFalse}return this.each(function(){jQuery.event.remove(this,types,fn,selector)})},bind:function(types,data,fn){return this.on(types,null,data,fn)},unbind:function(types,fn){return this.off(types,null,fn)},live:function(types,data,fn){jQuery(this.context).on(types,this.selector,data,fn);return this},die:function(types,fn){jQuery(this.context).off(types,this.selector||"**",fn);return this},delegate:function(selector,types,data,fn){return this.on(types,selector,data,fn)},undelegate:function(selector,types,fn){return arguments.length===1?this.off(selector,"**"):this.off(types,selector||"**",fn)},trigger:function(type,data){return this.each(function(){jQuery.event.trigger(type,data,this)})},triggerHandler:function(type,data){if(this[0]){return jQuery.event.trigger(type,data,this[0],true)}},toggle:function(fn){var args=arguments,guid=fn.guid||jQuery.guid++,i=0,toggler=function(event){var lastToggle=(jQuery._data(this,"lastToggle"+fn.guid)||0)%i;jQuery._data(this,"lastToggle"+fn.guid,lastToggle+1);event.preventDefault();return args[lastToggle].apply(this,arguments)||false};toggler.guid=guid;while(i<args.length){args[i++].guid=guid}return this.click(toggler)},hover:function(fnOver,fnOut){return this.mouseenter(fnOver).mouseleave(fnOut||fnOver)}});jQuery.each(("blur focus focusin focusout load resize scroll unload click dblclick "+"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave "+"change select submit keydown keypress keyup error contextmenu").split(" "),function(i,name){jQuery.fn[name]=function(data,fn){if(fn==null){fn=data;data=null}return arguments.length>0?this.on(name,null,data,fn):this.trigger(name)};if(rkeyEvent.test(name)){jQuery.event.fixHooks[name]=jQuery.event.keyHooks}if(rmouseEvent.test(name)){jQuery.event.fixHooks[name]=jQuery.event.mouseHooks}});(function(window,undefined){var cachedruns,assertGetIdNotName,Expr,getText,isXML,contains,compile,sortOrder,hasDuplicate,outermostContext,baseHasDuplicate=true,strundefined="undefined",expando=("sizcache"+Math.random()).replace(".",""),Token=String,document=window.document,docElem=document.documentElement,dirruns=0,done=0,pop=[].pop,push=[].push,slice=[].slice,indexOf=[].indexOf||function(elem){var i=0,len=this.length;for(;i<len;i++){if(this[i]===elem){return i}}return-1},markFunction=function(fn,value){fn[expando]=value==null||value;return fn},createCache=function(){var cache={},keys=[];return markFunction(function(key,value){if(keys.push(key)>Expr.cacheLength){delete cache[keys.shift()]}return cache[key+" "]=value},cache)},classCache=createCache(),tokenCache=createCache(),compilerCache=createCache(),whitespace="[\\x20\\t\\r\\n\\f]",characterEncoding="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",identifier=characterEncoding.replace("w","w#"),operators="([*^$|!~]?=)",attributes="\\["+whitespace+"*("+characterEncoding+")"+whitespace+"*(?:"+operators+whitespace+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+identifier+")|)|)"+whitespace+"*\\]",pseudos=":("+characterEncoding+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+attributes+")|[^:]|\\\\.)*|.*))\\)|)",pos=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+whitespace+"*((?:-\\d)?\\d*)"+whitespace+"*\\)|)(?=[^-]|$)",rtrim=new RegExp("^"+whitespace+"+|((?:^|[^\\\\])(?:\\\\.)*)"+whitespace+"+$","g"),rcomma=new RegExp("^"+whitespace+"*,"+whitespace+"*"),rcombinators=new RegExp("^"+whitespace+"*([\\x20\\t\\r\\n\\f>+~])"+whitespace+"*"),rpseudo=new RegExp(pseudos),rquickExpr=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,rnot=/^:not/,rsibling=/[\x20\t\r\n\f]*[+~]/,rendsWithNot=/:not\($/,rheader=/h\d/i,rinputs=/input|select|textarea|button/i,rbackslash=/\\(?!\\)/g,matchExpr={ID:new RegExp("^#("+characterEncoding+")"),CLASS:new RegExp("^\\.("+characterEncoding+")"),NAME:new RegExp("^\\[name=['\"]?("+characterEncoding+")['\"]?\\]"),TAG:new RegExp("^("+characterEncoding.replace("w","w*")+")"),ATTR:new RegExp("^"+attributes),PSEUDO:new RegExp("^"+pseudos),POS:new RegExp(pos,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+whitespace+"*(even|odd|(([+-]|)(\\d*)n|)"+whitespace+"*(?:([+-]|)"+whitespace+"*(\\d+)|))"+whitespace+"*\\)|)","i"),needsContext:new RegExp("^"+whitespace+"*[>+~]|"+pos,"i")},assert=function(fn){var div=document.createElement("div");try{return fn(div)}catch(e){return false}finally{div=null}},assertTagNameNoComments=assert(function(div){div.appendChild(document.createComment(""));return!div.getElementsByTagName("*").length}),assertHrefNotNormalized=assert(function(div){div.innerHTML="<a href='#'></a>";return div.firstChild&&typeof div.firstChild.getAttribute!==strundefined&&div.firstChild.getAttribute("href")==="#"}),assertAttributes=assert(function(div){div.innerHTML="<select></select>";var type=typeof div.lastChild.getAttribute("multiple");return type!=="boolean"&&type!=="string"}),assertUsableClassName=assert(function(div){div.innerHTML="<div class='hidden e'></div><div class='hidden'></div>";if(!div.getElementsByClassName||!div.getElementsByClassName("e").length){return false}div.lastChild.className="e";return div.getElementsByClassName("e").length===2}),assertUsableName=assert(function(div){div.id=expando+0;div.innerHTML="<a name='"+expando+"'></a><div name='"+expando+"'></div>";docElem.insertBefore(div,docElem.firstChild);var pass=document.getElementsByName&&document.getElementsByName(expando).length===2+document.getElementsByName(expando+0).length;assertGetIdNotName=!document.getElementById(expando);docElem.removeChild(div);return pass});try{slice.call(docElem.childNodes,0)[0].nodeType}catch(e){slice=function(i){var elem,results=[];for(;elem=this[i];i++){results.push(elem)}return results}}function Sizzle(selector,context,results,seed){results=results||[];context=context||document;var match,elem,xml,m,nodeType=context.nodeType;if(!selector||typeof selector!=="string"){return results}if(nodeType!==1&&nodeType!==9){return[]}xml=isXML(context);if(!xml&&!seed){if(match=rquickExpr.exec(selector)){if(m=match[1]){if(nodeType===9){elem=context.getElementById(m);if(elem&&elem.parentNode){if(elem.id===m){results.push(elem);return results}}else{return results}}else{if(context.ownerDocument&&(elem=context.ownerDocument.getElementById(m))&&contains(context,elem)&&elem.id===m){results.push(elem);return results}}}else if(match[2]){push.apply(results,slice.call(context.getElementsByTagName(selector),0));return results}else if((m=match[3])&&assertUsableClassName&&context.getElementsByClassName){push.apply(results,slice.call(context.getElementsByClassName(m),0));return results}}}return select(selector.replace(rtrim,"$1"),context,results,seed,xml)}Sizzle.matches=function(expr,elements){return Sizzle(expr,null,null,elements)};Sizzle.matchesSelector=function(elem,expr){return Sizzle(expr,null,null,[elem]).length>0};function createInputPseudo(type){return function(elem){var name=elem.nodeName.toLowerCase();return name==="input"&&elem.type===type}}function createButtonPseudo(type){return function(elem){var name=elem.nodeName.toLowerCase();return(name==="input"||name==="button")&&elem.type===type}}function createPositionalPseudo(fn){return markFunction(function(argument){argument=+argument;return markFunction(function(seed,matches){var j,matchIndexes=fn([],seed.length,argument),i=matchIndexes.length;while(i--){if(seed[j=matchIndexes[i]]){seed[j]=!(matches[j]=seed[j])}}})})}getText=Sizzle.getText=function(elem){var node,ret="",i=0,nodeType=elem.nodeType;if(nodeType){if(nodeType===1||nodeType===9||nodeType===11){if(typeof elem.textContent==="string"){return elem.textContent}else{for(elem=elem.firstChild;elem;elem=elem.nextSibling){ret+=getText(elem)}}}else if(nodeType===3||nodeType===4){return elem.nodeValue}}else{for(;node=elem[i];i++){ret+=getText(node)}}return ret};isXML=Sizzle.isXML=function(elem){var documentElement=elem&&(elem.ownerDocument||elem).documentElement;return documentElement?documentElement.nodeName!=="HTML":false};contains=Sizzle.contains=docElem.contains?function(a,b){var adown=a.nodeType===9?a.documentElement:a,bup=b&&b.parentNode;return a===bup||!!(bup&&bup.nodeType===1&&adown.contains&&adown.contains(bup))}:docElem.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode){if(b===a){return true}}return false};Sizzle.attr=function(elem,name){var val,xml=isXML(elem);if(!xml){name=name.toLowerCase()}if(val=Expr.attrHandle[name]){return val(elem)}if(xml||assertAttributes){return elem.getAttribute(name)}val=elem.getAttributeNode(name);return val?typeof elem[name]==="boolean"?elem[name]?name:null:val.specified?val.value:null:null};Expr=Sizzle.selectors={cacheLength:50,createPseudo:markFunction,match:matchExpr,attrHandle:assertHrefNotNormalized?{}:{href:function(elem){return elem.getAttribute("href",2)},type:function(elem){return elem.getAttribute("type")}},find:{ID:assertGetIdNotName?function(id,context,xml){if(typeof context.getElementById!==strundefined&&!xml){var m=context.getElementById(id);return m&&m.parentNode?[m]:[]}}:function(id,context,xml){if(typeof context.getElementById!==strundefined&&!xml){var m=context.getElementById(id);return m?m.id===id||typeof m.getAttributeNode!==strundefined&&m.getAttributeNode("id").value===id?[m]:undefined:[]}},TAG:assertTagNameNoComments?function(tag,context){if(typeof context.getElementsByTagName!==strundefined){return context.getElementsByTagName(tag)}}:function(tag,context){var results=context.getElementsByTagName(tag);if(tag==="*"){var elem,tmp=[],i=0;for(;elem=results[i];i++){if(elem.nodeType===1){tmp.push(elem)}}return tmp}return results},NAME:assertUsableName&&function(tag,context){if(typeof context.getElementsByName!==strundefined){return context.getElementsByName(name)}},CLASS:assertUsableClassName&&function(className,context,xml){if(typeof context.getElementsByClassName!==strundefined&&!xml){return context.getElementsByClassName(className)}}},relative:{">":{dir:"parentNode",first:true}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:true},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(match){match[1]=match[1].replace(rbackslash,"");match[3]=(match[4]||match[5]||"").replace(rbackslash,"");if(match[2]==="~="){match[3]=" "+match[3]+" "}return match.slice(0,4)},CHILD:function(match){match[1]=match[1].toLowerCase();if(match[1]==="nth"){if(!match[2]){Sizzle.error(match[0])}match[3]=+(match[3]?match[4]+(match[5]||1):2*(match[2]==="even"||match[2]==="odd"));match[4]=+(match[6]+match[7]||match[2]==="odd")}else if(match[2]){Sizzle.error(match[0])}return match},PSEUDO:function(match){var unquoted,excess;if(matchExpr["CHILD"].test(match[0])){return null}if(match[3]){match[2]=match[3]}else if(unquoted=match[4]){if(rpseudo.test(unquoted)&&(excess=tokenize(unquoted,true))&&(excess=unquoted.indexOf(")",unquoted.length-excess)-unquoted.length)){unquoted=unquoted.slice(0,excess);match[0]=match[0].slice(0,excess)}match[2]=unquoted}return match.slice(0,3)}},filter:{ID:assertGetIdNotName?function(id){id=id.replace(rbackslash,"");return function(elem){return elem.getAttribute("id")===id}}:function(id){id=id.replace(rbackslash,"");return function(elem){var node=typeof elem.getAttributeNode!==strundefined&&elem.getAttributeNode("id");return node&&node.value===id}},TAG:function(nodeName){if(nodeName==="*"){return function(){return true}}nodeName=nodeName.replace(rbackslash,"").toLowerCase();return function(elem){return elem.nodeName&&elem.nodeName.toLowerCase()===nodeName}},CLASS:function(className){var pattern=classCache[expando][className+" "];return pattern||(pattern=new RegExp("(^|"+whitespace+")"+className+"("+whitespace+"|$)"))&&classCache(className,function(elem){return pattern.test(elem.className||typeof elem.getAttribute!==strundefined&&elem.getAttribute("class")||"")})},ATTR:function(name,operator,check){return function(elem,context){var result=Sizzle.attr(elem,name);if(result==null){return operator==="!="}if(!operator){return true}result+="";return operator==="="?result===check:operator==="!="?result!==check:operator==="^="?check&&result.indexOf(check)===0:operator==="*="?check&&result.indexOf(check)>-1:operator==="$="?check&&result.substr(result.length-check.length)===check:operator==="~="?(" "+result+" ").indexOf(check)>-1:operator==="|="?result===check||result.substr(0,check.length+1)===check+"-":false}},CHILD:function(type,argument,first,last){if(type==="nth"){return function(elem){var node,diff,parent=elem.parentNode;if(first===1&&last===0){return true}if(parent){diff=0;for(node=parent.firstChild;node;node=node.nextSibling){if(node.nodeType===1){diff++;
+if(elem===node){break}}}}diff-=last;return diff===first||diff%first===0&&diff/first>=0}}return function(elem){var node=elem;switch(type){case"only":case"first":while(node=node.previousSibling){if(node.nodeType===1){return false}}if(type==="first"){return true}node=elem;case"last":while(node=node.nextSibling){if(node.nodeType===1){return false}}return true}}},PSEUDO:function(pseudo,argument){var args,fn=Expr.pseudos[pseudo]||Expr.setFilters[pseudo.toLowerCase()]||Sizzle.error("unsupported pseudo: "+pseudo);if(fn[expando]){return fn(argument)}if(fn.length>1){args=[pseudo,pseudo,"",argument];return Expr.setFilters.hasOwnProperty(pseudo.toLowerCase())?markFunction(function(seed,matches){var idx,matched=fn(seed,argument),i=matched.length;while(i--){idx=indexOf.call(seed,matched[i]);seed[idx]=!(matches[idx]=matched[i])}}):function(elem){return fn(elem,0,args)}}return fn}},pseudos:{not:markFunction(function(selector){var input=[],results=[],matcher=compile(selector.replace(rtrim,"$1"));return matcher[expando]?markFunction(function(seed,matches,context,xml){var elem,unmatched=matcher(seed,null,xml,[]),i=seed.length;while(i--){if(elem=unmatched[i]){seed[i]=!(matches[i]=elem)}}}):function(elem,context,xml){input[0]=elem;matcher(input,null,xml,results);return!results.pop()}}),has:markFunction(function(selector){return function(elem){return Sizzle(selector,elem).length>0}}),contains:markFunction(function(text){return function(elem){return(elem.textContent||elem.innerText||getText(elem)).indexOf(text)>-1}}),enabled:function(elem){return elem.disabled===false},disabled:function(elem){return elem.disabled===true},checked:function(elem){var nodeName=elem.nodeName.toLowerCase();return nodeName==="input"&&!!elem.checked||nodeName==="option"&&!!elem.selected},selected:function(elem){if(elem.parentNode){elem.parentNode.selectedIndex}return elem.selected===true},parent:function(elem){return!Expr.pseudos["empty"](elem)},empty:function(elem){var nodeType;elem=elem.firstChild;while(elem){if(elem.nodeName>"@"||(nodeType=elem.nodeType)===3||nodeType===4){return false}elem=elem.nextSibling}return true},header:function(elem){return rheader.test(elem.nodeName)},text:function(elem){var type,attr;return elem.nodeName.toLowerCase()==="input"&&(type=elem.type)==="text"&&((attr=elem.getAttribute("type"))==null||attr.toLowerCase()===type)},radio:createInputPseudo("radio"),checkbox:createInputPseudo("checkbox"),file:createInputPseudo("file"),password:createInputPseudo("password"),image:createInputPseudo("image"),submit:createButtonPseudo("submit"),reset:createButtonPseudo("reset"),button:function(elem){var name=elem.nodeName.toLowerCase();return name==="input"&&elem.type==="button"||name==="button"},input:function(elem){return rinputs.test(elem.nodeName)},focus:function(elem){var doc=elem.ownerDocument;return elem===doc.activeElement&&(!doc.hasFocus||doc.hasFocus())&&!!(elem.type||elem.href||~elem.tabIndex)},active:function(elem){return elem===elem.ownerDocument.activeElement},first:createPositionalPseudo(function(){return[0]}),last:createPositionalPseudo(function(matchIndexes,length){return[length-1]}),eq:createPositionalPseudo(function(matchIndexes,length,argument){return[argument<0?argument+length:argument]}),even:createPositionalPseudo(function(matchIndexes,length){for(var i=0;i<length;i+=2){matchIndexes.push(i)}return matchIndexes}),odd:createPositionalPseudo(function(matchIndexes,length){for(var i=1;i<length;i+=2){matchIndexes.push(i)}return matchIndexes}),lt:createPositionalPseudo(function(matchIndexes,length,argument){for(var i=argument<0?argument+length:argument;--i>=0;){matchIndexes.push(i)}return matchIndexes}),gt:createPositionalPseudo(function(matchIndexes,length,argument){for(var i=argument<0?argument+length:argument;++i<length;){matchIndexes.push(i)}return matchIndexes})}};function siblingCheck(a,b,ret){if(a===b){return ret}var cur=a.nextSibling;while(cur){if(cur===b){return-1}cur=cur.nextSibling}return 1}sortOrder=docElem.compareDocumentPosition?function(a,b){if(a===b){hasDuplicate=true;return 0}return(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:function(a,b){if(a===b){hasDuplicate=true;return 0}else if(a.sourceIndex&&b.sourceIndex){return a.sourceIndex-b.sourceIndex}var al,bl,ap=[],bp=[],aup=a.parentNode,bup=b.parentNode,cur=aup;if(aup===bup){return siblingCheck(a,b)}else if(!aup){return-1}else if(!bup){return 1}while(cur){ap.unshift(cur);cur=cur.parentNode}cur=bup;while(cur){bp.unshift(cur);cur=cur.parentNode}al=ap.length;bl=bp.length;for(var i=0;i<al&&i<bl;i++){if(ap[i]!==bp[i]){return siblingCheck(ap[i],bp[i])}}return i===al?siblingCheck(a,bp[i],-1):siblingCheck(ap[i],b,1)};[0,0].sort(sortOrder);baseHasDuplicate=!hasDuplicate;Sizzle.uniqueSort=function(results){var elem,duplicates=[],i=1,j=0;hasDuplicate=baseHasDuplicate;results.sort(sortOrder);if(hasDuplicate){for(;elem=results[i];i++){if(elem===results[i-1]){j=duplicates.push(i)}}while(j--){results.splice(duplicates[j],1)}}return results};Sizzle.error=function(msg){throw new Error("Syntax error, unrecognized expression: "+msg)};function tokenize(selector,parseOnly){var matched,match,tokens,type,soFar,groups,preFilters,cached=tokenCache[expando][selector+" "];if(cached){return parseOnly?0:cached.slice(0)}soFar=selector;groups=[];preFilters=Expr.preFilter;while(soFar){if(!matched||(match=rcomma.exec(soFar))){if(match){soFar=soFar.slice(match[0].length)||soFar}groups.push(tokens=[])}matched=false;if(match=rcombinators.exec(soFar)){tokens.push(matched=new Token(match.shift()));soFar=soFar.slice(matched.length);matched.type=match[0].replace(rtrim," ")}for(type in Expr.filter){if((match=matchExpr[type].exec(soFar))&&(!preFilters[type]||(match=preFilters[type](match)))){tokens.push(matched=new Token(match.shift()));soFar=soFar.slice(matched.length);matched.type=type;matched.matches=match}}if(!matched){break}}return parseOnly?soFar.length:soFar?Sizzle.error(selector):tokenCache(selector,groups).slice(0)}function addCombinator(matcher,combinator,base){var dir=combinator.dir,checkNonElements=base&&combinator.dir==="parentNode",doneName=done++;return combinator.first?function(elem,context,xml){while(elem=elem[dir]){if(checkNonElements||elem.nodeType===1){return matcher(elem,context,xml)}}}:function(elem,context,xml){if(!xml){var cache,dirkey=dirruns+" "+doneName+" ",cachedkey=dirkey+cachedruns;while(elem=elem[dir]){if(checkNonElements||elem.nodeType===1){if((cache=elem[expando])===cachedkey){return elem.sizset}else if(typeof cache==="string"&&cache.indexOf(dirkey)===0){if(elem.sizset){return elem}}else{elem[expando]=cachedkey;if(matcher(elem,context,xml)){elem.sizset=true;return elem}elem.sizset=false}}}}else{while(elem=elem[dir]){if(checkNonElements||elem.nodeType===1){if(matcher(elem,context,xml)){return elem}}}}}}function elementMatcher(matchers){return matchers.length>1?function(elem,context,xml){var i=matchers.length;while(i--){if(!matchers[i](elem,context,xml)){return false}}return true}:matchers[0]}function condense(unmatched,map,filter,context,xml){var elem,newUnmatched=[],i=0,len=unmatched.length,mapped=map!=null;for(;i<len;i++){if(elem=unmatched[i]){if(!filter||filter(elem,context,xml)){newUnmatched.push(elem);if(mapped){map.push(i)}}}}return newUnmatched}function setMatcher(preFilter,selector,matcher,postFilter,postFinder,postSelector){if(postFilter&&!postFilter[expando]){postFilter=setMatcher(postFilter)}if(postFinder&&!postFinder[expando]){postFinder=setMatcher(postFinder,postSelector)}return markFunction(function(seed,results,context,xml){var temp,i,elem,preMap=[],postMap=[],preexisting=results.length,elems=seed||multipleContexts(selector||"*",context.nodeType?[context]:context,[]),matcherIn=preFilter&&(seed||!selector)?condense(elems,preMap,preFilter,context,xml):elems,matcherOut=matcher?postFinder||(seed?preFilter:preexisting||postFilter)?[]:results:matcherIn;if(matcher){matcher(matcherIn,matcherOut,context,xml)}if(postFilter){temp=condense(matcherOut,postMap);postFilter(temp,[],context,xml);i=temp.length;while(i--){if(elem=temp[i]){matcherOut[postMap[i]]=!(matcherIn[postMap[i]]=elem)}}}if(seed){if(postFinder||preFilter){if(postFinder){temp=[];i=matcherOut.length;while(i--){if(elem=matcherOut[i]){temp.push(matcherIn[i]=elem)}}postFinder(null,matcherOut=[],temp,xml)}i=matcherOut.length;while(i--){if((elem=matcherOut[i])&&(temp=postFinder?indexOf.call(seed,elem):preMap[i])>-1){seed[temp]=!(results[temp]=elem)}}}}else{matcherOut=condense(matcherOut===results?matcherOut.splice(preexisting,matcherOut.length):matcherOut);if(postFinder){postFinder(null,results,matcherOut,xml)}else{push.apply(results,matcherOut)}}})}function matcherFromTokens(tokens){var checkContext,matcher,j,len=tokens.length,leadingRelative=Expr.relative[tokens[0].type],implicitRelative=leadingRelative||Expr.relative[" "],i=leadingRelative?1:0,matchContext=addCombinator(function(elem){return elem===checkContext},implicitRelative,true),matchAnyContext=addCombinator(function(elem){return indexOf.call(checkContext,elem)>-1},implicitRelative,true),matchers=[function(elem,context,xml){return!leadingRelative&&(xml||context!==outermostContext)||((checkContext=context).nodeType?matchContext(elem,context,xml):matchAnyContext(elem,context,xml))}];for(;i<len;i++){if(matcher=Expr.relative[tokens[i].type]){matchers=[addCombinator(elementMatcher(matchers),matcher)]}else{matcher=Expr.filter[tokens[i].type].apply(null,tokens[i].matches);if(matcher[expando]){j=++i;for(;j<len;j++){if(Expr.relative[tokens[j].type]){break}}return setMatcher(i>1&&elementMatcher(matchers),i>1&&tokens.slice(0,i-1).join("").replace(rtrim,"$1"),matcher,i<j&&matcherFromTokens(tokens.slice(i,j)),j<len&&matcherFromTokens(tokens=tokens.slice(j)),j<len&&tokens.join(""))}matchers.push(matcher)}}return elementMatcher(matchers)}function matcherFromGroupMatchers(elementMatchers,setMatchers){var bySet=setMatchers.length>0,byElement=elementMatchers.length>0,superMatcher=function(seed,context,xml,results,expandContext){var elem,j,matcher,setMatched=[],matchedCount=0,i="0",unmatched=seed&&[],outermost=expandContext!=null,contextBackup=outermostContext,elems=seed||byElement&&Expr.find["TAG"]("*",expandContext&&context.parentNode||context),dirrunsUnique=dirruns+=contextBackup==null?1:Math.E;if(outermost){outermostContext=context!==document&&context;cachedruns=superMatcher.el}for(;(elem=elems[i])!=null;i++){if(byElement&&elem){for(j=0;matcher=elementMatchers[j];j++){if(matcher(elem,context,xml)){results.push(elem);break}}if(outermost){dirruns=dirrunsUnique;cachedruns=++superMatcher.el}}if(bySet){if(elem=!matcher&&elem){matchedCount--}if(seed){unmatched.push(elem)}}}matchedCount+=i;if(bySet&&i!==matchedCount){for(j=0;matcher=setMatchers[j];j++){matcher(unmatched,setMatched,context,xml)}if(seed){if(matchedCount>0){while(i--){if(!(unmatched[i]||setMatched[i])){setMatched[i]=pop.call(results)}}}setMatched=condense(setMatched)}push.apply(results,setMatched);if(outermost&&!seed&&setMatched.length>0&&matchedCount+setMatchers.length>1){Sizzle.uniqueSort(results)}}if(outermost){dirruns=dirrunsUnique;outermostContext=contextBackup}return unmatched};superMatcher.el=0;return bySet?markFunction(superMatcher):superMatcher}compile=Sizzle.compile=function(selector,group){var i,setMatchers=[],elementMatchers=[],cached=compilerCache[expando][selector+" "];if(!cached){if(!group){group=tokenize(selector)}i=group.length;while(i--){cached=matcherFromTokens(group[i]);if(cached[expando]){setMatchers.push(cached)}else{elementMatchers.push(cached)}}cached=compilerCache(selector,matcherFromGroupMatchers(elementMatchers,setMatchers))}return cached};function multipleContexts(selector,contexts,results){var i=0,len=contexts.length;for(;i<len;i++){Sizzle(selector,contexts[i],results)}return results}function select(selector,context,results,seed,xml){var i,tokens,token,type,find,match=tokenize(selector),j=match.length;if(!seed){if(match.length===1){tokens=match[0]=match[0].slice(0);if(tokens.length>2&&(token=tokens[0]).type==="ID"&&context.nodeType===9&&!xml&&Expr.relative[tokens[1].type]){context=Expr.find["ID"](token.matches[0].replace(rbackslash,""),context,xml)[0];if(!context){return results}selector=selector.slice(tokens.shift().length)}for(i=matchExpr["POS"].test(selector)?-1:tokens.length-1;i>=0;i--){token=tokens[i];if(Expr.relative[type=token.type]){break}if(find=Expr.find[type]){if(seed=find(token.matches[0].replace(rbackslash,""),rsibling.test(tokens[0].type)&&context.parentNode||context,xml)){tokens.splice(i,1);selector=seed.length&&tokens.join("");if(!selector){push.apply(results,slice.call(seed,0));return results}break}}}}}compile(selector,match)(seed,context,xml,results,rsibling.test(selector));return results}if(document.querySelectorAll){(function(){var disconnectedMatch,oldSelect=select,rescape=/'|\\/g,rattributeQuotes=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,rbuggyQSA=[":focus"],rbuggyMatches=[":active"],matches=docElem.matchesSelector||docElem.mozMatchesSelector||docElem.webkitMatchesSelector||docElem.oMatchesSelector||docElem.msMatchesSelector;assert(function(div){div.innerHTML="<select><option selected=''></option></select>";if(!div.querySelectorAll("[selected]").length){rbuggyQSA.push("\\["+whitespace+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)")}if(!div.querySelectorAll(":checked").length){rbuggyQSA.push(":checked")}});assert(function(div){div.innerHTML="<p test=''></p>";if(div.querySelectorAll("[test^='']").length){rbuggyQSA.push("[*^$]="+whitespace+"*(?:\"\"|'')")}div.innerHTML="<input type='hidden'/>";if(!div.querySelectorAll(":enabled").length){rbuggyQSA.push(":enabled",":disabled")}});rbuggyQSA=new RegExp(rbuggyQSA.join("|"));select=function(selector,context,results,seed,xml){if(!seed&&!xml&&!rbuggyQSA.test(selector)){var groups,i,old=true,nid=expando,newContext=context,newSelector=context.nodeType===9&&selector;if(context.nodeType===1&&context.nodeName.toLowerCase()!=="object"){groups=tokenize(selector);if(old=context.getAttribute("id")){nid=old.replace(rescape,"\\$&")}else{context.setAttribute("id",nid)}nid="[id='"+nid+"'] ";i=groups.length;while(i--){groups[i]=nid+groups[i].join("")}newContext=rsibling.test(selector)&&context.parentNode||context;newSelector=groups.join(",")}if(newSelector){try{push.apply(results,slice.call(newContext.querySelectorAll(newSelector),0));return results}catch(qsaError){}finally{if(!old){context.removeAttribute("id")}}}}return oldSelect(selector,context,results,seed,xml)};if(matches){assert(function(div){disconnectedMatch=matches.call(div,"div");try{matches.call(div,"[test!='']:sizzle");rbuggyMatches.push("!=",pseudos)}catch(e){}});rbuggyMatches=new RegExp(rbuggyMatches.join("|"));Sizzle.matchesSelector=function(elem,expr){expr=expr.replace(rattributeQuotes,"='$1']");if(!isXML(elem)&&!rbuggyMatches.test(expr)&&!rbuggyQSA.test(expr)){try{var ret=matches.call(elem,expr);if(ret||disconnectedMatch||elem.document&&elem.document.nodeType!==11){return ret}}catch(e){}}return Sizzle(expr,null,null,[elem]).length>0}}})()}Expr.pseudos["nth"]=Expr.pseudos["eq"];function setFilters(){}Expr.filters=setFilters.prototype=Expr.pseudos;Expr.setFilters=new setFilters;Sizzle.attr=jQuery.attr;jQuery.find=Sizzle;jQuery.expr=Sizzle.selectors;jQuery.expr[":"]=jQuery.expr.pseudos;jQuery.unique=Sizzle.uniqueSort;jQuery.text=Sizzle.getText;jQuery.isXMLDoc=Sizzle.isXML;jQuery.contains=Sizzle.contains})(window);var runtil=/Until$/,rparentsprev=/^(?:parents|prev(?:Until|All))/,isSimple=/^.[^:#\[\.,]*$/,rneedsContext=jQuery.expr.match.needsContext,guaranteedUnique={children:true,contents:true,next:true,prev:true};jQuery.fn.extend({find:function(selector){var i,l,length,n,r,ret,self=this;if(typeof selector!=="string"){return jQuery(selector).filter(function(){for(i=0,l=self.length;i<l;i++){if(jQuery.contains(self[i],this)){return true}}})}ret=this.pushStack("","find",selector);for(i=0,l=this.length;i<l;i++){length=ret.length;jQuery.find(selector,this[i],ret);if(i>0){for(n=length;n<ret.length;n++){for(r=0;r<length;r++){if(ret[r]===ret[n]){ret.splice(n--,1);break}}}}}return ret},has:function(target){var i,targets=jQuery(target,this),len=targets.length;return this.filter(function(){for(i=0;i<len;i++){if(jQuery.contains(this,targets[i])){return true}}})},not:function(selector){return this.pushStack(winnow(this,selector,false),"not",selector)},filter:function(selector){return this.pushStack(winnow(this,selector,true),"filter",selector)},is:function(selector){return!!selector&&(typeof selector==="string"?rneedsContext.test(selector)?jQuery(selector,this.context).index(this[0])>=0:jQuery.filter(selector,this).length>0:this.filter(selector).length>0)},closest:function(selectors,context){var cur,i=0,l=this.length,ret=[],pos=rneedsContext.test(selectors)||typeof selectors!=="string"?jQuery(selectors,context||this.context):0;for(;i<l;i++){cur=this[i];while(cur&&cur.ownerDocument&&cur!==context&&cur.nodeType!==11){if(pos?pos.index(cur)>-1:jQuery.find.matchesSelector(cur,selectors)){ret.push(cur);break}cur=cur.parentNode}}ret=ret.length>1?jQuery.unique(ret):ret;return this.pushStack(ret,"closest",selectors)},index:function(elem){if(!elem){return this[0]&&this[0].parentNode?this.prevAll().length:-1}if(typeof elem==="string"){return jQuery.inArray(this[0],jQuery(elem))}return jQuery.inArray(elem.jquery?elem[0]:elem,this)},add:function(selector,context){var set=typeof selector==="string"?jQuery(selector,context):jQuery.makeArray(selector&&selector.nodeType?[selector]:selector),all=jQuery.merge(this.get(),set);return this.pushStack(isDisconnected(set[0])||isDisconnected(all[0])?all:jQuery.unique(all))},addBack:function(selector){return this.add(selector==null?this.prevObject:this.prevObject.filter(selector))}});jQuery.fn.andSelf=jQuery.fn.addBack;function isDisconnected(node){return!node||!node.parentNode||node.parentNode.nodeType===11}function sibling(cur,dir){do{cur=cur[dir]}while(cur&&cur.nodeType!==1);return cur}jQuery.each({parent:function(elem){var parent=elem.parentNode;return parent&&parent.nodeType!==11?parent:null},parents:function(elem){return jQuery.dir(elem,"parentNode")},parentsUntil:function(elem,i,until){return jQuery.dir(elem,"parentNode",until)},next:function(elem){return sibling(elem,"nextSibling")},prev:function(elem){return sibling(elem,"previousSibling")},nextAll:function(elem){return jQuery.dir(elem,"nextSibling")},prevAll:function(elem){return jQuery.dir(elem,"previousSibling")},nextUntil:function(elem,i,until){return jQuery.dir(elem,"nextSibling",until)},prevUntil:function(elem,i,until){return jQuery.dir(elem,"previousSibling",until)},siblings:function(elem){return jQuery.sibling((elem.parentNode||{}).firstChild,elem)},children:function(elem){return jQuery.sibling(elem.firstChild)},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.merge([],elem.childNodes)}},function(name,fn){jQuery.fn[name]=function(until,selector){var ret=jQuery.map(this,fn,until);if(!runtil.test(name)){selector=until}if(selector&&typeof selector==="string"){ret=jQuery.filter(selector,ret)}ret=this.length>1&&!guaranteedUnique[name]?jQuery.unique(ret):ret;if(this.length>1&&rparentsprev.test(name)){ret=ret.reverse()}return this.pushStack(ret,name,core_slice.call(arguments).join(","))}});jQuery.extend({filter:function(expr,elems,not){if(not){expr=":not("+expr+")"}return elems.length===1?jQuery.find.matchesSelector(elems[0],expr)?[elems[0]]:[]:jQuery.find.matches(expr,elems)},dir:function(elem,dir,until){var matched=[],cur=elem[dir];while(cur&&cur.nodeType!==9&&(until===undefined||cur.nodeType!==1||!jQuery(cur).is(until))){if(cur.nodeType===1){matched.push(cur)}cur=cur[dir]}return matched},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType===1&&n!==elem){r.push(n)}}return r}});function winnow(elements,qualifier,keep){qualifier=qualifier||0;if(jQuery.isFunction(qualifier)){return jQuery.grep(elements,function(elem,i){var retVal=!!qualifier.call(elem,i,elem);return retVal===keep})}else if(qualifier.nodeType){return jQuery.grep(elements,function(elem,i){return elem===qualifier===keep})}else if(typeof qualifier==="string"){var filtered=jQuery.grep(elements,function(elem){return elem.nodeType===1});if(isSimple.test(qualifier)){return jQuery.filter(qualifier,filtered,!keep)}else{qualifier=jQuery.filter(qualifier,filtered)}}return jQuery.grep(elements,function(elem,i){return jQuery.inArray(elem,qualifier)>=0===keep})}function createSafeFragment(document){var list=nodeNames.split("|"),safeFrag=document.createDocumentFragment();if(safeFrag.createElement){while(list.length){safeFrag.createElement(list.pop())}}return safeFrag}var nodeNames="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|"+"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",rinlinejQuery=/ jQuery\d+="(?:null|\d+)"/g,rleadingWhitespace=/^\s+/,rxhtmlTag=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,rtagName=/<([\w:]+)/,rtbody=/<tbody/i,rhtml=/<|&#?\w+;/,rnoInnerhtml=/<(?:script|style|link)/i,rnocache=/<(?:script|object|embed|option|style)/i,rnoshimcache=new RegExp("<(?:"+nodeNames+")[\\s/>]","i"),rcheckableType=/^(?:checkbox|radio)$/,rchecked=/checked\s*(?:[^=]|=\s*.checked.)/i,rscriptType=/\/(java|ecma)script/i,rcleanScript=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,wrapMap={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},safeFragment=createSafeFragment(document),fragmentDiv=safeFragment.appendChild(document.createElement("div"));wrapMap.optgroup=wrapMap.option;wrapMap.tbody=wrapMap.tfoot=wrapMap.colgroup=wrapMap.caption=wrapMap.thead;wrapMap.th=wrapMap.td;if(!jQuery.support.htmlSerialize){wrapMap._default=[1,"X<div>","</div>"]}jQuery.fn.extend({text:function(value){return jQuery.access(this,function(value){return value===undefined?jQuery.text(this):this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(value))},null,value,arguments.length)},wrapAll:function(html){if(jQuery.isFunction(html)){return this.each(function(i){jQuery(this).wrapAll(html.call(this,i))})}if(this[0]){var wrap=jQuery(html,this[0].ownerDocument).eq(0).clone(true);if(this[0].parentNode){wrap.insertBefore(this[0])}wrap.map(function(){var elem=this;while(elem.firstChild&&elem.firstChild.nodeType===1){elem=elem.firstChild}return elem}).append(this)}return this},wrapInner:function(html){if(jQuery.isFunction(html)){return this.each(function(i){jQuery(this).wrapInner(html.call(this,i))})}return this.each(function(){var self=jQuery(this),contents=self.contents();if(contents.length){contents.wrapAll(html)}else{self.append(html)}})},wrap:function(html){var isFunction=jQuery.isFunction(html);return this.each(function(i){jQuery(this).wrapAll(isFunction?html.call(this,i):html)})},unwrap:function(){return this.parent().each(function(){if(!jQuery.nodeName(this,"body")){jQuery(this).replaceWith(this.childNodes)}}).end()},append:function(){return this.domManip(arguments,true,function(elem){if(this.nodeType===1||this.nodeType===11){this.appendChild(elem)}})},prepend:function(){return this.domManip(arguments,true,function(elem){if(this.nodeType===1||this.nodeType===11){this.insertBefore(elem,this.firstChild)}})},before:function(){if(!isDisconnected(this[0])){return this.domManip(arguments,false,function(elem){this.parentNode.insertBefore(elem,this)})}if(arguments.length){var set=jQuery.clean(arguments);return this.pushStack(jQuery.merge(set,this),"before",this.selector)}},after:function(){if(!isDisconnected(this[0])){return this.domManip(arguments,false,function(elem){this.parentNode.insertBefore(elem,this.nextSibling)})}if(arguments.length){var set=jQuery.clean(arguments);return this.pushStack(jQuery.merge(this,set),"after",this.selector)}},remove:function(selector,keepData){var elem,i=0;for(;(elem=this[i])!=null;i++){if(!selector||jQuery.filter(selector,[elem]).length){if(!keepData&&elem.nodeType===1){jQuery.cleanData(elem.getElementsByTagName("*"));jQuery.cleanData([elem])}if(elem.parentNode){elem.parentNode.removeChild(elem)}}}return this},empty:function(){var elem,i=0;for(;(elem=this[i])!=null;i++){if(elem.nodeType===1){jQuery.cleanData(elem.getElementsByTagName("*"))}while(elem.firstChild){elem.removeChild(elem.firstChild)}}return this},clone:function(dataAndEvents,deepDataAndEvents){dataAndEvents=dataAndEvents==null?false:dataAndEvents;deepDataAndEvents=deepDataAndEvents==null?dataAndEvents:deepDataAndEvents;return this.map(function(){return jQuery.clone(this,dataAndEvents,deepDataAndEvents)})},html:function(value){return jQuery.access(this,function(value){var elem=this[0]||{},i=0,l=this.length;if(value===undefined){return elem.nodeType===1?elem.innerHTML.replace(rinlinejQuery,""):undefined}if(typeof value==="string"&&!rnoInnerhtml.test(value)&&(jQuery.support.htmlSerialize||!rnoshimcache.test(value))&&(jQuery.support.leadingWhitespace||!rleadingWhitespace.test(value))&&!wrapMap[(rtagName.exec(value)||["",""])[1].toLowerCase()]){value=value.replace(rxhtmlTag,"<$1></$2>");try{for(;i<l;i++){elem=this[i]||{};if(elem.nodeType===1){jQuery.cleanData(elem.getElementsByTagName("*"));elem.innerHTML=value}}elem=0}catch(e){}}if(elem){this.empty().append(value)}},null,value,arguments.length)},replaceWith:function(value){if(!isDisconnected(this[0])){if(jQuery.isFunction(value)){return this.each(function(i){var self=jQuery(this),old=self.html();self.replaceWith(value.call(this,i,old))})}if(typeof value!=="string"){value=jQuery(value).detach()}return this.each(function(){var next=this.nextSibling,parent=this.parentNode;jQuery(this).remove();if(next){jQuery(next).before(value)}else{jQuery(parent).append(value)}})}return this.length?this.pushStack(jQuery(jQuery.isFunction(value)?value():value),"replaceWith",value):this},detach:function(selector){return this.remove(selector,true)},domManip:function(args,table,callback){args=[].concat.apply([],args);var results,first,fragment,iNoClone,i=0,value=args[0],scripts=[],l=this.length;if(!jQuery.support.checkClone&&l>1&&typeof value==="string"&&rchecked.test(value)){return this.each(function(){jQuery(this).domManip(args,table,callback)})}if(jQuery.isFunction(value)){return this.each(function(i){var self=jQuery(this);args[0]=value.call(this,i,table?self.html():undefined);self.domManip(args,table,callback)})}if(this[0]){results=jQuery.buildFragment(args,this,scripts);fragment=results.fragment;first=fragment.firstChild;if(fragment.childNodes.length===1){fragment=first}if(first){table=table&&jQuery.nodeName(first,"tr");for(iNoClone=results.cacheable||l-1;i<l;i++){callback.call(table&&jQuery.nodeName(this[i],"table")?findOrAppend(this[i],"tbody"):this[i],i===iNoClone?fragment:jQuery.clone(fragment,true,true))}}fragment=first=null;if(scripts.length){jQuery.each(scripts,function(i,elem){if(elem.src){if(jQuery.ajax){jQuery.ajax({url:elem.src,type:"GET",dataType:"script",async:false,global:false,"throws":true})}else{jQuery.error("no ajax")}}else{jQuery.globalEval((elem.text||elem.textContent||elem.innerHTML||"").replace(rcleanScript,""))}if(elem.parentNode){elem.parentNode.removeChild(elem)}})}}return this}});function findOrAppend(elem,tag){return elem.getElementsByTagName(tag)[0]||elem.appendChild(elem.ownerDocument.createElement(tag))}function cloneCopyEvent(src,dest){if(dest.nodeType!==1||!jQuery.hasData(src)){return}var type,i,l,oldData=jQuery._data(src),curData=jQuery._data(dest,oldData),events=oldData.events;if(events){delete curData.handle;curData.events={};for(type in events){for(i=0,l=events[type].length;i<l;i++){jQuery.event.add(dest,type,events[type][i])}}}if(curData.data){curData.data=jQuery.extend({},curData.data)}}function cloneFixAttributes(src,dest){var nodeName;if(dest.nodeType!==1){return}if(dest.clearAttributes){dest.clearAttributes()}if(dest.mergeAttributes){dest.mergeAttributes(src)}nodeName=dest.nodeName.toLowerCase();if(nodeName==="object"){if(dest.parentNode){dest.outerHTML=src.outerHTML}if(jQuery.support.html5Clone&&(src.innerHTML&&!jQuery.trim(dest.innerHTML))){dest.innerHTML=src.innerHTML}}else if(nodeName==="input"&&rcheckableType.test(src.type)){dest.defaultChecked=dest.checked=src.checked;if(dest.value!==src.value){dest.value=src.value}}else if(nodeName==="option"){dest.selected=src.defaultSelected}else if(nodeName==="input"||nodeName==="textarea"){dest.defaultValue=src.defaultValue}else if(nodeName==="script"&&dest.text!==src.text){dest.text=src.text}dest.removeAttribute(jQuery.expando)}jQuery.buildFragment=function(args,context,scripts){var fragment,cacheable,cachehit,first=args[0];context=context||document;context=!context.nodeType&&context[0]||context;context=context.ownerDocument||context;if(args.length===1&&typeof first==="string"&&first.length<512&&context===document&&first.charAt(0)==="<"&&!rnocache.test(first)&&(jQuery.support.checkClone||!rchecked.test(first))&&(jQuery.support.html5Clone||!rnoshimcache.test(first))){cacheable=true;fragment=jQuery.fragments[first];cachehit=fragment!==undefined}if(!fragment){fragment=context.createDocumentFragment();jQuery.clean(args,context,fragment,scripts);if(cacheable){jQuery.fragments[first]=cachehit&&fragment}}return{fragment:fragment,cacheable:cacheable}};jQuery.fragments={};jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(selector){var elems,i=0,ret=[],insert=jQuery(selector),l=insert.length,parent=this.length===1&&this[0].parentNode;if((parent==null||parent&&parent.nodeType===11&&parent.childNodes.length===1)&&l===1){insert[original](this[0]);return this}else{for(;i<l;i++){elems=(i>0?this.clone(true):this).get();jQuery(insert[i])[original](elems);ret=ret.concat(elems)}return this.pushStack(ret,name,insert.selector)}}});function getAll(elem){if(typeof elem.getElementsByTagName!=="undefined"){return elem.getElementsByTagName("*")}else if(typeof elem.querySelectorAll!=="undefined"){return elem.querySelectorAll("*")}else{return[]}}function fixDefaultChecked(elem){if(rcheckableType.test(elem.type)){elem.defaultChecked=elem.checked}}jQuery.extend({clone:function(elem,dataAndEvents,deepDataAndEvents){var srcElements,destElements,i,clone;if(jQuery.support.html5Clone||jQuery.isXMLDoc(elem)||!rnoshimcache.test("<"+elem.nodeName+">")){clone=elem.cloneNode(true)}else{fragmentDiv.innerHTML=elem.outerHTML;fragmentDiv.removeChild(clone=fragmentDiv.firstChild)}if((!jQuery.support.noCloneEvent||!jQuery.support.noCloneChecked)&&(elem.nodeType===1||elem.nodeType===11)&&!jQuery.isXMLDoc(elem)){cloneFixAttributes(elem,clone);srcElements=getAll(elem);destElements=getAll(clone);for(i=0;srcElements[i];++i){if(destElements[i]){cloneFixAttributes(srcElements[i],destElements[i])}}}if(dataAndEvents){cloneCopyEvent(elem,clone);if(deepDataAndEvents){srcElements=getAll(elem);destElements=getAll(clone);for(i=0;srcElements[i];++i){cloneCopyEvent(srcElements[i],destElements[i])}}}srcElements=destElements=null;return clone},clean:function(elems,context,fragment,scripts){var i,j,elem,tag,wrap,depth,div,hasBody,tbody,len,handleScript,jsTags,safe=context===document&&safeFragment,ret=[];if(!context||typeof context.createDocumentFragment==="undefined"){context=document}for(i=0;(elem=elems[i])!=null;i++){if(typeof elem==="number"){elem+=""}if(!elem){continue}if(typeof elem==="string"){if(!rhtml.test(elem)){elem=context.createTextNode(elem)}else{safe=safe||createSafeFragment(context);div=context.createElement("div");safe.appendChild(div);elem=elem.replace(rxhtmlTag,"<$1></$2>");tag=(rtagName.exec(elem)||["",""])[1].toLowerCase();wrap=wrapMap[tag]||wrapMap._default;depth=wrap[0];div.innerHTML=wrap[1]+elem+wrap[2];while(depth--){div=div.lastChild
+}if(!jQuery.support.tbody){hasBody=rtbody.test(elem);tbody=tag==="table"&&!hasBody?div.firstChild&&div.firstChild.childNodes:wrap[1]==="<table>"&&!hasBody?div.childNodes:[];for(j=tbody.length-1;j>=0;--j){if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length){tbody[j].parentNode.removeChild(tbody[j])}}}if(!jQuery.support.leadingWhitespace&&rleadingWhitespace.test(elem)){div.insertBefore(context.createTextNode(rleadingWhitespace.exec(elem)[0]),div.firstChild)}elem=div.childNodes;div.parentNode.removeChild(div)}}if(elem.nodeType){ret.push(elem)}else{jQuery.merge(ret,elem)}}if(div){elem=div=safe=null}if(!jQuery.support.appendChecked){for(i=0;(elem=ret[i])!=null;i++){if(jQuery.nodeName(elem,"input")){fixDefaultChecked(elem)}else if(typeof elem.getElementsByTagName!=="undefined"){jQuery.grep(elem.getElementsByTagName("input"),fixDefaultChecked)}}}if(fragment){handleScript=function(elem){if(!elem.type||rscriptType.test(elem.type)){return scripts?scripts.push(elem.parentNode?elem.parentNode.removeChild(elem):elem):fragment.appendChild(elem)}};for(i=0;(elem=ret[i])!=null;i++){if(!(jQuery.nodeName(elem,"script")&&handleScript(elem))){fragment.appendChild(elem);if(typeof elem.getElementsByTagName!=="undefined"){jsTags=jQuery.grep(jQuery.merge([],elem.getElementsByTagName("script")),handleScript);ret.splice.apply(ret,[i+1,0].concat(jsTags));i+=jsTags.length}}}}return ret},cleanData:function(elems,acceptData){var data,id,elem,type,i=0,internalKey=jQuery.expando,cache=jQuery.cache,deleteExpando=jQuery.support.deleteExpando,special=jQuery.event.special;for(;(elem=elems[i])!=null;i++){if(acceptData||jQuery.acceptData(elem)){id=elem[internalKey];data=id&&cache[id];if(data){if(data.events){for(type in data.events){if(special[type]){jQuery.event.remove(elem,type)}else{jQuery.removeEvent(elem,type,data.handle)}}}if(cache[id]){delete cache[id];if(deleteExpando){delete elem[internalKey]}else if(elem.removeAttribute){elem.removeAttribute(internalKey)}else{elem[internalKey]=null}jQuery.deletedIds.push(id)}}}}}});(function(){var matched,browser;jQuery.uaMatch=function(ua){ua=ua.toLowerCase();var match=/(chrome)[ \/]([\w.]+)/.exec(ua)||/(webkit)[ \/]([\w.]+)/.exec(ua)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua)||/(msie) ([\w.]+)/.exec(ua)||ua.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua)||[];return{browser:match[1]||"",version:match[2]||"0"}};matched=jQuery.uaMatch(navigator.userAgent);browser={};if(matched.browser){browser[matched.browser]=true;browser.version=matched.version}if(browser.chrome){browser.webkit=true}else if(browser.webkit){browser.safari=true}jQuery.browser=browser;jQuery.sub=function(){function jQuerySub(selector,context){return new jQuerySub.fn.init(selector,context)}jQuery.extend(true,jQuerySub,this);jQuerySub.superclass=this;jQuerySub.fn=jQuerySub.prototype=this();jQuerySub.fn.constructor=jQuerySub;jQuerySub.sub=this.sub;jQuerySub.fn.init=function init(selector,context){if(context&&context instanceof jQuery&&!(context instanceof jQuerySub)){context=jQuerySub(context)}return jQuery.fn.init.call(this,selector,context,rootjQuerySub)};jQuerySub.fn.init.prototype=jQuerySub.fn;var rootjQuerySub=jQuerySub(document);return jQuerySub}})();var curCSS,iframe,iframeDoc,ralpha=/alpha\([^)]*\)/i,ropacity=/opacity=([^)]*)/,rposition=/^(top|right|bottom|left)$/,rdisplayswap=/^(none|table(?!-c[ea]).+)/,rmargin=/^margin/,rnumsplit=new RegExp("^("+core_pnum+")(.*)$","i"),rnumnonpx=new RegExp("^("+core_pnum+")(?!px)[a-z%]+$","i"),rrelNum=new RegExp("^([-+])=("+core_pnum+")","i"),elemdisplay={BODY:"block"},cssShow={position:"absolute",visibility:"hidden",display:"block"},cssNormalTransform={letterSpacing:0,fontWeight:400},cssExpand=["Top","Right","Bottom","Left"],cssPrefixes=["Webkit","O","Moz","ms"],eventsToggle=jQuery.fn.toggle;function vendorPropName(style,name){if(name in style){return name}var capName=name.charAt(0).toUpperCase()+name.slice(1),origName=name,i=cssPrefixes.length;while(i--){name=cssPrefixes[i]+capName;if(name in style){return name}}return origName}function isHidden(elem,el){elem=el||elem;return jQuery.css(elem,"display")==="none"||!jQuery.contains(elem.ownerDocument,elem)}function showHide(elements,show){var elem,display,values=[],index=0,length=elements.length;for(;index<length;index++){elem=elements[index];if(!elem.style){continue}values[index]=jQuery._data(elem,"olddisplay");if(show){if(!values[index]&&elem.style.display==="none"){elem.style.display=""}if(elem.style.display===""&&isHidden(elem)){values[index]=jQuery._data(elem,"olddisplay",css_defaultDisplay(elem.nodeName))}}else{display=curCSS(elem,"display");if(!values[index]&&display!=="none"){jQuery._data(elem,"olddisplay",display)}}}for(index=0;index<length;index++){elem=elements[index];if(!elem.style){continue}if(!show||elem.style.display==="none"||elem.style.display===""){elem.style.display=show?values[index]||"":"none"}}return elements}jQuery.fn.extend({css:function(name,value){return jQuery.access(this,function(elem,name,value){return value!==undefined?jQuery.style(elem,name,value):jQuery.css(elem,name)},name,value,arguments.length>1)},show:function(){return showHide(this,true)},hide:function(){return showHide(this)},toggle:function(state,fn2){var bool=typeof state==="boolean";if(jQuery.isFunction(state)&&jQuery.isFunction(fn2)){return eventsToggle.apply(this,arguments)}return this.each(function(){if(bool?state:isHidden(this)){jQuery(this).show()}else{jQuery(this).hide()}})}});jQuery.extend({cssHooks:{opacity:{get:function(elem,computed){if(computed){var ret=curCSS(elem,"opacity");return ret===""?"1":ret}}}},cssNumber:{fillOpacity:true,fontWeight:true,lineHeight:true,opacity:true,orphans:true,widows:true,zIndex:true,zoom:true},cssProps:{"float":jQuery.support.cssFloat?"cssFloat":"styleFloat"},style:function(elem,name,value,extra){if(!elem||elem.nodeType===3||elem.nodeType===8||!elem.style){return}var ret,type,hooks,origName=jQuery.camelCase(name),style=elem.style;name=jQuery.cssProps[origName]||(jQuery.cssProps[origName]=vendorPropName(style,origName));hooks=jQuery.cssHooks[name]||jQuery.cssHooks[origName];if(value!==undefined){type=typeof value;if(type==="string"&&(ret=rrelNum.exec(value))){value=(ret[1]+1)*ret[2]+parseFloat(jQuery.css(elem,name));type="number"}if(value==null||type==="number"&&isNaN(value)){return}if(type==="number"&&!jQuery.cssNumber[origName]){value+="px"}if(!hooks||!("set"in hooks)||(value=hooks.set(elem,value,extra))!==undefined){try{style[name]=value}catch(e){}}}else{if(hooks&&"get"in hooks&&(ret=hooks.get(elem,false,extra))!==undefined){return ret}return style[name]}},css:function(elem,name,numeric,extra){var val,num,hooks,origName=jQuery.camelCase(name);name=jQuery.cssProps[origName]||(jQuery.cssProps[origName]=vendorPropName(elem.style,origName));hooks=jQuery.cssHooks[name]||jQuery.cssHooks[origName];if(hooks&&"get"in hooks){val=hooks.get(elem,true,extra)}if(val===undefined){val=curCSS(elem,name)}if(val==="normal"&&name in cssNormalTransform){val=cssNormalTransform[name]}if(numeric||extra!==undefined){num=parseFloat(val);return numeric||jQuery.isNumeric(num)?num||0:val}return val},swap:function(elem,options,callback){var ret,name,old={};for(name in options){old[name]=elem.style[name];elem.style[name]=options[name]}ret=callback.call(elem);for(name in options){elem.style[name]=old[name]}return ret}});if(window.getComputedStyle){curCSS=function(elem,name){var ret,width,minWidth,maxWidth,computed=window.getComputedStyle(elem,null),style=elem.style;if(computed){ret=computed.getPropertyValue(name)||computed[name];if(ret===""&&!jQuery.contains(elem.ownerDocument,elem)){ret=jQuery.style(elem,name)}if(rnumnonpx.test(ret)&&rmargin.test(name)){width=style.width;minWidth=style.minWidth;maxWidth=style.maxWidth;style.minWidth=style.maxWidth=style.width=ret;ret=computed.width;style.width=width;style.minWidth=minWidth;style.maxWidth=maxWidth}}return ret}}else if(document.documentElement.currentStyle){curCSS=function(elem,name){var left,rsLeft,ret=elem.currentStyle&&elem.currentStyle[name],style=elem.style;if(ret==null&&style&&style[name]){ret=style[name]}if(rnumnonpx.test(ret)&&!rposition.test(name)){left=style.left;rsLeft=elem.runtimeStyle&&elem.runtimeStyle.left;if(rsLeft){elem.runtimeStyle.left=elem.currentStyle.left}style.left=name==="fontSize"?"1em":ret;ret=style.pixelLeft+"px";style.left=left;if(rsLeft){elem.runtimeStyle.left=rsLeft}}return ret===""?"auto":ret}}function setPositiveNumber(elem,value,subtract){var matches=rnumsplit.exec(value);return matches?Math.max(0,matches[1]-(subtract||0))+(matches[2]||"px"):value}function augmentWidthOrHeight(elem,name,extra,isBorderBox){var i=extra===(isBorderBox?"border":"content")?4:name==="width"?1:0,val=0;for(;i<4;i+=2){if(extra==="margin"){val+=jQuery.css(elem,extra+cssExpand[i],true)}if(isBorderBox){if(extra==="content"){val-=parseFloat(curCSS(elem,"padding"+cssExpand[i]))||0}if(extra!=="margin"){val-=parseFloat(curCSS(elem,"border"+cssExpand[i]+"Width"))||0}}else{val+=parseFloat(curCSS(elem,"padding"+cssExpand[i]))||0;if(extra!=="padding"){val+=parseFloat(curCSS(elem,"border"+cssExpand[i]+"Width"))||0}}}return val}function getWidthOrHeight(elem,name,extra){var val=name==="width"?elem.offsetWidth:elem.offsetHeight,valueIsBorderBox=true,isBorderBox=jQuery.support.boxSizing&&jQuery.css(elem,"boxSizing")==="border-box";if(val<=0||val==null){val=curCSS(elem,name);if(val<0||val==null){val=elem.style[name]}if(rnumnonpx.test(val)){return val}valueIsBorderBox=isBorderBox&&(jQuery.support.boxSizingReliable||val===elem.style[name]);val=parseFloat(val)||0}return val+augmentWidthOrHeight(elem,name,extra||(isBorderBox?"border":"content"),valueIsBorderBox)+"px"}function css_defaultDisplay(nodeName){if(elemdisplay[nodeName]){return elemdisplay[nodeName]}var elem=jQuery("<"+nodeName+">").appendTo(document.body),display=elem.css("display");elem.remove();if(display==="none"||display===""){iframe=document.body.appendChild(iframe||jQuery.extend(document.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!iframeDoc||!iframe.createElement){iframeDoc=(iframe.contentWindow||iframe.contentDocument).document;iframeDoc.write("<!doctype html><html><body>");iframeDoc.close()}elem=iframeDoc.body.appendChild(iframeDoc.createElement(nodeName));display=curCSS(elem,"display");document.body.removeChild(iframe)}elemdisplay[nodeName]=display;return display}jQuery.each(["height","width"],function(i,name){jQuery.cssHooks[name]={get:function(elem,computed,extra){if(computed){if(elem.offsetWidth===0&&rdisplayswap.test(curCSS(elem,"display"))){return jQuery.swap(elem,cssShow,function(){return getWidthOrHeight(elem,name,extra)})}else{return getWidthOrHeight(elem,name,extra)}}},set:function(elem,value,extra){return setPositiveNumber(elem,value,extra?augmentWidthOrHeight(elem,name,extra,jQuery.support.boxSizing&&jQuery.css(elem,"boxSizing")==="border-box"):0)}}});if(!jQuery.support.opacity){jQuery.cssHooks.opacity={get:function(elem,computed){return ropacity.test((computed&&elem.currentStyle?elem.currentStyle.filter:elem.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":computed?"1":""},set:function(elem,value){var style=elem.style,currentStyle=elem.currentStyle,opacity=jQuery.isNumeric(value)?"alpha(opacity="+value*100+")":"",filter=currentStyle&&currentStyle.filter||style.filter||"";style.zoom=1;if(value>=1&&jQuery.trim(filter.replace(ralpha,""))===""&&style.removeAttribute){style.removeAttribute("filter");if(currentStyle&&!currentStyle.filter){return}}style.filter=ralpha.test(filter)?filter.replace(ralpha,opacity):filter+" "+opacity}}}jQuery(function(){if(!jQuery.support.reliableMarginRight){jQuery.cssHooks.marginRight={get:function(elem,computed){return jQuery.swap(elem,{display:"inline-block"},function(){if(computed){return curCSS(elem,"marginRight")}})}}}if(!jQuery.support.pixelPosition&&jQuery.fn.position){jQuery.each(["top","left"],function(i,prop){jQuery.cssHooks[prop]={get:function(elem,computed){if(computed){var ret=curCSS(elem,prop);return rnumnonpx.test(ret)?jQuery(elem).position()[prop]+"px":ret}}}})}});if(jQuery.expr&&jQuery.expr.filters){jQuery.expr.filters.hidden=function(elem){return elem.offsetWidth===0&&elem.offsetHeight===0||!jQuery.support.reliableHiddenOffsets&&(elem.style&&elem.style.display||curCSS(elem,"display"))==="none"};jQuery.expr.filters.visible=function(elem){return!jQuery.expr.filters.hidden(elem)}}jQuery.each({margin:"",padding:"",border:"Width"},function(prefix,suffix){jQuery.cssHooks[prefix+suffix]={expand:function(value){var i,parts=typeof value==="string"?value.split(" "):[value],expanded={};for(i=0;i<4;i++){expanded[prefix+cssExpand[i]+suffix]=parts[i]||parts[i-2]||parts[0]}return expanded}};if(!rmargin.test(prefix)){jQuery.cssHooks[prefix+suffix].set=setPositiveNumber}});var r20=/%20/g,rbracket=/\[\]$/,rCRLF=/\r?\n/g,rinput=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,rselectTextarea=/^(?:select|textarea)/i;jQuery.fn.extend({serialize:function(){return jQuery.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?jQuery.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||rselectTextarea.test(this.nodeName)||rinput.test(this.type))}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:jQuery.isArray(val)?jQuery.map(val,function(val,i){return{name:elem.name,value:val.replace(rCRLF,"\r\n")}}):{name:elem.name,value:val.replace(rCRLF,"\r\n")}}).get()}});jQuery.param=function(a,traditional){var prefix,s=[],add=function(key,value){value=jQuery.isFunction(value)?value():value==null?"":value;s[s.length]=encodeURIComponent(key)+"="+encodeURIComponent(value)};if(traditional===undefined){traditional=jQuery.ajaxSettings&&jQuery.ajaxSettings.traditional}if(jQuery.isArray(a)||a.jquery&&!jQuery.isPlainObject(a)){jQuery.each(a,function(){add(this.name,this.value)})}else{for(prefix in a){buildParams(prefix,a[prefix],traditional,add)}}return s.join("&").replace(r20,"+")};function buildParams(prefix,obj,traditional,add){var name;if(jQuery.isArray(obj)){jQuery.each(obj,function(i,v){if(traditional||rbracket.test(prefix)){add(prefix,v)}else{buildParams(prefix+"["+(typeof v==="object"?i:"")+"]",v,traditional,add)}})}else if(!traditional&&jQuery.type(obj)==="object"){for(name in obj){buildParams(prefix+"["+name+"]",obj[name],traditional,add)}}else{add(prefix,obj)}}var ajaxLocParts,ajaxLocation,rhash=/#.*$/,rheaders=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,rlocalProtocol=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,rnoContent=/^(?:GET|HEAD)$/,rprotocol=/^\/\//,rquery=/\?/,rscript=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,rts=/([?&])_=[^&]*/,rurl=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,_load=jQuery.fn.load,prefilters={},transports={},allTypes=["*/"]+["*"];try{ajaxLocation=location.href}catch(e){ajaxLocation=document.createElement("a");ajaxLocation.href="";ajaxLocation=ajaxLocation.href}ajaxLocParts=rurl.exec(ajaxLocation.toLowerCase())||[];function addToPrefiltersOrTransports(structure){return function(dataTypeExpression,func){if(typeof dataTypeExpression!=="string"){func=dataTypeExpression;dataTypeExpression="*"}var dataType,list,placeBefore,dataTypes=dataTypeExpression.toLowerCase().split(core_rspace),i=0,length=dataTypes.length;if(jQuery.isFunction(func)){for(;i<length;i++){dataType=dataTypes[i];placeBefore=/^\+/.test(dataType);if(placeBefore){dataType=dataType.substr(1)||"*"}list=structure[dataType]=structure[dataType]||[];list[placeBefore?"unshift":"push"](func)}}}}function inspectPrefiltersOrTransports(structure,options,originalOptions,jqXHR,dataType,inspected){dataType=dataType||options.dataTypes[0];inspected=inspected||{};inspected[dataType]=true;var selection,list=structure[dataType],i=0,length=list?list.length:0,executeOnly=structure===prefilters;for(;i<length&&(executeOnly||!selection);i++){selection=list[i](options,originalOptions,jqXHR);if(typeof selection==="string"){if(!executeOnly||inspected[selection]){selection=undefined}else{options.dataTypes.unshift(selection);selection=inspectPrefiltersOrTransports(structure,options,originalOptions,jqXHR,selection,inspected)}}}if((executeOnly||!selection)&&!inspected["*"]){selection=inspectPrefiltersOrTransports(structure,options,originalOptions,jqXHR,"*",inspected)}return selection}function ajaxExtend(target,src){var key,deep,flatOptions=jQuery.ajaxSettings.flatOptions||{};for(key in src){if(src[key]!==undefined){(flatOptions[key]?target:deep||(deep={}))[key]=src[key]}}if(deep){jQuery.extend(true,target,deep)}}jQuery.fn.load=function(url,params,callback){if(typeof url!=="string"&&_load){return _load.apply(this,arguments)}if(!this.length){return this}var selector,type,response,self=this,off=url.indexOf(" ");if(off>=0){selector=url.slice(off,url.length);url=url.slice(0,off)}if(jQuery.isFunction(params)){callback=params;params=undefined}else if(params&&typeof params==="object"){type="POST"}jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(jqXHR,status){if(callback){self.each(callback,response||[jqXHR.responseText,status,jqXHR])}}}).done(function(responseText){response=arguments;self.html(selector?jQuery("<div>").append(responseText.replace(rscript,"")).find(selector):responseText)});return this};jQuery.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(i,o){jQuery.fn[o]=function(f){return this.on(o,f)}});jQuery.each(["get","post"],function(i,method){jQuery[method]=function(url,data,callback,type){if(jQuery.isFunction(data)){type=type||callback;callback=data;data=undefined}return jQuery.ajax({type:method,url:url,data:data,success:callback,dataType:type})}});jQuery.extend({getScript:function(url,callback){return jQuery.get(url,undefined,callback,"script")},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json")},ajaxSetup:function(target,settings){if(settings){ajaxExtend(target,jQuery.ajaxSettings)}else{settings=target;target=jQuery.ajaxSettings}ajaxExtend(target,settings);return target},ajaxSettings:{url:ajaxLocation,isLocal:rlocalProtocol.test(ajaxLocParts[1]),global:true,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:true,async:true,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":allTypes},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":window.String,"text html":true,"text json":jQuery.parseJSON,"text xml":jQuery.parseXML},flatOptions:{context:true,url:true}},ajaxPrefilter:addToPrefiltersOrTransports(prefilters),ajaxTransport:addToPrefiltersOrTransports(transports),ajax:function(url,options){if(typeof url==="object"){options=url;url=undefined}options=options||{};var ifModifiedKey,responseHeadersString,responseHeaders,transport,timeoutTimer,parts,fireGlobals,i,s=jQuery.ajaxSetup({},options),callbackContext=s.context||s,globalEventContext=callbackContext!==s&&(callbackContext.nodeType||callbackContext instanceof jQuery)?jQuery(callbackContext):jQuery.event,deferred=jQuery.Deferred(),completeDeferred=jQuery.Callbacks("once memory"),statusCode=s.statusCode||{},requestHeaders={},requestHeadersNames={},state=0,strAbort="canceled",jqXHR={readyState:0,setRequestHeader:function(name,value){if(!state){var lname=name.toLowerCase();name=requestHeadersNames[lname]=requestHeadersNames[lname]||name;requestHeaders[name]=value}return this},getAllResponseHeaders:function(){return state===2?responseHeadersString:null},getResponseHeader:function(key){var match;if(state===2){if(!responseHeaders){responseHeaders={};while(match=rheaders.exec(responseHeadersString)){responseHeaders[match[1].toLowerCase()]=match[2]}}match=responseHeaders[key.toLowerCase()]}return match===undefined?null:match},overrideMimeType:function(type){if(!state){s.mimeType=type}return this},abort:function(statusText){statusText=statusText||strAbort;if(transport){transport.abort(statusText)}done(0,statusText);return this}};function done(status,nativeStatusText,responses,headers){var isSuccess,success,error,response,modified,statusText=nativeStatusText;if(state===2){return}state=2;if(timeoutTimer){clearTimeout(timeoutTimer)}transport=undefined;responseHeadersString=headers||"";jqXHR.readyState=status>0?4:0;if(responses){response=ajaxHandleResponses(s,jqXHR,responses)}if(status>=200&&status<300||status===304){if(s.ifModified){modified=jqXHR.getResponseHeader("Last-Modified");if(modified){jQuery.lastModified[ifModifiedKey]=modified}modified=jqXHR.getResponseHeader("Etag");if(modified){jQuery.etag[ifModifiedKey]=modified}}if(status===304){statusText="notmodified";isSuccess=true}else{isSuccess=ajaxConvert(s,response);statusText=isSuccess.state;success=isSuccess.data;error=isSuccess.error;isSuccess=!error}}else{error=statusText;if(!statusText||status){statusText="error";if(status<0){status=0}}}jqXHR.status=status;jqXHR.statusText=(nativeStatusText||statusText)+"";if(isSuccess){deferred.resolveWith(callbackContext,[success,statusText,jqXHR])}else{deferred.rejectWith(callbackContext,[jqXHR,statusText,error])}jqXHR.statusCode(statusCode);statusCode=undefined;if(fireGlobals){globalEventContext.trigger("ajax"+(isSuccess?"Success":"Error"),[jqXHR,s,isSuccess?success:error])}completeDeferred.fireWith(callbackContext,[jqXHR,statusText]);if(fireGlobals){globalEventContext.trigger("ajaxComplete",[jqXHR,s]);if(!--jQuery.active){jQuery.event.trigger("ajaxStop")}}}deferred.promise(jqXHR);jqXHR.success=jqXHR.done;jqXHR.error=jqXHR.fail;jqXHR.complete=completeDeferred.add;jqXHR.statusCode=function(map){if(map){var tmp;if(state<2){for(tmp in map){statusCode[tmp]=[statusCode[tmp],map[tmp]]}}else{tmp=map[jqXHR.status];jqXHR.always(tmp)}}return this};s.url=((url||s.url)+"").replace(rhash,"").replace(rprotocol,ajaxLocParts[1]+"//");s.dataTypes=jQuery.trim(s.dataType||"*").toLowerCase().split(core_rspace);if(s.crossDomain==null){parts=rurl.exec(s.url.toLowerCase());s.crossDomain=!!(parts&&(parts[1]!==ajaxLocParts[1]||parts[2]!==ajaxLocParts[2]||(parts[3]||(parts[1]==="http:"?80:443))!=(ajaxLocParts[3]||(ajaxLocParts[1]==="http:"?80:443))))}if(s.data&&s.processData&&typeof s.data!=="string"){s.data=jQuery.param(s.data,s.traditional)}inspectPrefiltersOrTransports(prefilters,s,options,jqXHR);if(state===2){return jqXHR}fireGlobals=s.global;s.type=s.type.toUpperCase();s.hasContent=!rnoContent.test(s.type);if(fireGlobals&&jQuery.active++===0){jQuery.event.trigger("ajaxStart")}if(!s.hasContent){if(s.data){s.url+=(rquery.test(s.url)?"&":"?")+s.data;delete s.data}ifModifiedKey=s.url;if(s.cache===false){var ts=jQuery.now(),ret=s.url.replace(rts,"$1_="+ts);s.url=ret+(ret===s.url?(rquery.test(s.url)?"&":"?")+"_="+ts:"")}}if(s.data&&s.hasContent&&s.contentType!==false||options.contentType){jqXHR.setRequestHeader("Content-Type",s.contentType)}if(s.ifModified){ifModifiedKey=ifModifiedKey||s.url;if(jQuery.lastModified[ifModifiedKey]){jqXHR.setRequestHeader("If-Modified-Since",jQuery.lastModified[ifModifiedKey])}if(jQuery.etag[ifModifiedKey]){jqXHR.setRequestHeader("If-None-Match",jQuery.etag[ifModifiedKey])}}jqXHR.setRequestHeader("Accept",s.dataTypes[0]&&s.accepts[s.dataTypes[0]]?s.accepts[s.dataTypes[0]]+(s.dataTypes[0]!=="*"?", "+allTypes+"; q=0.01":""):s.accepts["*"]);for(i in s.headers){jqXHR.setRequestHeader(i,s.headers[i])}if(s.beforeSend&&(s.beforeSend.call(callbackContext,jqXHR,s)===false||state===2)){return jqXHR.abort()}strAbort="abort";for(i in{success:1,error:1,complete:1}){jqXHR[i](s[i])}transport=inspectPrefiltersOrTransports(transports,s,options,jqXHR);if(!transport){done(-1,"No Transport")}else{jqXHR.readyState=1;if(fireGlobals){globalEventContext.trigger("ajaxSend",[jqXHR,s])}if(s.async&&s.timeout>0){timeoutTimer=setTimeout(function(){jqXHR.abort("timeout")},s.timeout)}try{state=1;transport.send(requestHeaders,done)}catch(e){if(state<2){done(-1,e)}else{throw e}}}return jqXHR},active:0,lastModified:{},etag:{}});function ajaxHandleResponses(s,jqXHR,responses){var ct,type,finalDataType,firstDataType,contents=s.contents,dataTypes=s.dataTypes,responseFields=s.responseFields;for(type in responseFields){if(type in responses){jqXHR[responseFields[type]]=responses[type]}}while(dataTypes[0]==="*"){dataTypes.shift();if(ct===undefined){ct=s.mimeType||jqXHR.getResponseHeader("content-type")}}if(ct){for(type in contents){if(contents[type]&&contents[type].test(ct)){dataTypes.unshift(type);break}}}if(dataTypes[0]in responses){finalDataType=dataTypes[0]}else{for(type in responses){if(!dataTypes[0]||s.converters[type+" "+dataTypes[0]]){finalDataType=type;break}if(!firstDataType){firstDataType=type}}finalDataType=finalDataType||firstDataType}if(finalDataType){if(finalDataType!==dataTypes[0]){dataTypes.unshift(finalDataType)}return responses[finalDataType]}}function ajaxConvert(s,response){var conv,conv2,current,tmp,dataTypes=s.dataTypes.slice(),prev=dataTypes[0],converters={},i=0;if(s.dataFilter){response=s.dataFilter(response,s.dataType)}if(dataTypes[1]){for(conv in s.converters){converters[conv.toLowerCase()]=s.converters[conv]}}for(;current=dataTypes[++i];){if(current!=="*"){if(prev!=="*"&&prev!==current){conv=converters[prev+" "+current]||converters["* "+current];if(!conv){for(conv2 in converters){tmp=conv2.split(" ");if(tmp[1]===current){conv=converters[prev+" "+tmp[0]]||converters["* "+tmp[0]];if(conv){if(conv===true){conv=converters[conv2]}else if(converters[conv2]!==true){current=tmp[0];dataTypes.splice(i--,0,current)}break}}}}if(conv!==true){if(conv&&s["throws"]){response=conv(response)}else{try{response=conv(response)}catch(e){return{state:"parsererror",error:conv?e:"No conversion from "+prev+" to "+current}}}}}prev=current}}return{state:"success",data:response}}var oldCallbacks=[],rquestion=/\?/,rjsonp=/(=)\?(?=&|$)|\?\?/,nonce=jQuery.now();jQuery.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var callback=oldCallbacks.pop()||jQuery.expando+"_"+nonce++;this[callback]=true;return callback}});jQuery.ajaxPrefilter("json jsonp",function(s,originalSettings,jqXHR){var callbackName,overwritten,responseContainer,data=s.data,url=s.url,hasCallback=s.jsonp!==false,replaceInUrl=hasCallback&&rjsonp.test(url),replaceInData=hasCallback&&!replaceInUrl&&typeof data==="string"&&!(s.contentType||"").indexOf("application/x-www-form-urlencoded")&&rjsonp.test(data);if(s.dataTypes[0]==="jsonp"||replaceInUrl||replaceInData){callbackName=s.jsonpCallback=jQuery.isFunction(s.jsonpCallback)?s.jsonpCallback():s.jsonpCallback;overwritten=window[callbackName];if(replaceInUrl){s.url=url.replace(rjsonp,"$1"+callbackName)}else if(replaceInData){s.data=data.replace(rjsonp,"$1"+callbackName)}else if(hasCallback){s.url+=(rquestion.test(url)?"&":"?")+s.jsonp+"="+callbackName}s.converters["script json"]=function(){if(!responseContainer){jQuery.error(callbackName+" was not called")}return responseContainer[0]};s.dataTypes[0]="json";window[callbackName]=function(){responseContainer=arguments};jqXHR.always(function(){window[callbackName]=overwritten;if(s[callbackName]){s.jsonpCallback=originalSettings.jsonpCallback;oldCallbacks.push(callbackName)}if(responseContainer&&jQuery.isFunction(overwritten)){overwritten(responseContainer[0])}responseContainer=overwritten=undefined});return"script"}});jQuery.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(text){jQuery.globalEval(text);return text}}});jQuery.ajaxPrefilter("script",function(s){if(s.cache===undefined){s.cache=false}if(s.crossDomain){s.type="GET";s.global=false}});jQuery.ajaxTransport("script",function(s){if(s.crossDomain){var script,head=document.head||document.getElementsByTagName("head")[0]||document.documentElement;return{send:function(_,callback){script=document.createElement("script");script.async="async";if(s.scriptCharset){script.charset=s.scriptCharset}script.src=s.url;script.onload=script.onreadystatechange=function(_,isAbort){if(isAbort||!script.readyState||/loaded|complete/.test(script.readyState)){script.onload=script.onreadystatechange=null;if(head&&script.parentNode){head.removeChild(script)}script=undefined;if(!isAbort){callback(200,"success")}}};head.insertBefore(script,head.firstChild)},abort:function(){if(script){script.onload(0,1)}}}}});var xhrCallbacks,xhrOnUnloadAbort=window.ActiveXObject?function(){for(var key in xhrCallbacks){xhrCallbacks[key](0,1)}}:false,xhrId=0;function createStandardXHR(){try{return new window.XMLHttpRequest}catch(e){}}function createActiveXHR(){try{return new window.ActiveXObject("Microsoft.XMLHTTP")}catch(e){}}jQuery.ajaxSettings.xhr=window.ActiveXObject?function(){return!this.isLocal&&createStandardXHR()||createActiveXHR()}:createStandardXHR;(function(xhr){jQuery.extend(jQuery.support,{ajax:!!xhr,cors:!!xhr&&"withCredentials"in xhr})})(jQuery.ajaxSettings.xhr());if(jQuery.support.ajax){jQuery.ajaxTransport(function(s){if(!s.crossDomain||jQuery.support.cors){var callback;return{send:function(headers,complete){var handle,i,xhr=s.xhr();if(s.username){xhr.open(s.type,s.url,s.async,s.username,s.password)}else{xhr.open(s.type,s.url,s.async)}if(s.xhrFields){for(i in s.xhrFields){xhr[i]=s.xhrFields[i]}}if(s.mimeType&&xhr.overrideMimeType){xhr.overrideMimeType(s.mimeType)}if(!s.crossDomain&&!headers["X-Requested-With"]){headers["X-Requested-With"]="XMLHttpRequest"}try{for(i in headers){xhr.setRequestHeader(i,headers[i])}}catch(_){}xhr.send(s.hasContent&&s.data||null);callback=function(_,isAbort){var status,statusText,responseHeaders,responses,xml;try{if(callback&&(isAbort||xhr.readyState===4)){callback=undefined;if(handle){xhr.onreadystatechange=jQuery.noop;if(xhrOnUnloadAbort){delete xhrCallbacks[handle]}}if(isAbort){if(xhr.readyState!==4){xhr.abort()}}else{status=xhr.status;responseHeaders=xhr.getAllResponseHeaders();responses={};xml=xhr.responseXML;if(xml&&xml.documentElement){responses.xml=xml}try{responses.text=xhr.responseText}catch(e){}try{statusText=xhr.statusText}catch(e){statusText=""}if(!status&&s.isLocal&&!s.crossDomain){status=responses.text?200:404}else if(status===1223){status=204}}}}catch(firefoxAccessException){if(!isAbort){complete(-1,firefoxAccessException)}}if(responses){complete(status,statusText,responses,responseHeaders)}};if(!s.async){callback()}else if(xhr.readyState===4){setTimeout(callback,0)}else{handle=++xhrId;if(xhrOnUnloadAbort){if(!xhrCallbacks){xhrCallbacks={};jQuery(window).unload(xhrOnUnloadAbort)}xhrCallbacks[handle]=callback}xhr.onreadystatechange=callback}},abort:function(){if(callback){callback(0,1)}}}}})}var fxNow,timerId,rfxtypes=/^(?:toggle|show|hide)$/,rfxnum=new RegExp("^(?:([-+])=|)("+core_pnum+")([a-z%]*)$","i"),rrun=/queueHooks$/,animationPrefilters=[defaultPrefilter],tweeners={"*":[function(prop,value){var end,unit,tween=this.createTween(prop,value),parts=rfxnum.exec(value),target=tween.cur(),start=+target||0,scale=1,maxIterations=20;if(parts){end=+parts[2];unit=parts[3]||(jQuery.cssNumber[prop]?"":"px");if(unit!=="px"&&start){start=jQuery.css(tween.elem,prop,true)||end||1;do{scale=scale||".5";start=start/scale;jQuery.style(tween.elem,prop,start+unit)}while(scale!==(scale=tween.cur()/target)&&scale!==1&&--maxIterations)}tween.unit=unit;tween.start=start;tween.end=parts[1]?start+(parts[1]+1)*end:end}return tween}]};function createFxNow(){setTimeout(function(){fxNow=undefined},0);return fxNow=jQuery.now()}function createTweens(animation,props){jQuery.each(props,function(prop,value){var collection=(tweeners[prop]||[]).concat(tweeners["*"]),index=0,length=collection.length;for(;index<length;index++){if(collection[index].call(animation,prop,value)){return}}})}function Animation(elem,properties,options){var result,index=0,tweenerIndex=0,length=animationPrefilters.length,deferred=jQuery.Deferred().always(function(){delete tick.elem}),tick=function(){var currentTime=fxNow||createFxNow(),remaining=Math.max(0,animation.startTime+animation.duration-currentTime),temp=remaining/animation.duration||0,percent=1-temp,index=0,length=animation.tweens.length;
+for(;index<length;index++){animation.tweens[index].run(percent)}deferred.notifyWith(elem,[animation,percent,remaining]);if(percent<1&&length){return remaining}else{deferred.resolveWith(elem,[animation]);return false}},animation=deferred.promise({elem:elem,props:jQuery.extend({},properties),opts:jQuery.extend(true,{specialEasing:{}},options),originalProperties:properties,originalOptions:options,startTime:fxNow||createFxNow(),duration:options.duration,tweens:[],createTween:function(prop,end,easing){var tween=jQuery.Tween(elem,animation.opts,prop,end,animation.opts.specialEasing[prop]||animation.opts.easing);animation.tweens.push(tween);return tween},stop:function(gotoEnd){var index=0,length=gotoEnd?animation.tweens.length:0;for(;index<length;index++){animation.tweens[index].run(1)}if(gotoEnd){deferred.resolveWith(elem,[animation,gotoEnd])}else{deferred.rejectWith(elem,[animation,gotoEnd])}return this}}),props=animation.props;propFilter(props,animation.opts.specialEasing);for(;index<length;index++){result=animationPrefilters[index].call(animation,elem,props,animation.opts);if(result){return result}}createTweens(animation,props);if(jQuery.isFunction(animation.opts.start)){animation.opts.start.call(elem,animation)}jQuery.fx.timer(jQuery.extend(tick,{anim:animation,queue:animation.opts.queue,elem:elem}));return animation.progress(animation.opts.progress).done(animation.opts.done,animation.opts.complete).fail(animation.opts.fail).always(animation.opts.always)}function propFilter(props,specialEasing){var index,name,easing,value,hooks;for(index in props){name=jQuery.camelCase(index);easing=specialEasing[name];value=props[index];if(jQuery.isArray(value)){easing=value[1];value=props[index]=value[0]}if(index!==name){props[name]=value;delete props[index]}hooks=jQuery.cssHooks[name];if(hooks&&"expand"in hooks){value=hooks.expand(value);delete props[name];for(index in value){if(!(index in props)){props[index]=value[index];specialEasing[index]=easing}}}else{specialEasing[name]=easing}}}jQuery.Animation=jQuery.extend(Animation,{tweener:function(props,callback){if(jQuery.isFunction(props)){callback=props;props=["*"]}else{props=props.split(" ")}var prop,index=0,length=props.length;for(;index<length;index++){prop=props[index];tweeners[prop]=tweeners[prop]||[];tweeners[prop].unshift(callback)}},prefilter:function(callback,prepend){if(prepend){animationPrefilters.unshift(callback)}else{animationPrefilters.push(callback)}}});function defaultPrefilter(elem,props,opts){var index,prop,value,length,dataShow,toggle,tween,hooks,oldfire,anim=this,style=elem.style,orig={},handled=[],hidden=elem.nodeType&&isHidden(elem);if(!opts.queue){hooks=jQuery._queueHooks(elem,"fx");if(hooks.unqueued==null){hooks.unqueued=0;oldfire=hooks.empty.fire;hooks.empty.fire=function(){if(!hooks.unqueued){oldfire()}}}hooks.unqueued++;anim.always(function(){anim.always(function(){hooks.unqueued--;if(!jQuery.queue(elem,"fx").length){hooks.empty.fire()}})})}if(elem.nodeType===1&&("height"in props||"width"in props)){opts.overflow=[style.overflow,style.overflowX,style.overflowY];if(jQuery.css(elem,"display")==="inline"&&jQuery.css(elem,"float")==="none"){if(!jQuery.support.inlineBlockNeedsLayout||css_defaultDisplay(elem.nodeName)==="inline"){style.display="inline-block"}else{style.zoom=1}}}if(opts.overflow){style.overflow="hidden";if(!jQuery.support.shrinkWrapBlocks){anim.done(function(){style.overflow=opts.overflow[0];style.overflowX=opts.overflow[1];style.overflowY=opts.overflow[2]})}}for(index in props){value=props[index];if(rfxtypes.exec(value)){delete props[index];toggle=toggle||value==="toggle";if(value===(hidden?"hide":"show")){continue}handled.push(index)}}length=handled.length;if(length){dataShow=jQuery._data(elem,"fxshow")||jQuery._data(elem,"fxshow",{});if("hidden"in dataShow){hidden=dataShow.hidden}if(toggle){dataShow.hidden=!hidden}if(hidden){jQuery(elem).show()}else{anim.done(function(){jQuery(elem).hide()})}anim.done(function(){var prop;jQuery.removeData(elem,"fxshow",true);for(prop in orig){jQuery.style(elem,prop,orig[prop])}});for(index=0;index<length;index++){prop=handled[index];tween=anim.createTween(prop,hidden?dataShow[prop]:0);orig[prop]=dataShow[prop]||jQuery.style(elem,prop);if(!(prop in dataShow)){dataShow[prop]=tween.start;if(hidden){tween.end=tween.start;tween.start=prop==="width"||prop==="height"?1:0}}}}}function Tween(elem,options,prop,end,easing){return new Tween.prototype.init(elem,options,prop,end,easing)}jQuery.Tween=Tween;Tween.prototype={constructor:Tween,init:function(elem,options,prop,end,easing,unit){this.elem=elem;this.prop=prop;this.easing=easing||"swing";this.options=options;this.start=this.now=this.cur();this.end=end;this.unit=unit||(jQuery.cssNumber[prop]?"":"px")},cur:function(){var hooks=Tween.propHooks[this.prop];return hooks&&hooks.get?hooks.get(this):Tween.propHooks._default.get(this)},run:function(percent){var eased,hooks=Tween.propHooks[this.prop];if(this.options.duration){this.pos=eased=jQuery.easing[this.easing](percent,this.options.duration*percent,0,1,this.options.duration)}else{this.pos=eased=percent}this.now=(this.end-this.start)*eased+this.start;if(this.options.step){this.options.step.call(this.elem,this.now,this)}if(hooks&&hooks.set){hooks.set(this)}else{Tween.propHooks._default.set(this)}return this}};Tween.prototype.init.prototype=Tween.prototype;Tween.propHooks={_default:{get:function(tween){var result;if(tween.elem[tween.prop]!=null&&(!tween.elem.style||tween.elem.style[tween.prop]==null)){return tween.elem[tween.prop]}result=jQuery.css(tween.elem,tween.prop,false,"");return!result||result==="auto"?0:result},set:function(tween){if(jQuery.fx.step[tween.prop]){jQuery.fx.step[tween.prop](tween)}else if(tween.elem.style&&(tween.elem.style[jQuery.cssProps[tween.prop]]!=null||jQuery.cssHooks[tween.prop])){jQuery.style(tween.elem,tween.prop,tween.now+tween.unit)}else{tween.elem[tween.prop]=tween.now}}}};Tween.propHooks.scrollTop=Tween.propHooks.scrollLeft={set:function(tween){if(tween.elem.nodeType&&tween.elem.parentNode){tween.elem[tween.prop]=tween.now}}};jQuery.each(["toggle","show","hide"],function(i,name){var cssFn=jQuery.fn[name];jQuery.fn[name]=function(speed,easing,callback){return speed==null||typeof speed==="boolean"||!i&&jQuery.isFunction(speed)&&jQuery.isFunction(easing)?cssFn.apply(this,arguments):this.animate(genFx(name,true),speed,easing,callback)}});jQuery.fn.extend({fadeTo:function(speed,to,easing,callback){return this.filter(isHidden).css("opacity",0).show().end().animate({opacity:to},speed,easing,callback)},animate:function(prop,speed,easing,callback){var empty=jQuery.isEmptyObject(prop),optall=jQuery.speed(speed,easing,callback),doAnimation=function(){var anim=Animation(this,jQuery.extend({},prop),optall);if(empty){anim.stop(true)}};return empty||optall.queue===false?this.each(doAnimation):this.queue(optall.queue,doAnimation)},stop:function(type,clearQueue,gotoEnd){var stopQueue=function(hooks){var stop=hooks.stop;delete hooks.stop;stop(gotoEnd)};if(typeof type!=="string"){gotoEnd=clearQueue;clearQueue=type;type=undefined}if(clearQueue&&type!==false){this.queue(type||"fx",[])}return this.each(function(){var dequeue=true,index=type!=null&&type+"queueHooks",timers=jQuery.timers,data=jQuery._data(this);if(index){if(data[index]&&data[index].stop){stopQueue(data[index])}}else{for(index in data){if(data[index]&&data[index].stop&&rrun.test(index)){stopQueue(data[index])}}}for(index=timers.length;index--;){if(timers[index].elem===this&&(type==null||timers[index].queue===type)){timers[index].anim.stop(gotoEnd);dequeue=false;timers.splice(index,1)}}if(dequeue||!gotoEnd){jQuery.dequeue(this,type)}})}});function genFx(type,includeWidth){var which,attrs={height:type},i=0;includeWidth=includeWidth?1:0;for(;i<4;i+=2-includeWidth){which=cssExpand[i];attrs["margin"+which]=attrs["padding"+which]=type}if(includeWidth){attrs.opacity=attrs.width=type}return attrs}jQuery.each({slideDown:genFx("show"),slideUp:genFx("hide"),slideToggle:genFx("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(name,props){jQuery.fn[name]=function(speed,easing,callback){return this.animate(props,speed,easing,callback)}});jQuery.speed=function(speed,easing,fn){var opt=speed&&typeof speed==="object"?jQuery.extend({},speed):{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&!jQuery.isFunction(easing)&&easing};opt.duration=jQuery.fx.off?0:typeof opt.duration==="number"?opt.duration:opt.duration in jQuery.fx.speeds?jQuery.fx.speeds[opt.duration]:jQuery.fx.speeds._default;if(opt.queue==null||opt.queue===true){opt.queue="fx"}opt.old=opt.complete;opt.complete=function(){if(jQuery.isFunction(opt.old)){opt.old.call(this)}if(opt.queue){jQuery.dequeue(this,opt.queue)}};return opt};jQuery.easing={linear:function(p){return p},swing:function(p){return.5-Math.cos(p*Math.PI)/2}};jQuery.timers=[];jQuery.fx=Tween.prototype.init;jQuery.fx.tick=function(){var timer,timers=jQuery.timers,i=0;fxNow=jQuery.now();for(;i<timers.length;i++){timer=timers[i];if(!timer()&&timers[i]===timer){timers.splice(i--,1)}}if(!timers.length){jQuery.fx.stop()}fxNow=undefined};jQuery.fx.timer=function(timer){if(timer()&&jQuery.timers.push(timer)&&!timerId){timerId=setInterval(jQuery.fx.tick,jQuery.fx.interval)}};jQuery.fx.interval=13;jQuery.fx.stop=function(){clearInterval(timerId);timerId=null};jQuery.fx.speeds={slow:600,fast:200,_default:400};jQuery.fx.step={};if(jQuery.expr&&jQuery.expr.filters){jQuery.expr.filters.animated=function(elem){return jQuery.grep(jQuery.timers,function(fn){return elem===fn.elem}).length}}var rroot=/^(?:body|html)$/i;jQuery.fn.offset=function(options){if(arguments.length){return options===undefined?this:this.each(function(i){jQuery.offset.setOffset(this,options,i)})}var docElem,body,win,clientTop,clientLeft,scrollTop,scrollLeft,box={top:0,left:0},elem=this[0],doc=elem&&elem.ownerDocument;if(!doc){return}if((body=doc.body)===elem){return jQuery.offset.bodyOffset(elem)}docElem=doc.documentElement;if(!jQuery.contains(docElem,elem)){return box}if(typeof elem.getBoundingClientRect!=="undefined"){box=elem.getBoundingClientRect()}win=getWindow(doc);clientTop=docElem.clientTop||body.clientTop||0;clientLeft=docElem.clientLeft||body.clientLeft||0;scrollTop=win.pageYOffset||docElem.scrollTop;scrollLeft=win.pageXOffset||docElem.scrollLeft;return{top:box.top+scrollTop-clientTop,left:box.left+scrollLeft-clientLeft}};jQuery.offset={bodyOffset:function(body){var top=body.offsetTop,left=body.offsetLeft;if(jQuery.support.doesNotIncludeMarginInBodyOffset){top+=parseFloat(jQuery.css(body,"marginTop"))||0;left+=parseFloat(jQuery.css(body,"marginLeft"))||0}return{top:top,left:left}},setOffset:function(elem,options,i){var position=jQuery.css(elem,"position");if(position==="static"){elem.style.position="relative"}var curElem=jQuery(elem),curOffset=curElem.offset(),curCSSTop=jQuery.css(elem,"top"),curCSSLeft=jQuery.css(elem,"left"),calculatePosition=(position==="absolute"||position==="fixed")&&jQuery.inArray("auto",[curCSSTop,curCSSLeft])>-1,props={},curPosition={},curTop,curLeft;if(calculatePosition){curPosition=curElem.position();curTop=curPosition.top;curLeft=curPosition.left}else{curTop=parseFloat(curCSSTop)||0;curLeft=parseFloat(curCSSLeft)||0}if(jQuery.isFunction(options)){options=options.call(elem,i,curOffset)}if(options.top!=null){props.top=options.top-curOffset.top+curTop}if(options.left!=null){props.left=options.left-curOffset.left+curLeft}if("using"in options){options.using.call(elem,props)}else{curElem.css(props)}}};jQuery.fn.extend({position:function(){if(!this[0]){return}var elem=this[0],offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=rroot.test(offsetParent[0].nodeName)?{top:0,left:0}:offsetParent.offset();offset.top-=parseFloat(jQuery.css(elem,"marginTop"))||0;offset.left-=parseFloat(jQuery.css(elem,"marginLeft"))||0;parentOffset.top+=parseFloat(jQuery.css(offsetParent[0],"borderTopWidth"))||0;parentOffset.left+=parseFloat(jQuery.css(offsetParent[0],"borderLeftWidth"))||0;return{top:offset.top-parentOffset.top,left:offset.left-parentOffset.left}},offsetParent:function(){return this.map(function(){var offsetParent=this.offsetParent||document.body;while(offsetParent&&(!rroot.test(offsetParent.nodeName)&&jQuery.css(offsetParent,"position")==="static")){offsetParent=offsetParent.offsetParent}return offsetParent||document.body})}});jQuery.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(method,prop){var top=/Y/.test(prop);jQuery.fn[method]=function(val){return jQuery.access(this,function(elem,method,val){var win=getWindow(elem);if(val===undefined){return win?prop in win?win[prop]:win.document.documentElement[method]:elem[method]}if(win){win.scrollTo(!top?val:jQuery(win).scrollLeft(),top?val:jQuery(win).scrollTop())}else{elem[method]=val}},method,val,arguments.length,null)}});function getWindow(elem){return jQuery.isWindow(elem)?elem:elem.nodeType===9?elem.defaultView||elem.parentWindow:false}jQuery.each({Height:"height",Width:"width"},function(name,type){jQuery.each({padding:"inner"+name,content:type,"":"outer"+name},function(defaultExtra,funcName){jQuery.fn[funcName]=function(margin,value){var chainable=arguments.length&&(defaultExtra||typeof margin!=="boolean"),extra=defaultExtra||(margin===true||value===true?"margin":"border");return jQuery.access(this,function(elem,type,value){var doc;if(jQuery.isWindow(elem)){return elem.document.documentElement["client"+name]}if(elem.nodeType===9){doc=elem.documentElement;return Math.max(elem.body["scroll"+name],doc["scroll"+name],elem.body["offset"+name],doc["offset"+name],doc["client"+name])}return value===undefined?jQuery.css(elem,type,value,extra):jQuery.style(elem,type,value,extra)},type,chainable?margin:undefined,chainable,null)}})});window.jQuery=window.$=jQuery;if(typeof define==="function"&&define.amd&&define.amd.jQuery){define("jquery",[],function(){return jQuery})}})(window);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 072f07167a..9268216dce 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -416,6 +416,7 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark,
 	
 	function yFormatter(v, axis) {
 		format = new Array();
+		
 		for (i = 0; i < labels_total.length; i++) {
 			var label = labels_total[i][1];
 			// var shortLabel = reduceText(label, 25);
@@ -1011,7 +1012,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		// Prepared to turn series with a checkbox
 		// showed[i] = true;
 	}
-//console.log(data_base);
+
 	max_x = data_base[0]['data'][data_base[0]['data'].length -1][0];
 
 	if(min_check != 0){
@@ -1534,6 +1535,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 
 	// The first execution, the graph data is the base data
 	datas = data_base;
+	console.log(datas);
 	// minTickSize
 	var count_data = datas[0].data.length;
 	var min_tick_pixels = 80;
@@ -1779,6 +1781,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 			if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) {
 				$('#timestamp_'+graph_id).show();
 				// If no legend, the timestamp labels are short and with value
+				console.log(y);
 				if (legend.length == 0) {
 					$('#timestamp_'+graph_id).text(labels[j] + ' (' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + ')');
 				}
@@ -1904,6 +1907,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 	});
 
 	$('#overview_'+graph_id).bind('plothover',  function (event, pos, item) {
+		console.log('entra22222');
 		plot.setCrosshair({ x: pos.x, y: 0 });
 		currentPlot = overview;
 		latestPosition = pos;
@@ -2379,3 +2383,1217 @@ function reduceText (text, maxLength) {
 	var str_cut = text.substr(0, firstSlideEnd);
 	return str_cut + '...' + text.substr(-firstSlideEnd - 3);
 }
+
+
+
+function pandoraFlotAreaNew(
+	graph_id, values, legend, agent_module_id,
+	series_type, watermark, date_array,
+	data_module_graph, show_elements_graph,
+	format_graph, force_integer, series_suffix_str, 
+	background_color, legend_color, short_data
+) {
+
+	var threshold = true;
+	var thresholded = false;
+	if(format_graph.unit){
+		var unit = format_graph.unit;
+	}
+	else{
+		var unit = '';
+	}
+	console.log(format_graph);
+//XXXX
+	var type        = 'area_simple';
+	var xaxisname   = 'xaxisname';
+	var labels_long = '';
+	var min_check   = 0;
+	var water_mark = '';
+	
+	var homeurl     = format_graph.homeurl;
+	var font_size   = format_graph.font_size;
+	var font        = format_graph.font;
+	var width       = format_graph.width;
+	var height      = format_graph.height;
+	var vconsole    = show_elements_graph.vconsole;
+	var dashboard   = show_elements_graph.dashboard;
+	var menu        = show_elements_graph.menu;
+	
+	switch (type) {
+		case 'line_simple':
+			stacked = null;
+			filled = false;
+			break;
+		case 'line_stacked':
+			stacked = 'stack';
+			filled = false;
+			break;
+		case 'area_simple':
+			stacked = null;
+			filled = true;
+			break;
+		case 'area_stacked':
+			stacked = 'stack';
+			filled = true;
+			break;
+	}
+
+	var datas = new Array();
+	var data_base = new Array();
+	var data2 = new Array();
+	i=0;
+	var lineWidth = $('#hidden-line_width_graph').val() || 1;
+	$.each(values, function (index, value) {
+		if (typeof value.data !== "undefined") {
+			switch (series_type[index]) {
+				case 'area':
+					line_show = true;
+					points_show = false; // XXX - false
+					filled = 0.2;
+					steps_chart = false;
+					break;
+				case 'line':
+				default:
+					line_show = true;
+					points_show = false;
+					filled = false;
+					steps_chart = false;
+					break;
+				case 'points':
+					line_show = false;
+					points_show = true;
+					filled = false;
+					steps_chart = false
+					break;
+				case 'unknown':
+				case 'boolean':
+					line_show = true;
+					points_show = false;
+					filled = true;
+					steps_chart = true;
+					break;
+			}
+			data_base.push({
+				id: 'serie_' + i,
+				data: value.data,
+				label: index,
+				color: value.color,
+				lines: {
+					show: line_show,
+					fill: filled,
+					lineWidth: lineWidth,
+					steps: steps_chart
+				},
+				points: { show: points_show }
+			});
+			i++;
+		}
+	});
+	
+	max_x = date_array['final_date'];
+
+console.log(data_module_graph);
+	var yellow_threshold = data_module_graph.w_min;
+	var red_threshold = data_module_graph.c_min;
+	var yellow_up = data_module_graph.w_max;
+	var red_up = data_module_graph.c_max;
+	var yellow_inverse = data_module_graph.w_inv;
+	var red_inverse = data_module_graph.c_inv;
+	// If threshold and up are the same, that critical or warning is disabled
+	if (yellow_threshold == yellow_up) yellow_inverse = false;
+	if (red_threshold == red_up) red_inverse = false;
+
+	//Array with points to be painted
+	var threshold_data = new Array();
+	//Array with some interesting points
+	var extremes = new Array ();
+	
+	yellow_threshold = parseFloat (yellow_threshold);
+	yellow_up = parseFloat (yellow_up);
+	red_threshold = parseFloat (red_threshold);
+	red_up = parseFloat (red_up);
+	var yellow_only_min = ((yellow_up == 0) && (yellow_threshold != 0));
+	red_only_min = ((red_up == 0) && (red_threshold != 0));
+	
+	var normalw = '#efe';
+	var warningw = '#ffe';
+	var criticalw = '#fee';
+	var normal = '#0f0';
+	var warning = '#ff0';
+	var critical = '#f00';
+
+	if (threshold) {
+		// Warning interval. Change extremes depends on critical interval
+		if (yellow_inverse && red_inverse) {
+			if (red_only_min && yellow_only_min) {
+				// C: |--------         |
+				// W: |········====     |
+				
+				if (yellow_threshold > red_threshold) {
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_fdown_1'] = red_threshold;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+				}
+			} else if (!red_only_min && yellow_only_min) {
+				// C: |--------   ------|
+				// W: |········===·     |
+				
+				if (yellow_threshold > red_up) {
+					yellow_threshold = red_up;
+				}
+				if (yellow_threshold > red_threshold) {
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_fdown_1'] = red_threshold;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+				}
+			} else if (red_only_min && !yellow_only_min) {
+				// C: |-------          |
+				// W: |·······====   ===|
+				if (red_threshold < yellow_threshold) {
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_fdown_1'] = red_threshold;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+				}
+				
+				if (yellow_up < red_threshold) {
+					yellow_up = red_threshold;
+				}
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'warning_up',
+					data: [[max_x, yellow_up]],
+					label: null,
+					color: warning, 
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+				});
+				extremes['warning_up'] = yellow_up;
+				
+			} else {
+				if (yellow_threshold > red_threshold) {
+					// C: |--------   ------|
+					// W: |········===·  ···|
+					if (yellow_threshold > red_up) {
+						yellow_threshold = red_up;
+					}
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_fdown_1'] = red_threshold;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+				}
+				if (yellow_up < red_up) {
+					// C: |--------      ---|
+					// W: |·····  ·======···|
+					if (yellow_up < red_threshold) {
+						yellow_up = red_up;
+					}
+					threshold_data.push({ 
+						id: 'warning_normal_fup',
+						data: [[max_x, yellow_up]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: red_up - yellow_up, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_fup_1'] = red_up;
+					extremes['warning_normal_fup_2'] = yellow_up;
+				}
+				// If warning is under critical completely do not paint anything yellow
+					// C: |--------    -----|
+					// W: |····          ···|
+			}
+		} else if (yellow_inverse && !red_inverse) {
+			if (red_only_min && yellow_only_min) {
+				// C: |            -----|
+				// W: |============···  |
+				if (yellow_threshold > red_threshold) {
+					yellow_threshold = red_threshold;
+				}
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'warning_down',
+					data: [[max_x, yellow_threshold]],
+					label: null,
+					color: warning, 
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+				});
+				extremes['warning_down'] = yellow_threshold;
+				
+			} else if (!red_only_min && yellow_only_min) {
+				// C: |      ----       |
+				// W: |======····===    |
+				
+				if (yellow_threshold > red_up) {
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_up]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: yellow_threshold - red_up, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_fdown_1'] = red_up;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+				}
+				
+				if (yellow_threshold > red_threshold) {
+					yellow_threshold = red_threshold;
+				}
+				threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+					});
+				extremes['warning_down'] = yellow_threshold;
+				
+			} else if (red_only_min && !yellow_only_min) {
+				if (yellow_threshold < red_threshold) {
+					// C: |            -----|
+					// W: |=======  ===·····|
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_down'] = yellow_threshold;
+					
+					if (red_threshold > yellow_up) {
+						threshold_data.push({
+							id: 'warning_normal_fup',
+							data: [[max_x, yellow_up]],
+							label: null,
+							color: warning, 
+							bars: {show: true, align: "left", barWidth: red_threshold - yellow_up, lineWidth: 0, horizontal: true}
+						});
+						extremes['warning_normal_fup_1'] = yellow_up;
+						extremes['warning_normal_fup_2'] = red_threshold;
+					}
+				} else {
+					// C: |     ------------|
+					// W: |=====··  ········|
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_down'] = red_threshold;
+				}
+			} else {
+				if (yellow_threshold > red_up) {
+					// C: |    -----        |
+					// W: |====·····===  ===|
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_down'] = red_threshold;
+					
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_up]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: yellow_threshold - red_up, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_fdown_1'] = red_up;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+					
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_up',
+						data: [[max_x, yellow_up]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_up'] = yellow_up;
+				} else if (red_threshold > yellow_up){
+					// C: |          -----  |
+					// W: |===    ===·····==|
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_down'] = yellow_threshold;
+					
+					threshold_data.push({
+						id: 'warning_normal_fup',
+						data: [[max_x, yellow_up]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: red_threshold - yellow_up, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_fup_1'] = yellow_up;
+					extremes['warning_normal_fup_2'] = red_threshold;
+					
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_up',
+						data: [[max_x, red_up]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_up'] = red_up;
+				} else {
+					// C: |  --------       |
+					// W: |==·    ···=======|
+					if (yellow_threshold > red_threshold) {
+						yellow_threshold = red_threshold;
+					}
+					if (yellow_up < red_up) {
+						yellow_up = red_up;
+					}
+					
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_down'] = yellow_threshold;
+					
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_up',
+						data: [[max_x, yellow_up]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_up'] = yellow_up;
+				}
+			}
+		} else if (!yellow_inverse && red_inverse) {
+			if (yellow_only_min && red_only_min) {
+				// C: |-----            |
+				// W: |   ··============|
+				if (yellow_threshold < red_threshold) {
+					yellow_threshold = red_threshold;
+				}
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'warning_up',
+					data: [[max_x, yellow_threshold]],
+					label: null,
+					color: warning, 
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+				});
+				extremes['warning_up'] = yellow_threshold;
+				
+			} else if (!yellow_only_min && red_only_min) {
+				// C: |-----            |
+				// W: |   ··========    |
+				if (yellow_threshold < red_threshold) {
+					yellow_threshold = red_threshold;
+				}
+				if (yellow_up > red_threshold) {
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = yellow_up;
+				}
+			} else if (yellow_only_min && !red_only_min) {
+				// C: |-----      ------|
+				// W: |   ··======······|
+				if (yellow_threshold < red_threshold) {
+					yellow_threshold = red_threshold;
+				}
+				if (yellow_threshold < red_up) {
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: (red_up - yellow_threshold), lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = red_up;
+				}
+				// If warning is under critical completely do not paint anything yellow
+					// C: |--------    -----|
+					// W: |              ···|
+			} else {
+				if (red_up > yellow_threshold && red_threshold < yellow_up) {
+					// C: |-----      ------|
+					// W: |   ··======·     |
+					if (yellow_threshold < red_threshold) {
+						yellow_threshold = red_threshold;
+					}
+					if (yellow_up > red_up) {
+						yellow_up = red_up;
+					}
+					
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = yellow_up;
+				}
+			}
+		}
+			// If warning is under critical completely do not paint anything yellow
+				// C: |--------    -----|   or	// C: |--------    -----|
+				// W: |   ····          |		// W: |             ··  |
+		else {
+			if (red_only_min && yellow_only_min) {
+				if (yellow_threshold < red_threshold) {
+					// C: |        ---------|
+					// W: |   =====·········|
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: (red_threshold - yellow_threshold), lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = red_threshold;
+				}
+			} else if (red_only_min && !yellow_only_min) {
+				// C: |        ---------|
+				// W: |   =====···      |
+				if (yellow_up > red_threshold) {
+					yellow_up = red_threshold;
+				}
+				if (yellow_threshold < red_threshold) {
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = yellow_up;
+				}
+			} else if (!red_only_min && yellow_only_min) {
+				// C: |     -------     |
+				// W: |   ==·······=====|
+				
+				if (yellow_threshold < red_threshold) {
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: red_threshold - yellow_threshold, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_fdown_1'] = yellow_threshold;
+					extremes['warning_normal_fdown_2'] = red_threshold;
+				}
+				
+				if (yellow_threshold < red_up) {
+					yellow_threshold = red_up;
+				}
+				
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'warning_up',
+					data: [[max_x, yellow_threshold]],
+					label: null,
+					color: warning, 
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+				});
+				extremes['warning_up'] = yellow_threshold;
+				
+			} else {
+				if (red_threshold > yellow_threshold && red_up < yellow_up ) {
+					// C: |    ------       |
+					// W: |  ==······====   |
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: red_threshold - yellow_threshold, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_fdown_1'] = yellow_threshold;
+					extremes['warning_normal_fdown_2'] = red_threshold;
+					
+					threshold_data.push({
+						id: 'warning_normal_fup',
+						data: [[max_x, red_up]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: yellow_up - red_up, lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_fup_1'] = red_up;
+					extremes['warning_normal_fup_2'] = yellow_up;
+				} else if (red_threshold < yellow_threshold && red_up > yellow_up) {
+				// If warning is under critical completely do not paint anything yellow
+					// C: |  --------        |
+					// W: |    ····          |
+				} else {
+					// C: |     --------    |   or	// C: |     ------      |
+					// W: |   ==··          |		// W: |        ···====  |
+					if ((yellow_up > red_threshold) && (yellow_up < red_up)) {
+						yellow_up = red_threshold;
+					}
+					if ((yellow_threshold < red_up) && (yellow_threshold > red_threshold)) {
+						yellow_threshold = red_up;
+					}
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning, 
+						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = yellow_up;
+				}
+			}
+		}
+		// Critical interval
+		if (red_inverse) {
+			if (!red_only_min) {
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'critical_up',
+					data: [[max_x, red_up]],
+					label: null,
+					color: critical, 
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+				});
+			}
+			threshold_data.push({ // barWidth will be correct on draw time
+				id: 'critical_down',
+				data: [[max_x, red_threshold]],
+				label: null,
+				color: critical, 
+				bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+			});
+		} else {
+			if (red_up == 0 && red_threshold != 0) {
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'critical_up',
+					data: [[max_x, red_threshold]],
+					label: null,
+					color: critical, 
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
+				});
+			} else {
+				threshold_data.push({
+					id: 'critical_normal',
+					data: [[max_x, red_threshold]],
+					label: null,
+					color: critical, 
+					bars: {show: true, align: "left", barWidth: (red_up - red_threshold), lineWidth: 0, horizontal: true}
+				});
+			}
+		}
+		
+	}
+
+	// The first execution, the graph data is the base data
+	datas = data_base;
+
+	// minTickSize
+	var count_data = datas[0].data.length;
+	var min_tick_pixels = 80;
+	
+	if (unit != "") {
+		xaxisname = xaxisname + " (" + unit + ")"
+	}
+	
+	var options = {
+			series: {
+				stack: stacked,
+				shadowSize: 0.1
+			},
+			crosshair: { mode: 'xy' },
+			selection: { mode: 'x', color: '#777' },
+			export: {
+				export_data: true,
+				labels_long: labels_long,
+				homeurl: homeurl
+			},
+			grid: {
+				hoverable: true,
+				clickable: true,
+				borderWidth:1,
+				borderColor: '#C1C1C1',
+				tickColor: background_color,
+				color: legend_color
+			},
+			xaxes: [{
+				axisLabelFontSizePixels: font_size,
+				mode: "time",
+				//min: date_array.start_date * 1000,
+				//max: date_array.final_date * 1000,
+				tickFormatter: xFormatter,
+				// timeformat: "%Y/%m/%d %H:%M:%S",
+			}],
+			yaxes: [{
+				//min: min_check,
+				//max: 5000,
+				tickFormatter: yFormatter,
+				color: '',
+				alignTicksWithAxis: 1,
+				labelWidth: 30,
+				position: 'left',
+				font: font,
+				reserveSpace: true,
+				
+			}],
+			legend: {
+				position: 'se',
+				container: $('#legend_' + graph_id),
+				labelFormatter: lFormatter
+			}
+		};
+	if (vconsole) {
+		options.grid['hoverable'] = false;
+		options.grid['clickable'] = false;
+		options.crosshair = false;
+		options.selection = false;
+	}
+	
+	var stack = 0, bars = true, lines = false, steps = false;
+	var plot = $.plot($('#' + graph_id), datas, options);
+	console.log(plot);
+	// Re-calculate the graph height with the legend height
+	if (dashboard || vconsole) {
+		var hDiff = $('#'+graph_id).height() - $('#legend_'+graph_id).height();
+		if(/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ){
+		}
+		else {
+			$('#'+graph_id).css('height', hDiff);
+		}
+	}
+	
+	if (vconsole) {
+		var myCanvas = plot.getCanvas();
+		plot.setupGrid(); // redraw plot to new size
+		plot.draw();
+		var image = myCanvas.toDataURL("image/png");
+		return;
+	}
+	
+	// Adjust the overview plot to the width and position of the main plot
+	adjust_left_width_canvas(graph_id, 'overview_'+graph_id);
+	update_left_width_canvas(graph_id); 
+
+	// Adjust overview when main chart is resized
+	$('#'+graph_id).resize(function(){
+		update_left_width_canvas(graph_id);
+	});
+
+	// Adjust linked graph to the width and position of the main plot
+
+	// Miniplot
+	if (!vconsole) {
+		var overview = $.plot($('#overview_'+graph_id),datas, {
+			series: {
+				stack: stacked,
+				lines: { show: true, lineWidth: 1 },
+				shadowSize: 0
+			},
+			grid: { borderWidth: 1, hoverable: true, autoHighlight: false},
+			xaxis: { },
+				xaxes: [ {
+					tickFormatter: xFormatter,
+					minTickSize: steps,
+					color: ''
+					} ],
+			yaxis: {ticks: [], autoscaleMargin: 0.1 },
+			selection: {mode: 'x', color: '#777' },
+			legend: {show: false},
+			crosshair: {mode: 'x'}
+		});
+	}
+	// Connection between plot and miniplot
+
+	$('#' + graph_id).bind('plotselected', function (event, ranges) {
+		// do the zooming if exist menu to undo it
+		if (menu == 0) {
+			return;
+		}
+		
+		//XXX
+		dataInSelection = ranges.xaxis.to - ranges.xaxis.from;
+		//time_format_y = dataInSelection;
+		dataInPlot = plot.getData()[0].data.length;
+
+		factor = dataInSelection / dataInPlot;
+
+		new_steps = parseInt(factor * steps);
+
+		plot = $.plot($('#' + graph_id), data_base,
+			$.extend(true, {}, options, {
+				xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to},
+				xaxes: [ {
+						tickFormatter: xFormatter,
+						//XXX
+						//minTickSize: new_steps,
+						color: ''
+						} ],
+				legend: { show: false }
+			}));
+		if (thresholded) {
+			var zoom_data_threshold = new Array ();
+			
+			var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
+									red_threshold, extremes, red_up);
+			plot = $.plot($('#' + graph_id), data_base,
+			$.extend(true, {}, options, {
+				yaxis: {
+					max: y_recal.max,
+					min: y_recal.min
+				},
+				xaxis: {
+					min: plot.getAxes().xaxis.min,
+					max: plot.getAxes().xaxis.max
+				}
+			}));
+			zoom_data_threshold = add_threshold (data_base, threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
+										red_threshold, extremes, red_up);
+			plot.setData(zoom_data_threshold);
+			plot.draw();
+		}
+			
+
+		$('#menu_cancelzoom_' + graph_id)
+			.attr('src', homeurl + '/images/zoom_cross_grey.png');
+
+		currentRanges = ranges;
+		// don't fire event on the overview to prevent eternal loop
+		overview.setSelection(ranges, true);
+	});
+
+	$('#overview_' + graph_id)
+		.bind('plotselected', function (event, ranges) {
+			plot.setSelection(ranges);
+	});
+
+	var legends = $('#legend_' + graph_id + ' .legendLabel');
+
+	var updateLegendTimeout = null;
+	var latestPosition = null;
+	var currentPlot = null;
+	var currentRanges = null;
+
+	// Update legend with the data of the plot in the mouse position
+	function updateLegend() {
+		updateLegendTimeout = null;
+		var pos = latestPosition;
+		console.log(pos);
+
+		var axes = currentPlot.getAxes();
+		if (pos.x < axes.xaxis.min || pos.x > axes.xaxis.max ||
+			pos.y < axes.yaxis.min || pos.y > axes.yaxis.max) {
+			return;
+		}
+
+		var j, dataset = currentPlot.getData();
+
+		var i = 0;
+
+		console.log(dataset);
+		for (k = 0; k < dataset.length; k++) {
+
+			// k is the real series counter
+			// i is the series counter without thresholds
+			var series = dataset[k];
+			console.log(series);
+			if (series.label == null) {
+				continue;
+			}
+
+			// find the nearest points, x-wise
+			for (j = 0; j < series.data.length; ++j)
+				if (series.data[j][0] > pos.x) {
+					break;
+				}
+			if(series.data[j]){
+				var x = series.data[j][0];
+				var y = series.data[j][1];
+			}
+			
+
+			var how_bigger = "";
+			if (y > 1000000) {
+				how_bigger = "M";
+				y = y / 1000000;
+			}
+			else if (y > 1000) {
+				how_bigger = "K";
+				y = y / 1000;
+			}
+			else if(y < -1000000) {
+				how_bigger = "M";
+				y = y / 1000000;
+			}
+			else if (y < -1000) {
+				how_bigger = "K";
+				y = y / 1000;	
+			}
+
+			if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) {
+				$('#timestamp_'+graph_id).show();
+				// If no legend, the timestamp labels are short and with value
+				if (legend.length == 0) {
+					$('#timestamp_'+graph_id).text(labels[j] + ' (' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + ')');
+				}
+				else {
+					var d = new Date(x);
+
+					date_format =	(d.getDate() <10?'0':'') + d.getDate() + "/" +
+									(d.getMonth()<9?'0':'') + (d.getMonth() + 1) + "/" + 
+									d.getFullYear() + "\n" + 
+									(d.getHours()<10?'0':'') + d.getHours() + ":" + 
+									(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + 
+									(d.getSeconds()<10?'0':'') + d.getSeconds();
+
+					$('#timestamp_'+graph_id).text(date_format);
+				}
+				//$('#timestamp_'+graph_id).css('top', plot.offset().top-$('#timestamp_'+graph_id).height()*1.5);
+
+				var timesize = $('#timestamp_'+graph_id).width();
+
+				if (currentRanges != null) {
+					dataset = plot.getData();
+				}
+
+				var timenewpos = dataset[0].xaxis.p2c(pos.x)+$('.yAxis>div').eq(0).width();
+
+				var canvaslimit = plot.width();
+
+				if (timesize+timenewpos > canvaslimit) {
+					$('#timestamp_'+graph_id).css('left', timenewpos - timesize);
+					$('#timestamp_'+graph_id).css('top', 50);
+				}
+				else {
+					$('#timestamp_'+graph_id).css('left', timenewpos);
+					$('#timestamp_'+graph_id).css('top', 50);
+				}
+			}
+			else {
+				$('#timestamp_'+graph_id).hide();
+			}
+
+			var label_aux = series.label;
+
+			// The graphs of points type and unknown graphs will dont be updated
+
+			serie_types = new Array();
+			if (serie_types[i] != 'points' && series.label != $('#hidden-unknown_text').val()) {
+				$('#legend_' + graph_id + ' .legendLabel')
+					.eq(i).html(label_aux +	'= ' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + how_bigger + ' ' + unit);
+			}
+
+			$('#legend_' + graph_id + ' .legendLabel')
+				.eq(i).css('font-size',font_size+'pt');
+
+			$('#legend_' + graph_id + ' .legendLabel')
+				.eq(i).css('color','');
+
+			$('#legend_' + graph_id + ' .legendLabel')
+				.eq(i).css('font-family',font+'Font');
+
+			i++;
+		}
+	}
+
+	// Events
+	$('#' + graph_id).bind('plothover',  function (event, pos, item) {
+		overview.setCrosshair({ x: pos.x, y: 0 });
+		currentPlot = plot;
+		latestPosition = pos;
+		if (!updateLegendTimeout) {
+			updateLegendTimeout = setTimeout(updateLegend, 50);
+		}
+
+	});
+
+	$('#' + graph_id).bind("plotclick", function (event, pos, item) {
+		plot.unhighlight();
+		if (item && item.series.label != '' && (item.series.label == legend_events || item.series.label == legend_events+series_suffix_str || item.series.label == legend_alerts || item.series.label == legend_alerts+series_suffix_str)) {
+			plot.unhighlight();
+			var dataset  = plot.getData();
+
+			var extra_info = '<i>No info to show</i>';
+			var extra_show = false;
+
+			var coord_x = (item.dataIndex/item.series.xaxis.datamax)* (event.target.clientWidth - event.target.offsetLeft + 1) + event.target.offsetLeft;
+
+
+			$('#extra_'+graph_id).css('left',coord_x);
+			$('#extra_'+graph_id).css('top', event.target.offsetTop + 55 );
+
+			switch(item.series.label) {
+				case legend_alerts+series_suffix_str:
+				case legend_alerts:
+					extra_info = '<b>'+legend_alerts+':<br><span style="font-size:xx-small; font-weight: normal;">From: '+labels_long[item.dataIndex];
+					if (labels_long[item.dataIndex+1] != undefined) {
+						extra_info += '<br>To: '+labels_long[item.dataIndex+1];
+					}
+					extra_info += '</span></b>'+get_event_details(alertsz[item.dataIndex]);
+					extra_show = true;
+					break;
+				case legend_events+series_suffix_str:
+				case legend_events:
+					extra_info = '<b>'+legend_events+':<br><span style="font-size:xx-small; font-weight: normal;">From: '+labels_long[item.dataIndex];
+					if (labels_long[item.dataIndex+1] != undefined) {
+						extra_info += '<br>To: '+labels_long[item.dataIndex+1];
+					}
+					extra_info += '</span></b>'+get_event_details(eventsz[item.dataIndex]);
+					extra_show = true;
+					break;
+				default:
+					return;
+					break;
+			}
+
+			if (extra_show) {
+				$('#extra_'+graph_id).html(extra_info);
+				$('#extra_'+graph_id).css('display','');
+			}
+			plot.highlight(item.series, item.datapoint);
+		}
+		else {
+			$('#extra_'+graph_id).html('');
+			$('#extra_'+graph_id).css('display','none');
+		}
+	});
+
+	$('#'+graph_id).bind('mouseout',resetInteractivity);
+	$('#overview_'+graph_id).bind('mouseout',resetInteractivity);
+	
+	//~ // Reset interactivity styles
+	function resetInteractivity() {
+		$('#timestamp_'+graph_id).hide();
+		dataset = plot.getData();
+		for (i = 0; i < dataset.length; ++i) {
+			var series = dataset[i];
+			var label_aux = series.label;
+			$('#legend_' + graph_id + ' .legendLabel')
+				.eq(i).html(label_aux);
+		}
+		plot.clearCrosshair();
+		overview.clearCrosshair();
+	}
+
+	// Format functions
+	function xFormatter(v, axis) {
+		//console.log('x: '+ v);
+		//XXX
+		/*
+			if ($period <= SECONDS_6HOURS) {
+				$time_format = 'H:i:s';
+			}
+			elseif ($period < SECONDS_1DAY) {
+				$time_format = 'H:i';
+			}
+			elseif ($period < SECONDS_15DAYS) {
+				$time_format = "M \nd H:i";
+			}
+			elseif ($period < SECONDS_1MONTH) {
+				$time_format = "M \nd H\h";
+			} 
+			elseif ($period < SECONDS_6MONTHS) {
+				$time_format = "M \nd H\h";
+			}
+			else {
+				$time_format = "Y M \nd H\h";
+			}	
+		*/
+		
+		var d = new Date(v);
+		var result_date_format = 0;
+		
+	//	if(time_format_y > 86400000){ //DAY
+
+			result_date_format = 
+								(d.getDate() <10?'0':'') + d.getDate() + "/" +
+								(d.getMonth()<9?'0':'') + (d.getMonth() + 1) + "/" + 
+								d.getFullYear() + "\n" + 
+								(d.getHours()<10?'0':'') + d.getHours() + ":" + 
+								(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + 
+								(d.getSeconds()<10?'0':'') + d.getSeconds(); //+  ":" + d.getMilliseconds();
+	/*	}
+		else{
+			result_date_format = 	
+								d.getHours() + ":" + 
+								d.getMinutes() + ":" + 
+								d.getSeconds(); //+  ":" + d.getMilliseconds();
+		}
+	*/
+		//extra_css = '';
+		return '<div class='+font+' style="transform: rotate(-15deg); -ms-transform:rotate(-15deg); -moz-transform:rotate(-15deg); -webkit-transform:rotate(-15deg); -o-transform:rotate(-15deg); font-size:'+font_size+'pt; margin-top:15px;">'+result_date_format+'</div>';
+	}
+
+	function yFormatter(v, axis) {
+		axis.datamin = 0;
+		if (short_data) {
+			var formatted = number_format(v, force_integer, "");
+		}
+		else {
+			var formatted = v;
+		}
+
+		return '<div class='+font+' style="font-size:'+font_size+'pt;">'+formatted+'</div>';
+	}
+
+	function lFormatter(v, item) {
+		return '<div style="font-size:'+font_size+'pt;">'+v+'</div>';
+		// Prepared to turn series with a checkbox
+		//return '<div style=color:;font-size:'+font_size+'pt><input type="checkbox" id="' + graph_id + '_' + item.id +'" checked="checked" class="check_serie_'+graph_id+'">'+v+'</div>';
+	}
+	
+	if (menu) {
+		var parent_height;
+		$('#menu_overview_' + graph_id).click(function() {
+			$('#overview_' + graph_id).toggle();
+		});
+
+		//~ $('#menu_export_csv_' + graph_id).click(function() {
+			//~ exportData({ type: 'csv' });
+		//~ });
+		
+		$("#menu_export_csv_"+graph_id)
+			.click(function (event) {
+				event.preventDefault();
+				plot.exportDataCSV();
+		});
+		
+		//Not a correct call
+		//~ $('#menu_export_json_' + graph_id).click(function() {
+			//~ exportData({ type: 'json' });
+		//~ });
+		
+		//This is a correct call to export data in json
+		//~ $("#menu_export_json_"+graph_id)
+			//~ .click(function (event) {
+				//~ event.preventDefault();
+				//~ plot.exportDataJSON();
+		//~ });
+		
+		$('#menu_threshold_' + graph_id).click(function() {
+			datas = new Array();
+
+			if (thresholded) {
+				$.each(data_base, function() {
+					// Prepared to turning series
+					//if(showed[this.id.split('_')[1]]) {
+						datas.push(this);
+					//}
+				});
+				plot = $.plot($('#' + graph_id), data_base,
+					$.extend(true, {}, options, {
+						yaxis: {max: max_draw},
+						xaxis: {
+							min: plot.getAxes().xaxis.min,
+							max: plot.getAxes().xaxis.max
+						}
+					}));
+				thresholded = false;
+			}
+			else {
+				var max_draw = plot.getAxes().yaxis.datamax;
+				// Recalculate the y axis
+				var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
+										red_threshold, extremes, red_up);
+
+				plot = $.plot($('#' + graph_id), data_base,
+				$.extend(true, {}, options, {
+					yaxis: {
+						max: y_recal.max,
+						min: y_recal.min
+					},
+					xaxis: {
+						mode:"time",
+						min: plot.getAxes().xaxis.min,
+						max: plot.getAxes().xaxis.max
+					}
+				}));
+
+				datas = add_threshold (data_base, threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
+										red_threshold, extremes, red_up);
+
+				thresholded = true;
+				
+			}
+						
+			plot.setData(datas);
+			plot.draw();
+
+			//~ plot.setSelection(currentRanges);
+		});
+
+		$('#menu_cancelzoom_' + graph_id).click(function() {
+			// cancel the zooming
+			plot = $.plot($('#' + graph_id), data_base,
+				$.extend(true, {}, options, {
+					//XXX
+					xaxis: {max: max_x },
+					legend: { show: false }
+				}));
+			
+			$('#menu_cancelzoom_' + graph_id)
+				.attr('src', homeurl + '/images/zoom_cross.disabled.png');
+			overview.clearSelection();
+			currentRanges = null;
+			
+			thresholded = false;
+		});
+
+		// Adjust the menu image on top of the plot
+		// If there is no legend we increase top-padding to make space to the menu
+		if (legend.length == 0) {
+			$('#menu_' + graph_id).parent().css('padding-top',
+				$('#menu_' + graph_id).css('height'));
+		}
+
+		// Add bottom margin in the legend
+		// Estimated height of 24 (works fine with this data in all browsers)
+		menu_height = 24;
+		var legend_margin_bottom = parseInt(
+			$('#legend_'+graph_id).css('margin-bottom').split('px')[0]);
+		$('#legend_'+graph_id).css('margin-bottom', '10px');
+		parent_height = parseInt(
+			$('#menu_'+graph_id).parent().css('height').split('px')[0]);
+		adjust_menu(graph_id, plot, parent_height, width);
+	}
+	
+	if (!dashboard) {
+		if (water_mark)
+			set_watermark(graph_id, plot, $('#watermark_image_'+graph_id).attr('src'));
+		adjust_menu(graph_id, plot, parent_height, width);
+	}
+}
\ No newline at end of file
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 8c27ba90a3..1ccaf388b3 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -34,6 +34,8 @@ function include_javascript_dependencies_flot_graph($return = false) {
 		// NOTE: jquery.flot.threshold is not te original file. Is patched to allow multiple thresholds and filled area
 		$output = '
 			<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="' . ui_get_full_url($metaconsole_hack . '/include/graphs/flot/excanvas.js') . '"></script><![endif]-->
+			<script language="javascript" type="text/javascript" src="'.
+				ui_get_full_url($metaconsole_hack . '/include/graphs/flot/jquery.flot.js') .'"></script>
 			<script language="javascript" type="text/javascript" src="'.
 				ui_get_full_url($metaconsole_hack . '/include/graphs/flot/jquery.flot.min.js') .'"></script>
 			<script language="javascript" type="text/javascript" src="'.
@@ -337,7 +339,6 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 			$colors[] = '';
 		}
 	}
-	
 	foreach ($chart_data as $label => $values) {
 		$labels[] = $label;
 		
@@ -501,7 +502,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 		$short_data = false;
 	}
 	
-	
+	//html_debug_print($values);
 	// Javascript code
 	$return .= "<script type='text/javascript'>";
 	$return .= "$(document).ready( function () {";
@@ -553,6 +554,307 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 	
 	return $return;
 }
+
+
+
+
+
+
+
+function flot_area_graph_new (
+	$agent_module_id, $array_data, $color,
+	$legend, $series_type, $date_array,
+	$data_module_graph, $show_elements_graph,
+	$format_graph, $water_mark, $series_suffix_str ) {
+	
+	global $config;
+	
+	include_javascript_dependencies_flot_graph();
+
+	// Get a unique identifier to graph
+	$graph_id = uniqid('graph_');
+	
+
+	//html_debug_print($agent_module_id);
+	//html_debug_print($array_data);
+	//html_debug_print($color);
+	//html_debug_print($legend);
+	//html_debug_print($series_type);
+	//html_debug_print($date_array);
+
+/*	
+	html_debug_print($water_mark);
+	html_debug_print($series_suffix_str);
+*/
+	
+	$background_style = '';
+	switch ($format_graph['background']) {
+		default:
+		case 'white':
+			$background_style = ' background: #fff; ';
+			break;
+		case 'black':
+			$background_style = ' background: #000; ';
+			break;
+		case 'transparent':
+			$background_style = '';
+			break;
+	}
+		
+	// Parent layer
+	$return = "<div class='parent_graph' style='width: " . ($format_graph['width']) . "px; " . $background_style . "'>";
+	// Set some containers to legend, graph, timestamp tooltip, etc.
+	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:" . $format_graph['font_size'] ."pt !important;'></p>";
+	
+	/*
+	if (!empty($threshold_data)) {
+		$yellow_up = $threshold_data['yellow_up'];
+		$red_up = $threshold_data['red_up'];
+		$yellow_inverse = $threshold_data['yellow_inverse'];
+		$red_inverse = $threshold_data['red_inverse'];
+	}
+	else {
+	*/
+
+		$yellow_threshold = $data_module_graph['w_min'];
+		$red_threshold = $data_module_graph['c_min'];
+		// Get other required module datas to draw warning and critical
+		if ($agent_module_id == 0) {
+			$yellow_up = 0;
+			$red_up = 0;
+			$yellow_inverse = false;
+			$red_inverse = false;
+		} else {
+			$yellow_up = $data_module_graph['w_max'];
+			$red_up = $data_module_graph['c_max'];
+			$yellow_inverse = !($data_module_graph['w_inv'] == 0);
+			$red_inverse = !($data_module_graph['c_inv'] == 0);
+		}
+	//}
+	
+	if ($show_elements_graph['menu']) {
+		$return .= menu_graph(
+			$yellow_threshold, $red_threshold, 
+			$yellow_up, $red_up, $yellow_inverse, 
+			$red_inverse, $show_elements_graph['dashboard'], 
+			$show_elements_graph['vconsole'], 
+			$graph_id, $format_graph['width'], 
+			$format_graph['homeurl']
+		);
+	}
+
+	$return .= html_print_input_hidden('line_width_graph', $config['custom_graph_width'], true);
+	$return .= "<div id='timestamp_$graph_id' 
+					class='timestamp_graph' 
+					style='	font-size:".$format_graph['font_size']."pt;
+							display:none; position:absolute; 
+							background:#fff; border: solid 1px #aaa; 
+							padding: 2px; z-index:1000;'></div>";
+	$return .= "<div id='$graph_id' class='";
+
+	if($format_graph['type'] == 'area_simple'){
+		$return .= "noresizevc ";
+	}
+	
+	$return .= "graph" .$format_graph['adapt_key'] ."' 
+				style='	width: ".$format_graph['width']."px; 
+						height: ".$format_graph['height']."px;'></div>";
+
+	if ($show_elements_graph['menu']) {
+		$format_graph['height'] = 100;
+	}
+	else {
+		$format_graph['height'] = 1;
+	}
+	if (!$vconsole)
+		$return .= "<div 	id='overview_$graph_id' 
+							class='overview_graph' 
+							style='	display: none; margin-left:0px; 
+									margin-top:20px; margin-bottom:50px; 
+									width: ".$format_graph['width']."px; 
+									height: ".$format_graph['height'] ."px;'></div>";
+	//XXXXTODO
+	$water_mark = '';
+	if ($water_mark != '') {
+		$return .= "<div id='watermark_$graph_id' style='display:none; position:absolute;'><img id='watermark_image_$graph_id' src='$water_mark'></div>";
+		$watermark = 'true';
+	}
+	else {
+		$watermark = 'false';
+	}
+	
+
+	foreach($series_type as $k => $v){
+		$series_type_unique["data_" . $graph_id . "_" . $k] = $v; 
+	}	
+
+	
+	// Store data series in javascript format
+	$extra_width = (int)($format_graph['width'] / 3);
+	$return .= "<div id='extra_$graph_id' 
+					style='font-size: " . $format_graph['font_size'] . "pt; 
+					display:none; position:absolute; overflow: auto; 
+					max-height: ".($format_graph['height']+50)."px; 
+					width: ".$extra_width."px; 
+					background:#fff; padding: 2px 2px 2px 2px; 
+					border: solid #000 1px;'></div>";
+		
+	if(substr($background_style, -6, 4) == '#fff'){
+		$background_color = "#eee";
+		$legend_color = "#151515";
+	}
+	else if(substr($background_style, -6, 4) == '#000'){
+		$background_color = "#151515";
+		$legend_color = "#BDBDBD";
+	}
+	else{
+		$background_color = "#A4A4A4";
+		$legend_color = "#A4A4A4";
+	}
+
+	//XXXX force_integer TODO
+	$force_integer = 0;
+	
+	// Trick to get translated string from javascript
+	$return .= html_print_input_hidden('unknown_text', __('Unknown'), true);
+
+	if (!isset($config["short_module_graph_data"]))
+		$config["short_module_graph_data"] = true;
+	
+	if ($config["short_module_graph_data"]) {
+		$short_data = true;
+	}
+	else {
+		$short_data = false;
+	}
+	
+	$values              = json_encode($array_data);
+	$legend              = json_encode($legend);
+	$series_type         = json_encode($series_type);
+	$date_array          = json_encode($date_array);
+	$data_module_graph   = json_encode($data_module_graph); 
+	$show_elements_graph = json_encode($show_elements_graph);
+	$format_graph        = json_encode($format_graph);
+
+	// Javascript code
+	$return .= "<script type='text/javascript'>";
+	$return .= "$(document).ready( function () {";
+	$return .= "pandoraFlotAreaNew(" .
+		"'$graph_id', \n" .
+		"JSON.parse('$values'), \n" .
+		"JSON.parse('$legend'), \n" .
+		"'$agent_module_id', \n" .
+		"JSON.parse('$series_type'), \n" .
+		"'$watermark', \n" .
+		"JSON.parse('$date_array'), \n" .
+		"JSON.parse('$data_module_graph'), \n" .
+		"JSON.parse('$show_elements_graph'), \n" .
+		"JSON.parse('$format_graph'), \n" .
+		"$force_integer, \n" .
+		"'$series_suffix_str', \n" .
+		"'$background_color', \n" .
+		"'$legend_color', \n" .
+		"'$short_data'
+	);";
+	$return .= "});";
+	$return .= "</script>";
+	
+	// Parent layer
+	$return .= "</div>";
+	
+	return $return;
+}
+
+function menu_graph(
+	$yellow_threshold, $red_threshold, 
+	$yellow_up, $red_up, $yellow_inverse, 
+	$red_inverse, $dashboard, $vconsole, 
+	$graph_id, $width, $homeurl
+){
+	$return = '';
+	$threshold = false;
+	if ($yellow_threshold != $yellow_up || $red_threshold != $red_up) {
+		$threshold = true;
+	}
+	
+	$nbuttons = 3;
+	
+	if ($threshold) {
+		$nbuttons++;
+	}
+	$menu_width = 25 * $nbuttons + 15;
+	if ( $dashboard == false AND $vconsole == false) {
+		$return .= "<div id='geneal_menu_$graph_id' class='menu_graph' style='
+						width: 30px;
+						height: 250px;
+						left: " . $width . "px;
+						position: absolute;
+						top: 0px;
+						background-color: white;'>";
+		$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='".$homeurl."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
+		if ($threshold) {
+			$return .= " <a href='javascript:'><img id='menu_threshold_$graph_id' src='".$homeurl."images/chart_curve_threshold.png' alt='".__('Warning and Critical thresholds')."' title='".__('Warning and Critical thresholds')."'></a>";
+		}
+		$return .= " <a href='javascript:'>
+			<img id='menu_overview_$graph_id' class='menu_overview' src='" . $homeurl . "images/chart_curve_overview.png' alt='" . __('Overview graph') . "' title='".__('Overview graph')."'></a>";
+		
+		// Export buttons
+		$return .= " <a href='javascript:'><img id='menu_export_csv_$graph_id' src='".$homeurl."images/csv_grey.png' alt='".__('Export to CSV')."' title='".__('Export to CSV')."'></a>";
+		// Button disabled. This feature works, but seems that is not useful enough to the final users.
+		//$return .= " <a href='javascript:'><img id='menu_export_json_$graph_id' src='".$homeurl."images/json.png' alt='".__('Export to JSON')."' title='".__('Export to JSON')."'></a>";
+		
+		$return .= "</div>";
+		$return .= "</div>";
+	}
+
+	if ($dashboard) {
+		$return .= "<div id='geneal_menu_$graph_id' class='menu_graph' style='
+						width: 30px;
+						height: 250px;
+						left: " . $width . "px;
+						position: absolute;
+						top: 0px;
+						background-color: white;'>";
+
+		$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='".$homeurl."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
+	
+		$return .= "</div>";
+		$return .= "</div>";
+	}
+	return $return;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 ///////////////////////////////
 ///////////////////////////////

From 8be776e3ea94c8db46d84671eed38055339145c9 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 19 Feb 2018 09:31:45 +0100
Subject: [PATCH 006/146] fixed errrors graphs

---
 .../include/graphs/flot/pandora.flot.js       | 69 ++++++++-----------
 1 file changed, 29 insertions(+), 40 deletions(-)

diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 9268216dce..f6229209bf 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1535,7 +1535,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 
 	// The first execution, the graph data is the base data
 	datas = data_base;
-	console.log(datas);
+
 	// minTickSize
 	var count_data = datas[0].data.length;
 	var min_tick_pixels = 80;
@@ -1781,7 +1781,6 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 			if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) {
 				$('#timestamp_'+graph_id).show();
 				// If no legend, the timestamp labels are short and with value
-				console.log(y);
 				if (legend.length == 0) {
 					$('#timestamp_'+graph_id).text(labels[j] + ' (' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + ')');
 				}
@@ -1907,7 +1906,6 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 	});
 
 	$('#overview_'+graph_id).bind('plothover',  function (event, pos, item) {
-		console.log('entra22222');
 		plot.setCrosshair({ x: pos.x, y: 0 });
 		currentPlot = overview;
 		latestPosition = pos;
@@ -2402,8 +2400,8 @@ function pandoraFlotAreaNew(
 	else{
 		var unit = '';
 	}
-	console.log(format_graph);
-//XXXX
+
+	//XXXX
 	var type        = 'area_simple';
 	var xaxisname   = 'xaxisname';
 	var labels_long = '';
@@ -2490,31 +2488,34 @@ function pandoraFlotAreaNew(
 		}
 	});
 	
-	max_x = date_array['final_date'];
+	max_x = date_array['final_date'] *1000;
+	console.log(max_x);
 
-console.log(data_module_graph);
-	var yellow_threshold = data_module_graph.w_min;
-	var red_threshold = data_module_graph.c_min;
-	var yellow_up = data_module_graph.w_max;
-	var red_up = data_module_graph.c_max;
-	var yellow_inverse = data_module_graph.w_inv;
-	var red_inverse = data_module_graph.c_inv;
+	var yellow_threshold = parseFloat (data_module_graph.w_min);
+	var red_threshold    = parseFloat (data_module_graph.c_min);
+	var yellow_up 		 = parseFloat (data_module_graph.w_max);
+	var red_up 			 = parseFloat (data_module_graph.c_max);
+	
+	var yellow_inverse   = data_module_graph.w_inv;
+	var red_inverse      = data_module_graph.c_inv;
 	// If threshold and up are the same, that critical or warning is disabled
-	if (yellow_threshold == yellow_up) yellow_inverse = false;
-	if (red_threshold == red_up) red_inverse = false;
+	if (yellow_threshold == yellow_up){
+		yellow_inverse = false;
+	}
+	
+	if (red_threshold == red_up){ 
+		red_inverse = false;
+	}
 
 	//Array with points to be painted
 	var threshold_data = new Array();
 	//Array with some interesting points
 	var extremes = new Array ();
-	
-	yellow_threshold = parseFloat (yellow_threshold);
-	yellow_up = parseFloat (yellow_up);
-	red_threshold = parseFloat (red_threshold);
-	red_up = parseFloat (red_up);
+
 	var yellow_only_min = ((yellow_up == 0) && (yellow_threshold != 0));
-	red_only_min = ((red_up == 0) && (red_threshold != 0));
+	var red_only_min    = ((red_up == 0) && (red_threshold != 0));
 	
+	//color
 	var normalw = '#efe';
 	var warningw = '#ffe';
 	var criticalw = '#fee';
@@ -2525,6 +2526,7 @@ console.log(data_module_graph);
 	if (threshold) {
 		// Warning interval. Change extremes depends on critical interval
 		if (yellow_inverse && red_inverse) {
+			console.log('entra');
 			if (red_only_min && yellow_only_min) {
 				// C: |--------         |
 				// W: |········====     |
@@ -3054,14 +3056,9 @@ console.log(data_module_graph);
 			xaxes: [{
 				axisLabelFontSizePixels: font_size,
 				mode: "time",
-				//min: date_array.start_date * 1000,
-				//max: date_array.final_date * 1000,
-				tickFormatter: xFormatter,
-				// timeformat: "%Y/%m/%d %H:%M:%S",
+				tickFormatter: xFormatter
 			}],
 			yaxes: [{
-				//min: min_check,
-				//max: 5000,
 				tickFormatter: yFormatter,
 				color: '',
 				alignTicksWithAxis: 1,
@@ -3086,7 +3083,7 @@ console.log(data_module_graph);
 	
 	var stack = 0, bars = true, lines = false, steps = false;
 	var plot = $.plot($('#' + graph_id), datas, options);
-	console.log(plot);
+
 	// Re-calculate the graph height with the legend height
 	if (dashboard || vconsole) {
 		var hDiff = $('#'+graph_id).height() - $('#legend_'+graph_id).height();
@@ -3144,8 +3141,7 @@ console.log(data_module_graph);
 		if (menu == 0) {
 			return;
 		}
-		
-		//XXX
+
 		dataInSelection = ranges.xaxis.to - ranges.xaxis.from;
 		//time_format_y = dataInSelection;
 		dataInPlot = plot.getData()[0].data.length;
@@ -3159,12 +3155,11 @@ console.log(data_module_graph);
 				xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to},
 				xaxes: [ {
 						tickFormatter: xFormatter,
-						//XXX
-						//minTickSize: new_steps,
 						color: ''
 						} ],
-				legend: { show: false }
+				legend: { show: true }
 			}));
+
 		if (thresholded) {
 			var zoom_data_threshold = new Array ();
 			
@@ -3212,7 +3207,6 @@ console.log(data_module_graph);
 	function updateLegend() {
 		updateLegendTimeout = null;
 		var pos = latestPosition;
-		console.log(pos);
 
 		var axes = currentPlot.getAxes();
 		if (pos.x < axes.xaxis.min || pos.x > axes.xaxis.max ||
@@ -3224,13 +3218,11 @@ console.log(data_module_graph);
 
 		var i = 0;
 
-		console.log(dataset);
 		for (k = 0; k < dataset.length; k++) {
 
 			// k is the real series counter
 			// i is the series counter without thresholds
 			var series = dataset[k];
-			console.log(series);
 			if (series.label == null) {
 				continue;
 			}
@@ -3411,7 +3403,6 @@ console.log(data_module_graph);
 
 	// Format functions
 	function xFormatter(v, axis) {
-		//console.log('x: '+ v);
 		//XXX
 		/*
 			if ($period <= SECONDS_6HOURS) {
@@ -3560,9 +3551,7 @@ console.log(data_module_graph);
 			// cancel the zooming
 			plot = $.plot($('#' + graph_id), data_base,
 				$.extend(true, {}, options, {
-					//XXX
-					xaxis: {max: max_x },
-					legend: { show: false }
+					legend: { show: true }
 				}));
 			
 			$('#menu_cancelzoom_' + graph_id)

From 4b654bd87df88e9d04e08b4770c4681f36cf6839 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 21 Feb 2018 11:54:24 +0100
Subject: [PATCH 007/146] fixed errors grapgh

---
 pandora_console/include/functions.php         | 156 ++++--
 pandora_console/include/functions_graph.php   | 466 ++++++++++++++----
 .../include/graphs/flot/pandora.flot.js       | 168 ++++---
 .../include/graphs/functions_flot.php         |   2 +-
 4 files changed, 580 insertions(+), 212 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 7f70444ec3..3b5dc766f0 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2792,65 +2792,123 @@ function validate_address($address){
 	return true;
 }
 
-function color_graph_array($series_suffix){
+function color_graph_array($series_suffix, $compare = false){
 	global $config;
 
 	//////////////////////////////////////////////////
 	// Color commented not to restrict serie colors //
 	//////////////////////////////////////////////////
-	$color['event' . $series_suffix] =
-		array(	'border' => '#ff0000',
-				'color' => '#ff0000',
-				'alpha' => CHART_DEFAULT_ALPHA
-		);
-	
-	$color['alert' . $series_suffix] =
-		array(	'border' => '#ff7f00',
-				'color' => '#ff7f00',
-				'alpha' => CHART_DEFAULT_ALPHA
-		);
-
-	$color['unknown' . $series_suffix] =
-		array(	'border' => '#999999',
-				'color' => '#999999',
-				'alpha' => CHART_DEFAULT_ALPHA
-		);
-	
-	$color['no_data'.$series_suffix] =
-		array(	'border' => '#000000',
-				'color' => '#f2c40e',
-				'alpha' => CHART_DEFAULT_ALPHA
+	if(!$compare) {
+		$color['event' . $series_suffix] =
+			array(	'border' => '#ff0000',
+					'color' => '#ff0000',
+					'alpha' => CHART_DEFAULT_ALPHA
 			);
-	
-	$color['max'.$series_suffix] =
-		array(	'border' => '#000000',
-				'color' => $config['graph_color3'],
-				'alpha' => CHART_DEFAULT_ALPHA
-			);
-	
-	$color['sum'.$series_suffix] =
-		array(	'border' => '#000000',
-				'color' => $config['graph_color2'],
-				'alpha' => CHART_DEFAULT_ALPHA
-			);
-	
-	$color['min'.$series_suffix] =
-		array(	'border' => '#000000',
-				'color' => $config['graph_color1'],
-				'alpha' => CHART_DEFAULT_ALPHA
+		
+		$color['alert' . $series_suffix] =
+			array(	'border' => '#ff7f00',
+					'color' => '#ff7f00',
+					'alpha' => CHART_DEFAULT_ALPHA
 			);
 
-	$color['unit'.$series_suffix] =
-		array(	'border' => null,
-				'color' => '#0097BC',
-				'alpha' => 10
+		$color['unknown' . $series_suffix] =
+			array(	'border' => '#999999',
+					'color' => '#999999',
+					'alpha' => CHART_DEFAULT_ALPHA
 			);
+		
+		$color['no_data'.$series_suffix] =
+			array(	'border' => '#000000',
+					'color' => '#f2c40e',
+					'alpha' => CHART_DEFAULT_ALPHA
+				);
+		
+		$color['max'.$series_suffix] =
+			array(	'border' => '#000000',
+					'color' => $config['graph_color3'],
+					'alpha' => CHART_DEFAULT_ALPHA
+				);
+		
+		$color['sum'.$series_suffix] =
+			array(	'border' => '#000000',
+					'color' => $config['graph_color2'],
+					'alpha' => CHART_DEFAULT_ALPHA
+				);
+		
+		$color['min'.$series_suffix] =
+			array(	'border' => '#000000',
+					'color' => $config['graph_color1'],
+					'alpha' => CHART_DEFAULT_ALPHA
+				);
+
+		$color['unit'.$series_suffix] =
+			array(	'border' => null,
+					'color' => '#0097BC',
+					'alpha' => 10
+				);
+		
+		$color['percentil'.$series_suffix] =
+			array(	'border' => '#000000',
+					'color' => '#0097BC',
+					'alpha' => CHART_DEFAULT_ALPHA
+				);
+	}
+	else{
+		$color['event' . $series_suffix] =
+			array(	'border' => '#ff0000',
+					'color' => '#ff66cc',
+					'alpha' => CHART_DEFAULT_ALPHA
+			);
+		
+		$color['alert' . $series_suffix] =
+			array(	'border' => '#ffff00',
+					'color' => '#ffff00',
+					'alpha' => CHART_DEFAULT_ALPHA
+			);
+
+		$color['unknown' . $series_suffix] =
+			array(	'border' => '#999999',
+					'color' => '#E1E1E1',
+					'alpha' => CHART_DEFAULT_ALPHA
+			);
+		
+		$color['no_data'.$series_suffix] =
+			array(	'border' => '#000000',
+					'color' => '#f2c40e',
+					'alpha' => CHART_DEFAULT_ALPHA
+				);
+		
+		$color['max'.$series_suffix] =
+			array(	'border' => '#000000',
+					'color' => $config['graph_color3'],
+					'alpha' => CHART_DEFAULT_ALPHA
+				);
+		
+		$color['sum'.$series_suffix] =
+			array(	'border' => '#000000',
+					'color' => '#99ffff',
+					'alpha' => CHART_DEFAULT_ALPHA
+				);
+		
+		$color['min'.$series_suffix] =
+			array(	'border' => '#000000',
+					'color' => $config['graph_color1'],
+					'alpha' => CHART_DEFAULT_ALPHA
+				);
+
+		$color['unit'.$series_suffix] =
+			array(	'border' => null,
+					'color' => '#0097BC',
+					'alpha' => 10
+				);
+		
+		$color['percentil'.$series_suffix] =
+			array(	'border' => '#000000',
+					'color' => '#003333',
+					'alpha' => CHART_DEFAULT_ALPHA
+				);
 	
-	$color['percentil'.$series_suffix] =
-		array(	'border' => '#000000',
-				'color' => '#0097BC',
-				'alpha' => CHART_DEFAULT_ALPHA
-			);
+	}
 	
 	return $color;
 }
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index fb80f34ec8..c62552f67f 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -227,6 +227,125 @@ function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
 	return $stats;
 }
 
+function grafico_modulo_sparse_data_chart_new (
+		$agent_module_id,
+		$date_array,
+		$data_module_graph,
+		$show_elements_graph,
+		$format_graph,
+		$series_suffix
+	) {
+
+	global $config;
+
+	$data = db_get_all_rows_filter ('tagente_datos',
+						array ('id_agente_modulo' => (int)$agent_module_id,
+								"utimestamp > '". $date_array['start_date']. "'",
+								"utimestamp < '". $date_array['final_date'] . "'",
+								'order' => 'utimestamp ASC'),
+						array ('datos', 'utimestamp'), 'AND', $data_module_graph['history_db']);
+
+	// Get previous data
+	$previous_data = modules_get_previous_data (
+						$agent_module_id, 
+						$date_array['start_date']
+					);
+
+	if ($previous_data !== false) {
+		$previous_data['utimestamp'] = $date_array['start_date'];
+		unset($previous_data['id_agente_modulo']);
+		array_unshift ($data, $previous_data);
+	}
+
+	// Get next data
+	$nextData = modules_get_next_data (
+					$agent_module_id, 
+					$date_array['final_date']
+				);
+
+	if ($nextData !== false) {
+		unset($nextData['id_agente_modulo']);
+		array_push ($data, $nextData);
+	}
+	else if (count ($data) > 0) {
+		// Propagate the last known data to the end of the interval
+		$nextData = array(
+			'datos'      => $data[count($data)-1]['datos'],
+			'utimestamp' => $date_array['final_date'], 
+		);
+		array_push ($data, $nextData);
+	}
+	
+	if ($data === false) {
+		$data = array ();
+	}
+	
+	// Check available data
+	if (count ($data) < 1) {
+		//if (!$graphic_type) {
+			return fs_error_image ();
+		//}
+		//graphic_error ();
+	}
+	$array_data = array();
+	$min_value = PHP_INT_MAX-1;
+	$max_value = PHP_INT_MIN+1;
+	$array_percentil = array();
+
+	foreach ($data as $k => $v) {
+		//convert array
+		if($show_elements_graph['flag_overlapped']){
+			$array_data["sum" . $series_suffix]['data'][$k] = array(
+				($v['utimestamp'] + $date_array['period']  )* 1000,
+				$v['datos']
+			);
+		}
+		else{
+			$array_data["sum" . $series_suffix]['data'][$k] = array(
+				$v['utimestamp'] * 1000,
+				$v['datos']
+			);
+		}
+		
+		//min
+		if($min_value > $v['datos']){
+			$min_value = $v['datos'];
+		}
+		
+		//max
+		if($max_value < $v['datos']){
+			$max_value = $v['datos'];
+		}
+
+		//avg
+		$sum_data += $v['datos'];
+		$count_data++;
+
+		//percentil
+		if (!is_null($show_elements_graph['percentil']) && $show_elements_graph['percentil']) {
+			$array_percentil[] = $v['datos'];
+		}
+	}
+
+	$array_data["sum" . $series_suffix]['min'] = $min_value;
+	$array_data["sum" . $series_suffix]['max'] = $max_value;
+	$array_data["sum" . $series_suffix]['avg'] = $sum_data/$count_data;
+
+	if (!is_null($show_elements_graph['percentil']) && $show_elements_graph['percentil'] && !$show_elements_graph['flag_overlapped']) {
+		$percentil_result = get_percentile($show_elements_graph['percentil'], $array_percentil);
+		$array_data["percentil" . $series_suffix]['data'][0] = array(
+			$date_array['start_date'] * 1000, 
+			$percentil_result
+		);
+		$array_data["percentil" . $series_suffix]['data'][1] = array(
+			$date_array['final_date'] * 1000, 
+			$percentil_result
+		);
+	}
+	return $array_data;
+}
+
+
 function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_index, 
 				$data, $data_i, $previous_data, $resolution, $interval, $period, $datelimit, 
 				$projection, $avg_only = false, $uncompressed_module = false, 
@@ -537,7 +656,8 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
 function grafico_modulo_sparse_data_new(
 	$agent_module_id, $date_array, 
 	$data_module_graph, $show_elements_graph, 
-	$format_graph, $exception_interval_graph ) {
+	$format_graph, $exception_interval_graph,
+	$series_suffix, $str_series_suffix) {
 
 	global $config;
 	global $array_data;
@@ -546,22 +666,30 @@ function grafico_modulo_sparse_data_new(
 	global $legend;
 	global $series_type;
 
-	$series_suffix = 1;
-	
 	if($show_elements_graph['fullscale']){
 		$array_data = fullscale_data_new(
-			$agent_module_id, 
-			$date_array, 
+			$agent_module_id,
+			$date_array,
 			$show_elements_graph['show_unknown'],
-			$show_elements_graph['percentil']
+			$show_elements_graph['percentil'],
+			$series_suffix,
+			$str_series_suffix,
+			$show_elements_graph['flag_overlapped']
 		);
 	}
 	else{
-
+		$array_data = grafico_modulo_sparse_data_chart_new (
+			$agent_module_id,
+			$date_array,
+			$data_module_graph,
+			$show_elements_graph,
+			$format_graph, 
+			$series_suffix
+		);
 	}
 
 	if($show_elements_graph['percentil']){
-		$percentil_value = $array_data['percentil' . $series_suffix]['data'][0][0];
+		$percentil_value = $array_data['percentil' . $series_suffix]['data'][0][1];
 	}
 	else{
 		$percentil_value = 0;
@@ -574,71 +702,119 @@ function grafico_modulo_sparse_data_new(
 		$avg = $array_data['sum'. $series_suffix]['avg'];
 	}
 
-	if(	$show_elements_graph['show_unknown'] &&
-		isset($array_data['unknown' . $series_suffix]) &&
-		is_array($array_data['unknown' . $series_suffix]['data']) ){
-		foreach ($array_data['unknown' . $series_suffix]['data'] as $key => $s_date) {
-			if ($s_date[1] == 1) {
-				$array_data['unknown' . $series_suffix]['data'][$key] = array($s_date[0], $max * 1.05);
-			}
-		}
-	}
-
-	if ($show_elements_graph['show_events']  || 
-		$show_elements_graph['show_alerts'] ) {
+	if(!$show_elements_graph['flag_overlapped']){
 		
-		$events = db_get_all_rows_filter (
-			'tevento',
-			array ('id_agentmodule' => $agent_module_id,
-					"utimestamp > " . $date_array['start_date'],
-					"utimestamp < " . $date_array['final_date'],
-					'order' => 'utimestamp ASC'
-				),
-			false, 
-			'AND',
-			$data_module_graph['history_db']
-		);
-
-		$alerts_array = array();
-		$events_array = array();
-
-		if($events && is_array($events)){
-			$i=0;
-			foreach ($events as $k => $v) {
-				if (strpos($v["event_type"], "alert") !== false){
-					$alerts_array['data'][$i] = array( ($v['utimestamp']*1000) , $max * 1.10);
+		if($show_elements_graph['fullscale']){
+			if(	$show_elements_graph['show_unknown'] &&
+				isset($array_data['unknown' . $series_suffix]) &&
+				is_array($array_data['unknown' . $series_suffix]['data']) ){
+				foreach ($array_data['unknown' . $series_suffix]['data'] as $key => $s_date) {
+					if ($s_date[1] == 1) {
+						$array_data['unknown' . $series_suffix]['data'][$key] = array($s_date[0], $max * 1.05);
+					}
 				}
-				else{
-					$events_array['data'][$i] = array( ($v['utimestamp']*1000) , $max * 1.2);
-				}
-				$i++;
 			}
 		}
+		else{
+			if(	$show_elements_graph['show_unknown'] ) {
+				$unknown_events = db_get_module_ranges_unknown(
+					$agent_module_id, 
+					$date_array['start_date'], 
+					$date_array['final_date'], 
+					$data_module_graph['history_db']
+				);
 
+				if($unknown_events !== false){
+					foreach ($unknown_events as $key => $s_date) {
+						if( isset($s_date['time_from']) ){
+							$array_data['unknown' . $series_suffix]['data'][] = array( 
+								($s_date['time_from'] - 1) * 1000,
+								0
+							);
+							
+							$array_data['unknown' . $series_suffix]['data'][] = array(	
+								$s_date['time_from'] * 1000,
+								$max * 1.05
+							);
+						}
+						else{
+							$array_data['unknown' . $series_suffix]['data'][] = array(	
+								$date_array['start_date'] * 1000,
+								$max * 1.05
+							);
+						}
+						
+						if( isset($s_date['time_to']) ){
+							$array_data['unknown' . $series_suffix]['data'][] = array(
+								$s_date['time_to'] * 1000,
+								$max * 1.05
+							);
+							
+							$array_data['unknown' . $series_suffix]['data'][] = array( 
+								($s_date['time_to'] + 1) * 1000,
+								0
+							);
+						}
+						else{
+							$array_data['unknown' . $series_suffix]['data'][] = array(	
+								$date_array['final_date'] * 1000,
+								$max * 1.05
+							);
+						}
+					}
+				}
+			}
+		}
+		
+		if ($show_elements_graph['show_events']  || 
+			$show_elements_graph['show_alerts'] ) {
+			
+			$events = db_get_all_rows_filter (
+				'tevento',
+				array ('id_agentmodule' => $agent_module_id,
+						"utimestamp > " . $date_array['start_date'],
+						"utimestamp < " . $date_array['final_date'],
+						'order' => 'utimestamp ASC'
+					),
+				false, 
+				'AND',
+				$data_module_graph['history_db']
+			);
 
-		/*
-		// Get the last event after inverval to know if graph start on unknown
-		$prev_event = db_get_row_filter (
-			'tevento',
-			array ('id_agentmodule' => $agent_module_id,
-				"utimestamp <= $datelimit",
-				'order' => 'utimestamp DESC'
-			),
-			false,
-			'AND',
-			$search_in_history_db	
-		);
-		*/
-	}
+			$alerts_array = array();
+			$events_array = array();
 
-	
-	
-	if($show_elements_graph['show_events']){
-		$array_data['event' . $series_suffix] = $events_array;
-	}
+			if($events && is_array($events)){
+				$i=0;
+				foreach ($events as $k => $v) {
+					if (strpos($v["event_type"], "alert") !== false){
+						if($show_elements_graph['flag_overlapped']){
+							$alerts_array['data'][$i] = array( ($v['utimestamp'] + $date_array['period'] *1000) , $max * 1.10);
+						}
+						else{
+							$alerts_array['data'][$i] = array( ($v['utimestamp']*1000) , $max * 1.10);
+						}
+					}
+					else{
+						if($show_elements_graph['flag_overlapped']){
+							$events_array['data'][$i] = array( ($v['utimestamp'] + $date_array['period'] *1000) , $max * 1.2);
+						}
+						else{
+							$events_array['data'][$i] = array( ($v['utimestamp']*1000) , $max * 1.2);
+						}
+					}
+					$i++;
+				}
+			}
+		}
+		
+		if($show_elements_graph['show_events']){
+			$array_data['event' . $series_suffix] = $events_array;
+		}
 
-	if($show_elements_graph['show_alerts']){
-		$array_data['alert' . $series_suffix] = $alerts_array;
+		if($show_elements_graph['show_alerts']){
+			$array_data['alert' . $series_suffix] = $alerts_array;
+		}
 	}
 
 	if ($show_elements_graph['return_data'] == 1) {
@@ -658,11 +834,9 @@ function grafico_modulo_sparse_data_new(
 		$caption = array();
 	}
 
+	//XXX
 	//$graph_stats = get_statwin_graph_statistics($chart, $series_suffix);
-
-
-
-	$color = color_graph_array($series_suffix);
+	$color = color_graph_array($series_suffix, $show_elements_graph['flag_overlapped']);
 
 	foreach ($color as $k => $v) {
 		if(is_array($array_data[$k])){
@@ -1157,23 +1331,101 @@ if($flash_chart && $entra_por){
 	$exception_interval_graph['max_only']       = $max_only;
 	$exception_interval_graph['min_only']       = $min_only;
 	
-	$series_suffix =1;
-	$$series_suffix_str = '';
+	if ($show_elements_graph['compare'] !== false) {
+		$series_suffix = 2;
+		$series_suffix_str = ' (' . __('Previous') . ')';
+
+		$date_array_prev['final_date'] = $date_array['start_date'];
+		$date_array_prev['start_date'] = $date_array['start_date'] - $date_array['period'];
+		$date_array_prev['period']     = $date_array['period'];
+		
+		if ($show_elements_graph['compare'] === 'overlapped') {
+			$show_elements_graph['flag_overlapped'] = 1;
+		}
+		else{
+			$show_elements_graph['flag_overlapped'] = 0;
+		}
+		
+		grafico_modulo_sparse_data_new(	
+			$agent_module_id, $date_array_prev,
+			$data_module_graph, $show_elements_graph,
+			$format_graph, $exception_interval_graph,
+			$series_suffix, $series_suffix_str
+		);
+
+		switch ($show_elements_graph['compare']) {
+			case 'separated':
+			case 'overlapped':
+				// Store the chart calculated
+				$array_data_prev  = $array_data;
+				$legend_prev      = $legend;
+				$series_type_prev = $series_type;
+				$color_prev       = $color;
+				$caption_prev     = $caption;
+				break;
+		}
+	}
+
+	$series_suffix = 1;
+	$series_suffix_str = '';
+	$show_elements_graph['flag_overlapped'] = 0;
 
 	grafico_modulo_sparse_data_new(	
-		$agent_module_id, $date_array, $data_module_graph,
-		$show_elements_graph, $format_graph,
-		$exception_interval_graph 
+		$agent_module_id, $date_array,
+		$data_module_graph, $show_elements_graph,
+		$format_graph, $exception_interval_graph,
+		$series_suffix, $str_series_suffix
 	);
-	
+
+	if($show_elements_graph['compare']){
+		if ($show_elements_graph['compare'] === 'overlapped') {
+			$array_data = array_merge($array_data, $array_data_prev);
+			$legend     = array_merge($legend, $legend_prev);
+			$color      = array_merge($color, $color_prev);
+		}
+	}
+
 	if (empty($array_data)) {
+		//XXXX
 		return graph_nodata_image($width, $height);
 		return '<img src="' . $no_data_image . '" />';
 	}
 
+	//XXX
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
 
-	return 	flot_area_graph_new(
+	if ($show_elements_graph['compare'] === 'separated') {
+		return 	flot_area_graph_new(
+					$agent_module_id,
+					$array_data,
+					$color,
+					$legend,
+					$series_type,
+					$date_array,
+					$data_module_graph,
+					$show_elements_graph,
+					$format_graph,
+					$water_mark,
+					$series_suffix_str
+				) .
+				'<br>'
+				.
+				flot_area_graph_new(
+					$agent_module_id,
+					$array_data_prev,
+					$color,
+					$legend,
+					$series_type,
+					$date_array,
+					$data_module_graph,
+					$show_elements_graph,
+					$format_graph,
+					$water_mark,
+					$series_suffix_str
+				);
+	}
+	else{
+		return flot_area_graph_new(
 				$agent_module_id,
 				$array_data,
 				$color,
@@ -1186,7 +1438,7 @@ if($flash_chart && $entra_por){
 				$water_mark,
 				$series_suffix_str
 			);
-
+	}
 	
 die();
 }
@@ -4898,8 +5150,10 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 
 function fullscale_data_new (
 	$agent_module_id, $date_array, 
-	$show_unknown = 0, $show_percentil = 0 ){
-	
+	$show_unknown = 0, $show_percentil = 0, 
+	$series_suffix, $str_series_suffix = '',
+	$compare = false){
+
 	global $config;
 	$data_uncompress = 
 		db_uncompress_module_data(
@@ -4910,7 +5164,6 @@ function fullscale_data_new (
 
 	$data = array();
 	$previous_data = 0;
-	$series_suffix = 1;
 	$min_value = PHP_INT_MAX-1;
 	$max_value = PHP_INT_MIN+1;
 	$flag_unknown  = 0;
@@ -4920,17 +5173,24 @@ function fullscale_data_new (
 			if (isset($v["type"]) && $v["type"] == 1) { # skip unnecesary virtual data
 				continue;
 			}
-			$real_date = $v['utimestamp'] * 1000; // * 1000 need js utimestam mlsecond
+			if($compare){ // * 1000 need js utimestam mlsecond
+				$real_date = ($v['utimestamp'] + $date_array['period']) * 1000;
+			}
+			else{
+				$real_date = $v['utimestamp'] * 1000;	
+			}
 
 			if ($v["datos"] === NULL) {
 				// Unknown
-				if($flag_unknown){
-					$data["unknown" . $series_suffix]['data'][] = array($real_date , 1);
-				}
-				else{
-					$data["unknown" . $series_suffix]['data'][] = array( ($real_date - 1) , 0);
-					$data["unknown" . $series_suffix]['data'][] = array($real_date , 1);
-					$flag_unknown = 1;
+				if(!$compare){
+					if($flag_unknown){
+						$data["unknown" . $series_suffix]['data'][] = array($real_date , 1);
+					}
+					else{
+						$data["unknown" . $series_suffix]['data'][] = array( ($real_date - 1) , 0);
+						$data["unknown" . $series_suffix]['data'][] = array($real_date , 1);
+						$flag_unknown = 1;
+					}
 				}
 
 				$data["sum" . $series_suffix]['data'][] = array($real_date , $previous_data);
@@ -4946,9 +5206,11 @@ function fullscale_data_new (
 				//normal
 				$previous_data = $v["datos"];
 				$data["sum" . $series_suffix]['data'][] = array($real_date , $v["datos"]);
-				if($flag_unknown){
-					$data["unknown" . $series_suffix]['data'][] = array($real_date , 0);
-					$flag_unknown = 0;
+				if(!$compare){
+					if($flag_unknown){
+						$data["unknown" . $series_suffix]['data'][] = array($real_date , 0);
+						$flag_unknown = 0;
+					}
 				}
 			}
 
@@ -4967,7 +5229,7 @@ function fullscale_data_new (
 			//avg count
 			$count_data++;
 
-			if($show_percentil){
+			if($show_percentil && !$compare){
 				$array_percentil[] = $v["datos"]; 
 			}
 
@@ -4975,13 +5237,25 @@ function fullscale_data_new (
 		}
 	}
 
-	if($show_percentil){
+	if($show_percentil && !$compare){
 		$percentil_result = get_percentile($show_percentil, $array_percentil);
-		$data["percentil" . $series_suffix]['data'][] = array($date_array['start_date'] * 1000 , $percentil_result);
-		$data["percentil" . $series_suffix]['data'][] = array($date_array['final_date'] * 1000 , $percentil_result);
+		if($compare){
+			$data["percentil" . $series_suffix]['data'][] = array( ($date_array['start_date'] + $date_array['period']) * 1000 , $percentil_result);
+			$data["percentil" . $series_suffix]['data'][] = array( ($date_array['final_date'] + $date_array['period']) * 1000 , $percentil_result);
+		}
+		else{
+			$data["percentil" . $series_suffix]['data'][] = array($date_array['start_date'] * 1000 , $percentil_result);
+			$data["percentil" . $series_suffix]['data'][] = array($date_array['final_date'] * 1000 , $percentil_result);
+		}
 	}
 	// Add missed last data
-	$data["sum" . $series_suffix]['data'][] = array($date_array['final_date'] * 1000 , $last_data);
+	if($compare){
+		$data["sum" . $series_suffix]['data'][] = array( ($date_array['final_date'] + $date_array['period']) * 1000 , $last_data);
+	}
+	else{
+		$data["sum" . $series_suffix]['data'][] = array($date_array['final_date'] * 1000 , $last_data);
+	}
+	
 	$data["sum" . $series_suffix]['min'] = $min_value;
 	$data["sum" . $series_suffix]['max'] = $max_value;
 	$data["sum" . $series_suffix]['avg'] = $sum_data/$count_data;
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index f6229209bf..83f459a3ca 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -869,6 +869,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 	yellow_up, red_up, yellow_inverse, red_inverse,
 	series_suffix_str, dashboard, vconsole, xaxisname,background_color,legend_color,
 	short_data) {
+console.log(legend_events);
 
 	var threshold = true;
 	var thresholded = false;
@@ -2282,6 +2283,7 @@ function axis_thresholded (threshold_data, y_min, y_max, red_threshold, extremes
 		normal_down: 0,
 		down: null
 	};
+
 	// Resize the y axis to display all intervals
 	$.each(threshold_data, function() {
 		if (/_up/.test(this.id)){
@@ -2322,14 +2324,12 @@ function axis_thresholded (threshold_data, y_min, y_max, red_threshold, extremes
 			? yaxis_resize['up'] + margin_up_or_down
 			: y_min;
 	}
-	
 	return y;
 }
 function add_threshold (data_base, threshold_data, y_min, y_max,
 						red_threshold, extremes, red_up) {
-	
+
 	var datas = new Array ();
-	
 	$.each(data_base, function() {
 		// Prepared to turning series
 		//if(showed[this.id.split('_')[1]]) {
@@ -2370,9 +2370,7 @@ function add_threshold (data_base, threshold_data, y_min, y_max,
 		}	
 		datas.push(this);
 	});
-	
 	return datas;
-	
 }
 
 function reduceText (text, maxLength) {
@@ -2382,8 +2380,6 @@ function reduceText (text, maxLength) {
 	return str_cut + '...' + text.substr(-firstSlideEnd - 3);
 }
 
-
-
 function pandoraFlotAreaNew(
 	graph_id, values, legend, agent_module_id,
 	series_type, watermark, date_array,
@@ -2391,23 +2387,10 @@ function pandoraFlotAreaNew(
 	format_graph, force_integer, series_suffix_str, 
 	background_color, legend_color, short_data
 ) {
-
-	var threshold = true;
-	var thresholded = false;
-	if(format_graph.unit){
-		var unit = format_graph.unit;
-	}
-	else{
-		var unit = '';
-	}
-
-	//XXXX
-	var type        = 'area_simple';
-	var xaxisname   = 'xaxisname';
-	var labels_long = '';
-	var min_check   = 0;
-	var water_mark = '';
-	
+	console.log(series_suffix_str);
+	console.log('asdasdasdas');
+	//vars
+	var unit        = format_graph.unit ? format_graph.unit : '';
 	var homeurl     = format_graph.homeurl;
 	var font_size   = format_graph.font_size;
 	var font        = format_graph.font;
@@ -2416,6 +2399,27 @@ function pandoraFlotAreaNew(
 	var vconsole    = show_elements_graph.vconsole;
 	var dashboard   = show_elements_graph.dashboard;
 	var menu        = show_elements_graph.menu;
+	var max_x       = date_array['final_date'] *1000;
+
+	//for threshold
+	var threshold        = true;
+	var thresholded      = false;
+	var yellow_threshold = parseFloat (data_module_graph.w_min);
+	var red_threshold    = parseFloat (data_module_graph.c_min);
+	var yellow_up 		 = parseFloat (data_module_graph.w_max);
+	var red_up 			 = parseFloat (data_module_graph.c_max);	
+	var yellow_inverse   = parseInt(data_module_graph.w_inv);
+	var red_inverse      = parseInt(data_module_graph.c_inv);
+
+
+	//XXXX
+	var type        = 'area_simple';
+	var xaxisname   = 'xaxisname';
+	var labels_long = '';
+	var min_check   = 0;
+	var water_mark = '';
+	var legend_events = null;
+	var legend_alerts = null;
 	
 	switch (type) {
 		case 'line_simple':
@@ -2474,7 +2478,7 @@ function pandoraFlotAreaNew(
 			data_base.push({
 				id: 'serie_' + i,
 				data: value.data,
-				label: index,
+				label: index + series_suffix_str,
 				color: value.color,
 				lines: {
 					show: line_show,
@@ -2487,17 +2491,7 @@ function pandoraFlotAreaNew(
 			i++;
 		}
 	});
-	
-	max_x = date_array['final_date'] *1000;
-	console.log(max_x);
-
-	var yellow_threshold = parseFloat (data_module_graph.w_min);
-	var red_threshold    = parseFloat (data_module_graph.c_min);
-	var yellow_up 		 = parseFloat (data_module_graph.w_max);
-	var red_up 			 = parseFloat (data_module_graph.c_max);
-	
-	var yellow_inverse   = data_module_graph.w_inv;
-	var red_inverse      = data_module_graph.c_inv;
+	console.log(series_suffix_str);
 	// If threshold and up are the same, that critical or warning is disabled
 	if (yellow_threshold == yellow_up){
 		yellow_inverse = false;
@@ -2526,7 +2520,6 @@ function pandoraFlotAreaNew(
 	if (threshold) {
 		// Warning interval. Change extremes depends on critical interval
 		if (yellow_inverse && red_inverse) {
-			console.log('entra');
 			if (red_only_min && yellow_only_min) {
 				// C: |--------         |
 				// W: |········====     |
@@ -3032,7 +3025,8 @@ function pandoraFlotAreaNew(
 	if (unit != "") {
 		xaxisname = xaxisname + " (" + unit + ")"
 	}
-	
+
+	var maxticks = date_array['period'] / 3600 /6;
 	var options = {
 			series: {
 				stack: stacked,
@@ -3056,7 +3050,9 @@ function pandoraFlotAreaNew(
 			xaxes: [{
 				axisLabelFontSizePixels: font_size,
 				mode: "time",
-				tickFormatter: xFormatter
+				tickFormatter: xFormatter,
+				tickSize: [maxticks, 'hour'],
+				labelWidth: 70
 			}],
 			yaxes: [{
 				tickFormatter: yFormatter,
@@ -3149,22 +3145,54 @@ function pandoraFlotAreaNew(
 		factor = dataInSelection / dataInPlot;
 
 		new_steps = parseInt(factor * steps);
-
-		plot = $.plot($('#' + graph_id), data_base,
-			$.extend(true, {}, options, {
-				xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to},
-				xaxes: [ {
-						tickFormatter: xFormatter,
-						color: ''
-						} ],
-				legend: { show: true }
-			}));
+		var maxticks_zoom = dataInSelection / 3600000 / 6;
+		flag_caca = 0;
+		if(maxticks_zoom < 0.005){
+			flag_caca = 1;
+			maxticks_zoom = dataInSelection / 60000 / 6;
+			if(maxticks_zoom < 0.005){
+				maxticks_zoom = 1;
+			}
+		}
+		
+		console.log(maxticks_zoom);
+		if(flag_caca == 0){
+			plot = $.plot($('#' + graph_id), data_base,
+				$.extend(true, {}, options, {
+					grid: { borderWidth: 1, hoverable: true, autoHighlight: false},
+					xaxis: { 	min: ranges.xaxis.from, 
+								max: ranges.xaxis.to
+							},
+					xaxes: [ {
+							mode: "time",
+							tickFormatter: xFormatter,
+							tickSize: [maxticks_zoom, 'hour']
+							} ],
+					legend: { show: true }
+				}));
+		}
+		else{
+			plot = $.plot($('#' + graph_id), data_base,
+				$.extend(true, {}, options, {
+					grid: { borderWidth: 1, hoverable: true, autoHighlight: false},
+					xaxis: { 	min: ranges.xaxis.from, 
+								max: ranges.xaxis.to
+							},
+					xaxes: [ {
+							mode: "time",
+							tickFormatter: xFormatter,
+							tickSize: [maxticks_zoom, 'minute']
+							} ],
+					legend: { show: true }
+				}));
+		}
 
 		if (thresholded) {
 			var zoom_data_threshold = new Array ();
 			
 			var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
 									red_threshold, extremes, red_up);
+
 			plot = $.plot($('#' + graph_id), data_base,
 			$.extend(true, {}, options, {
 				yaxis: {
@@ -3299,7 +3327,7 @@ function pandoraFlotAreaNew(
 				$('#timestamp_'+graph_id).hide();
 			}
 
-			var label_aux = series.label;
+			var label_aux = series.label + series_suffix_str;
 
 			// The graphs of points type and unknown graphs will dont be updated
 
@@ -3393,7 +3421,7 @@ function pandoraFlotAreaNew(
 		dataset = plot.getData();
 		for (i = 0; i < dataset.length; ++i) {
 			var series = dataset[i];
-			var label_aux = series.label;
+			var label_aux = series.label + series_suffix_str;
 			$('#legend_' + graph_id + ' .legendLabel')
 				.eq(i).html(label_aux);
 		}
@@ -3429,10 +3457,17 @@ function pandoraFlotAreaNew(
 		var result_date_format = 0;
 		
 	//	if(time_format_y > 86400000){ //DAY
-
+			var monthNames = [	
+				"Jan", "Feb", "Mar",
+				"Apr", "May", "Jun",
+				"Jul", "Aug", "Sep",
+				"Oct", "Nov", "Dec"
+			];
+			
 			result_date_format = 
-								(d.getDate() <10?'0':'') + d.getDate() + "/" +
-								(d.getMonth()<9?'0':'') + (d.getMonth() + 1) + "/" + 
+								(d.getDate() <10?'0':'') + d.getDate() + " " +
+								//(d.getMonth()<9?'0':'') + (d.getMonth() + 1) + "/" + 
+								monthNames[d.getMonth()] + " " +
 								d.getFullYear() + "\n" + 
 								(d.getHours()<10?'0':'') + d.getHours() + ":" + 
 								(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + 
@@ -3446,7 +3481,7 @@ function pandoraFlotAreaNew(
 		}
 	*/
 		//extra_css = '';
-		return '<div class='+font+' style="transform: rotate(-15deg); -ms-transform:rotate(-15deg); -moz-transform:rotate(-15deg); -webkit-transform:rotate(-15deg); -o-transform:rotate(-15deg); font-size:'+font_size+'pt; margin-top:15px;">'+result_date_format+'</div>';
+		return '<div class='+font+' style="font-size:'+font_size+'pt; margin-top:15px;">'+result_date_format+'</div>';
 	}
 
 	function yFormatter(v, axis) {
@@ -3462,6 +3497,7 @@ function pandoraFlotAreaNew(
 	}
 
 	function lFormatter(v, item) {
+		console.log(v);
 		return '<div style="font-size:'+font_size+'pt;">'+v+'</div>';
 		// Prepared to turn series with a checkbox
 		//return '<div style=color:;font-size:'+font_size+'pt><input type="checkbox" id="' + graph_id + '_' + item.id +'" checked="checked" class="check_serie_'+graph_id+'">'+v+'</div>';
@@ -3522,17 +3558,17 @@ function pandoraFlotAreaNew(
 										red_threshold, extremes, red_up);
 
 				plot = $.plot($('#' + graph_id), data_base,
-				$.extend(true, {}, options, {
-					yaxis: {
-						max: y_recal.max,
-						min: y_recal.min
-					},
-					xaxis: {
-						mode:"time",
-						min: plot.getAxes().xaxis.min,
-						max: plot.getAxes().xaxis.max
-					}
-				}));
+						$.extend(true, {}, options, {
+							yaxis: {
+								max: y_recal.max,
+								min: y_recal.min
+							},
+							xaxis: {
+								//mode:"time",
+								//min: plot.getAxes().xaxis.min,
+								//max: plot.getAxes().xaxis.max
+							}
+						}));
 
 				datas = add_threshold (data_base, threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
 										red_threshold, extremes, red_up);
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 1ccaf388b3..38e5f5ff4a 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -586,7 +586,7 @@ function flot_area_graph_new (
 	html_debug_print($water_mark);
 	html_debug_print($series_suffix_str);
 */
-	
+	//html_debug_print($series_suffix_str);
 	$background_style = '';
 	switch ($format_graph['background']) {
 		default:

From 688acb8a4b1f3dcc1460253da071598ab2e96984 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 23 Feb 2018 14:31:00 +0100
Subject: [PATCH 008/146] fixed error graphs

---
 pandora_console/include/functions.php         | 256 ++---------
 pandora_console/include/functions_graph.php   |  11 +-
 .../include/graphs/flot/pandora.flot.js       | 435 +++++++++---------
 .../include/graphs/functions_flot.php         |  12 +-
 4 files changed, 263 insertions(+), 451 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 3b5dc766f0..b2b3d532ac 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2919,225 +2919,53 @@ function legend_graph_array(
 	$series_suffix_str,
 	$format_graph,
 	$show_elements_graph,
-	$percentil_value){
-
+	$percentil_value,
+	$data_module_graph){
+	
+	global $config;
+	global $legend;
 	$unit = $format_graph['unit'];
 
-	if ($show_elements_graph['show_events']) {
-		$legend['event'.$series_suffix_str] = __('Events').$series_suffix_str;
+	$legend['sum'.$series_suffix] = 
+		$data_module_graph['module_name'] . ' ' .
+		__('Min:') . remove_right_zeros(
+			number_format(
+				$min, 
+				$config['graph_precision']
+			)
+		)  . ' ' . 
+		__('Max:') . remove_right_zeros(
+			number_format(
+				$max, 
+				$config['graph_precision']
+			)
+		) . ' ' . 
+		_('Avg:') . remove_right_zeros(
+			number_format(
+				$max, 
+				$config['graph_precision']
+			)
+		) . ' ' . $series_suffix_str;
+
+	if($show_elements_graph['show_unknown']){
+		$legend['unknown'.$series_suffix]   = __('Unknown') . ' ' . $series_suffix_str;
 	}
-	if ($show_elements_graph['show_alerts']) {
-		$legend['alert'.$series_suffix] = __('Alerts').$series_suffix_str;
+	if($show_elements_graph['show_events']){
+		$legend['event'.$series_suffix]     = __('Events') . ' ' . $series_suffix_str;
+	}
+	if($show_elements_graph['show_alerts']){
+		$legend['alert'.$series_suffix]     = __('Alert') . ' ' . $series_suffix_str;
+	}
+	if($show_elements_graph['percentil']){
+		$legend['percentil'.$series_suffix] = __('Percentil') . ' Value: ' . 
+		remove_right_zeros(
+			number_format(
+				$percentil_value, 
+				$config['graph_precision']
+			)
+		) . ' ' . $series_suffix_str;
 	}
 
-	if ($show_elements_graph['vconsole']) {
-		$legend['sum'.$series_suffix] = 
-			__('Last') . ': ' . 
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['last'], 
-					$config['graph_precision']
-				)
-			) . ($unit ? ' ' . $unit : '') . ' ; '. 
-			__('Avg') . ': ' . 
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['avg'],
-					$config['graph_precision']
-					)
-				) . ($unit ? ' ' . $unit : ''
-			);
-	}
-	else if (	$show_elements_graph['dashboard'] && 
-				!$show_elements_graph['avg_only']	) {
-		
-		$legend['max'.$series_suffix] = 
-			__('Max').$series_suffix_str.': '.__('Avg').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['max']['avg'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Max').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['max']['max'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Min').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['max']['min'],
-					$config['graph_precision']
-				)
-			).' '.$unit;
-			
-		$legend['sum'.$series_suffix] = 
-			__('Avg').$series_suffix_str.': '.__('Avg').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['avg'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Max').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['max'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Min').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['min'],
-					$config['graph_precision']
-				)
-			).' '.$unit;
-
-		$legend['min'.$series_suffix] = 
-			__('Min').$series_suffix_str.': '.__('Avg').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['min']['avg'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Max').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['min']['max'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Min').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['min']['min'],
-					$config['graph_precision']
-				)
-			).' '.$unit;
-	}
-	else if ($show_elements_graph['dashboard']) {
-		$legend['sum'.$series_suffix] =
-			__('Last') . ': ' .
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['last'],
-					$config['graph_precision']
-				)
-			) . ($unit ? ' ' . $unit : '') . ' ; '.
-			__('Avg') . ': ' . 
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['avg'],
-					$config['graph_precision']
-				)
-			) . ($unit ? ' ' . $unit : '');
-	}
-	else if (!$show_elements_graph['avg_only'] && 
-			!$show_elements_graph['fullscale']) {
-		
-		$legend['max'.$series_suffix] = 
-			__('Max').$series_suffix_str.': '.__('Avg').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['max']['avg'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Max').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['max']['max'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Min').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['max']['min'],
-					$config['graph_precision']
-				)
-			).' '.$unit;
-		
-		$legend['sum'.$series_suffix] = 
-			__('Avg').$series_suffix_str.': '.
-			__('Avg').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['avg'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Max').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['max'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Min').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['min'],
-					$config['graph_precision']
-				)
-			).' '.$unit;
-		
-		$legend['min'.$series_suffix] =
-			__('Min').$series_suffix_str.': '.
-			__('Avg').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['min']['avg'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Max').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['min']['max'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Min').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['min']['min'],
-					$config['graph_precision']
-				)
-			).' '.$unit;
-	}
-	else if ($show_elements_graph['fullscale']){
-		$legend['sum'.$series_suffix] = 
-			__('Data').$series_suffix_str.': ';
-	}
-	else {
-		$legend['sum'.$series_suffix] = 
-			__('Avg').$series_suffix_str.': '.
-			__('Avg').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['avg'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.
-			__('Max').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['max'],
-					$config['graph_precision']
-				)
-			).' '.$unit.' ; '.__('Min').': '.
-			remove_right_zeros(
-				number_format(
-					$graph_stats['sum']['min'],
-					$config['graph_precision']
-				)
-			).' '.$unit;
-	}
-
-	if ($show_elements_graph['show_unknown']) {
-		$legend['unknown'.$series_suffix] = 
-			__('Unknown').$series_suffix_str;	
-	}
-
-	if (!is_null($show_elements_graph['percentil']) && 
-		$show_elements_graph['percentil']) {
-		$legend['percentil'.$series_suffix] =
-			__('Percentile %dº', $percentil) . $series_suffix_str . " (" . $percentil_value . " " . $unit . ") ";
-	}
 	return $legend;
 }
 ?>
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index c62552f67f..012196c8ad 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -844,13 +844,14 @@ function grafico_modulo_sparse_data_new(
 		}
 	}
 
-	$legend = legend_graph_array(
+	legend_graph_array(
 		$max, $min, $avg,
 		$series_suffix,
-		$series_suffix_str,
+		$str_series_suffix,
 		$format_graph,
 		$show_elements_graph,
-		$percentil_value
+		$percentil_value,
+		$data_module_graph
 	);
 
 	$series_type['event'.$series_suffix] = 'points';
@@ -862,8 +863,7 @@ function grafico_modulo_sparse_data_new(
 	else{
 		$series_type['sum'.$series_suffix] = 'area';
 	}
-	$series_type['percentil' . $series_suffix] = 'line';
-	
+	$series_type['percentil' . $series_suffix] = 'percentil';
 }
 
 function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
@@ -1034,7 +1034,6 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
 			graphic_error ();
 		}
 		
-
 		// Data iterator
 		$data_i = 0;
 		
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 83f459a3ca..968c0d7600 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -869,7 +869,6 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 	yellow_up, red_up, yellow_inverse, red_inverse,
 	series_suffix_str, dashboard, vconsole, xaxisname,background_color,legend_color,
 	short_data) {
-console.log(legend_events);
 
 	var threshold = true;
 	var thresholded = false;
@@ -2121,23 +2120,26 @@ console.log(legend_events);
 }
 
 function adjust_menu(graph_id, plot, parent_height, width) {
+	/*
 	if ($('#'+graph_id+' .xAxis .tickLabel').eq(0).css('width') != undefined) {
 		left_ticks_width = $('#'+graph_id+' .xAxis .tickLabel').eq(0).css('width').split('px')[0];
 	}
 	else {
 		left_ticks_width = 0;
 	}
-
+	*/
 	var parent_height_new = 0;
 
 	var legend_height = parseInt($('#legend_'+graph_id).css('height').split('px')[0]) + parseInt($('#legend_'+graph_id).css('margin-top').split('px')[0]);
+	
+	/*
 	if ($('#overview_'+graph_id).css('display') == 'none') {
 		overview_height = 0;
 	}
 	else {
 		overview_height = parseInt($('#overview_'+graph_id).css('height').split('px')[0]) + parseInt($('#overview_'+graph_id).css('margin-top').split('px')[0]);
 	}
-
+	*/
 	var menu_height = '25';
 
 	if ($('#menu_'+graph_id).height() != undefined && $('#menu_'+graph_id).height() > 20) {
@@ -2223,7 +2225,7 @@ function adjust_left_width_canvas(adapter_id, adapted_id) {
 
 
 function update_left_width_canvas(graph_id) {
-	$('#overview_'+graph_id).width($('#'+graph_id).width() - 30);
+	$('#overview_'+graph_id).width($('#'+graph_id).width());
 	$('#overview_'+graph_id).css('margin-left', $('#'+graph_id+' .yAxis .tickLabel').width());
 }
 
@@ -2387,19 +2389,18 @@ function pandoraFlotAreaNew(
 	format_graph, force_integer, series_suffix_str, 
 	background_color, legend_color, short_data
 ) {
-	console.log(series_suffix_str);
-	console.log('asdasdasdas');
-	//vars
-	var unit        = format_graph.unit ? format_graph.unit : '';
-	var homeurl     = format_graph.homeurl;
-	var font_size   = format_graph.font_size;
-	var font        = format_graph.font;
-	var width       = format_graph.width;
-	var height      = format_graph.height;
-	var vconsole    = show_elements_graph.vconsole;
-	var dashboard   = show_elements_graph.dashboard;
-	var menu        = show_elements_graph.menu;
-	var max_x       = date_array['final_date'] *1000;
+	console.log(legend);
+	//diferents vars
+	var unit      = format_graph.unit ? format_graph.unit : '';
+	var homeurl   = format_graph.homeurl;
+	var font_size = format_graph.font_size;
+	var font      = format_graph.font;
+	var width     = format_graph.width;
+	var height    = format_graph.height;
+	var vconsole  = show_elements_graph.vconsole;
+	var dashboard = show_elements_graph.dashboard;
+	var menu      = show_elements_graph.menu;
+	var max_x     = date_array['final_date'] *1000;
 
 	//for threshold
 	var threshold        = true;
@@ -2408,70 +2409,73 @@ function pandoraFlotAreaNew(
 	var red_threshold    = parseFloat (data_module_graph.c_min);
 	var yellow_up 		 = parseFloat (data_module_graph.w_max);
 	var red_up 			 = parseFloat (data_module_graph.c_max);	
-	var yellow_inverse   = parseInt(data_module_graph.w_inv);
-	var red_inverse      = parseInt(data_module_graph.c_inv);
+	var yellow_inverse   = parseInt   (data_module_graph.w_inv);
+	var red_inverse      = parseInt   (data_module_graph.c_inv);
 
 
-	//XXXX
-	var type        = 'area_simple';
-	var xaxisname   = 'xaxisname';
-	var labels_long = '';
-	var min_check   = 0;
-	var water_mark = '';
+	//XXXX ver que hay que hacer
+	var type          = 'area_simple';
+	//var xaxisname     = 'xaxisname';
+	
+	var labels_long   = '';
+	var min_check     = 0;
+	var water_mark    = '';
+	
 	var legend_events = null;
 	var legend_alerts = null;
 	
 	switch (type) {
 		case 'line_simple':
 			stacked = null;
-			filled = false;
+			filled  = false;
 			break;
 		case 'line_stacked':
 			stacked = 'stack';
-			filled = false;
+			filled  = false;
 			break;
 		case 'area_simple':
 			stacked = null;
-			filled = true;
+			filled  = true;
 			break;
 		case 'area_stacked':
 			stacked = 'stack';
-			filled = true;
+			filled  = true;
 			break;
 	}
 
-	var datas = new Array();
+	var datas     = new Array();
 	var data_base = new Array();
-	var data2 = new Array();
-	i=0;
 	var lineWidth = $('#hidden-line_width_graph').val() || 1;
+	
+	i=0;
 	$.each(values, function (index, value) {
 		if (typeof value.data !== "undefined") {
 			switch (series_type[index]) {
 				case 'area':
-					line_show = true;
+					line_show   = true;
 					points_show = false; // XXX - false
-					filled = 0.2;
+					filled      = 0.2;
 					steps_chart = false;
 					break;
+				case 'percentil':
 				case 'line':
 				default:
-					line_show = true;
+					line_show   = true;
 					points_show = false;
-					filled = false;
+					filled      = false;
 					steps_chart = false;
 					break;
 				case 'points':
-					line_show = false;
+					line_show   = false;
 					points_show = true;
-					filled = false;
+					filled      = false;
 					steps_chart = false
 					break;
 				case 'unknown':
 				case 'boolean':
-					line_show = true;
+					line_show   = true;
 					points_show = false;
-					filled = true;
+					filled      = true;
 					steps_chart = true;
 					break;
 			}
@@ -2491,7 +2495,7 @@ function pandoraFlotAreaNew(
 			i++;
 		}
 	});
-	console.log(series_suffix_str);
+
 	// If threshold and up are the same, that critical or warning is disabled
 	if (yellow_threshold == yellow_up){
 		yellow_inverse = false;
@@ -2510,12 +2514,12 @@ function pandoraFlotAreaNew(
 	var red_only_min    = ((red_up == 0) && (red_threshold != 0));
 	
 	//color
-	var normalw = '#efe';
-	var warningw = '#ffe';
+	var normalw   = '#efe';
+	var warningw  = '#ffe';
 	var criticalw = '#fee';
-	var normal = '#0f0';
-	var warning = '#ff0';
-	var critical = '#f00';
+	var normal    = '#0f0';
+	var warning   = '#ff0';
+	var critical  = '#f00';
 
 	if (threshold) {
 		// Warning interval. Change extremes depends on critical interval
@@ -3022,18 +3026,19 @@ function pandoraFlotAreaNew(
 	var count_data = datas[0].data.length;
 	var min_tick_pixels = 80;
 	
-	if (unit != "") {
-		xaxisname = xaxisname + " (" + unit + ")"
-	}
-
 	var maxticks = date_array['period'] / 3600 /6;
 	var options = {
 			series: {
 				stack: stacked,
 				shadowSize: 0.1
 			},
-			crosshair: { mode: 'xy' },
-			selection: { mode: 'x', color: '#777' },
+			crosshair: { 
+				mode: 'xy'
+			},
+			selection: { 
+				mode: 'x',
+				color: '#777' 
+			},
 			export: {
 				export_data: true,
 				labels_long: labels_long,
@@ -3062,7 +3067,6 @@ function pandoraFlotAreaNew(
 				position: 'left',
 				font: font,
 				reserveSpace: true,
-				
 			}],
 			legend: {
 				position: 'se',
@@ -3077,7 +3081,11 @@ function pandoraFlotAreaNew(
 		options.selection = false;
 	}
 	
-	var stack = 0, bars = true, lines = false, steps = false;
+	var stack = 0,
+		bars = true,
+		lines = false,
+		steps = false;
+
 	var plot = $.plot($('#' + graph_id), datas, options);
 
 	// Re-calculate the graph height with the legend height
@@ -3114,20 +3122,39 @@ function pandoraFlotAreaNew(
 		var overview = $.plot($('#overview_'+graph_id),datas, {
 			series: {
 				stack: stacked,
-				lines: { show: true, lineWidth: 1 },
+				lines: { 
+					show: true,
+					lineWidth: 1
+				},
 				shadowSize: 0
 			},
-			grid: { borderWidth: 1, hoverable: true, autoHighlight: false},
-			xaxis: { },
-				xaxes: [ {
-					tickFormatter: xFormatter,
-					minTickSize: steps,
-					color: ''
-					} ],
-			yaxis: {ticks: [], autoscaleMargin: 0.1 },
-			selection: {mode: 'x', color: '#777' },
-			legend: {show: false},
-			crosshair: {mode: 'x'}
+			grid: {
+				borderWidth: 1,
+				borderColor: '#C1C1C1',
+				hoverable: true,
+				autoHighlight: false
+			},
+			xaxes: [ {
+				axisLabelFontSizePixels: font_size,
+				mode: "time",
+				tickFormatter: xFormatter,
+				tickSize: [maxticks, 'hour'],
+				labelWidth: 70,
+			} ],
+			yaxis: {
+				ticks: [], 
+				autoscaleMargin: 0.1
+			},
+			selection: {
+				mode: 'x', 
+				color: '#777'
+			},
+			legend: {
+				show: false
+			},
+			crosshair: {
+				mode: 'x'
+			}
 		});
 	}
 	// Connection between plot and miniplot
@@ -3139,53 +3166,35 @@ function pandoraFlotAreaNew(
 		}
 
 		dataInSelection = ranges.xaxis.to - ranges.xaxis.from;
-		//time_format_y = dataInSelection;
-		dataInPlot = plot.getData()[0].data.length;
 
-		factor = dataInSelection / dataInPlot;
-
-		new_steps = parseInt(factor * steps);
 		var maxticks_zoom = dataInSelection / 3600000 / 6;
-		flag_caca = 0;
-		if(maxticks_zoom < 0.005){
-			flag_caca = 1;
+		if(maxticks_zoom < 0.001){
 			maxticks_zoom = dataInSelection / 60000 / 6;
-			if(maxticks_zoom < 0.005){
-				maxticks_zoom = 1;
+			if(maxticks_zoom < 0.001){
+				maxticks_zoom = 0;
 			}
 		}
-		
-		console.log(maxticks_zoom);
-		if(flag_caca == 0){
-			plot = $.plot($('#' + graph_id), data_base,
-				$.extend(true, {}, options, {
-					grid: { borderWidth: 1, hoverable: true, autoHighlight: false},
-					xaxis: { 	min: ranges.xaxis.from, 
-								max: ranges.xaxis.to
-							},
-					xaxes: [ {
-							mode: "time",
-							tickFormatter: xFormatter,
-							tickSize: [maxticks_zoom, 'hour']
-							} ],
-					legend: { show: true }
-				}));
-		}
-		else{
-			plot = $.plot($('#' + graph_id), data_base,
-				$.extend(true, {}, options, {
-					grid: { borderWidth: 1, hoverable: true, autoHighlight: false},
-					xaxis: { 	min: ranges.xaxis.from, 
-								max: ranges.xaxis.to
-							},
-					xaxes: [ {
-							mode: "time",
-							tickFormatter: xFormatter,
-							tickSize: [maxticks_zoom, 'minute']
-							} ],
-					legend: { show: true }
-				}));
-		}
+
+		plot = $.plot($('#' + graph_id), data_base,
+			$.extend(true, {}, options, {
+				grid: { 
+					borderWidth: 1, 
+					hoverable: true, 
+					autoHighlight: true
+				},
+				xaxis: { 	
+					min: ranges.xaxis.from, 
+					max: ranges.xaxis.to
+				},
+				xaxes: [{
+					mode: "time",
+					tickFormatter: xFormatter,
+					tickSize: [maxticks_zoom, 'hour']
+				}],
+				legend: { 
+					show: true 
+				}
+		}));
 
 		if (thresholded) {
 			var zoom_data_threshold = new Array ();
@@ -3204,8 +3213,10 @@ function pandoraFlotAreaNew(
 					max: plot.getAxes().xaxis.max
 				}
 			}));
+
 			zoom_data_threshold = add_threshold (data_base, threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
 										red_threshold, extremes, red_up);
+			
 			plot.setData(zoom_data_threshold);
 			plot.draw();
 		}
@@ -3224,47 +3235,79 @@ function pandoraFlotAreaNew(
 			plot.setSelection(ranges);
 	});
 
-	var legends = $('#legend_' + graph_id + ' .legendLabel');
-
 	var updateLegendTimeout = null;
-	var latestPosition = null;
-	var currentPlot = null;
-	var currentRanges = null;
+	var latestPosition      = null;
+	var currentPlot         = null;
+	var currentRanges       = null;
 
 	// Update legend with the data of the plot in the mouse position
 	function updateLegend() {
+		console.log(currentPlot);
 		updateLegendTimeout = null;
 		var pos = latestPosition;
-
 		var axes = currentPlot.getAxes();
 		if (pos.x < axes.xaxis.min || pos.x > axes.xaxis.max ||
 			pos.y < axes.yaxis.min || pos.y > axes.yaxis.max) {
 			return;
 		}
 
-		var j, dataset = currentPlot.getData();
+		$('#timestamp_'+graph_id).show();
+				
+		var d = new Date(pos.x);
+		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() + "\n" + 
+						(d.getHours()<10?'0':'') + d.getHours() + ":" + 
+						(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + 
+						(d.getSeconds()<10?'0':'') + d.getSeconds();
 
+		$('#timestamp_'+graph_id).text(date_format);
+
+		var timesize   = $('#timestamp_'+graph_id).width();
+
+		dataset = currentPlot.getData();
+
+		var timenewpos = dataset[0].xaxis.p2c(pos.x)+$('.yAxis>div').eq(0).width();
+		var canvaslimit = $('#'+graph_id).width();
+		
+		
+		$('#timestamp_'+graph_id).css('top', currentPlot.offset().top - $('#timestamp_'+graph_id).height()*2.5);
+	
+
+		if (timesize+timenewpos > canvaslimit) {
+			$('#timestamp_'+graph_id).css('left', timenewpos - timesize);
+		}
+		else {
+			$('#timestamp_'+graph_id).css('left', timenewpos);
+		}
+
+		var dataset = currentPlot.getData();
 		var i = 0;
-
 		for (k = 0; k < dataset.length; k++) {
-
 			// k is the real series counter
 			// i is the series counter without thresholds
 			var series = dataset[k];
 			if (series.label == null) {
 				continue;
 			}
-
+			
 			// find the nearest points, x-wise
-			for (j = 0; j < series.data.length; ++j)
+			for (j = 0; j < series.data.length; ++j){
 				if (series.data[j][0] > pos.x) {
 					break;
 				}
-			if(series.data[j]){
-				var x = series.data[j][0];
-				var y = series.data[j][1];
+
+				if(series.data[j]){
+					var y = series.data[j][1];
+				}
 			}
-			
 
 			var how_bigger = "";
 			if (y > 1000000) {
@@ -3284,57 +3327,18 @@ function pandoraFlotAreaNew(
 				y = y / 1000;	
 			}
 
-			if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) {
-				$('#timestamp_'+graph_id).show();
-				// If no legend, the timestamp labels are short and with value
-				if (legend.length == 0) {
-					$('#timestamp_'+graph_id).text(labels[j] + ' (' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + ')');
-				}
-				else {
-					var d = new Date(x);
-
-					date_format =	(d.getDate() <10?'0':'') + d.getDate() + "/" +
-									(d.getMonth()<9?'0':'') + (d.getMonth() + 1) + "/" + 
-									d.getFullYear() + "\n" + 
-									(d.getHours()<10?'0':'') + d.getHours() + ":" + 
-									(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + 
-									(d.getSeconds()<10?'0':'') + d.getSeconds();
-
-					$('#timestamp_'+graph_id).text(date_format);
-				}
-				//$('#timestamp_'+graph_id).css('top', plot.offset().top-$('#timestamp_'+graph_id).height()*1.5);
-
-				var timesize = $('#timestamp_'+graph_id).width();
-
-				if (currentRanges != null) {
-					dataset = plot.getData();
-				}
-
-				var timenewpos = dataset[0].xaxis.p2c(pos.x)+$('.yAxis>div').eq(0).width();
-
-				var canvaslimit = plot.width();
-
-				if (timesize+timenewpos > canvaslimit) {
-					$('#timestamp_'+graph_id).css('left', timenewpos - timesize);
-					$('#timestamp_'+graph_id).css('top', 50);
-				}
-				else {
-					$('#timestamp_'+graph_id).css('left', timenewpos);
-					$('#timestamp_'+graph_id).css('top', 50);
-				}
-			}
-			else {
-				$('#timestamp_'+graph_id).hide();
-			}
-
-			var label_aux = series.label + series_suffix_str;
+			var label_aux = legend[series.label] + series_suffix_str;
 
 			// The graphs of points type and unknown graphs will dont be updated
-
-			serie_types = new Array();
-			if (serie_types[i] != 'points' && series.label != $('#hidden-unknown_text').val()) {
+			if (series_type[dataset[k]["label"]] != 'points' && 
+				series_type[dataset[k]["label"]] != 'unknown' &&
+				series_type[dataset[k]["label"]] != 'percentil'
+			) {
 				$('#legend_' + graph_id + ' .legendLabel')
-					.eq(i).html(label_aux +	'= ' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + how_bigger + ' ' + unit);
+					.eq(i).html(label_aux +	' value = ' + 
+					(short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + 
+					how_bigger + ' ' + unit
+				);
 			}
 
 			$('#legend_' + graph_id + ' .legendLabel')
@@ -3345,20 +3349,30 @@ function pandoraFlotAreaNew(
 
 			$('#legend_' + graph_id + ' .legendLabel')
 				.eq(i).css('font-family',font+'Font');
-
+			
 			i++;
 		}
 	}
 
 	// Events
+	$('#overview_' + graph_id).bind('plothover',  function (event, pos, item) {
+		plot.setCrosshair({ x: pos.x, y: 0 });
+		currentPlot = plot;
+		latestPosition = pos;
+		console.log('entra');
+		if (!updateLegendTimeout) {
+			updateLegendTimeout = setTimeout(updateLegend, 50);
+		}
+	});
+
 	$('#' + graph_id).bind('plothover',  function (event, pos, item) {
 		overview.setCrosshair({ x: pos.x, y: 0 });
 		currentPlot = plot;
 		latestPosition = pos;
+		console.log('entra 2');
 		if (!updateLegendTimeout) {
 			updateLegendTimeout = setTimeout(updateLegend, 50);
 		}
-
 	});
 
 	$('#' + graph_id).bind("plotclick", function (event, pos, item) {
@@ -3415,13 +3429,13 @@ function pandoraFlotAreaNew(
 	$('#'+graph_id).bind('mouseout',resetInteractivity);
 	$('#overview_'+graph_id).bind('mouseout',resetInteractivity);
 	
-	//~ // Reset interactivity styles
+	// Reset interactivity styles
 	function resetInteractivity() {
 		$('#timestamp_'+graph_id).hide();
 		dataset = plot.getData();
 		for (i = 0; i < dataset.length; ++i) {
 			var series = dataset[i];
-			var label_aux = series.label + series_suffix_str;
+			var label_aux = legend[series.label] + ' ' + series_suffix_str;
 			$('#legend_' + graph_id + ' .legendLabel')
 				.eq(i).html(label_aux);
 		}
@@ -3431,56 +3445,23 @@ function pandoraFlotAreaNew(
 
 	// Format functions
 	function xFormatter(v, axis) {
-		//XXX
-		/*
-			if ($period <= SECONDS_6HOURS) {
-				$time_format = 'H:i:s';
-			}
-			elseif ($period < SECONDS_1DAY) {
-				$time_format = 'H:i';
-			}
-			elseif ($period < SECONDS_15DAYS) {
-				$time_format = "M \nd H:i";
-			}
-			elseif ($period < SECONDS_1MONTH) {
-				$time_format = "M \nd H\h";
-			} 
-			elseif ($period < SECONDS_6MONTHS) {
-				$time_format = "M \nd H\h";
-			}
-			else {
-				$time_format = "Y M \nd H\h";
-			}	
-		*/
-		
 		var d = new Date(v);
 		var result_date_format = 0;
+
+		var monthNames = [	
+			"Jan", "Feb", "Mar",
+			"Apr", "May", "Jun",
+			"Jul", "Aug", "Sep",
+			"Oct", "Nov", "Dec"
+		];
 		
-	//	if(time_format_y > 86400000){ //DAY
-			var monthNames = [	
-				"Jan", "Feb", "Mar",
-				"Apr", "May", "Jun",
-				"Jul", "Aug", "Sep",
-				"Oct", "Nov", "Dec"
-			];
-			
-			result_date_format = 
-								(d.getDate() <10?'0':'') + d.getDate() + " " +
-								//(d.getMonth()<9?'0':'') + (d.getMonth() + 1) + "/" + 
-								monthNames[d.getMonth()] + " " +
-								d.getFullYear() + "\n" + 
-								(d.getHours()<10?'0':'') + d.getHours() + ":" + 
-								(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + 
-								(d.getSeconds()<10?'0':'') + d.getSeconds(); //+  ":" + d.getMilliseconds();
-	/*	}
-		else{
-			result_date_format = 	
-								d.getHours() + ":" + 
-								d.getMinutes() + ":" + 
-								d.getSeconds(); //+  ":" + d.getMilliseconds();
-		}
-	*/
-		//extra_css = '';
+		result_date_format = (d.getDate() <10?'0':'') + d.getDate() + " " +
+							monthNames[d.getMonth()] + " " +
+							d.getFullYear() + "\n" + 
+							(d.getHours()<10?'0':'') + d.getHours() + ":" + 
+							(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + 
+							(d.getSeconds()<10?'0':'') + d.getSeconds();
+	
 		return '<div class='+font+' style="font-size:'+font_size+'pt; margin-top:15px;">'+result_date_format+'</div>';
 	}
 
@@ -3492,15 +3473,12 @@ function pandoraFlotAreaNew(
 		else {
 			var formatted = v;
 		}
-
 		return '<div class='+font+' style="font-size:'+font_size+'pt;">'+formatted+'</div>';
 	}
 
 	function lFormatter(v, item) {
 		console.log(v);
-		return '<div style="font-size:'+font_size+'pt;">'+v+'</div>';
-		// Prepared to turn series with a checkbox
-		//return '<div style=color:;font-size:'+font_size+'pt><input type="checkbox" id="' + graph_id + '_' + item.id +'" checked="checked" class="check_serie_'+graph_id+'">'+v+'</div>';
+		return '<div style="font-size:'+font_size+'pt;">'+legend[v]+'</div>';
 	}
 	
 	if (menu) {
@@ -3609,10 +3587,9 @@ function pandoraFlotAreaNew(
 		// Estimated height of 24 (works fine with this data in all browsers)
 		menu_height = 24;
 		var legend_margin_bottom = parseInt(
-			$('#legend_'+graph_id).css('margin-bottom').split('px')[0]);
+		$('#legend_'+graph_id).css('margin-bottom').split('px')[0]);
 		$('#legend_'+graph_id).css('margin-bottom', '10px');
-		parent_height = parseInt(
-			$('#menu_'+graph_id).parent().css('height').split('px')[0]);
+		parent_height = parseInt($('#menu_'+graph_id).parent().css('height').split('px')[0]);
 		adjust_menu(graph_id, plot, parent_height, width);
 	}
 	
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 38e5f5ff4a..5356dd57b3 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -187,7 +187,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 	global $config;
 	
 	include_javascript_dependencies_flot_graph();
-
+	
 	$menu = (int)$menu;
 	// Get a unique identifier to graph
 	$graph_id = uniqid('graph_');
@@ -666,13 +666,15 @@ function flot_area_graph_new (
 	else {
 		$format_graph['height'] = 1;
 	}
-	if (!$vconsole)
+
+	if (!$vconsole){
 		$return .= "<div 	id='overview_$graph_id' 
 							class='overview_graph' 
 							style='	display: none; margin-left:0px; 
 									margin-top:20px; margin-bottom:50px; 
 									width: ".$format_graph['width']."px; 
 									height: ".$format_graph['height'] ."px;'></div>";
+	}
 	//XXXXTODO
 	$water_mark = '';
 	if ($water_mark != '') {
@@ -765,6 +767,12 @@ function flot_area_graph_new (
 	return $return;
 }
 
+
+
+
+
+
+
 function menu_graph(
 	$yellow_threshold, $red_threshold, 
 	$yellow_up, $red_up, $yellow_inverse, 

From d2390528acf2b3302f97be63073d14d4cdf18372 Mon Sep 17 00:00:00 2001
From: daniel <daniel@localhost.localdomain>
Date: Tue, 27 Feb 2018 16:28:00 +0100
Subject: [PATCH 009/146] fixed errors in graphs

---
 pandora_console/include/functions.php         |   54 +-
 pandora_console/include/functions_db.php      |  119 +-
 pandora_console/include/functions_graph.php   | 2840 ++++-------------
 pandora_console/include/functions_modules.php |   21 +-
 pandora_console/include/graphs/fgraph.php     |  301 +-
 .../include/graphs/flot/pandora.flot.js       | 1393 +-------
 .../include/graphs/functions_flot.php         |  559 +---
 .../mobile/operation/module_graph.php         |  149 +-
 .../operation/agentes/stat_win.php            |  137 +-
 9 files changed, 1010 insertions(+), 4563 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index b2b3d532ac..c3b10f03d6 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2766,12 +2766,12 @@ function register_pass_change_try ($id_user, $success) {
 }
 
 function isJson($string) {
- json_decode($string);
- return (json_last_error() == JSON_ERROR_NONE);
+	json_decode($string);
+	return (json_last_error() == JSON_ERROR_NONE);
 }
 
 /**
- * returns true or false if it is a valid ip 
+ * returns true or false if it is a valid ip
  * checking ipv4 and ipv6 or resolves the name dns
  * @param string address
  *
@@ -2804,7 +2804,7 @@ function color_graph_array($series_suffix, $compare = false){
 					'color' => '#ff0000',
 					'alpha' => CHART_DEFAULT_ALPHA
 			);
-		
+
 		$color['alert' . $series_suffix] =
 			array(	'border' => '#ff7f00',
 					'color' => '#ff7f00',
@@ -2816,25 +2816,25 @@ function color_graph_array($series_suffix, $compare = false){
 					'color' => '#999999',
 					'alpha' => CHART_DEFAULT_ALPHA
 			);
-		
+
 		$color['no_data'.$series_suffix] =
 			array(	'border' => '#000000',
 					'color' => '#f2c40e',
 					'alpha' => CHART_DEFAULT_ALPHA
 				);
-		
+
 		$color['max'.$series_suffix] =
 			array(	'border' => '#000000',
 					'color' => $config['graph_color3'],
 					'alpha' => CHART_DEFAULT_ALPHA
 				);
-		
+
 		$color['sum'.$series_suffix] =
 			array(	'border' => '#000000',
 					'color' => $config['graph_color2'],
 					'alpha' => CHART_DEFAULT_ALPHA
 				);
-		
+
 		$color['min'.$series_suffix] =
 			array(	'border' => '#000000',
 					'color' => $config['graph_color1'],
@@ -2846,7 +2846,7 @@ function color_graph_array($series_suffix, $compare = false){
 					'color' => '#0097BC',
 					'alpha' => 10
 				);
-		
+
 		$color['percentil'.$series_suffix] =
 			array(	'border' => '#000000',
 					'color' => '#0097BC',
@@ -2859,7 +2859,7 @@ function color_graph_array($series_suffix, $compare = false){
 					'color' => '#ff66cc',
 					'alpha' => CHART_DEFAULT_ALPHA
 			);
-		
+
 		$color['alert' . $series_suffix] =
 			array(	'border' => '#ffff00',
 					'color' => '#ffff00',
@@ -2871,25 +2871,25 @@ function color_graph_array($series_suffix, $compare = false){
 					'color' => '#E1E1E1',
 					'alpha' => CHART_DEFAULT_ALPHA
 			);
-		
+
 		$color['no_data'.$series_suffix] =
 			array(	'border' => '#000000',
 					'color' => '#f2c40e',
 					'alpha' => CHART_DEFAULT_ALPHA
 				);
-		
+
 		$color['max'.$series_suffix] =
 			array(	'border' => '#000000',
 					'color' => $config['graph_color3'],
 					'alpha' => CHART_DEFAULT_ALPHA
 				);
-		
+
 		$color['sum'.$series_suffix] =
 			array(	'border' => '#000000',
-					'color' => '#99ffff',
+					'color' => '#b781c1',
 					'alpha' => CHART_DEFAULT_ALPHA
 				);
-		
+
 		$color['min'.$series_suffix] =
 			array(	'border' => '#000000',
 					'color' => $config['graph_color1'],
@@ -2901,15 +2901,15 @@ function color_graph_array($series_suffix, $compare = false){
 					'color' => '#0097BC',
 					'alpha' => 10
 				);
-		
+
 		$color['percentil'.$series_suffix] =
 			array(	'border' => '#000000',
 					'color' => '#003333',
 					'alpha' => CHART_DEFAULT_ALPHA
 				);
-	
+
 	}
-	
+
 	return $color;
 }
 
@@ -2921,28 +2921,28 @@ function legend_graph_array(
 	$show_elements_graph,
 	$percentil_value,
 	$data_module_graph){
-	
+
 	global $config;
 	global $legend;
 	$unit = $format_graph['unit'];
 
-	$legend['sum'.$series_suffix] = 
+	$legend['sum'.$series_suffix] =
 		$data_module_graph['module_name'] . ' ' .
 		__('Min:') . remove_right_zeros(
 			number_format(
-				$min, 
+				$min,
 				$config['graph_precision']
 			)
-		)  . ' ' . 
+		)  . ' ' .
 		__('Max:') . remove_right_zeros(
 			number_format(
-				$max, 
+				$max,
 				$config['graph_precision']
 			)
-		) . ' ' . 
+		) . ' ' .
 		_('Avg:') . remove_right_zeros(
 			number_format(
-				$max, 
+				$max,
 				$config['graph_precision']
 			)
 		) . ' ' . $series_suffix_str;
@@ -2957,10 +2957,10 @@ function legend_graph_array(
 		$legend['alert'.$series_suffix]     = __('Alert') . ' ' . $series_suffix_str;
 	}
 	if($show_elements_graph['percentil']){
-		$legend['percentil'.$series_suffix] = __('Percentil') . ' Value: ' . 
+		$legend['percentil'.$series_suffix] = __('Percentil') . ' Value: ' .
 		remove_right_zeros(
 			number_format(
-				$percentil_value, 
+				$percentil_value,
 				$config['graph_precision']
 			)
 		) . ' ' . $series_suffix_str;
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index b92a9fbcc5..1f5a26f7e9 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -418,7 +418,7 @@ function db_get_row ($table, $field_search, $condition, $fields = false) {
  */
 function db_get_row_filter($table, $filter, $fields = false, $where_join = 'AND', $historydb = false) {
 	global $config;
-	
+
 	switch ($config["dbtype"]) {
 		case "mysql":
 			return mysql_db_get_row_filter($table, $filter, $fields, $where_join, $historydb);
@@ -443,10 +443,10 @@ function db_get_row_filter($table, $filter, $fields = false, $where_join = 'AND'
 
 function db_get_sql ($sql, $field = 0, $search_history_db = false) {
 	$result = db_get_all_rows_sql ($sql, $search_history_db);
-	
+
 	if ($result === false)
 		return false;
-	
+
 	$ax = 0;
 	foreach ($result[0] as $f) {
 		if ($field == $ax)
@@ -467,7 +467,7 @@ function db_get_sql ($sql, $field = 0, $search_history_db = false) {
  */
 function db_get_all_rows_sql($sql, $search_history_db = false, $cache = true, $dbconnection = false) {
 	global $config;
-	
+
 	switch ($config["dbtype"]) {
 		case "mysql":
 			return mysql_db_get_all_rows_sql($sql, $search_history_db, $cache, $dbconnection);
@@ -482,15 +482,12 @@ function db_get_all_rows_sql($sql, $search_history_db = false, $cache = true, $d
 }
 
 /**
- * 
  * Returns the time the module is in unknown status (by events)
- * 
  * @param int  $id_agente_modulo  module to check
  * @param int  $tstart            begin of search
  * @param int  $tend              end of search
- * 
  */
-function db_get_module_ranges_unknown($id_agente_modulo, $tstart = false, $tend = false, $historydb = false) {
+function db_get_module_ranges_unknown($id_agente_modulo, $tstart = false, $tend = false, $historydb = false, $fix_to_range = 0) {
 	global $config;
 
 	if (!isset($id_agente_modulo)) {
@@ -512,18 +509,39 @@ function db_get_module_ranges_unknown($id_agente_modulo, $tstart = false, $tend
 	}
 
 	// Retrieve going unknown events in range
-	$query  = "SELECT utimestamp,event_type FROM tevento WHERE id_agentmodule = " . $id_agente_modulo;
-	$query .= " AND event_type like 'going_%' ";
-	$query .= " AND utimestamp >= $tstart AND utimestamp <= $tend ";
-	$query .= " ORDER BY utimestamp ASC";
-
+	$query  = "SELECT * FROM tevento WHERE id_agentmodule = " . $id_agente_modulo
+			. " AND event_type like 'going_%' "
+			. " AND utimestamp >= $tstart AND utimestamp <= $tend "
+			. " ORDER BY utimestamp ASC";
 	$events = db_get_all_rows_sql($query, $historydb);
 
-	if (! is_array($events)){
+	$query  = "SELECT * FROM tevento WHERE id_agentmodule = " . $id_agente_modulo
+			. " AND event_type like 'going_%' "
+			. " AND utimestamp < $tstart "
+			. " ORDER BY utimestamp DESC LIMIT 1;";
+	$previous_event = db_get_all_rows_sql($query, $historydb);
+
+	if ($previous_event !== false) {
+		$last_status = $previous_event[0]["event_type"] == "going_unknown" ? 1:0;
+	}
+	else {
+		$last_status = 0;
+	}
+
+	if ((! is_array($events)) && (! is_array($previous_event))) {
 		return false;
 	}
 
-	$last_status = $events[0]["event_type"] != "going_unknown" ? 1:0;
+	if (! is_array($events)) {
+		if ($previous_event[0]["event_type"] == "going_unknown") {
+			return array(
+				array(
+					"time_from" => (($fix_to_range == 1)?$tstart:$previous_event[0]["utimestamp"]),
+				)
+			);
+		}
+	}
+
 	$return = array();
 	$i=0;
 	foreach ($events as $event) {
@@ -558,23 +576,22 @@ function db_get_module_ranges_unknown($id_agente_modulo, $tstart = false, $tend
 	return $return;
 }
 
-
 /**
  * Uncompresses and returns the data of a given id_agent_module
- * 
+ *
  * @param int          $id_agente_modulo  id_agente_modulo
  * @param utimestamp   $tstart            Begin of the catch
  * @param utimestamp   $tend              End of the catch
  * @param int          $interval          Size of slice (default-> module_interval)
- * 
+ *
  * @return   hash with the data uncompressed in blocks of module_interval
  * false in case of empty result
- * 
+ *
  * Note: All "unknown" data are marked as NULL
  * Warning: Be careful with the amount of data, check your RAM size available
  * We'll return a bidimensional array
  * Structure returned: schema:
- * 
+ *
  * uncompressed_data =>
  *      pool_id (int)
  *          utimestamp (start of current slice)
@@ -582,7 +599,7 @@ function db_get_module_ranges_unknown($id_agente_modulo, $tstart = false, $tend
  *              array
  *                  datos
  *                  utimestamp
- * 
+ *
  */
 function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = false) {
 	global $config;
@@ -602,7 +619,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 
 	$search_historydb = false;
 	$table = "tagente_datos";
-	
+
 	$module = modules_get_agentmodule($id_agente_modulo);
 	if ($module === false){
 		// module not exists
@@ -610,11 +627,11 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 	}
 	$module_type = $module['id_tipo_modulo'];
 	$module_type_str = modules_get_type_name ($module_type);
-	
+
 	if (strstr ($module_type_str, 'string') !== false) {
 		$table = "tagente_datos_string";
 	}
-	
+
 	$flag_async = false;
 	if(strstr ($module_type_str, 'async_data') !== false) {
 		$flag_async = true;
@@ -634,7 +651,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 	else {
 		$query  = "SELECT datos,utimestamp FROM $table ";
 		$query .= " WHERE id_agente_modulo=$id_agente_modulo ";
-		$query .= " AND utimestamp=" . $first_utimestamp;
+		$query .= " AND utimestamp = " . $first_utimestamp;
 
 		$data = db_get_all_rows_sql($query,$search_historydb);
 
@@ -652,7 +669,6 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 		else {
 			$first_data["utimestamp"] = $data[0]["utimestamp"];
 			$first_data["datos"]      = $data[0]["datos"];
-
 		}
 	}
 
@@ -670,27 +686,11 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 	}
 
 	// Retrieve going unknown events in range
-	$unknown_events = db_get_module_ranges_unknown($id_agente_modulo, $tstart, $tend, $search_historydb);
-	
-	// Get the last event after inverval to know if graph start on unknown
-	$previous_unknown_events = db_get_row_filter (
-		'tevento',
-		array ('id_agentmodule' => $id_agente_modulo,
-			"utimestamp <= $tstart",
-			'order' => 'utimestamp DESC'
-		),
-		false,
-		'AND',
-		$search_historydb
+	$unknown_events = db_get_module_ranges_unknown(
+		$id_agente_modulo, $tstart,
+		$tend, $search_historydb, 1
 	);
 
-	//show graph if graph is inside unknown	
-	if( $previous_unknown_events && $previous_unknown_events['event_type'] == 'going_unknown' && 
-		$unknown_events === false){
-		$last_inserted_value = $first_data["datos"];
-		$unknown_events[0]['time_from'] = $tstart;
-	}
-
 	//if time to is missing in last event force time to outside range time
 	if( $unknown_events && !isset($unknown_events[count($unknown_events) -1]['time_to']) ){
 		$unknown_events[count($unknown_events) -1]['time_to'] = $tend;
@@ -699,8 +699,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 	//if time to is missing in first event force time to outside range time
 	if ($first_data["datos"] === false && !$flag_async) {
 		$last_inserted_value = false;
-	}elseif(($unknown_events && !isset($unknown_events[0]['time_from']) &&  
-			$previous_unknown_events && $previous_unknown_events['event_type'] == 'going_unknown' && !$flag_async) ||
+	}elseif(($unknown_events && !isset($unknown_events[0]['time_from']) && !$flag_async) ||
 			($first_utimestamp < $tstart - (SECONDS_1DAY + 2*$module_interval) && !$flag_async) ){
 		$last_inserted_value = $first_data["datos"];
 		$unknown_events[0]['time_from'] = $tstart;
@@ -734,7 +733,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 	else{
 		$current_unknown = null;
 	}
-	
+
 	if(is_array($raw_data)) {
 		$current_raw_data = array_pop($raw_data);
 	}
@@ -751,15 +750,15 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 		|| (($current_timestamp - $last_timestamp) > (SECONDS_1DAY + 2 * $module_interval)) ) {
 
 			$tmp_data["utimestamp"] = $current_timestamp;
-			
+
 			//check not init
 			$tmp_data["datos"] = $last_value === false ? false : null;
-			
+
 			//async not unknown
 			if($flag_async &&  $tmp_data["datos"] === null){
 				$tmp_data["datos"] = $last_inserted_value;
 			}
-			
+
 			// debug purpose
 			//$tmp_data["obs"] = "unknown extra";
 			array_push($return[$pool_id]["data"], $tmp_data);
@@ -767,9 +766,9 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 
 		//insert raw data
 		while ( ($current_raw_data != null) &&
-				(   ($current_timestamp_end >  $current_raw_data['utimestamp']) && 
+				(   ($current_timestamp_end >  $current_raw_data['utimestamp']) &&
 					($current_timestamp     <= $current_raw_data['utimestamp']) ) ) {
-		
+
 			// Add real data detected
 			if (count($return[$pool_id]['data']) == 0) {
 				//insert first slice data
@@ -802,16 +801,16 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 				$current_raw_data = null;
 			}
 		}
-		
+
 		//unknown
 		$data_slices = $return[$pool_id]["data"];
 		if(!$flag_async){
 			while ( ($current_unknown != null) &&
 					( ( ($current_unknown['time_from'] != null) &&
-						($current_timestamp_end >= $current_unknown['time_from']) ) || 
+						($current_timestamp_end >= $current_unknown['time_from']) ) ||
 					($current_timestamp_end >= $current_unknown['time_to']) ) ) {
 
-				if( ( $current_timestamp <= $current_unknown['time_from']) && 
+				if( ( $current_timestamp <= $current_unknown['time_from']) &&
 					( $current_timestamp_end >= $current_unknown['time_from'] ) ){
 					if (count($return[$pool_id]['data']) == 0) {
 						//insert first slice data
@@ -835,7 +834,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 					array_push($return[$pool_id]["data"], $tmp_data);
 					$current_unknown["time_from"] = null;
 				}
-				elseif( ($current_timestamp <= $current_unknown['time_to']) && 
+				elseif( ($current_timestamp <= $current_unknown['time_to']) &&
 					($current_timestamp_end > $current_unknown['time_to'] ) ){
 
 					if (count($return[$pool_id]['data']) == 0) {
@@ -864,7 +863,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 						}
 						$i--;
 					}
-					
+
 					// debug purpose
 					//$tmp_data["obs"] = "event data unknown to";
 					array_push($return[$pool_id]["data"], $tmp_data);
@@ -904,7 +903,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 		//put the last slice data like first element of next slice
 		$last_inserted_value = end($return[$pool_id]['data']);
 		$last_inserted_value = $last_inserted_value['datos'];
-		
+
 		//increment
 		$pool_id++;
 		$current_timestamp = $current_timestamp_end;
@@ -950,7 +949,7 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
  */
 function db_get_all_rows_filter($table, $filter = array(), $fields = false, $where_join = 'AND', $search_history_db = false, $returnSQL = false) {
 	global $config;
-	
+
 	switch ($config["dbtype"]) {
 		case "mysql":
 			return mysql_db_get_all_rows_filter($table, $filter, $fields, $where_join, $search_history_db, $returnSQL);
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 012196c8ad..1925a836d7 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -22,27 +22,27 @@ include_once($config['homedir'] . "/include/functions_users.php");
 
 function get_graph_statistics ($chart_array) {
 	global $config;
-	
+
 	/// IMPORTANT!
 	///
 	/// The calculus for AVG, MIN and MAX values are in this function
-	/// because it must be done based on graph array data not using reporting 
+	/// because it must be done based on graph array data not using reporting
 	/// function to get coherent data between stats and graph visualization
-	
+
 	$stats = array ();
-	
+
 	$count = 0;
-	
+
 	$size = sizeof($chart_array);
-	
+
 	//Initialize stats array
 	$stats = array ("avg" => 0, "min" => null, "max" => null, "last" => 0);
-	
+
 	foreach ($chart_array as $item) {
-		
+
 		//Sum all values later divide by the number of elements
 		$stats['avg'] = $stats['avg'] + $item;
-		
+
 		//Get minimum
 		if ($stats['min'] == null) {
 			$stats['min'] = $item;
@@ -50,7 +50,7 @@ function get_graph_statistics ($chart_array) {
 		else if ($item < $stats['min']) {
 			$stats['min'] = $item;
 		}
-		
+
 		//Get maximum
 		if ($stats['max'] == null) {
 			$stats['max'] = $item;
@@ -58,49 +58,49 @@ function get_graph_statistics ($chart_array) {
 		else if ($item > $stats['max']) {
 			$stats['max'] = $item;
 		}
-		
+
 		$count++;
-		
+
 		//Get last data
 		if ($count == $size) {
 			$stats['last'] = $item;
 		}
 	}
-	
+
 	//End the calculus for average
 	if ($count > 0) {
-		
+
 		$stats['avg'] = $stats['avg'] / $count;
 	}
-	
+
 	//Format stat data to display properly
 	$stats['last'] = remove_right_zeros(number_format($stats['last'], $config['graph_precision']));
 	$stats['avg'] = remove_right_zeros(number_format($stats['avg'], $config['graph_precision']));
 	$stats['min'] = remove_right_zeros(number_format($stats['min'], $config['graph_precision']));
 	$stats['max'] = remove_right_zeros(number_format($stats['max'], $config['graph_precision']));
-	
+
 	return $stats;
 }
 
 function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
-	
+
 	/// IMPORTANT!
 	///
 	/// The calculus for AVG, MIN and MAX values are in this function
-	/// because it must be done based on graph array data not using reporting 
+	/// because it must be done based on graph array data not using reporting
 	/// function to get coherent data between stats and graph visualization
-	
+
 	$stats = array ();
-	
+
 	$count = 0;
-	
+
 	$size = sizeof($chart_array);
-	
+
 	//Initialize stats array
 	$stats['sum'] = array ("avg" => 0, "min" => null, "max" => null, "last" => 0);
 	$stats['min'] = array ("avg" => 0, "min" => null, "max" => null, "last" => 0);
 	$stats['max'] = array ("avg" => 0, "min" => null, "max" => null, "last" => 0);
-	
+
 	foreach ($chart_array as $item) {
 		if ($series_suffix != '') {
 			if (isset($item['sum' . $series_suffix]))
@@ -110,13 +110,13 @@ function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
 			if (isset($item['max' . $series_suffix]))
 				$item['max'] = $item['max' . $series_suffix];
 		}
-		
+
 		//Get stats for normal graph
 		if (isset($item['sum']) && $item['sum']) {
-			
+
 			//Sum all values later divide by the number of elements
 			$stats['sum']['avg'] = $stats['sum']['avg'] + $item['sum'];
-			
+
 			//Get minimum
 			if ($stats['sum']['min'] == null) {
 				$stats['sum']['min'] = $item['sum'];
@@ -124,7 +124,7 @@ function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
 			else if ($item['sum'] < $stats['sum']['min']) {
 				$stats['sum']['min'] = $item['sum'];
 			}
-			
+
 			//Get maximum
 			if ($stats['sum']['max'] == null) {
 				$stats['sum']['max'] = $item['sum'];
@@ -132,14 +132,13 @@ function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
 			else if ($item['sum'] > $stats['sum']['max']) {
 				$stats['sum']['max'] = $item['sum'];
 			}
-			
 		}
-		
+
 		//Get stats for min graph
 		if (isset($item['min']) && $item['min']) {
 			//Sum all values later divide by the number of elements
 			$stats['min']['avg'] = $stats['min']['avg'] + $item['min'];
-			
+
 			//Get minimum
 			if ($stats['min']['min'] == null) {
 				$stats['min']['min'] = $item['min'];
@@ -147,7 +146,7 @@ function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
 			else if ($item['min'] < $stats['min']['min']) {
 				$stats['min']['min'] = $item['min'];
 			}
-			
+
 			//Get maximum
 			if ($stats['min']['max'] == null) {
 				$stats['min']['max'] = $item['min'];
@@ -155,14 +154,13 @@ function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
 			else if ($item['min'] > $stats['min']['max']) {
 				$stats['min']['max'] = $item['min'];
 			}
-		
 		}
-		
+
 		//Get stats for max graph
 		if (isset($item['max']) && $item['max']) {
 			//Sum all values later divide by the number of elements
 			$stats['max']['avg'] = $stats['max']['avg'] + $item['max'];
-			
+
 			//Get minimum
 			if ($stats['max']['min'] == null) {
 				$stats['max']['min'] = $item['max'];
@@ -170,7 +168,7 @@ function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
 			else if ($item['max'] < $stats['max']['min']) {
 				$stats['max']['min'] = $item['max'];
 			}
-			
+
 			//Get maximum
 			if ($stats['max']['max'] == null) {
 				$stats['max']['max'] = $item['max'];
@@ -179,55 +177,54 @@ function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
 				$stats['max']['max'] = $item['max'];
 			}
 		}
-		
-		
+
 		//Count elements
 		$count++;
-		
+
 		//Get last data
 		if ($count == $size) {
 			if (isset($item['sum']) && $item['sum']) {
 				$stats['sum']['last'] = $item['sum'];
 			}
-			
+
 			if (isset($item['min']) && $item['min']) {
 				$stats['min']['last'] = $item['min'];
 			}
-			
+
 			if (isset($item['max']) && $item['max']) {
 				$stats['max']['last'] = $item['max'];
 			}
 		}
 	}
-	
+
 	//End the calculus for average
 	if ($count > 0) {
-		
+
 		$stats['sum']['avg'] = $stats['sum']['avg'] / $count;
 		$stats['min']['avg'] = $stats['min']['avg'] / $count;
 		$stats['max']['avg'] = $stats['max']['avg'] / $count;
 	}
-	
+
 	//Format stat data to display properly
 	$stats['sum']['last'] = round($stats['sum']['last'], 2);
 	$stats['sum']['avg'] = round($stats['sum']['avg'], 2);
 	$stats['sum']['min'] = round($stats['sum']['min'], 2);
 	$stats['sum']['max'] = round($stats['sum']['max'], 2);
-	
+
 	$stats['min']['last'] = round($stats['min']['last'], 2);
 	$stats['min']['avg'] = round($stats['min']['avg'], 2);
 	$stats['min']['min'] = round($stats['min']['min'], 2);
 	$stats['min']['max'] = round($stats['min']['max'], 2);
-	
+
 	$stats['max']['last'] = round($stats['max']['last'], 2);
 	$stats['max']['avg'] = round($stats['max']['avg'], 2);
 	$stats['max']['min'] = round($stats['max']['min'], 2);
 	$stats['max']['max'] = round($stats['max']['max'], 2);
-	
+
 	return $stats;
 }
 
-function grafico_modulo_sparse_data_chart_new (
+function grafico_modulo_sparse_data_chart (
 		$agent_module_id,
 		$date_array,
 		$data_module_graph,
@@ -238,18 +235,26 @@ function grafico_modulo_sparse_data_chart_new (
 
 	global $config;
 
-	$data = db_get_all_rows_filter ('tagente_datos',
-						array ('id_agente_modulo' => (int)$agent_module_id,
-								"utimestamp > '". $date_array['start_date']. "'",
-								"utimestamp < '". $date_array['final_date'] . "'",
-								'order' => 'utimestamp ASC'),
-						array ('datos', 'utimestamp'), 'AND', $data_module_graph['history_db']);
+	$data = db_get_all_rows_filter (
+		'tagente_datos',
+		array ('id_agente_modulo' => (int)$agent_module_id,
+				"utimestamp > '". $date_array['start_date']. "'",
+				"utimestamp < '". $date_array['final_date'] . "'",
+				'order' => 'utimestamp ASC'),
+		array ('datos', 'utimestamp'),
+		'AND',
+		$data_module_graph['history_db']
+	);
+
+	if($data === false){
+		$data = array();
+	}
 
 	// Get previous data
 	$previous_data = modules_get_previous_data (
-						$agent_module_id, 
-						$date_array['start_date']
-					);
+		$agent_module_id,
+		$date_array['start_date']
+	);
 
 	if ($previous_data !== false) {
 		$previous_data['utimestamp'] = $date_array['start_date'];
@@ -259,9 +264,9 @@ function grafico_modulo_sparse_data_chart_new (
 
 	// Get next data
 	$nextData = modules_get_next_data (
-					$agent_module_id, 
-					$date_array['final_date']
-				);
+		$agent_module_id,
+		$date_array['final_date']
+	);
 
 	if ($nextData !== false) {
 		unset($nextData['id_agente_modulo']);
@@ -271,22 +276,17 @@ function grafico_modulo_sparse_data_chart_new (
 		// Propagate the last known data to the end of the interval
 		$nextData = array(
 			'datos'      => $data[count($data)-1]['datos'],
-			'utimestamp' => $date_array['final_date'], 
+			'utimestamp' => $date_array['final_date'],
 		);
 		array_push ($data, $nextData);
 	}
-	
-	if ($data === false) {
-		$data = array ();
-	}
-	
+
 	// Check available data
 	if (count ($data) < 1) {
-		//if (!$graphic_type) {
-			return fs_error_image ();
-		//}
-		//graphic_error ();
+		//return fs_error_image ();
+		return false;
 	}
+
 	$array_data = array();
 	$min_value = PHP_INT_MAX-1;
 	$max_value = PHP_INT_MIN+1;
@@ -306,12 +306,12 @@ function grafico_modulo_sparse_data_chart_new (
 				$v['datos']
 			);
 		}
-		
+
 		//min
 		if($min_value > $v['datos']){
 			$min_value = $v['datos'];
 		}
-		
+
 		//max
 		if($max_value < $v['datos']){
 			$max_value = $v['datos'];
@@ -331,331 +331,25 @@ function grafico_modulo_sparse_data_chart_new (
 	$array_data["sum" . $series_suffix]['max'] = $max_value;
 	$array_data["sum" . $series_suffix]['avg'] = $sum_data/$count_data;
 
-	if (!is_null($show_elements_graph['percentil']) && $show_elements_graph['percentil'] && !$show_elements_graph['flag_overlapped']) {
+	if (!is_null($show_elements_graph['percentil']) &&
+		$show_elements_graph['percentil'] &&
+		!$show_elements_graph['flag_overlapped']) {
 		$percentil_result = get_percentile($show_elements_graph['percentil'], $array_percentil);
 		$array_data["percentil" . $series_suffix]['data'][0] = array(
-			$date_array['start_date'] * 1000, 
+			$date_array['start_date'] * 1000,
 			$percentil_result
 		);
 		$array_data["percentil" . $series_suffix]['data'][1] = array(
-			$date_array['final_date'] * 1000, 
+			$date_array['final_date'] * 1000,
 			$percentil_result
 		);
 	}
 	return $array_data;
 }
 
-
-function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_index, 
-				$data, $data_i, $previous_data, $resolution, $interval, $period, $datelimit, 
-				$projection, $avg_only = false, $uncompressed_module = false, 
-				$show_events = false, $show_alerts = false, $show_unknown = false, $baseline = false, 
-				$baseline_data = array(), $events = array(), $series_suffix = '', $start_unknown = false,
-				$percentil = null, $fullscale = false, $force_interval = false,$time_interval = 300,
-				$max_only = 0, $min_only = 0) {
-	global $config;
-	global $chart_extra_data;
-	global $series_type;
-	global $max_value;
-	global $min_value;
-
-	$max_value = 0;
-	$min_value = null;
-	$flash_chart = $config['flash_charts'];
-	
-	// Event iterator
-	$event_i = 0;
-	
-	// Calculate chart data
-	$last_known = $previous_data;
-	
-	$first_events_unknown = $start_unknown;
-
-	for ($i = 0; $i <= $resolution; $i++) {
-		$timestamp = $datelimit + ($interval * $i);
-
-		$total = 0;
-		$count = 0;
-		
-		// Read data that falls in the current interval
-		$interval_min = false;
-		$interval_max = false;
-
-		while (isset ($data[$data_i]) && $data[$data_i]['utimestamp'] >= $timestamp
-				&& $data[$data_i]['utimestamp'] < ($timestamp + $interval)) {
-			if ($interval_min === false) {
-				$interval_min = $data[$data_i]['datos'];
-			}
-			if ($interval_max === false) {
-				$interval_max = $data[$data_i]['datos'];
-			}
-			
-			if ($data[$data_i]['datos'] > $interval_max) {
-				$interval_max = $data[$data_i]['datos'];
-			}
-			else if ($data[$data_i]['datos'] < $interval_min) {
-				$interval_min = $data[$data_i]['datos'];
-			}
-			
-			$total += $data[$data_i]['datos'];
-			$last_known = $data[$data_i]['datos'];
-			$count++;
-			$data_i++;
-		}
-		
-		if ($max_value < $interval_max) {
-			$max_value = $interval_max;
-		}
-		
-		if ($min_value > $interval_max || $min_value == null) {
-			$min_value = $interval_max;
-		}
-		
-		// Data in the interval
-		if ($count > 0) {
-			$total /= $count;
-			// If detect data, unknown period finishes
-			$is_unknown = false;
-		}
-		
-		// Read events and alerts that fall in the current interval
-		$event_value = 0;
-		$alert_value = 0;
-		$unknown_value = 0;
-		// Is the first point of a unknown interval
-		$check_unknown = false;
-		$first_unknown = false;
-		if($first_events_unknown){
-			$is_unknown = true;
-		}
-
-		$event_ids = array();
-		$alert_ids = array();
-		
-		while (isset ($events[$event_i]) && $events[$event_i]['utimestamp'] >= $timestamp 
-				&& $events[$event_i]['utimestamp'] <= ($timestamp + $interval)) {
-			if ($show_events == 1) {
-				$event_value++;
-				$event_ids[] = $events[$event_i]['id_evento'];
-			}
-			if ($show_alerts == 1 && substr ($events[$event_i]['event_type'], 0, 5) == 'alert') {
-				$alert_value++;
-				$alert_ids[] = $events[$event_i]['id_evento'];
-			}
-			if ($show_unknown) {
-				if ($events[$event_i]['event_type'] == 'going_unknown') {
-					if ($is_unknown == false) {
-						$first_unknown = true;
-					}
-					$is_unknown = true;
-					$check_unknown = true;
-				}
-				else if (substr ($events[$event_i]['event_type'], 0, 5) == 'going') {
-					$first_events_unknown = false;
-					$first_unknown = false;
-					$is_unknown = false;
-				}
-			}
-			$event_i++;
-		}
-		
-		// In some cases, can be marked as known because a recovery event
-		// was found in same interval. For this cases first_unknown is 
-		// checked too
-		if ($is_unknown || $first_unknown) {
-			$unknown_value++;
-		}
-		
-		if (!$flash_chart) {
-			// Set the title and time format
-			if ($period <= SECONDS_6HOURS) {
-				$time_format = 'H:i:s';
-			}
-			elseif ($period < SECONDS_1DAY) {
-				$time_format = 'H:i';
-			}
-			elseif ($period < SECONDS_15DAYS) {
-				$time_format = "M \nd H:i";
-			}
-			elseif ($period < SECONDS_1MONTH) {
-				$time_format = "M \nd H\h";
-			} 
-			elseif ($period < SECONDS_6MONTHS) {
-				$time_format = "M \nd H\h";
-			}
-			else {
-				$time_format = "Y M \nd H\h";
-			}
-		}
-		else {
-			// Set the title and time format
-			if ($period <= SECONDS_6HOURS) {
-				$time_format = 'H:i:s';
-			}
-			elseif ($period < SECONDS_1DAY) {
-				$time_format = 'H:i';
-			}
-			elseif ($period < SECONDS_15DAYS) {
-				$time_format = "M d H:i";
-			}
-			elseif ($period < SECONDS_1MONTH) {
-				$time_format = "M d H\h";
-			} 
-			elseif ($period < SECONDS_6MONTHS) {
-				$time_format = "M d H\h";
-			}
-			else {
-				$time_format = "Y M d H\h";
-			}
-		}
-		
-		$timestamp_short = date($time_format, $timestamp);
-		$long_index[$timestamp_short] = date(
-			html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
-		if (!$projection) {
-			if (!$fullscale) {
-				//XXXXXX
-				//$timestamp = $timestamp_short;
-			}
-		}
-		
-		// Data
-		if ($show_events) {
-			if (!isset($chart[$timestamp]['event'.$series_suffix])) {
-				$chart[$timestamp]['event'.$series_suffix] = 0;
-			}
-			
-			$chart[$timestamp]['event'.$series_suffix] += $event_value;
-			$series_type['event'.$series_suffix] = 'points';
-		}
-		if ($show_alerts) {
-			if (!isset($chart[$timestamp]['alert'.$series_suffix])) {
-				$chart[$timestamp]['alert'.$series_suffix] = 0;
-			}
-			
-			$chart[$timestamp]['alert'.$series_suffix] += $alert_value;
-			$series_type['alert'.$series_suffix] = 'points';
-		}
-		
-		if ($count > 0) {
-			
-			if ($avg_only) {
-				$chart[$timestamp]['sum'.$series_suffix] = $total;
-			}
-			else if($max_only){
-				$chart[$timestamp]['max'.$series_suffix] = $interval_max;
-			}
-			else if($min_only){
-				$chart[$timestamp]['min'.$series_suffix] = $interval_min;
-			}
-			else{
-				$chart[$timestamp]['max'.$series_suffix] = $interval_max;
-				$chart[$timestamp]['sum'.$series_suffix] = $total;
-				$chart[$timestamp]['min'.$series_suffix] = $interval_min;
-			}
-		// Compressed data
-		}
-		else {
-			if ($uncompressed_module || ($timestamp > time ())) {
-				if ($avg_only) {
-					$chart[$timestamp]['sum'.$series_suffix] = 0;
-				}
-				else if($max_only){
-					$chart[$timestamp]['max'.$series_suffix] = 0;
-				}
-				else if($min_only){
-					$chart[$timestamp]['min'.$series_suffix] = 0;
-				}
-				else{
-					$chart[$timestamp]['max'.$series_suffix] = 0;
-					$chart[$timestamp]['sum'.$series_suffix] = 0;
-					$chart[$timestamp]['min'.$series_suffix] = 0;
-				}
-			}
-			else {
-				if ($avg_only) {
-					$chart[$timestamp]['sum'.$series_suffix] = $last_known;
-				}
-				else if ($max_only) {
-					$chart[$timestamp]['max'.$series_suffix] = $last_known;
-				}
-				else if ($min_only) {
-					$chart[$timestamp]['min'.$series_suffix] = $last_known;
-				}
-				else {
-					$chart[$timestamp]['max'.$series_suffix] = $last_known;
-					$chart[$timestamp]['sum'.$series_suffix] = $last_known;
-					$chart[$timestamp]['min'.$series_suffix] = $last_known;
-				}
-			}
-		}
-
-		if ($uncompressed_module || ($timestamp > time ())) {
-			if (!isset($chart[$timestamp]['no_data'.$series_suffix])) {
-				$chart[$timestamp]['no_data'.$series_suffix] = 0;
-			}
-			if ($chart[$timestamp]['sum'.$series_suffix] == $last_known) {
-				$chart[$timestamp]['no_data'.$series_suffix] = 0;
-				$series_type['no_data'.$series_suffix] = 'area';
-			}
-			else {
-				if($uncompressed_module){
-					$chart[$timestamp]['sum'.$series_suffix] = $last_known;
-					$series_type['sum'.$series_suffix] = 'area';
-				}
-				else{
-					$chart[$timestamp]['no_data'.$series_suffix] = $last_known;
-					$series_type['no_data'.$series_suffix] = 'area';
-				}
-			}
-		}
-		
-		if ($show_unknown) {
-			if (!isset($chart[$timestamp]['unknown'.$series_suffix])) {
-				$chart[$timestamp]['unknown'.$series_suffix] = 0;
-			}
-			$chart[$timestamp]['unknown'.$series_suffix] = $unknown_value;
-
-			if($unknown_value == 0 && $check_unknown == true){
-				$chart[$timestamp]['unknown'.$series_suffix] = 1;
-				$check_unknown = false;
-			}
-
-			$series_type['unknown'.$series_suffix] = 'unknown';
-		}
-		
-		if (!empty($event_ids)) {
-			$chart_extra_data[count($chart)-1]['events'] = implode(',',$event_ids);
-		}
-		if (!empty($alert_ids)) {
-			$chart_extra_data[count($chart)-1]['alerts'] = implode(',',$alert_ids);
-		}
-	}
-	
-	//min paint graph 2 elements
-	if(count($chart) == 1){
-		$timestamp_short = date($time_format, $date_limit);
-		foreach($chart as $key => $value){
-			$chart[$timestamp_short] = $value;
-		}
-	}
-	
-	if (!is_null($percentil) && $percentil) {
-		$avg = array_map(function($item) { return $item['sum'];}, $chart);
-		
-		$percentil_result = get_percentile($percentil, $avg);
-
-		//Fill the data of chart
-		array_walk($chart, function(&$item) use ($percentil_result, $series_suffix) {
-			$item['percentil' . $series_suffix] = $percentil_result; });
-		$series_type['percentil' . $series_suffix] = 'line';
-	}
-}
-
-
-function grafico_modulo_sparse_data_new(
-	$agent_module_id, $date_array, 
-	$data_module_graph, $show_elements_graph, 
+function grafico_modulo_sparse_data(
+	$agent_module_id, $date_array,
+	$data_module_graph, $show_elements_graph,
 	$format_graph, $exception_interval_graph,
 	$series_suffix, $str_series_suffix) {
 
@@ -667,7 +361,7 @@ function grafico_modulo_sparse_data_new(
 	global $series_type;
 
 	if($show_elements_graph['fullscale']){
-		$array_data = fullscale_data_new(
+		$array_data = fullscale_data(
 			$agent_module_id,
 			$date_array,
 			$show_elements_graph['show_unknown'],
@@ -678,16 +372,20 @@ function grafico_modulo_sparse_data_new(
 		);
 	}
 	else{
-		$array_data = grafico_modulo_sparse_data_chart_new (
+		$array_data = grafico_modulo_sparse_data_chart (
 			$agent_module_id,
 			$date_array,
 			$data_module_graph,
 			$show_elements_graph,
-			$format_graph, 
+			$format_graph,
 			$series_suffix
 		);
 	}
 
+	if($array_data === false){
+		return false;
+	}
+
 	if($show_elements_graph['percentil']){
 		$percentil_value = $array_data['percentil' . $series_suffix]['data'][0][1];
 	}
@@ -703,7 +401,6 @@ function grafico_modulo_sparse_data_new(
 	}
 
 	if(!$show_elements_graph['flag_overlapped']){
-		
 		if($show_elements_graph['fullscale']){
 			if(	$show_elements_graph['show_unknown'] &&
 				isset($array_data['unknown' . $series_suffix]) &&
@@ -718,45 +415,46 @@ function grafico_modulo_sparse_data_new(
 		else{
 			if(	$show_elements_graph['show_unknown'] ) {
 				$unknown_events = db_get_module_ranges_unknown(
-					$agent_module_id, 
-					$date_array['start_date'], 
-					$date_array['final_date'], 
-					$data_module_graph['history_db']
+					$agent_module_id,
+					$date_array['start_date'],
+					$date_array['final_date'],
+					$data_module_graph['history_db'],
+					1 // fix the time ranges to start_date - final_date
 				);
 
 				if($unknown_events !== false){
 					foreach ($unknown_events as $key => $s_date) {
-						if( isset($s_date['time_from']) ){
-							$array_data['unknown' . $series_suffix]['data'][] = array( 
+						if( isset($s_date['time_from'])) {
+							$array_data['unknown' . $series_suffix]['data'][] = array(
 								($s_date['time_from'] - 1) * 1000,
 								0
 							);
-							
-							$array_data['unknown' . $series_suffix]['data'][] = array(	
+
+							$array_data['unknown' . $series_suffix]['data'][] = array(
 								$s_date['time_from'] * 1000,
 								$max * 1.05
 							);
 						}
 						else{
-							$array_data['unknown' . $series_suffix]['data'][] = array(	
+							$array_data['unknown' . $series_suffix]['data'][] = array(
 								$date_array['start_date'] * 1000,
 								$max * 1.05
 							);
 						}
-						
+
 						if( isset($s_date['time_to']) ){
 							$array_data['unknown' . $series_suffix]['data'][] = array(
 								$s_date['time_to'] * 1000,
 								$max * 1.05
 							);
-							
-							$array_data['unknown' . $series_suffix]['data'][] = array( 
+
+							$array_data['unknown' . $series_suffix]['data'][] = array(
 								($s_date['time_to'] + 1) * 1000,
 								0
 							);
 						}
 						else{
-							$array_data['unknown' . $series_suffix]['data'][] = array(	
+							$array_data['unknown' . $series_suffix]['data'][] = array(
 								$date_array['final_date'] * 1000,
 								$max * 1.05
 							);
@@ -765,10 +463,10 @@ function grafico_modulo_sparse_data_new(
 				}
 			}
 		}
-		
-		if ($show_elements_graph['show_events']  || 
+
+		if ($show_elements_graph['show_events']  ||
 			$show_elements_graph['show_alerts'] ) {
-			
+
 			$events = db_get_all_rows_filter (
 				'tevento',
 				array ('id_agentmodule' => $agent_module_id,
@@ -776,7 +474,7 @@ function grafico_modulo_sparse_data_new(
 						"utimestamp < " . $date_array['final_date'],
 						'order' => 'utimestamp ASC'
 					),
-				false, 
+				false,
 				'AND',
 				$data_module_graph['history_db']
 			);
@@ -807,7 +505,7 @@ function grafico_modulo_sparse_data_new(
 				}
 			}
 		}
-		
+
 		if($show_elements_graph['show_events']){
 			$array_data['event' . $series_suffix] = $events_array;
 		}
@@ -820,7 +518,7 @@ function grafico_modulo_sparse_data_new(
 	if ($show_elements_graph['return_data'] == 1) {
 		return $array_data;
 	}
-	
+
 	// Only show caption if graph is not small
 	if ($width > MIN_WIDTH_CAPTION && $height > MIN_HEIGHT){
 		//Flash chart
@@ -857,355 +555,18 @@ function grafico_modulo_sparse_data_new(
 	$series_type['event'.$series_suffix] = 'points';
 	$series_type['alert'.$series_suffix] = 'points';
 	$series_type['unknown'.$series_suffix] = 'unknown';
-	if($boolean_graph){
-		$series_type['sum'.$series_suffix] = 'boolean';
-	}
-	else{
-		$series_type['sum'.$series_suffix] = 'area';
+	switch ($data_module_graph['id_module_type']) {
+		case 21: case 2: case 6:
+		case 18: case 9: case 31:
+			$series_type['sum'.$series_suffix] = 'boolean';
+			break;
+		default:
+			$series_type['sum'.$series_suffix] = 'area';
+			break;
 	}
 	$series_type['percentil' . $series_suffix] = 'percentil';
 }
 
-function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
-	$width, $height , $title = '', $unit_name = null,
-	$show_alerts = false, $avg_only = 0, $date = 0, $unit = '',
-	$baseline = 0, $return_data = 0, $show_title = true, $projection = false, 
-	$adapt_key = '', $compare = false, $series_suffix = '', $series_suffix_str = '', 
-	$show_unknown = false, $percentil = null, $dashboard = false, $vconsole = false,
-	$type_graph='area', $fullscale = false, $flash_chart = false, $force_interval = false,$time_interval = 300,
-	$max_only = 0, $min_only = 0) {
-		
-	global $config;
-	global $chart;
-	global $color;
-	global $legend;
-	global $long_index;
-	global $series_type;
-	global $chart_extra_data;
-	global $warning_min;
-	global $critical_min;
-	global $graphic_type;
-	global $max_value;
-	global $min_value;
-	
-	$chart = array();
-	$color = array();
-	$legend = array();
-	$long_index = array();
-	$warning_min = 0;
-	$critical_min = 0;
-	$start_unknown = false;
-	
-	// Set variables
-	if ($date == 0) {
-		$date = get_system_time();
-	}
-	
-	$datelimit = $date - $period;
-	
-	
-	$search_in_history_db = db_search_in_history_db($datelimit);
-	
-	if($force_interval){
-			$resolution = $period/$time_interval;
-	}
-	else{
-		$resolution = $config['graph_res'] * 50; //Number of points of the graph
-	}
-	
-	if($force_interval){
-		$interval = $time_interval;
-	}
-	else{
-		$interval = (int) ($period / $resolution);
-		
-	}
-	
-	$agent_name = modules_get_agentmodule_agent_name ($agent_module_id);
-	$agent_id = agents_get_agent_id ($agent_name);
-	$module_name = modules_get_agentmodule_name ($agent_module_id);
-	$id_module_type = modules_get_agentmodule_type ($agent_module_id);
-	$module_type = modules_get_moduletype_name ($id_module_type);
-	$uncompressed_module = is_module_uncompressed ($module_type);
-	if ($uncompressed_module) {
-		$avg_only = 1;
-	}
-	
-	$flash_chart = $config['flash_charts'];
-	
-	
-	// Get event data (contains alert data too)
-	$events = array();
-	if ($show_unknown == 1 || $show_events == 1 || $show_alerts == 1) {
-		$events = db_get_all_rows_filter (
-			'tevento',
-			array ('id_agentmodule' => $agent_module_id,
-				"utimestamp > $datelimit",
-				"utimestamp < $date",
-				'order' => 'utimestamp ASC'),
-			array ('id_evento', 'evento', 'utimestamp', 'event_type'), 
-			'AND', 
-			$search_in_history_db
-		);
-		
-		// Get the last event after inverval to know if graph start on unknown
-		$prev_event = db_get_row_filter (
-			'tevento',
-			array ('id_agentmodule' => $agent_module_id,
-				"utimestamp <= $datelimit",
-				'order' => 'utimestamp DESC'
-			),
-			false,
-			'AND',
-			$search_in_history_db	
-		);
-
-		if (isset($prev_event['event_type']) && $prev_event['event_type'] == 'going_unknown') {
-			$start_unknown = true;
-		}
-		
-		if ($events === false) {
-			$events = array ();
-		}
-	}
-	
-	// Get module data
-	if ($fullscale) {
-		fullscale_data( $chart, $chart_data_extra, $long_index, $series_type,
-						$agent_module_id, $datelimit, $date, $events, 
-						$show_events, $show_unknown, $show_alerts, 
-						$series_suffix, $percentil, $flash_chart, false);
-		if (count($chart) > $resolution) {
-			$resolution = count($chart); //Number of points of the graph
-			$interval = (int) ($period / $resolution);
-		}
-	}
-	else {
-		$data = db_get_all_rows_filter ('tagente_datos',
-						array ('id_agente_modulo' => (int)$agent_module_id,
-								"utimestamp > $datelimit",
-								"utimestamp < $date",
-								'order' => 'utimestamp ASC'),
-						array ('datos', 'utimestamp'), 'AND', $search_in_history_db);
-
-		if ($data === false) {
-			$data = array ();
-		}
-		
-		if ($uncompressed_module) {
-			// Uncompressed module data	
-			$min_necessary = 1;
-		}
-		else {
-			// Compressed module data
-			
-			// Get previous data
-			$previous_data = modules_get_previous_data ($agent_module_id, $datelimit);
-			if ($previous_data !== false) {
-				$previous_data['utimestamp'] = $datelimit;
-				array_unshift ($data, $previous_data);
-			}
-			
-			// Get next data
-			$nextData = modules_get_next_data ($agent_module_id, $date);
-			if ($nextData !== false) {
-				array_push ($data, $nextData);
-			}
-			else if (count ($data) > 0) {
-				// Propagate the last known data to the end of the interval
-				$nextData = array_pop ($data);
-				array_push ($data, $nextData);
-				$nextData['utimestamp'] = $date;
-				array_push ($data, $nextData);
-			}
-			$min_necessary = 2;
-		}
-
-		// Check available data
-		if (count ($data) < $min_necessary) {
-			if (!$graphic_type) {
-				if (!$projection) {
-					return fs_error_image ();
-				}
-				else {
-					return fs_error_image ();
-				}
-			}
-			graphic_error ();
-		}
-		
-		// Data iterator
-		$data_i = 0;
-		
-		// Set initial conditions
-		if ($data[0]['utimestamp'] == $datelimit) {
-			$previous_data = $data[0]['datos'];
-			$data_i++;
-		}
-		else {
-			$previous_data = 0;
-		}
-	}
-	// Get baseline data
-	$baseline_data = array();
-	if ($baseline) {
-		$baseline_data = array ();
-		if ($baseline == 1) {
-			$baseline_data = enterprise_hook(
-				'reporting_enterprise_get_baseline',
-				array ($agent_module_id, $period, $width, $height , $title, $unit_name, $date));
-			if ($baseline_data === ENTERPRISE_NOT_HOOK) {
-				$baseline_data = array ();
-			}
-		}
-	}
-	
-	if (empty($unit)) {
-		$unit = modules_get_unit($agent_module_id);
-		if(modules_is_unit_macro($unit)){
-			$unit = "";		
-		}
-	}
-
-	// Get module warning_min and critical_min
-	$warning_min  = db_get_value('min_warning','tagente_modulo','id_agente_modulo',$agent_module_id);
-	$critical_min = db_get_value('min_critical','tagente_modulo','id_agente_modulo',$agent_module_id);
-
-	// Calculate chart data
-	if($fullscale){
-		$avg_only = 1;
-
-		//Percentil
-		if (!is_null($percentil) && $percentil) {
-			$avg = array_map(function($item) { return $item['sum'];}, $chart);
-			
-			$percentil_result = get_percentile($percentil, $avg);
-	
-			//Fill the data of chart
-			array_walk($chart, function(&$item) use ($percentil_result, $series_suffix) {
-				$item['percentil' . $series_suffix] = $percentil_result; });
-			$series_type['percentil' . $series_suffix] = 'line';
-		}
-	}
-	else{
-		grafico_modulo_sparse_data_chart ($chart, $chart_data_extra, $long_index, 
-			$data, $data_i, $previous_data, $resolution, $interval, $period, $datelimit, 
-			$projection, $avg_only, $uncompressed_module, 
-			$show_events, $show_alerts, $show_unknown, $baseline, 
-			$baseline_data, $events, $series_suffix, $start_unknown,
-			$percentil, $fullscale, $force_interval, $time_interval, 
-			$max_only, $min_only);
-	}
-
-	// Return chart data and don't draw
-	if ($return_data == 1) {
-		return $chart;
-	}
-	
-	$graph_stats = get_statwin_graph_statistics($chart, $series_suffix);
-	
-	// Fix event and alert scale
-	if ($max_value > 0) {
-		$event_max = 2 + (float)$max_value * 1.05;
-	}
-	else {
-		$event_max = abs(($max_value+$min_value)/2);
-		if ($event_max < 5) {
-			$event_max = 5;
-		}
-	}
-
-	foreach ($chart as $timestamp => $chart_data) {
-		if($chart_data['max'] > $event_max){
-			$event_max = $chart_data['max'];
-		}
-		if ($show_events && $chart_data['event' . $series_suffix] > 0) {
-			$chart[$timestamp]['event' . $series_suffix] = $event_max * 1.2;
-		}
-		if ($show_alerts && $chart_data['alert' . $series_suffix] > 0) {
-			$chart[$timestamp]['alert' . $series_suffix] = $event_max * 1.10;
-		}
-		if ($show_unknown && $chart_data['unknown' . $series_suffix] > 0) {
-			$chart[$timestamp]['unknown' . $series_suffix] = $event_max * 1.05;
-		}
-	}
-	
-	// Only show caption if graph is not small
-	if ($width > MIN_WIDTH_CAPTION && $height > MIN_HEIGHT)
-		//Flash chart
-		$caption =
-			__('Max. Value') . $series_suffix_str . ': ' . $graph_stats['sum']['max'] . '    ' .
-			__('Avg. Value') . $series_suffix_str . ': ' .  $graph_stats['sum']['avg'] . '    ' .
-			__('Min. Value') . $series_suffix_str . ': ' . $graph_stats['sum']['min'] . '    ' .
-			__('Units. Value') . $series_suffix_str . ': ' . $unit;
-	else
-		$caption = array();
-	
-	$color = color_graph_array($series_suffix);
-	
-	if ($show_events) {
-		$legend['event'.$series_suffix_str] = __('Events').$series_suffix_str;
-		$chart_extra_data['legend_events'] = $legend['event'.$series_suffix_str];
-	}
-	if ($show_alerts) {
-		$legend['alert'.$series_suffix] = __('Alerts').$series_suffix_str;
-		$chart_extra_data['legend_alerts'] = $legend['alert'.$series_suffix_str];
-	}
-	
-	if ($vconsole) {
-		$legend['sum'.$series_suffix] =
-			__('Last') . ': ' . remove_right_zeros(number_format($graph_stats['sum']['last'], $config['graph_precision'])) . ($unit ? ' ' . $unit : '') . ' ; '
-			. __('Avg') . ': ' . remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])) . ($unit ? ' ' . $unit : '');
-	}
-	else if ($dashboard && !$avg_only) {
-		$legend['max'.$series_suffix] = __('Max').$series_suffix_str.': '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['max']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['max']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['max']['min'], $config['graph_precision'])).' '.$unit;
-		$legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['sum']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['sum']['min'], $config['graph_precision'])).' '.$unit;
-		$legend['min'.$series_suffix] = __('Min').$series_suffix_str.': '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['min']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['min']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['min']['min'], $config['graph_precision'])).' '.$unit;
-	}
-	else if ($dashboard) {
-		$legend['sum'.$series_suffix] =
-			__('Last') . ': ' . remove_right_zeros(number_format($graph_stats['sum']['last'], $config['graph_precision'])) . ($unit ? ' ' . $unit : '') . ' ; '
-			. __('Avg') . ': ' . remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])) . ($unit ? ' ' . $unit : '');
-	}
-	else if (!$avg_only && !$fullscale) {
-		$legend['max'.$series_suffix] = __('Max').$series_suffix_str.': '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['max']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['max']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['max']['min'], $config['graph_precision'])).' '.$unit;
-		$legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['sum']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['sum']['min'], $config['graph_precision'])).' '.$unit;
-		$legend['min'.$series_suffix] = __('Min').$series_suffix_str.': '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['min']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['min']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['min']['min'], $config['graph_precision'])).' '.$unit;
-	}
-	else if ($fullscale){
-		$legend['sum'.$series_suffix] = __('Data').$series_suffix_str.': ';
-	}
-	else {
-		$legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['sum']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['sum']['min'], $config['graph_precision'])).' '.$unit;
-	}
-
-	if ($show_unknown) {
-		$legend['unknown'.$series_suffix] = __('Unknown').$series_suffix_str;
-		$chart_extra_data['legend_unknown'] = $legend['unknown'.$series_suffix_str];
-	}
-
-	if (!is_null($percentil) && $percentil) {
-		$first_data = reset($chart);
-		$percentil_value = format_for_graph($first_data['percentil'], 2);
-		
-		$legend['percentil'.$series_suffix] = __('Percentile %dº', $percentil)  .$series_suffix_str . " (" . $percentil_value . " " . $unit . ") ";
-		$chart_extra_data['legend_percentil'] = $legend['percentil'.$series_suffix_str];
-	}
-
-	if($force_interval){
-		$legend = array();
-		if($avg_only){
-			$legend['sum'.$series_suffix] = __('Avg');
-		}
-		elseif ($max_only) {
-			$legend['min'.$series_suffix] = __('Max');
-		}
-		elseif ($min_only) {
-			$legend['max'.$series_suffix] = __('Min');	
-		}	
-	}
-}
-
 function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	$width, $height , $title = '', $unit_name = null,
 	$show_alerts = false, $avg_only = 0, $pure = false, $date = 0,
@@ -1216,16 +577,9 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	$dashboard = false, $vconsole = false, $type_graph = 'area', $fullscale = false,
 	$id_widget_dashboard = false,$force_interval = 0,$time_interval = 300,
 	$max_only = 0, $min_only = 0) {
-	
+
 	global $config;
 	global $graphic_type;
-	
-	$flash_chart = $config['flash_charts'];
-
-//XXXX
-$entra_por = 1;
-if($flash_chart && $entra_por){
-	
 	global $array_data;
 	global $caption;
 	global $color;
@@ -1237,9 +591,6 @@ if($flash_chart && $entra_por){
 	$color = array();
 	$legend = array();
 	$series_type = array();
-	
-	//XXX aqui empieza la obtencion de datos:
-	//Es infernal la cantidad de parametros que se le mandan pasamos a un array para simplificar este proceso:
 
 	//date start final period
 	if($date == 0){
@@ -1251,18 +602,21 @@ if($flash_chart && $entra_por){
 	$date_array["final_date"] = $date;
 	$date_array["start_date"] = $date - $period;
 
-
-	$module_data = db_get_row_sql ('SELECT * FROM tagente_modulo WHERE id_agente_modulo = ' . $agent_module_id);
+	$module_data = db_get_row_sql (
+		'SELECT * FROM tagente_modulo
+		WHERE id_agente_modulo = ' .
+		$agent_module_id
+	);
 
 	$data_module_graph = array();
 	$data_module_graph['history_db']     = db_search_in_history_db($date_array["start_date"]);
 	$data_module_graph['agent_name']     = modules_get_agentmodule_agent_name ($agent_module_id);
-	$data_module_graph['agent_id']       = $module_data['id_agente']; 
+	$data_module_graph['agent_id']       = $module_data['id_agente'];
 	$data_module_graph['module_name']    = $module_data['nombre'];
-	$data_module_graph['id_module_type'] = $module_data['id_tipo_modulo']; 
+	$data_module_graph['id_module_type'] = $module_data['id_tipo_modulo'];
 	$data_module_graph['module_type']    = modules_get_moduletype_name ($data_module_graph['id_module_type']);
 	$data_module_graph['uncompressed']   = is_module_uncompressed ($data_module_graph['module_type']);
-	$data_module_graph['w_min']    		 = $module_data['min_warning']; 
+	$data_module_graph['w_min']    		 = $module_data['min_warning'];
 	$data_module_graph['w_max']   		 = $module_data['max_warning'];
 	$data_module_graph['w_inv']    		 = $module_data['warning_inverse'];
 	$data_module_graph['c_min']    		 = $module_data['min_critical'];
@@ -1329,7 +683,9 @@ if($flash_chart && $entra_por){
 	$exception_interval_graph['time_interval']  = $time_interval;
 	$exception_interval_graph['max_only']       = $max_only;
 	$exception_interval_graph['min_only']       = $min_only;
-	
+
+	$type_graph = $config['type_module_charts'];
+
 	if ($show_elements_graph['compare'] !== false) {
 		$series_suffix = 2;
 		$series_suffix_str = ' (' . __('Previous') . ')';
@@ -1337,15 +693,15 @@ if($flash_chart && $entra_por){
 		$date_array_prev['final_date'] = $date_array['start_date'];
 		$date_array_prev['start_date'] = $date_array['start_date'] - $date_array['period'];
 		$date_array_prev['period']     = $date_array['period'];
-		
+
 		if ($show_elements_graph['compare'] === 'overlapped') {
 			$show_elements_graph['flag_overlapped'] = 1;
 		}
 		else{
 			$show_elements_graph['flag_overlapped'] = 0;
 		}
-		
-		grafico_modulo_sparse_data_new(	
+
+		grafico_modulo_sparse_data(
 			$agent_module_id, $date_array_prev,
 			$data_module_graph, $show_elements_graph,
 			$format_graph, $exception_interval_graph,
@@ -1369,7 +725,7 @@ if($flash_chart && $entra_por){
 	$series_suffix_str = '';
 	$show_elements_graph['flag_overlapped'] = 0;
 
-	grafico_modulo_sparse_data_new(	
+	grafico_modulo_sparse_data(
 		$agent_module_id, $date_array,
 		$data_module_graph, $show_elements_graph,
 		$format_graph, $exception_interval_graph,
@@ -1384,47 +740,23 @@ if($flash_chart && $entra_por){
 		}
 	}
 
-	if (empty($array_data)) {
-		//XXXX
-		return graph_nodata_image($width, $height);
-		return '<img src="' . $no_data_image . '" />';
-	}
-
 	//XXX
-	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-
+	//esto lo tenia la bool
+	$water_mark = array(
+		'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
+		'url' => ui_get_full_url(
+			"/images/logo_vertical_water.png",
+			false,
+			false,
+			false
+		)
+	);
+	//esto la sparse
+	//setup_watermark($water_mark, $water_mark_file, $water_mark_url);
+	// Check available data
 	if ($show_elements_graph['compare'] === 'separated') {
-		return 	flot_area_graph_new(
-					$agent_module_id,
-					$array_data,
-					$color,
-					$legend,
-					$series_type,
-					$date_array,
-					$data_module_graph,
-					$show_elements_graph,
-					$format_graph,
-					$water_mark,
-					$series_suffix_str
-				) .
-				'<br>'
-				.
-				flot_area_graph_new(
-					$agent_module_id,
-					$array_data_prev,
-					$color,
-					$legend,
-					$series_type,
-					$date_array,
-					$data_module_graph,
-					$show_elements_graph,
-					$format_graph,
-					$water_mark,
-					$series_suffix_str
-				);
-	}
-	else{
-		return flot_area_graph_new(
+		if (!empty($array_data)) {
+			$return = area_graph(
 				$agent_module_id,
 				$array_data,
 				$color,
@@ -1437,11 +769,54 @@ if($flash_chart && $entra_por){
 				$water_mark,
 				$series_suffix_str
 			);
+		}
+		else{
+			$return = graph_nodata_image($width, $height);
+		}
+		$return .= '<br>';
+		if (!empty($array_data_prev)) {
+			$return .= area_graph(
+				$agent_module_id,
+				$array_data_prev,
+				$color,
+				$legend,
+				$series_type,
+				$date_array,
+				$data_module_graph,
+				$show_elements_graph,
+				$format_graph,
+				$water_mark,
+				$series_suffix_str
+			);
+		}
+		else{
+			$return .= graph_nodata_image($width, $height);
+		}
+	}
+	else{
+		if (!empty($array_data)) {
+			$return = area_graph(
+				$agent_module_id,
+				$array_data,
+				$color,
+				$legend,
+				$series_type,
+				$date_array,
+				$data_module_graph,
+				$show_elements_graph,
+				$format_graph,
+				$water_mark,
+				$series_suffix_str
+			);
+		}
+		else{
+			$return = graph_nodata_image($width, $height);
+		}
 	}
-	
-die();
-}
 
+return $return;
+
+//de aki al final eliminar;
 
 	enterprise_include_once("include/functions_reporting.php");
 
@@ -1460,7 +835,7 @@ die();
 		$series_suffix = '2';
 		$series_suffix_str = ' (' . __('Previous') . ')';
 		// Build the data of the previous period
-		
+
 		grafico_modulo_sparse_data ($agent_module_id, $period,
 			$show_events, $width, $height, $title, $unit_name,
 			$show_alerts, $avg_only, $date-$period, $unit, $baseline,
@@ -1615,7 +990,7 @@ die();
 
 function graph_get_formatted_date($timestamp, $format1, $format2) {
 	global $config;
-	
+
 	if ($config['flash_charts']) {
 		$date = date("$format1 $format2", $timestamp);
 	}
@@ -1625,7 +1000,7 @@ function graph_get_formatted_date($timestamp, $format1, $format2) {
 			$date .= "\n".date($format2, $timestamp);
 		}
 	}
-	
+
 	return $date;
 }
 
@@ -2964,16 +2339,16 @@ function fullscale_data_combined($module_list, $period, $date, $flash_charts, $p
 		foreach ($data_uncompress as $key_data => $value_data) {
 			foreach ($value_data['data'] as $k => $v) {
 				$real_date = $v['utimestamp'];
-			
+
 				if(!isset($v['datos'])){
-						$v['datos'] = $previous_data;
+					$v['datos'] = $previous_data;
 				}
 				else{
-						$previous_data = $v['datos'];
+					$previous_data = $v['datos'];
 				}
 
 				if (!is_null($percentil) && $percentil) {
-						$array_percentil[] = $v['datos'];
+					$array_percentil[] = $v['datos'];
 				}
 
 				$data_all[$real_date][$key_module] = $v['datos'];
@@ -2981,11 +2356,11 @@ function fullscale_data_combined($module_list, $period, $date, $flash_charts, $p
 		}
 
 		if (!is_null($percentil) && $percentil) {
-				$percentil_value = get_percentile($config['percentil'], $array_percentil);
-				$percentil_result[$key_module] = array_fill (0, count($data_all), $percentil_value);
-				if(count($data_all) > $count_data_all){
-						$count_data_all = count($data_all);
-				}
+			$percentil_value = get_percentile($config['percentil'], $array_percentil);
+			$percentil_result[$key_module] = array_fill (0, count($data_all), $percentil_value);
+			if(count($data_all) > $count_data_all){
+				$count_data_all = count($data_all);
+			}
 		}
 	}
 
@@ -3039,19 +2414,18 @@ function fullscale_data_combined($module_list, $period, $date, $flash_charts, $p
 function graphic_agentaccess ($id_agent, $width, $height, $period = 0, $return = false) {
 	global $config;
 	global $graphic_type;
-	
-	
+
 	$data = array ();
-	
+
 	$resolution = $config["graph_res"] * ($period * 2 / $width); // Number of "slices" we want in graph
-	
+
 	$interval = (int) ($period / $resolution);
-	$date = get_system_time ();
+	$date = get_system_time();
 	$datelimit = $date - $period;
 	$periodtime = floor ($period / $interval);
 	$time = array ();
 	$data = array ();
-	
+
 	$empty_data = true;
 	for ($i = 0; $i < $interval; $i++) {
 		$bottom = $datelimit + ($periodtime * $i);
@@ -3061,31 +2435,20 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0, $return =
 		else {
 			$name = $bottom;
 		}
-		
+
 		$top = $datelimit + ($periodtime * ($i + 1));
-		switch ($config["dbtype"]) {
-			case "mysql":
-			case "postgresql":
-				$data[$name]['data'] = (int) db_get_value_filter ('COUNT(*)',
-					'tagent_access',
-					array ('id_agent' => $id_agent,
-						'utimestamp > '.$bottom,
-						'utimestamp < '.$top));
-				break;
-			case "oracle":
-				$data[$name]['data'] = (int) db_get_value_filter ('count(*)',
-					'tagent_access',
-					array ('id_agent' => $id_agent,
-						'utimestamp > '.$bottom,
-						'utimestamp < '.$top));
-				break;
-		}
-		
+
+		$data[$name]['data'] = (int) db_get_value_filter ('COUNT(*)',
+			'tagent_access',
+			array ('id_agent' => $id_agent,
+				'utimestamp > '.$bottom,
+				'utimestamp < '.$top));
+
 		if ($data[$name]['data'] != 0) {
 			$empty_data = false;
 		}
 	}
-	
+
 	if($config["fixed_graph"] == false){
 		$water_mark = array('file' =>
 			$config['homedir'] . "/images/logo_vertical_water.png",
@@ -3096,12 +2459,13 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0, $return =
 		$out = graph_nodata_image($width, $height);
 	}
 	else {
-		$out = area_graph($config['flash_charts'], $data, $width, $height, null, null, null,
+		$out = area_graph(
+			$config['flash_charts'], $data, $width, $height, null, null, null,
 			ui_get_full_url("images/image_problem_area_small.png", false, false, false),
 			"", "", ui_get_full_url(false, false, false, false), $water_mark,
 			$config['fontpath'], $config['font_size'], "", 1, array(), array(), 0, 0, '', false, '', false);
 	}
-	
+
 	if ($return) {
 		return $out;
 	}
@@ -3904,7 +3268,6 @@ function graphic_incident_group () {
 
 /**
  * Print a graph with access data of agents
- * 
  * @param integer id_agent Agent ID
  * @param integer width pie graph width
  * @param integer height pie graph height
@@ -4706,7 +4069,7 @@ function graph_graphic_moduleevents ($id_agent, $id_module, $width, $height, $pe
 			$out .=  "&nbsp;";
 		}
 	}
-	
+
 	if ($return) {
 		return $out;
 	}
@@ -4718,446 +4081,20 @@ function graph_graphic_moduleevents ($id_agent, $id_module, $width, $height, $pe
 // Prints an error image
 function fs_error_image ($width = 300, $height = 110) {
 	global $config;
-	
 	return graph_nodata_image($width, $height, 'area');
 }
 
-function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
-	$unit_name, $show_alerts, $avg_only = 0,
-	$date = 0, $series_suffix = '', $series_suffix_str = '', $show_unknown = false,
-	$fullscale = false, $flash_chart = true) {
-
-	global $config;
-	global $chart;
-	global $color;
-	global $legend;
-	global $long_index;
-	global $series_type;
-	global $chart_extra_data;
-
-	$chart = array();
-	$color = array();
-	$legend = array();
-	$long_index = array();
-	$start_unknown = false;
-	
-	// Set variables
-	if ($date == 0) $date = get_system_time();
-	$datelimit = $date - $period;
-	$search_in_history_db = db_search_in_history_db($datelimit);
-	$resolution = $config['graph_res'] * 50; //Number of points of the graph
-	$interval = (float) ($period / $resolution);
-	$agent_name = modules_get_agentmodule_agent_name ($agent_module_id);
-	$agent_id = agents_get_agent_id ($agent_name);
-	$module_name = modules_get_agentmodule_name ($agent_module_id);
-	$id_module_type = modules_get_agentmodule_type ($agent_module_id);
-	$module_type = modules_get_moduletype_name ($id_module_type);
-	$uncompressed_module = is_module_uncompressed ($module_type);
-	if ($uncompressed_module) {
-		$avg_only = 1;
-	}
-	
-	// Get event data (contains alert data too)
-	if ($show_unknown == 1 || $show_events == 1 || $show_alerts == 1) {
-		$events = db_get_all_rows_filter(
-			'tevento',
-			array ('id_agentmodule' => $agent_module_id,
-				"utimestamp > $datelimit",
-				"utimestamp < $date",
-				'order' => 'utimestamp ASC'
-			),
-			array ('evento', 'utimestamp', 'event_type', 'id_evento'), 
-			'AND', 
-			$search_in_history_db
-		);
-		
-		// Get the last event after inverval to know if graph start on unknown
-		$prev_event = db_get_row_filter (
-			'tevento',
-			array ('id_agentmodule' => $agent_module_id,
-				"utimestamp <= $datelimit",
-				'order' => 'utimestamp DESC'
-			),
-			false,
-			'AND',
-			$search_in_history_db
-		);
-
-		if (isset($prev_event['event_type']) && $prev_event['event_type'] == 'going_unknown') {
-			$start_unknown = true;
-		}
-		
-		if ($events === false) {
-			$events = array ();
-		}
-	}
-	
-	if ($fullscale) {
-		fullscale_data( $chart, $chart_data_extra, $long_index, $series_type,
-						$agent_module_id, $datelimit, $date, $events, 
-						$show_events, $show_unknown, $show_alerts, 
-						$series_suffix, $percentil, $flash_chart,true);
-		if (count($chart) > $resolution) {
-			$resolution = count($chart); //Number of points of the graph
-			$interval = (int) ($period / $resolution);
-		}
-		$max_value=1;
-	}
-	else {
-		// Get module data
-		$data = db_get_all_rows_filter ('tagente_datos',
-			array ('id_agente_modulo' => $agent_module_id,
-				"utimestamp > $datelimit",
-				"utimestamp < $date",
-				'order' => 'utimestamp ASC'),
-			array ('datos', 'utimestamp'), 'AND', $search_in_history_db);
-	
-	
-		if ($data === false) {
-			$data = array ();
-		}
-		
-		// Uncompressed module data
-		if ($uncompressed_module) {
-			$min_necessary = 1;
-		}
-		else {
-			// Get previous data
-			$previous_data = modules_get_previous_data ($agent_module_id, $datelimit);
-			if ($previous_data !== false) {
-				$previous_data['utimestamp'] = $datelimit;
-				array_unshift ($data, $previous_data);
-			}
-			
-			// Get next data
-			$nextData = modules_get_next_data ($agent_module_id, $date);
-			if ($nextData !== false) {
-				array_push ($data, $nextData);
-			}
-			else if (count ($data) > 0) {
-				// Propagate the last known data to the end of the interval
-				$nextData = array_pop ($data);
-				array_push ($data, $nextData);
-				$nextData['utimestamp'] = $date;
-				array_push ($data, $nextData);
-			}
-			
-			$min_necessary = 2;
-		}
-		
-		// Check available data
-		if (count ($data) < $min_necessary) {
-			if (!$graphic_type) {
-				return fs_error_image ();
-			}
-			graphic_error ();
-		}
-		
-		// Data iterator
-		$j = 0;
-		
-		// Event iterator
-		$k = 0;
-		
-		// Set initial conditions
-		if ($data[0]['utimestamp'] == $datelimit) {
-			$previous_data = $data[0]['datos'];
-			$j++;
-		}
-		else {
-			$previous_data = 0;
-		}
-		
-		$max_value = 0;
-		// Calculate chart data
-		$last_known = $previous_data;
-		$first_events_unknown = $start_unknown;
-
-		for ($i = 0; $i <= $resolution; $i++) {
-			$timestamp = $datelimit + ($interval * $i);
-
-
-			$zero = 0;
-			$total = 0;
-			$count = 0;
-			
-			// Read data that falls in the current interval
-			while (isset ($data[$j]) &&
-				$data[$j]['utimestamp'] >= $timestamp &&
-				$data[$j]['utimestamp'] <= ($timestamp + $interval)) {
-				if ($data[$j]['datos'] == 0) {
-					$zero = 1;
-				}
-				else {
-					$total += $data[$j]['datos'];
-					$count++;
-				}
-				
-				$last_known = $data[$j]['datos'];
-
-				if ($show_unknown && $data[$j]['unknown']){
-					$is_unknown = true;
-				}
-				$j++;
-			}
-			
-			// Average
-			if ($count > 0) {
-				$total /= $count;
-			}
-			
-			// Read events and alerts that fall in the current interval
-			$event_value = 0;
-			$alert_value = 0;
-			$unknown_value = 0;
-			// Is the first point of a unknown interval
-			$check_unknown = false;
-			$first_unknown = false;
-			if($first_events_unknown){
-				$is_unknown = true;
-			}
-
-			$event_ids = array();
-			$alert_ids = array();
-			while (isset ($events[$k]) &&
-				$events[$k]['utimestamp'] >= $timestamp &&
-				$events[$k]['utimestamp'] < ($timestamp + $interval)) {
-				if ($show_events == 1) {
-					$event_value++;
-					$event_ids[] = $events[$k]['id_evento'];
-				}
-				if ($show_alerts == 1 && substr ($events[$k]['event_type'], 0, 5) == 'alert') {
-					$alert_value++;
-					$alert_ids[] = $events[$k]['id_evento'];
-				}
-				if ($show_unknown) {
-					if ($events[$k]['event_type'] == 'going_unknown') {
-						if ($is_unknown == false) {
-							$first_unknown = true;
-						}
-						$is_unknown = true;
-						$check_unknown = true;
-					}
-					else if (substr ($events[$k]['event_type'], 0, 5) == 'going') {
-						$first_events_unknown = false;
-						$first_unknown = false;
-						$is_unknown = false;
-					}
-				}
-				$k++;
-			}
-
-			// In some cases, can be marked as known because a recovery event
-			// was found in same interval. For this cases first_unknown is 
-			// checked too
-			if ($is_unknown || $first_unknown) {
-				$unknown_value++;
-			}
-			
-			// Set the title and time format
-			if ($period <= SECONDS_6HOURS) {
-				$time_format = 'H:i:s';
-			}
-			elseif ($period < SECONDS_1DAY) {
-				$time_format = 'H:i';
-			}
-			elseif ($period < SECONDS_15DAYS) {
-				$time_format = 'M d H:i';
-			}
-			elseif ($period < SECONDS_1MONTH) {
-				$time_format = 'M d H\h';
-			}
-			else {
-				$time_format = 'M d H\h';
-			}
-			
-			$timestamp_short = date($time_format, $timestamp);
-			$long_index[$timestamp_short] = date(
-				html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
-			if (!$fullscale) {
-				$timestamp = $timestamp_short;
-			}
-			/////////////////////////////////////////////////////////////////
-			
-			if ($total > $max_value) {
-				$max_value = $total;
-			}
-			// Data
-			if ($show_events) {
-				if (!isset($chart[$timestamp]['event'.$series_suffix])) {
-					$chart[$timestamp]['event'.$series_suffix] = 0;
-				}
-
-				$chart[$timestamp]['event'.$series_suffix] += $event_value;
-				$series_type['event'.$series_suffix] = 'points';
-			}
-			if ($show_alerts) {
-				if (!isset($chart[$timestamp]['alert'.$series_suffix])) {
-					$chart[$timestamp]['alert'.$series_suffix] = 0;
-				}
-				
-				$chart[$timestamp]['alert'.$series_suffix] += $alert_value;
-				$series_type['alert'.$series_suffix] = 'points';
-			}
-			
-			// Data and zeroes (draw a step)
-			if ($zero == 1 && $count > 0) {
-				$chart[$timestamp]['sum'.$series_suffix] = 0;
-			}
-			else if ($zero == 1) { // Just zeros
-				$chart[$timestamp]['sum'.$series_suffix] = 0;
-			}
-			else if ($count > 0) { // No zeros
-				$chart[$timestamp]['sum'.$series_suffix] = $total;
-			}
-			else { // Compressed data
-				if ($uncompressed_module || ($timestamp > time ()) || $is_unknown) {
-					$chart[$timestamp]['sum'.$series_suffix] = 0;
-				}
-				else {
-					$chart[$timestamp]['sum'.$series_suffix] = $last_known;
-				}
-			}
-			
-			$series_type['sum' . $series_suffix] = 'boolean';
-
-			if ($show_unknown) {
-				if (!isset($chart[$timestamp]['unknown'.$series_suffix])) {
-					$chart[$timestamp]['unknown'.$series_suffix] = 0;
-				}
-				$chart[$timestamp]['unknown'.$series_suffix] = $unknown_value;
-
-				if($unknown_value == 0 && $check_unknown == true){
-					$chart[$timestamp]['unknown'.$series_suffix] = 1;
-					$check_unknown = false;
-				}
-
-				$series_type['unknown'.$series_suffix] = 'unknown';
-			}
-			
-			if (!empty($event_ids)) {
-				$chart_extra_data[count($chart)-1]['events'] = implode(',',$event_ids);
-			}
-			if (!empty($alert_ids)) {
-				$chart_extra_data[count($chart)-1]['alerts'] = implode(',',$alert_ids);
-			}
-		}
-	}
-
-	if (empty($unit_name)) {
-		$unit = modules_get_unit($agent_module_id);
-	}
-	else
-		$unit = $unit_name;
-
-	// Get min, max and avg (less efficient but centralized for all modules and reports)
-	$graph_stats = get_statwin_graph_statistics($chart, $series_suffix);
-	
-	// Fix event and alert scale
-	$max_value = 1;
-	foreach ($chart as $timestamp => $chart_data) {
-		if ($show_events) {
-			if ($chart_data['event'.$series_suffix] > 0) {
-				$chart[$timestamp]['event'.$series_suffix] = $max_value * 1.2;
-			}
-		}
-		if ($show_alerts) {
-			if ($chart_data['alert'.$series_suffix] > 0) {
-				$chart[$timestamp]['alert'.$series_suffix] = $max_value * 1.10;
-			}
-		}
-		if ($show_unknown) {
-			if ($chart_data['unknown'.$series_suffix] > 0) {
-				$chart[$timestamp]['unknown'.$series_suffix] = $max_value * 1.05;
-			}
-		}
-	}
-	///////////////////////////////////////////////////
-	if(!$fullscale){
-		// Set the title and time format
-		if ($period <= SECONDS_6HOURS) {
-			$time_format = 'H:i:s';
-		}
-		elseif ($period < SECONDS_1DAY) {
-			$time_format = 'H:i';
-		}
-		elseif ($period < SECONDS_15DAYS) {
-			$time_format = 'M d H:i';
-		}
-		elseif ($period < SECONDS_1MONTH) {
-			$time_format = 'M d H\h';
-		} 
-		elseif ($period < SECONDS_6MONTHS) {
-			$time_format = "M d H\h";
-		}
-		else {
-			$time_format = 'M d H\h';
-		}
-	}
-	// Flash chart
-	$caption = __('Max. Value').$series_suffix_str . ': ' . $graph_stats['sum']['max'] . '    ' . __('Avg. Value').$series_suffix_str . 
-	': ' . $graph_stats['sum']['avg'] . '    ' . __('Min. Value').$series_suffix_str . ': ' . $graph_stats['sum']['min'] . '   ' . __('Units').$series_suffix_str . ': ' . $unit;
-	
-	/////////////////////////////////////////////////////////////////////////////////////////
-	if ($show_events) {
-		$legend['event'.$series_suffix] = __('Events').$series_suffix_str;
-		$chart_extra_data['legend_events'] = $legend['event'.$series_suffix];
-	}
-	if ($show_alerts) {
-		$legend['alert'.$series_suffix] = __('Alerts').$series_suffix_str;
-		$chart_extra_data['legend_alerts'] = $legend['alert'.$series_suffix];
-	}
-	
-	if(!$fullscale){
-		$legend['sum'.$series_suffix] = __('Avg').$series_suffix_str.': '.__('Last').': '.remove_right_zeros(number_format($graph_stats['sum']['last'], $config['graph_precision'])).' '.$unit.' ; '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['sum']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['sum']['min'], $config['graph_precision'])).' '.$unit;
-	}
-	else{
-		$legend['sum'.$series_suffix] = __('Data');
-	}
-
-	if ($show_unknown) {
-		$legend['unknown'.$series_suffix] = __('Unknown').$series_suffix_str;
-		$chart_extra_data['legend_unknown'] = $legend['unknown'.$series_suffix];
-	}
-	//$legend['baseline'.$series_suffix] = __('Baseline').$series_suffix_str;
-	/////////////////////////////////////////////////////////////////////////////////////////
-	if ($show_events) {
-		$color['event'.$series_suffix] =
-			array('border' => '#ff0000', 'color' => '#ff0000',
-				'alpha' => CHART_DEFAULT_ALPHA);
-	}
-	if ($show_alerts) {
-		$color['alert'.$series_suffix] =
-			array('border' => '#ff7f00', 'color' => '#ff7f00',
-				'alpha' => CHART_DEFAULT_ALPHA);
-	}
-	$color['max'.$series_suffix] =
-		array('border' => '#000000', 'color' => $config['graph_color3'],
-			'alpha' => CHART_DEFAULT_ALPHA);
-	$color['sum'.$series_suffix] =
-		array('border' => '#000000', 'color' => $config['graph_color2'],
-			'alpha' => CHART_DEFAULT_ALPHA);
-	$color['min'.$series_suffix] =
-		array('border' => '#000000', 'color' => $config['graph_color1'],
-			'alpha' => CHART_DEFAULT_ALPHA);
-	if ($show_unknown) {
-		$color['unknown'.$series_suffix] =
-			array('border' => '#999999', 'color' => '#999999',
-				'alpha' => CHART_DEFAULT_ALPHA);
-	}
-}
-
-function fullscale_data_new (
-	$agent_module_id, $date_array, 
-	$show_unknown = 0, $show_percentil = 0, 
+function fullscale_data (
+	$agent_module_id, $date_array,
+	$show_unknown = 0, $show_percentil = 0,
 	$series_suffix, $str_series_suffix = '',
 	$compare = false){
 
 	global $config;
-	$data_uncompress = 
+	$data_uncompress =
 		db_uncompress_module_data(
-			$agent_module_id, 
-			$date_array['start_date'], 
+			$agent_module_id,
+			$date_array['start_date'],
 			$date_array['final_date']
 		);
 
@@ -5176,7 +4113,7 @@ function fullscale_data_new (
 				$real_date = ($v['utimestamp'] + $date_array['period']) * 1000;
 			}
 			else{
-				$real_date = $v['utimestamp'] * 1000;	
+				$real_date = $v['utimestamp'] * 1000;
 			}
 
 			if ($v["datos"] === NULL) {
@@ -5194,13 +4131,6 @@ function fullscale_data_new (
 
 				$data["sum" . $series_suffix]['data'][] = array($real_date , $previous_data);
 			}
-			/*
-			elseif($v["datos"] === false) {
-				// Not Init
-				$previous_data = $v["datos"];
-				$data[$real_date]["sum" . $series_suffix] = $v["datos"];
-			}
-			*/
 			else {
 				//normal
 				$previous_data = $v["datos"];
@@ -5229,7 +4159,7 @@ function fullscale_data_new (
 			$count_data++;
 
 			if($show_percentil && !$compare){
-				$array_percentil[] = $v["datos"]; 
+				$array_percentil[] = $v["datos"];
 			}
 
 			$last_data = $v["datos"];
@@ -5239,22 +4169,40 @@ function fullscale_data_new (
 	if($show_percentil && !$compare){
 		$percentil_result = get_percentile($show_percentil, $array_percentil);
 		if($compare){
-			$data["percentil" . $series_suffix]['data'][] = array( ($date_array['start_date'] + $date_array['period']) * 1000 , $percentil_result);
-			$data["percentil" . $series_suffix]['data'][] = array( ($date_array['final_date'] + $date_array['period']) * 1000 , $percentil_result);
+			$data["percentil" . $series_suffix]['data'][] = array(
+				($date_array['start_date'] + $date_array['period']) * 1000,
+				$percentil_result
+			);
+			$data["percentil" . $series_suffix]['data'][] = array(
+				($date_array['final_date'] + $date_array['period']) * 1000,
+				$percentil_result
+			);
 		}
 		else{
-			$data["percentil" . $series_suffix]['data'][] = array($date_array['start_date'] * 1000 , $percentil_result);
-			$data["percentil" . $series_suffix]['data'][] = array($date_array['final_date'] * 1000 , $percentil_result);
+			$data["percentil" . $series_suffix]['data'][] = array(
+				$date_array['start_date'] * 1000,
+				$percentil_result
+			);
+			$data["percentil" . $series_suffix]['data'][] = array(
+				$date_array['final_date'] * 1000,
+				$percentil_result
+			);
 		}
 	}
 	// Add missed last data
 	if($compare){
-		$data["sum" . $series_suffix]['data'][] = array( ($date_array['final_date'] + $date_array['period']) * 1000 , $last_data);
+		$data["sum" . $series_suffix]['data'][] = array(
+			($date_array['final_date'] + $date_array['period']) * 1000,
+			$last_data
+		);
 	}
 	else{
-		$data["sum" . $series_suffix]['data'][] = array($date_array['final_date'] * 1000 , $last_data);
+		$data["sum" . $series_suffix]['data'][] = array(
+			$date_array['final_date'] * 1000,
+			$last_data
+		);
 	}
-	
+
 	$data["sum" . $series_suffix]['min'] = $min_value;
 	$data["sum" . $series_suffix]['max'] = $max_value;
 	$data["sum" . $series_suffix]['avg'] = $sum_data/$count_data;
@@ -5262,316 +4210,18 @@ function fullscale_data_new (
 	return $data;
 }
 
-function fullscale_data ( &$chart_data, &$chart_extra_data, &$long_index,
-						$series_type, $agent_module_id, $datelimit, $date,
-						$events = false, $show_events = false,
-						$show_unknown = false, $show_alerts = false,
-						$series_suffix = '', $percentil = false,
-						$flash_chart = true, $boolean_graph = false){
-
-	global $config;
-	global $max_value;
-	global $min_value;
-	global $series_type;
-	global $chart_extra_data;
-
-	$first_data = 0;
-
-	$data_uncompress = db_uncompress_module_data($agent_module_id, $datelimit, $date);
-
-	$chart_data = array();
-	$flag_unknown = 0;
-	
-	$min_value = PHP_INT_MAX-1;
-	$max_value = PHP_INT_MIN+1;
-	$previous_data = $first_data;
-	$previous_unknown = 0;
-	
-	$i=0;
-	$current_event = $events[0];
-	
-	foreach ($data_uncompress as $k) {
-		foreach ($k["data"] as $v) {
-			if (isset($v["type"]) && $v["type"] == 1) { # skip unnecesary virtual data
-				continue;
-			}
-			$real_date = $v['utimestamp'];
-
-			if(!$flash_chart){
-				$real_date = date("Y/M/d", $v['utimestamp']);
-				$real_date .= "\n";
-				$real_date .= date("   H:i:s", $v['utimestamp']);
-			}
-
-			$event_ids = array();
-			$alert_ids = array();
-			while (isset($current_event) && ($v['utimestamp'] >= $current_event["utimestamp"]) ) {
-				$event_date = $current_event['utimestamp'];
-				if(!$flash_chart){
-					$event_date = date("Y/M/d", $current_event['utimestamp']);
-					$event_date .= "\n";
-					$event_date .= date("   H:i:s", $current_event['utimestamp']);
-				}
-	
-				if ($show_events && (strpos($current_event["event_type"], "going") !== false)) {
-					$event_ids[$event_date][] = $current_event["id_evento"];
-	
-					$chart_data[$event_date]["event" . $series_suffix] = 1;
-					$chart_data[$event_date]["alert" . $series_suffix] = NULL;
-					$chart_extra_data[count($chart_data)-1]['events'] = implode (',', $event_ids[$event_date]);
-				}
-				elseif ($show_alerts && (strpos($current_event["event_type"], "alert") !== false)) {
-					$alert_ids[$event_date][] = $current_event["id_evento"];
-	
-					$chart_data[$event_date]["event" . $series_suffix] = NULL;
-					$chart_data[$event_date]["alert" . $series_suffix] = 1;
-					$chart_extra_data[count($chart_data)-1]['alerts'] = implode (',', $alert_ids[$event_date]);
-				}
-				else{
-					$chart_data[$event_date]["event" . $series_suffix] = NULL;
-					$chart_data[$event_date]["alert" . $series_suffix] = NULL;
-				}
-				
-				$chart_data[$event_date]["sum" . $series_suffix] = $previous_data;
-				if($show_unknown) {
-					$chart_data[$event_date]["unknown" . $series_suffix] = $previous_unknown;
-				}
-				$current_event = $events[$i++];
-			}			
-
-			if ($v["datos"] === NULL) {
-				// Unknown
-				if (!isset($chart_data[$real_date]["event" . $series_suffix])) {
-					if($show_events) {
-						$chart_data[$real_date]["event" . $series_suffix] = NULL;
-					}
-					if($show_alerts) {
-						$chart_data[$real_date]["alert" . $series_suffix] = NULL;
-					}
-				}
-	
-				$chart_data[$real_date]["sum" . $series_suffix] = $previous_data;
-				if($show_unknown) {
-					$chart_data[$real_date]["unknown" . $series_suffix] = "1";
-				}
-				$previous_unknown = "1";
-			}
-			elseif($v["datos"] === false) {
-				// Not Init
-				$previous_data = $v["datos"];
-				if (!isset($chart_data[$real_date]["event" . $series_suffix])) {
-					if ($show_events) {
-						$chart_data[$real_date]["event" . $series_suffix] = NULL;
-					}
-					if ($show_alerts) {
-						$chart_data[$real_date]["alert" . $series_suffix] = NULL;
-					}
-				}
-				
-				$chart_data[$real_date]["sum" . $series_suffix] = $v["datos"];
-
-				if($v['datos'] >= $max_value){
-					$max_value = $v['datos'];
-				}
-
-				if($v['datos'] <= $min_value){
-					$min_value = $v['datos'];
-				}
-
-				if($show_unknown) {
-					$chart_data[$real_date]["unknown" . $series_suffix] = NULL;
-					$previous_unknown = NULL;
-				}
-			}
-			else {
-				$previous_data = $v["datos"];
-				if (!isset($chart_data[$real_date]["event" . $series_suffix])) {
-					if ($show_events) {
-						$chart_data[$real_date]["event" . $series_suffix] = NULL;
-					}
-					if ($show_alerts) {
-						$chart_data[$real_date]["alert" . $series_suffix] = NULL;
-					}
-				}
-				
-				$chart_data[$real_date]["sum" . $series_suffix] = $v["datos"];
-
-				if($v['datos'] >= $max_value){
-					$max_value = $v['datos'];
-				}
-
-				if($v['datos'] <= $min_value){
-					$min_value = $v['datos'];
-				}
-
-				if($show_unknown) {
-					$chart_data[$real_date]["unknown" . $series_suffix] = NULL;
-					$previous_unknown = NULL;
-				}
-			}
-			$last_data = $v["datos"];
-		}
-	}
-	$series_type['event'.$series_suffix] = 'points';
-	$series_type['alert'.$series_suffix] = 'points';
-	$series_type['unknown'.$series_suffix] = 'unknown';
-
-	// Add missed last data
-	$chart_data[$date]["sum" . $series_suffix] = $last_data;
-
-	if($boolean_graph){
-		$series_type['sum'.$series_suffix] = 'boolean';
-	}
-	else{
-		$series_type['sum'.$series_suffix] = 'area';
-	}
-}
-
-function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
-	$width, $height , $title='', $unit_name, $show_alerts, $avg_only = 0, $pure=0,
-	$date = 0, $only_image = false, $homeurl = '', $adapt_key = '', $compare = false, 
-	$show_unknown = false, $menu = true, $fullscale = false) {
-	
-	global $config;
-	global $graphic_type;
-	
-	$flash_chart = $config['flash_charts'];
-	
-	global $chart;
-	global $color;
-	global $color_prev;
-	global $legend;
-	global $long_index;
-	global $series_type;
-	global $chart_extra_data;
-	
-	if (empty($unit_name)) {
-		$unit = modules_get_unit($agent_module_id);
-	}
-	else
-		$unit = $unit_name;
-	
-	$series_suffix_str = '';
-	if ($compare !== false) {
-		$series_suffix = '2';
-		$series_suffix_str = ' (' . __('Previous') . ')';
-		// Build the data of the previous period
-		grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
-			$unit_name, $show_alerts, $avg_only, $date-$period, $series_suffix, 
-			$series_suffix_str, $show_unknown, $fullscale, $flash_chart);
-		switch ($compare) {
-			case 'separated':
-				// Store the chart calculated
-				$chart_prev = $chart;
-				$legend_prev = $legend;
-				$long_index_prev = $long_index;
-				$series_type_prev = $series_type;
-				$chart_extra_data_prev = $chart_extra_data;
-				$chart_extra_data = array();
-				$color_prev = $color;
-				break;
-			case 'overlapped':
-				// Store the chart calculated deleting index, because will be over the current period
-				$chart_prev = array_values($chart);
-				$legend_prev = $legend;
-				$series_type_prev = $series_type;
-				$color_prev = $color;
-				foreach ($color_prev as $k => $col) {
-					$color_prev[$k]['color'] = '#' . get_complementary_rgb($color_prev[$k]['color']);
-				}
-				break;
-		}
-	}
-	
-	grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
-		$unit_name, $show_alerts, $avg_only, $date, '', '', $show_unknown, $fullscale, $flash_chart);
-
-	
-	if ($compare === 'overlapped') {
-		$i = 0;
-		foreach($chart as $k => $v) {
-			$chart[$k] = array_merge($v, $chart_prev[$i]);
-			$i++;
-		}
-		
-		$legend = array_merge($legend, $legend_prev);
-		$color = array_merge($color, $color_prev);
-	}
-	
-	if ($only_image) {
-		$flash_chart = false;
-	}
-	
-	$water_mark = array(
-		'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
-		'url' => ui_get_full_url("/images/logo_vertical_water.png",
-		false, false, false));
-	$type_graph = $config['type_module_charts'];
-	
-	if ($type_graph === 'area') {
-		if ($compare === 'separated') {
-			return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend,
-				$long_index, ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				"", $unit, $homeurl, $water_mark,
-				$config['fontpath'], $config['font_size'], $unit, 1, $series_type, 
-				$chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str, $menu).
-				'<br>'.
-				area_graph($flash_chart, $chart_prev, $width, $height/2, $color_prev, $legend_prev,
-				$long_index_prev, ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				"", $unit, $homeurl, $water_mark,
-				$config['fontpath'], $config['font_size'], $unit, 1, $series_type_prev, 
-				$chart_extra_data_prev, 0, 0, $adapt_key, false, $series_suffix_str, $menu);
-		}
-		else {
-			return area_graph($flash_chart, $chart, $width, $height, $color, $legend,
-				$long_index, ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				$title, $unit, $homeurl, $water_mark,
-				$config['fontpath'], $config['font_size'], $unit, 1, $series_type, 
-				$chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str, $menu);
-		}
-	}
-	elseif ($type_graph === 'line') {
-		if ($compare === 'separated') {
-			return
-				line_graph($flash_chart, $chart, $width, $height/2, $color,
-					$legend, $long_index,
-					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-					"", $unit, $water_mark, $config['fontpath'],
-					$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor).
-				'<br>'.
-				line_graph($flash_chart, $chart_prev, $width, $height/2, $color,
-					$legend, $long_index,
-					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-					"", $unit, $water_mark, $config['fontpath'],
-					$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor);
-		}
-		else {
-			// Color commented not to restrict serie colors
-			return
-				line_graph($flash_chart, $chart, $width, $height, $color,
-					$legend, $long_index,
-					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-					$title, $unit, $water_mark, $config['fontpath'],
-					$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor);
-		}
-	}
-}
-
-
 /**
  * Print an area graph with netflow aggregated
  */
-
 function graph_netflow_aggregate_area ($data, $period, $width, $height, $unit = '', $ttl = 1, $only_image = false) {
 	global $config;
 	global $graphic_type;
-	
+
 	if (empty ($data)) {
 		echo fs_error_image ();
 		return;
 	}
-	
-	
+
 	if ($period <= SECONDS_6HOURS) {
 		$chart_time_format = 'H:i:s';
 	}
@@ -5678,17 +4328,14 @@ function graph_netflow_aggregate_area ($data, $period, $width, $height, $unit =
 	$color[15] = array('border' => '#000000',
 		'color' => COL_GRAPH13,
 		'alpha' => CHART_DEFAULT_ALPHA);
-	
-	
-	return area_graph($flash_chart, $chart, $width, $height, $color, 
+
+	return area_graph($flash_chart, $chart, $width, $height, $color,
 		$sources, array (), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
 		"", $unit, $homeurl,
 		$config['homedir'] .  "/images/logo_vertical_water.png",
 		$config['fontpath'], $config['font_size'], $unit, $ttl);
 }
 
-
-
 /**
  * Print an area graph with netflow total
  */
@@ -5842,312 +4489,6 @@ function graph_netflow_host_traffic ($data, $unit, $width = 700, $height = 700)
 	return d3_tree_map_graph ($data, $width, $height, true);
 }
 
-/**
- * Draw a graph of Module string data of agent
- * 
- * @param integer id_agent_modulo Agent Module ID
- * @param integer show_event show event (1 or 0)
- * @param integer height graph height
- * @param integer width graph width
- * @param string title graph title
- * @param string unit_name String of unit name
- * @param integer show alerts (1 or 0)
- * @param integer avg_only calcules avg only (1 or 0)
- * @param integer pure Fullscreen (1 or 0)
- * @param integer date date
- */
-function grafico_modulo_string ($agent_module_id, $period, $show_events,
-	$width, $height, $title, $unit_name, $show_alerts, $avg_only = 0, $pure = 0,
-	$date = 0, $only_image = false, $homeurl = '', $adapt_key = '', $ttl = 1, $menu = true) {
-	global $config;
-	global $graphic_type;
-	global $max_value;
-	
-	
-	// Set variables
-	if ($date == 0)
-		$date = get_system_time();
-	$datelimit = $date - $period;
-	$search_in_history_db = db_search_in_history_db($datelimit);
-	$resolution = $config['graph_res'] * 50; //Number of points of the graph
-	$interval = (int) ($period / $resolution);
-	$agent_name = modules_get_agentmodule_agent_name ($agent_module_id);
-	$agent_id = agents_get_agent_id ($agent_name);
-	$module_name = modules_get_agentmodule_name ($agent_module_id);
-	$id_module_type = modules_get_agentmodule_type ($agent_module_id);
-	$module_type = modules_get_moduletype_name ($id_module_type);
-	$uncompressed_module = is_module_uncompressed ($module_type);
-	if ($uncompressed_module) {
-		$avg_only = 1;
-	}
-	$search_in_history_db = db_search_in_history_db($datelimit);
-	
-	// Get event data (contains alert data too)
-	if ($show_events == 1 || $show_alerts == 1) {
-		$events = db_get_all_rows_filter ('tevento',
-			array ('id_agentmodule' => $agent_module_id,
-				"utimestamp > $datelimit",
-				"utimestamp < $date",
-				'order' => 'utimestamp ASC'),
-			array ('evento', 'utimestamp', 'event_type'));
-		if ($events === false) {
-			$events = array ();
-		}
-	}
-	
-	// Get module data
-	$data = db_get_all_rows_filter ('tagente_datos_string',
-		array ('id_agente_modulo' => $agent_module_id,
-			"utimestamp > $datelimit",
-			"utimestamp < $date",
-			'order' => 'utimestamp ASC'),
-		array ('datos', 'utimestamp'), 'AND', $search_in_history_db);
-	if ($data === false) {
-		$data = array ();
-	}
-	
-	// Uncompressed module data
-	if ($uncompressed_module) {
-		$min_necessary = 1;
-	}
-	else {
-		// Compressed module data
-		
-		// Get previous data
-		$previous_data = modules_get_previous_data ($agent_module_id, $datelimit, 1);
-		if ($previous_data !== false) {
-			$previous_data['utimestamp'] = $datelimit;
-			array_unshift ($data, $previous_data);
-		}
-		
-		// Get next data
-		$nextData = modules_get_next_data ($agent_module_id, $date, 1);
-		if ($nextData !== false) {
-			array_push ($data, $nextData);
-		}
-		else if (count ($data) > 0) {
-			// Propagate the last known data to the end of the interval
-			$nextData = array_pop ($data);
-			array_push ($data, $nextData);
-			$nextData['utimestamp'] = $date;
-			array_push ($data, $nextData);
-		}
-		
-		$min_necessary = 2;
-	}
-	
-	// Check available data
-	if (count ($data) < $min_necessary) {
-		if (!$graphic_type) {
-			return fs_error_image ($width, $height);
-		}
-		graphic_error ();
-	}
-	
-	// Data iterator
-	$j = 0;
-	
-	// Event iterator
-	$k = 0;
-	
-	// Set initial conditions
-	$chart = array();
-	if ($data[0]['utimestamp'] == $datelimit) {
-		$previous_data = 1;
-		$j++;
-	}
-	else {
-		$previous_data = 0;
-	}
-	
-	// Calculate chart data
-	$last_known = $previous_data;
-	for ($i = 0; $i < $resolution; $i++) {
-		$timestamp = $datelimit + ($interval * $i);
-		
-		$count = 0;
-		$total = 0;
-		// Read data that falls in the current interval
-		while (isset($data[$j]) &&
-			isset ($data[$j]) !== null &&
-			$data[$j]['utimestamp'] >= $timestamp &&
-			$data[$j]['utimestamp'] <= ($timestamp + $interval)) {
-			
-			// ---------------------------------------------------------
-			// FIX TICKET #1749
-			$last_known = $count;
-			// ---------------------------------------------------------
-			$count++;
-			$j++;
-		}
-		
-		if ($max_value < $count) {
-			$max_value = $count;
-		}
-		
-		// Read events and alerts that fall in the current interval
-		$event_value = 0;
-		$alert_value = 0;
-		while (isset ($events[$k]) && $events[$k]['utimestamp'] >= $timestamp && $events[$k]['utimestamp'] <= ($timestamp + $interval)) {
-			if ($show_events == 1) {
-				$event_value++;
-			}
-			if ($show_alerts == 1 && substr ($events[$k]['event_type'], 0, 5) == 'alert') {
-				$alert_value++;
-			}
-			$k++;
-		}
-		
-		/////////////////////////////////////////////////////////////////
-		// Set the title and time format
-		if ($period <= SECONDS_6HOURS) {
-			$time_format = 'H:i:s';
-		}
-		elseif ($period < SECONDS_1DAY) {
-			$time_format = 'H:i';
-		}
-		elseif ($period < SECONDS_15DAYS) {
-			$time_format = 'M d H:i';
-		}
-		elseif ($period < SECONDS_1MONTH) {
-			$time_format = 'M d H\h';
-		}
-		elseif ($period < SECONDS_6MONTHS) {
-			$time_format = "M d H\h";
-		}
-		else {
-			$time_format = "Y M d H\h";
-		}
-		
-		$timestamp_short = date($time_format, $timestamp);
-		$long_index[$timestamp_short] = date(
-			html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
-		$timestamp = $timestamp_short;
-		/////////////////////////////////////////////////////////////////
-		
-		// Data in the interval
-		//The order in chart array is very important!!!!
-		if ($show_events) {
-			$chart[$timestamp]['event'] = $event_value;
-		}
-		
-		if ($show_alerts) {
-			$chart[$timestamp]['alert'] = $alert_value;
-		}
-		
-		if (!$avg_only) {
-			$chart[$timestamp]['max'] = 0;
-		}
-		
-		if ($count > 0) {
-			$chart[$timestamp]['sum'] = $count;
-		}
-		else {
-			// Compressed data
-			$chart[$timestamp]['sum'] = $last_known;
-		}
-		
-		if (!$avg_only) {
-			$chart[$timestamp]['min'] = 0;
-		}
-	}
-	
-	$graph_stats = get_statwin_graph_statistics($chart);
-	
-	// Fix event and alert scale
-	$event_max = 2 + (float)$max_value * 1.05;
-	foreach ($chart as $timestamp => $chart_data) {
-		if (!empty($chart_data['event']) && $chart_data['event'] > 0) {
-			$chart[$timestamp]['event'] = $event_max;
-		}
-		if (!empty($chart_data['alert']) && $chart_data['alert'] > 0) {
-			$chart[$timestamp]['alert'] = $event_max;
-		}
-	}
-	
-	if (empty($unit_name)) {
-		$unit = modules_get_unit($agent_module_id);
-	}
-	else
-		$unit = $unit_name;
-	
-	/////////////////////////////////////////////////////////////////////////////////////////
-	$color = array();
-	
-	if ($show_events) {
-		$color['event'] = array('border' => '#ff0000',
-			'color' => '#ff0000', 'alpha' => CHART_DEFAULT_ALPHA);
-	}
-	if ($show_alerts) {
-		$color['alert'] = array('border' => '#ff7f00',
-			'color' => '#ff7f00', 'alpha' => CHART_DEFAULT_ALPHA);
-	}
-	
-	if (!$avg_only) {
-		$color['max'] = array('border' => '#000000',
-			'color' => $config['graph_color3'],
-			'alpha' => CHART_DEFAULT_ALPHA);
-	}
-	$color['sum'] = array('border' => '#000000',
-		'color' => $config['graph_color2'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	
-	if (!$avg_only) {
-		$color['min'] = array('border' => '#000000',
-			'color' => $config['graph_color1'],
-			'alpha' => CHART_DEFAULT_ALPHA);
-	}
-	
-	//$color['baseline'] = array('border' => null, 'color' => '#0097BD', 'alpha' => 10);
-	/////////////////////////////////////////////////////////////////////////////////////////
-	
-	$flash_chart = $config['flash_charts'];
-	if ($only_image) {
-		$flash_chart = false;
-	}
-	
-	$legend = array();
-	
-	if ($show_events) {
-		$legend['event'] = __('Events');
-	}
-	
-	if ($show_alerts) {
-		$legend['alert'] = __('Alerts');
-	}
-	
-	if (!$avg_only) {
-		$legend['max'] = __('Max').': '.__('Last').': '.remove_right_zeros(number_format($graph_stats['max']['last'], $config['graph_precision'])).' '.$unit.' ; '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['max']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['max']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['max']['min'], $config['graph_precision'])).' '.$unit;
-	}
-	
-	$legend['sum'] = __('Avg').': '.__('Last').': '.remove_right_zeros(number_format($graph_stats['sum']['last'], $config['graph_precision'])).' '.$unit.' ; '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['sum']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['sum']['min'], $config['graph_precision'])).' '.$unit;
-	
-	if (!$avg_only) {
-		$legend['min'] = __('Min').': '.__('Last').': '.remove_right_zeros(number_format($graph_stats['min']['last'], $config['graph_precision'])).' '.$unit.' ; '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['min']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['min']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['min']['min'], $config['graph_precision'])).' '.$unit;
-	}
-	
-	if($config["fixed_graph"] == false){
-		$water_mark = array('file' =>
-			$config['homedir'] . "/images/logo_vertical_water.png",
-			'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
-	}
-	
-	if ($type_graph === 'area') {
-		return area_graph($flash_chart, $chart, $width, $height, $color,
-			$legend, array(), '', $title, $unit, $homeurl,
-			$water_mark, $config['fontpath'], $config['font_size'], $unit,
-			1, array(),	array(), 0, 0, $adapt_key, true, '', $menu);
-	}
-	else {
-		return
-			line_graph($flash_chart, $chart, $width, $height, $color,
-				$legend, $long_index,
-				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				$title, $unit, $water_mark, $config['fontpath'],
-				$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor);
-	}
-}
-
 /**
  * Print a graph with event data of module
  * 
@@ -6298,360 +4639,6 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
 	}
 }
 
-///Functions for the LOG4X graphs
-function grafico_modulo_log4x ($id_agente_modulo, $periodo, $show_event,
-	$width, $height , $title, $unit_name, $show_alert, $avg_only = 0, $pure=0,
-	$date = 0) {
-	
-	grafico_modulo_log4x_trace("<pre style='text-align:left;'>");
-	
-	if ($date == "")
-		$now = time ();
-	else
-		$now = $date;
-	
-	$fechatope = $now - $periodo; // limit date
-	
-	$nombre_agente = modules_get_agentmodule_agent_name ($id_agente_modulo);
-	$nombre_modulo = modules_get_agentmodule_name ($id_agente_modulo);
-	$id_agente = agents_get_agent_id ($nombre_agente);
-	
-	$adjust_time = SECONDS_1MINUTE;
-	
-
-	if ($periodo == SECONDS_1DAY)
-		$adjust_time = SECONDS_1HOUR;
-	elseif ($periodo == SECONDS_1WEEK)
-		$adjust_time = SECONDS_1DAY;
-	elseif ($periodo == SECONDS_1HOUR)
-		$adjust_time = SECONDS_10MINUTES;
-	elseif ($periodo == SECONDS_1MONTH)
-		$adjust_time = SECONDS_1WEEK;
-	else
-		$adjust_time = $periodo / 12.0;
-	
-	$num_slices = $periodo / $adjust_time;
-	
-	$fechatope_index = grafico_modulo_log4x_index($fechatope, $adjust_time);
-	
-	$sql1="SELECT utimestamp, SEVERITY " .
-			" FROM tagente_datos_log4x " .
-			" WHERE id_agente_modulo = $id_agente_modulo AND utimestamp > $fechatope and utimestamp < $now";
-	
-	$valores = array();
-	
-	$max_count = -1;
-	$min_count = 9999999;
-	
-	grafico_modulo_log4x_trace("$sql1");
-	
-	$rows = 0;
-	
-	$first = true;
-	while ($row = get_db_all_row_by_steps_sql($first, $result, $sql1)) {
-		$first = false;
-		
-		$rows++;
-		$utimestamp = $row[0];
-		$severity = $row[1];
-		$severity_num = $row[2];
-		
-		if (!isset($valores[$severity]))
-			$valores[$severity] = array();
-		
-		$dest = grafico_modulo_log4x_index($utimestamp, $adjust_time);
-		
-		$index = (($dest - $fechatope_index) / $adjust_time) - 1;
-		
-		if (!isset($valores[$severity][$index])) {
-			$valores[$severity][$index] = array();
-			$valores[$severity][$index]['pivot'] = $dest;
-			$valores[$severity][$index]['count'] = 0;
-			$valores[$severity][$index]['alerts'] = 0;
-		}
-		
-		$valores[$severity][$index]['count']++;
-		
-		$max_count = max($max_count, $valores[$severity][$index]['count']);
-		$min_count = min($min_count, $valores[$severity][$index]['count']);
-	}
-	
-	grafico_modulo_log4x_trace("$rows rows");
-	
-	// Create graph
-	// *************
-	
-	grafico_modulo_log4x_trace(__LINE__);
-	
-	//set_error_handler("myErrorHandler");
-	
-	grafico_modulo_log4x_trace(__LINE__);
-	$ds = DIRECTORY_SEPARATOR;
-	set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . $ds."..".$ds."..".$ds."include");
-	
-	require_once 'Image/Graph.php';
-	
-	grafico_modulo_log4x_trace(__LINE__);
-	
-	$Graph =& Image_Graph::factory('graph', array($width, $height));
-	
-	grafico_modulo_log4x_trace(__LINE__);
-	
-	// add a TrueType font
-	$Font =& $Graph->addNew('font', $config['fontpath']); // C:\WINNT\Fonts\ARIAL.TTF
-	$Font->setSize(7);
-	
-	$Graph->setFont($Font);
-	
-	if ($periodo == SECONDS_1DAY)
-		$title_period = $lang_label["last_day"];
-	elseif ($periodo == SECONDS_1WEEK)
-		$title_period = $lang_label["last_week"];
-	elseif ($periodo == SECONDS_1HOUR)
-		$title_period = $lang_label["last_hour"];
-	elseif ($periodo == SECONDS_1MONTH)
-		$title_period = $lang_label["last_month"];
-	else {
-		$suffix = $lang_label["days"];
-		$graph_extension = $periodo / SECONDS_1DAY;
-		
-		if ($graph_extension < 1) {
-			$graph_extension = $periodo / SECONDS_1HOUR;
-			$suffix = $lang_label["hours"];
-		}
-		//$title_period = "Last ";
-		$title_period = format_numeric($graph_extension,2)." $suffix";
-	}
-	
-	$title_period = html_entity_decode($title_period);
-	
-	grafico_modulo_log4x_trace(__LINE__);
-	
-	if ($pure == 0) {
-		$Graph->add(
-			Image_Graph::horizontal(
-				Image_Graph::vertical(
-					Image_Graph::vertical(
-						$Title = Image_Graph::factory('title', array('   Pandora FMS Graph - '.strtoupper($nombre_agente)." - " .$title_period, 10)),
-						$Subtitle = Image_Graph::factory('title', array('     '.$title, 7)),
-						90
-					),
-					$Plotarea = Image_Graph::factory('plotarea', array('Image_Graph_Axis', 'Image_Graph_Axis')),
-					15 // If you change this, change the 0.85 below
-				),
-				Image_Graph::vertical(
-					$Legend = Image_Graph::factory('legend'),
-					$PlotareaMinMax = Image_Graph::factory('plotarea'),
-					65
-				),
-				85 // If you change this, change the 0.85 below
-			)
-		);
-		
-		$Legend->setPlotarea($Plotarea);
-		$Title->setAlignment(IMAGE_GRAPH_ALIGN_LEFT);
-		$Subtitle->setAlignment(IMAGE_GRAPH_ALIGN_LEFT);
-	}
-	else { // Pure, without title and legends
-		$Graph->add($Plotarea = Image_Graph::factory('plotarea', array('Image_Graph_Axis', 'Image_Graph_Axis')));
-	}
-	
-	grafico_modulo_log4x_trace(__LINE__);
-	
-	$dataset = array();
-	
-	$severities = array("FATAL", "ERROR", "WARN", "INFO", "DEBUG", "TRACE");
-	$colors = array("black", "red", "orange", "yellow", "#3300ff", 'magenta');
-	
-	$max_bubble_radius = $height * 0.6 / (count($severities) + 1); // this is the size for the max_count
-	$y = count($severities) - 1;
-	$i = 0;
-	
-	foreach($severities as $severity) {
-		$dataset[$i] = Image_Graph::factory('dataset');
-		$dataset[$i]->setName($severity);
-		
-		if (isset($valores[$severity])) {
-			$data =& $valores[$severity];
-			while (list($index, $data2) = each($data)) {
-				$count = $data2['count'];
-				$pivot = $data2['pivot'];
-				
-				//$x = $scale * $index;
-				$x = 100.0 * ($pivot - $fechatope) / ($now - $fechatope);
-				if ($x > 100) $x = 100;
-				
-				$size = grafico_modulo_log4x_bubble_size($count, $max_count, $max_bubble_radius);
-				
-				// pivot is the value in the X axis
-				// y is the number of steps (from the bottom of the graphics) (zero based)
-				// x is the position of the bubble, in % from the left (0% = full left, 100% = full right)
-				// size is the radius of the bubble
-				// value is the value associated with the bubble (needed to calculate the leyend)
-				//
-				$dataset[$i]->addPoint($pivot, $y, array("x" => $x, "size" => $size, "value" => $count));
-			}
-		}
-		else {
-			// There's a problem when we have no data ...
-			// This was the first try.. didnt work
-			//$dataset[$i]->addPoint($now, -1, array("x" => 0, "size" => 0));
-		}
-		
-		$y--;
-		$i++;
-	}
-	
-	grafico_modulo_log4x_trace(__LINE__);
-	
-	// create the 1st plot as smoothed area chart using the 1st dataset
-	$Plot =& $Plotarea->addNew('bubble', array(&$dataset));
-	$Plot->setFont($Font);
-	
-	$AxisX =& $Plotarea->getAxis(IMAGE_GRAPH_AXIS_X);
-	$AxisX->setDataPreprocessor(Image_Graph::factory('Image_Graph_DataPreprocessor_Function', 'grafico_modulo_log4x_format_x_axis'));
-	$AxisX->forceMinimum($fechatope);
-	$AxisX->forceMaximum($now);
-	
-	$minIntervalWidth = $Plot->getTextWidth("88/88/8888");
-	$interval_x = $adjust_time;
-	
-	while (true) {
-		$intervalWidth = $width * 0.85 * $interval_x/ $periodo;
-		if ($intervalWidth >= $minIntervalWidth)
-			break;
-		
-		$interval_x *= 2;
-	}
-	
-	$AxisX->setLabelInterval($interval_x);
-	$AxisX->setLabelOption("showtext",true);
-	
-	//*
-	$GridY2 =& $Plotarea->addNew('line_grid');
-	$GridY2->setLineColor('gray');
-	$GridY2->setFillColor('lightgray@0.05');
-	$GridY2->_setPrimaryAxis($AxisX);
-	//$GridY2->setLineStyle(Image_Graph::factory('Image_Graph_Line_Dotted', array("white", "gray", "gray", "gray")));
-	$GridY2->setLineStyle(Image_Graph::factory('Image_Graph_Line_Formatted', array(array("transparent", "transparent", "transparent", "gray"))));
-	//*/
-	//grafico_modulo_log4x_trace(print_r($AxisX, true));
-	
-	$AxisY =& $Plotarea->getAxis(IMAGE_GRAPH_AXIS_Y);
-	$AxisY->setDataPreprocessor(Image_Graph::factory('Image_Graph_DataPreprocessor_Function', 'grafico_modulo_log4x_format_y_axis'));
-	$AxisY->setLabelOption("showtext",true);
-	//$AxisY->setLabelInterval(0);
-	//$AxisY->showLabel(IMAGE_GRAPH_LABEL_ZERO);
-	
-	//*
-	$GridY2 =& $Plotarea->addNew('line_grid');
-	$GridY2->setLineColor('gray');
-	$GridY2->setFillColor('lightgray@0.05');
-	$GridY2->_setPrimaryAxis($AxisY);
-	$GridY2->setLineStyle(Image_Graph::factory('Image_Graph_Line_Formatted', array(array("transparent", "transparent", "transparent", "gray"))));
-	//*/
-	
-	$AxisY->forceMinimum(0);
-	$AxisY->forceMaximum(count($severities) + 1) ;
-	
-	// set line colors
-	$FillArray =& Image_Graph::factory('Image_Graph_Fill_Array');
-	
-	$Plot->setFillStyle($FillArray);
-	foreach($colors as $color)
-		$FillArray->addColor($color);
-	
-	grafico_modulo_log4x_trace(__LINE__);
-	
-	$FillArray->addColor('green@0.6');
-	//$AxisY_Weather =& $Plotarea->getAxis(IMAGE_GRAPH_AXIS_Y);
-	
-	// Show events !
-	if ($show_event == 1) {
-		$Plot =& $Plotarea->addNew('Plot_Impulse', array($dataset_event));
-		$Plot->setLineColor( 'red' );
-		$Marker_event =& Image_Graph::factory('Image_Graph_Marker_Cross');
-		$Plot->setMarker($Marker_event);
-		$Marker_event->setFillColor( 'red' );
-		$Marker_event->setLineColor( 'red' );
-		$Marker_event->setSize ( 5 );
-	}
-	
-	$Axis =& $PlotareaMinMax->getAxis(IMAGE_GRAPH_AXIS_X);
-	$Axis->Hide();
-	$Axis =& $PlotareaMinMax->getAxis(IMAGE_GRAPH_AXIS_Y);
-	$Axis->Hide();
-	
-	$plotMinMax =& $PlotareaMinMax->addNew('bubble', array(&$dataset, true));
-	
-	grafico_modulo_log4x_trace(__LINE__);
-	
-	$Graph->done();
-	
-	grafico_modulo_log4x_trace(__LINE__);
-}
-
-function grafico_modulo_log4x_index($x, $interval)
-{
-	return $x + $interval - (($x - 1) % $interval) - 1;
-}
-
-function grafico_modulo_log4x_trace($str)
-{
-	//echo "$str\n";
-}
-
-function grafico_modulo_log4x_bubble_size($count, $max_count, $max_bubble_radius)
-{
-	//Superformula de ROA
-	$r0 = 1.5;
-	$r1 = $max_bubble_radius;
-	$v2 = pow($max_count,1/2.0);
-	
-	return $r1*pow($count,1/2.0)/($v2)+$r0;
-}
-
-function grafico_modulo_log4x_format_x_axis ( $number , $decimals=2, $dec_point=".", $thousands_sep=",")
-{
-	// $number is the unix time in the local timezone
-	
-	//$dtZone = new DateTimeZone(date_default_timezone_get());
-	//$d = new DateTime("now", $dtZone);
-	//$offset = $dtZone->getOffset($d);
-	//$number -= $offset;
-	
-	return date("d/m", $number) . "\n" . date("H:i", $number);
-}
-
-function grafico_modulo_log4x_format_y_axis ( $number , $decimals=2, $dec_point=".", $thousands_sep=",")
-{
-	
-	switch ($number) {
-		case 6:
-			return "FATAL";
-			break;
-		case 5:
-			return "ERROR";
-			break;
-		case 4:
-			return "WARN";
-			break;
-		case 3:
-			return "INFO";
-			break;
-		case 2:
-			return "DEBUG";
-			break;
-		case 1:
-			return "TRACE";
-			break;
-		default:
-			return "";
-			break;
-	}
-	
-}
-
 function graph_nodata_image($width = 300, $height = 110, $type = 'area', $text = '') {
 	$image = ui_get_full_url('images/image_problem_area_small.png',
 		false, false, false); 
@@ -7069,4 +5056,313 @@ function graph_monitor_wheel ($width = 550, $height = 600, $filter = false) {
 	return d3_sunburst_graph ($graph_data, $width, $height, true);
 }
 
-?>
\ No newline at end of file
+/**
+ * Draw a graph of Module string data of agent
+ * @param integer id_agent_modulo Agent Module ID
+ * @param integer show_event show event (1 or 0)
+ * @param integer height graph height
+ * @param integer width graph width
+ * @param string title graph title
+ * @param string unit_name String of unit name
+ * @param integer show alerts (1 or 0)
+ * @param integer avg_only calcules avg only (1 or 0)
+ * @param integer pure Fullscreen (1 or 0)
+ * @param integer date date
+ */
+function grafico_modulo_string ($agent_module_id, $period, $show_events,
+	$width, $height, $title, $unit_name, $show_alerts, $avg_only = 0, $pure = 0,
+	$date = 0, $only_image = false, $homeurl = '', $adapt_key = '', $ttl = 1, $menu = true) {
+
+	global $config;
+	global $graphic_type;
+	global $max_value;
+
+	// Set variables
+	if ($date == 0){
+		$date = get_system_time();
+	}
+
+	$datelimit = $date - $period;
+	$search_in_history_db = db_search_in_history_db($datelimit);
+	$resolution = $config['graph_res'] * 50; //Number of points of the graph
+	$interval = (int) ($period / $resolution);
+	$agent_name = modules_get_agentmodule_agent_name ($agent_module_id);
+	$agent_id = agents_get_agent_id ($agent_name);
+	$module_name = modules_get_agentmodule_name ($agent_module_id);
+	$id_module_type = modules_get_agentmodule_type ($agent_module_id);
+	$module_type = modules_get_moduletype_name ($id_module_type);
+	$uncompressed_module = is_module_uncompressed ($module_type);
+
+	if ($uncompressed_module) {
+		$avg_only = 1;
+	}
+
+	$search_in_history_db = db_search_in_history_db($datelimit);
+
+	// Get event data (contains alert data too)
+	if ($show_events == 1 || $show_alerts == 1) {
+		$events = db_get_all_rows_filter ('tevento',
+			array ('id_agentmodule' => $agent_module_id,
+				"utimestamp > $datelimit",
+				"utimestamp < $date",
+				'order' => 'utimestamp ASC'),
+			array ('evento', 'utimestamp', 'event_type'));
+		if ($events === false) {
+			$events = array ();
+		}
+	}
+
+	// Get module data
+	$data = db_get_all_rows_filter ('tagente_datos_string',
+		array ('id_agente_modulo' => $agent_module_id,
+			"utimestamp > $datelimit",
+			"utimestamp < $date",
+			'order' => 'utimestamp ASC'),
+		array ('datos', 'utimestamp'), 'AND', $search_in_history_db);
+	if ($data === false) {
+		$data = array ();
+	}
+
+	// Uncompressed module data
+	if ($uncompressed_module) {
+		$min_necessary = 1;
+	}
+	else {
+		// Compressed module data
+
+		// Get previous data
+		$previous_data = modules_get_previous_data ($agent_module_id, $datelimit, 1);
+		if ($previous_data !== false) {
+			$previous_data['utimestamp'] = $datelimit;
+			array_unshift ($data, $previous_data);
+		}
+		
+		// Get next data
+		$nextData = modules_get_next_data ($agent_module_id, $date, 1);
+		if ($nextData !== false) {
+			array_push ($data, $nextData);
+		}
+		else if (count ($data) > 0) {
+			// Propagate the last known data to the end of the interval
+			$nextData = array_pop ($data);
+			array_push ($data, $nextData);
+			$nextData['utimestamp'] = $date;
+			array_push ($data, $nextData);
+		}
+		
+		$min_necessary = 2;
+	}
+	
+	// Check available data
+	if (count ($data) < $min_necessary) {
+		if (!$graphic_type) {
+			return fs_error_image ($width, $height);
+		}
+		graphic_error ();
+	}
+	
+	// Data iterator
+	$j = 0;
+	
+	// Event iterator
+	$k = 0;
+	
+	// Set initial conditions
+	$chart = array();
+	if ($data[0]['utimestamp'] == $datelimit) {
+		$previous_data = 1;
+		$j++;
+	}
+	else {
+		$previous_data = 0;
+	}
+	
+	// Calculate chart data
+	$last_known = $previous_data;
+	for ($i = 0; $i < $resolution; $i++) {
+		$timestamp = $datelimit + ($interval * $i);
+		
+		$count = 0;
+		$total = 0;
+		// Read data that falls in the current interval
+		while (isset($data[$j]) &&
+			isset ($data[$j]) !== null &&
+			$data[$j]['utimestamp'] >= $timestamp &&
+			$data[$j]['utimestamp'] <= ($timestamp + $interval)) {
+			
+			// ---------------------------------------------------------
+			// FIX TICKET #1749
+			$last_known = $count;
+			// ---------------------------------------------------------
+			$count++;
+			$j++;
+		}
+		
+		if ($max_value < $count) {
+			$max_value = $count;
+		}
+		
+		// Read events and alerts that fall in the current interval
+		$event_value = 0;
+		$alert_value = 0;
+		while (isset ($events[$k]) && $events[$k]['utimestamp'] >= $timestamp && $events[$k]['utimestamp'] <= ($timestamp + $interval)) {
+			if ($show_events == 1) {
+				$event_value++;
+			}
+			if ($show_alerts == 1 && substr ($events[$k]['event_type'], 0, 5) == 'alert') {
+				$alert_value++;
+			}
+			$k++;
+		}
+		
+		/////////////////////////////////////////////////////////////////
+		// Set the title and time format
+		if ($period <= SECONDS_6HOURS) {
+			$time_format = 'H:i:s';
+		}
+		elseif ($period < SECONDS_1DAY) {
+			$time_format = 'H:i';
+		}
+		elseif ($period < SECONDS_15DAYS) {
+			$time_format = 'M d H:i';
+		}
+		elseif ($period < SECONDS_1MONTH) {
+			$time_format = 'M d H\h';
+		}
+		elseif ($period < SECONDS_6MONTHS) {
+			$time_format = "M d H\h";
+		}
+		else {
+			$time_format = "Y M d H\h";
+		}
+		
+		$timestamp_short = date($time_format, $timestamp);
+		$long_index[$timestamp_short] = date(
+			html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
+		$timestamp = $timestamp_short;
+		/////////////////////////////////////////////////////////////////
+		
+		// Data in the interval
+		//The order in chart array is very important!!!!
+		if ($show_events) {
+			$chart[$timestamp]['event'] = $event_value;
+		}
+		
+		if ($show_alerts) {
+			$chart[$timestamp]['alert'] = $alert_value;
+		}
+		
+		if (!$avg_only) {
+			$chart[$timestamp]['max'] = 0;
+		}
+		
+		if ($count > 0) {
+			$chart[$timestamp]['sum'] = $count;
+		}
+		else {
+			// Compressed data
+			$chart[$timestamp]['sum'] = $last_known;
+		}
+		
+		if (!$avg_only) {
+			$chart[$timestamp]['min'] = 0;
+		}
+	}
+	
+	$graph_stats = get_statwin_graph_statistics($chart);
+	
+	// Fix event and alert scale
+	$event_max = 2 + (float)$max_value * 1.05;
+	foreach ($chart as $timestamp => $chart_data) {
+		if (!empty($chart_data['event']) && $chart_data['event'] > 0) {
+			$chart[$timestamp]['event'] = $event_max;
+		}
+		if (!empty($chart_data['alert']) && $chart_data['alert'] > 0) {
+			$chart[$timestamp]['alert'] = $event_max;
+		}
+	}
+	
+	if (empty($unit_name)) {
+		$unit = modules_get_unit($agent_module_id);
+	}
+	else
+		$unit = $unit_name;
+	
+	/////////////////////////////////////////////////////////////////////////////////////////
+	$color = array();
+	
+	if ($show_events) {
+		$color['event'] = array('border' => '#ff0000',
+			'color' => '#ff0000', 'alpha' => CHART_DEFAULT_ALPHA);
+	}
+	if ($show_alerts) {
+		$color['alert'] = array('border' => '#ff7f00',
+			'color' => '#ff7f00', 'alpha' => CHART_DEFAULT_ALPHA);
+	}
+	
+	if (!$avg_only) {
+		$color['max'] = array('border' => '#000000',
+			'color' => $config['graph_color3'],
+			'alpha' => CHART_DEFAULT_ALPHA);
+	}
+	$color['sum'] = array('border' => '#000000',
+		'color' => $config['graph_color2'],
+		'alpha' => CHART_DEFAULT_ALPHA);
+	
+	if (!$avg_only) {
+		$color['min'] = array('border' => '#000000',
+			'color' => $config['graph_color1'],
+			'alpha' => CHART_DEFAULT_ALPHA);
+	}
+	
+	//$color['baseline'] = array('border' => null, 'color' => '#0097BD', 'alpha' => 10);
+	/////////////////////////////////////////////////////////////////////////////////////////
+	
+	$flash_chart = $config['flash_charts'];
+	if ($only_image) {
+		$flash_chart = false;
+	}
+	
+	$legend = array();
+	
+	if ($show_events) {
+		$legend['event'] = __('Events');
+	}
+	
+	if ($show_alerts) {
+		$legend['alert'] = __('Alerts');
+	}
+	
+	if (!$avg_only) {
+		$legend['max'] = __('Max').': '.__('Last').': '.remove_right_zeros(number_format($graph_stats['max']['last'], $config['graph_precision'])).' '.$unit.' ; '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['max']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['max']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['max']['min'], $config['graph_precision'])).' '.$unit;
+	}
+	
+	$legend['sum'] = __('Avg').': '.__('Last').': '.remove_right_zeros(number_format($graph_stats['sum']['last'], $config['graph_precision'])).' '.$unit.' ; '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['sum']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['sum']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['sum']['min'], $config['graph_precision'])).' '.$unit;
+	
+	if (!$avg_only) {
+		$legend['min'] = __('Min').': '.__('Last').': '.remove_right_zeros(number_format($graph_stats['min']['last'], $config['graph_precision'])).' '.$unit.' ; '.__('Avg').': '.remove_right_zeros(number_format($graph_stats['min']['avg'], $config['graph_precision'])).' '.$unit.' ; '.__('Max').': '.remove_right_zeros(number_format($graph_stats['min']['max'], $config['graph_precision'])).' '.$unit.' ; '.__('Min').': '.remove_right_zeros(number_format($graph_stats['min']['min'], $config['graph_precision'])).' '.$unit;
+	}
+	
+	if($config["fixed_graph"] == false){
+		$water_mark = array('file' =>
+			$config['homedir'] . "/images/logo_vertical_water.png",
+			'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
+	}
+	
+	if ($type_graph === 'area') {
+		return area_graph($flash_chart, $chart, $width, $height, $color,
+			$legend, array(), '', $title, $unit, $homeurl,
+			$water_mark, $config['fontpath'], $config['font_size'], $unit,
+			1, array(),	array(), 0, 0, $adapt_key, true, '', $menu);
+	}
+	else {
+		return
+			line_graph($flash_chart, $chart, $width, $height, $color,
+				$legend, $long_index,
+				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
+				$title, $unit, $water_mark, $config['fontpath'],
+				$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor);
+	}
+}
+
+?>
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index b940072a6a..46e5997ead 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -1681,26 +1681,27 @@ function modules_get_last_value ($id_agentmodule) {
  * @return mixed The row of tagente_datos of the last period. False if there were no data.
  */
 function modules_get_previous_data ($id_agent_module, $utimestamp = 0, $string = 0) {
-	if (empty ($utimestamp))
+	if (empty ($utimestamp)){
 		$utimestamp = time ();
-	
+	}
+
 	if ($string == 1) {
 		$table = 'tagente_datos_string';
 	}
 	else {
 		$table = 'tagente_datos';
 	}
-	
+
 	$sql = sprintf ('SELECT *
 		FROM ' . $table . '
 		WHERE id_agente_modulo = %d
-			AND utimestamp <= %d 
-			AND utimestamp >= %d 
+			AND utimestamp <= %d
 		ORDER BY utimestamp DESC',
-		$id_agent_module, $utimestamp, $utimestamp - SECONDS_2DAY);
-	
-	$search_in_history_db = db_search_in_history_db($utimestamp);
+		$id_agent_module, $utimestamp,
+		$utimestamp - SECONDS_2DAY
+	);
 
+	$search_in_history_db = db_search_in_history_db($utimestamp);
 	return db_get_row_sql ($sql, $search_in_history_db);
 }
 
@@ -2318,7 +2319,7 @@ function modules_change_relation_lock ($id_relation) {
  */
 function modules_get_first_date($id_agent_module, $datelimit = 0) {
 	global $config;
-	
+
 	//check datatype string or normal
 	$table = "tagente_datos";
 	$module_type_str = modules_get_type_name ($id_agent_module);
@@ -2334,14 +2335,12 @@ function modules_get_first_date($id_agent_module, $datelimit = 0) {
 		$query  = " SELECT max(utimestamp) as utimestamp FROM $table ";
 		$query .= " WHERE id_agente_modulo=$id_agent_module ";
 		$query .= " AND utimestamp < $datelimit ";
-	
 	}
 	else {
 		// get first utimestamp
 		$query  = " SELECT min(utimestamp) as utimestamp FROM $table ";
 		$query .= " WHERE id_agente_modulo=$id_agent_module ";
 	}
-	
 
 	// SEARCH ACTIVE DB
 	$data = db_get_all_rows_sql($query,$search_historydb);
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index e4a2d672af..ba185c9344 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -39,11 +39,11 @@ if (!empty($graph_type)) {
 ob_end_clean ();
 
 switch($graph_type) {
-	case 'histogram': 
+	case 'histogram':
 		$width = get_parameter('width');
 		$height = get_parameter('height');
 		$data = json_decode(io_safe_output(get_parameter('data')), true);
-		
+
 		$max = get_parameter('max');
 		$title = get_parameter('title');
 		$mode = get_parameter ('mode', 1);
@@ -53,19 +53,19 @@ switch($graph_type) {
 		$width = get_parameter('width');
 		$height = get_parameter('height');
 		$progress = get_parameter('progress');
-		
+
 		$out_of_lim_str = io_safe_output(get_parameter('out_of_lim_str', false));
 		$out_of_lim_image = get_parameter('out_of_lim_image', false);
-		
+
 		$title = get_parameter('title');
-		
+
 		$mode = get_parameter('mode', 1);
-		
+
 		$fontsize = get_parameter('fontsize', 10);
-		
+
 		$value_text = get_parameter('value_text', '');
 		$colorRGB = get_parameter('colorRGB', '');
-		
+
 		gd_progress_bar ($width, $height, $progress, $title, $config['fontpath'],
 			$out_of_lim_str, $out_of_lim_image, $mode, $fontsize,
 			$value_text, $colorRGB);
@@ -74,19 +74,19 @@ switch($graph_type) {
 		$width = get_parameter('width');
 		$height = get_parameter('height');
 		$progress = get_parameter('progress');
-		
+
 		$out_of_lim_str = io_safe_output(get_parameter('out_of_lim_str', false));
 		$out_of_lim_image = get_parameter('out_of_lim_image', false);
-		
+
 		$title = get_parameter('title');
-		
+
 		$mode = get_parameter('mode', 1);
-		
+
 		$fontsize = get_parameter('fontsize', 7);
-		
+
 		$value_text = get_parameter('value_text', '');
 		$colorRGB = get_parameter('colorRGB', '');
-		
+
 		gd_progress_bubble ($width, $height, $progress, $title, $config['fontpath'],
 			$out_of_lim_str, $out_of_lim_image, $mode, $fontsize,
 			$value_text, $colorRGB);
@@ -95,7 +95,7 @@ switch($graph_type) {
 
 function histogram($chart_data, $width, $height, $font, $max, $title,
 	$mode, $ttl = 1) {
-	
+
 	$graph = array();
 	$graph['data'] = $chart_data;
 	$graph['width'] = $width;
@@ -104,18 +104,18 @@ function histogram($chart_data, $width, $height, $font, $max, $title,
 	$graph['max'] = $max;
 	$graph['title'] = $title;
 	$graph['mode'] = $mode;
-	
+
 	$id_graph = serialize_in_temp($graph, null, $ttl);
-	
+
 	return "<img src='include/graphs/functions_gd.php?static_graph=1&graph_type=histogram&ttl=".$ttl."&id_graph=".$id_graph."'>";
 }
 
 function progressbar($progress, $width, $height, $title, $font,
 	$mode = 1, $out_of_lim_str = false, $out_of_lim_image = false,
 	$ttl = 1) {
-	
+
 	$graph = array();
-	
+
 	$graph['progress'] = $progress;
 	$graph['width'] = $width;
 	$graph['height'] = $height;
@@ -124,7 +124,7 @@ function progressbar($progress, $width, $height, $title, $font,
 	$graph['title'] = $title;
 	$graph['font'] = $font;
 	$graph['mode'] = $mode;
-	
+
 	$id_graph = serialize_in_temp($graph, null, $ttl);
 	if (is_metaconsole()) {
 		return "<img src='../../include/graphs/functions_gd.php?static_graph=1&graph_type=progressbar&ttl=".$ttl."&id_graph=".$id_graph."'>";
@@ -137,7 +137,7 @@ function progressbar($progress, $width, $height, $title, $font,
 
 function slicesbar_graph($chart_data, $period, $width, $height, $colors,
 	$font, $round_corner, $home_url = '', $ttl = 1) {
-	
+
 	$graph = array();
 	$graph['data'] = $chart_data;
 	$graph['period'] = $period;
@@ -146,9 +146,9 @@ function slicesbar_graph($chart_data, $period, $width, $height, $colors,
 	$graph['font'] = $font;
 	$graph['round_corner'] = $round_corner;
 	$graph['color'] = $colors;
-	
+
 	$id_graph = serialize_in_temp($graph, null, $ttl);
-	
+
 	return "<img src='".$home_url."include/graphs/functions_pchart.php?static_graph=1&graph_type=slicebar&ttl=".$ttl."&id_graph=".$id_graph."' style='width:100%;'>";
 }
 
@@ -158,11 +158,11 @@ function vbar_graph($flash_chart, $chart_data, $width, $height,
 	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white',
 	$from_ux = false, $from_wux = false, $tick_color = 'white') {
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-	
+
 	if (empty($chart_data)) {
 		return '<img src="' . $no_data_image . '" />';
 	}
-	
+
 	if ($flash_chart) {
 		return flot_vcolumn_chart ($chart_data, $width, $height, $color,
 			$legend, $long_index, $homeurl, $unit, $water_mark_url,
@@ -172,20 +172,18 @@ function vbar_graph($flash_chart, $chart_data, $width, $height,
 	else {
 		foreach ($chart_data as $key => $value) {
 			if(strlen($key) > 20){
-				
-					if(strpos($key, ' - ') != -1){
-						$key_temp = explode(" - ",$key);
-						$key_temp[0] = $key_temp[0]."   \n";
-						$key_temp[1]= '...'.substr($key_temp[1],-15);
-						$key2 = $key_temp[0].$key_temp[1];
-						io_safe_output($key2);
-					}
+				if(strpos($key, ' - ') != -1){
+					$key_temp = explode(" - ",$key);
+					$key_temp[0] = $key_temp[0]."   \n";
+					$key_temp[1]= '...'.substr($key_temp[1],-15);
+					$key2 = $key_temp[0].$key_temp[1];
+					io_safe_output($key2);
+				}
 				$chart_data[$key2]['g'] = $chart_data[$key]['g'];
 				unset($chart_data[$key]);
 			}
-			
 		}
-				
+
 		$graph = array();
 		$graph['data'] = $chart_data;
 		$graph['width'] = $width;
@@ -197,85 +195,41 @@ function vbar_graph($flash_chart, $chart_data, $width, $height,
 		$graph['water_mark'] = $water_mark_file;
 		$graph['font'] = $font;
 		$graph['font_size'] = $font_size;
-		
+
 		$id_graph = serialize_in_temp($graph, null, $ttl);
-		
+
 		return "<img src='" . $homeurl . "include/graphs/functions_pchart.php?static_graph=1&graph_type=vbar&ttl=".$ttl."&id_graph=".$id_graph."'>";
 	}
 }
 
-// NOT USED ACTUALLY
-function threshold_graph($flash_chart, $chart_data, $width, $height,
-	$ttl = 1) {
-	
-	if ($flash_chart) {
-		return flot_area_simple_graph($chart_data, $width, $height);
-	}
-	else {
-		echo "<img src='include/graphs/functions_pchart.php?static_graph=1&graph_type=threshold&ttl=".$ttl."&data=".json_encode($chart_data)."&width=".$width."&height=".$height."'>";
-	}
-}
+function area_graph(
+	$agent_module_id, $array_data, $color,
+	$legend, $series_type, $date_array,
+	$data_module_graph, $show_elements_graph,
+	$format_graph, $water_mark, $series_suffix_str
+) {
+	global $config;
 
-function area_graph($flash_chart, $chart_data, $width, $height, $color,
-	$legend, $long_index, $no_data_image, $xaxisname = "",
-	$yaxisname = "", $homeurl="", $water_mark = "", $font = '',
-	$font_size = '', $unit = '', $ttl = 1, $series_type = array(),
-	$chart_extra_data = array(), $yellow_threshold = 0,
-	$red_threshold = 0, $adapt_key = '', $force_integer = false,
-	$series_suffix_str = '', $menu = true, $backgroundColor = 'white',
-	$dashboard = false, $vconsole = false, $agent_module_id = 0, $percentil_values = array(), 
-	$threshold_data = array()) {
-	
 	include_once('functions_flot.php');
-	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-	
-	// ATTENTION: The min size is in constants.php
-	// It's not the same minsize for all graphs, but we are choosed a prudent minsize for all
-	if ($height <= CHART_DEFAULT_HEIGHT) {
-		$height = CHART_DEFAULT_HEIGHT;
-	}
-	if ($width < CHART_DEFAULT_WIDTH) {
-		$width = CHART_DEFAULT_WIDTH;
-	}
-	
-	if (empty($chart_data)) {
-		return graph_nodata_image($width, $height);
-		return '<img src="' . $no_data_image . '" />';
-	}
 
-	if ($vconsole) $menu = false;
-	
-	if ($flash_chart) {
-		return flot_area_simple_graph(
-			$chart_data,
-			$width,
-			$height,
+	if ($config['flash_charts']) {
+		return flot_area_graph(
+			$agent_module_id,
+			$array_data,
 			$color,
 			$legend,
-			$long_index,
-			$homeurl,
-			$unit,
-			$water_mark_url,
 			$series_type,
-			$chart_extra_data,
-			$yellow_threshold,
-			$red_threshold,
-			$adapt_key,
-			$force_integer,
-			$series_suffix_str,
-			$menu,
-			$backgroundColor,
-			$dashboard,
-			$vconsole,
-			$agent_module_id,
-			$font,
-			$font_size,
-			$xaxisname,
-			$percentil_values,
-			$threshold_data
-			);
+			$date_array,
+			$data_module_graph,
+			$show_elements_graph,
+			$format_graph,
+			$water_mark,
+			$series_suffix_str
+		);
 	}
 	else {
+		//XXXXX
+		//Corregir este problema
 		$graph = array();
 		$graph['data'] = $chart_data;
 		$graph['width'] = $width;
@@ -291,7 +245,7 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color,
 		$graph['unit'] = $unit;
 		$graph['series_type'] = $series_type;
 		$graph['percentil'] = $percentil_values;
-		
+
 		$id_graph = serialize_in_temp($graph, null, $ttl);
 		// Warning: This string is used in the function "api_get_module_graph" from 'functions_api.php' with the regec patern "/<img src='(.+)'>/"
 		return "<img src='" .
@@ -309,15 +263,15 @@ function stacked_area_graph($flash_chart, $chart_data, $width, $height,
 	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
 	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white',
 	$dashboard = false, $vconsole = false, $agent_module_id) {
-	
+
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-	
+
 	if (empty($chart_data)) {
 		return '<img src="' . $no_data_image . '" />';
 	}
 
 	$menu = (!$dashboard && !$vconsole);
-	
+
 	if ($flash_chart) {
 		return flot_area_stacked_graph(
 			$chart_data,
@@ -347,7 +301,7 @@ function stacked_area_graph($flash_chart, $chart_data, $width, $height,
 	else {
 		//Stack the data
 		stack_data($chart_data, $legend, $color);
-		
+
 		$graph = array();
 		$graph['data'] = $chart_data;
 		$graph['width'] = $width;
@@ -360,9 +314,9 @@ function stacked_area_graph($flash_chart, $chart_data, $width, $height,
 		$graph['font'] = $font;
 		$graph['font_size'] = $font_size;
 		$graph['backgroundColor'] = $backgroundColor;
-		
+
 		$id_graph = serialize_in_temp($graph, null, $ttl);
-		
+
 		return "<img src='" . ui_get_full_url (false, false, false, false) .
 			"include/graphs/functions_pchart.php?static_graph=1&graph_type=stacked_area&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
 	}
@@ -373,15 +327,15 @@ function stacked_line_graph($flash_chart, $chart_data, $width, $height,
 	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
 	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white',
 	$dashboard = false, $vconsole = false) {
-	
+
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-	
+
 	if (empty($chart_data)) {
 		return '<img src="' . $no_data_image . '" />';
 	}
-	
+
 	$menu = (!$dashboard && !$vconsole);
-	
+
 	if ($flash_chart) {
 		return flot_line_stacked_graph(
 			$chart_data,
@@ -410,7 +364,7 @@ function stacked_line_graph($flash_chart, $chart_data, $width, $height,
 	else {
 		//Stack the data
 		stack_data($chart_data, $legend, $color);
-		
+
 		$graph = array();
 		$graph['data'] = $chart_data;
 		$graph['width'] = $width;
@@ -423,9 +377,9 @@ function stacked_line_graph($flash_chart, $chart_data, $width, $height,
 		$graph['font'] = $font;
 		$graph['font_size'] = $font_size;
 		$graph['backgroundColor'] = $backgroundColor;
-		
+
 		$id_graph = serialize_in_temp($graph, null, $ttl);
-		
+
 		return "<img src='" . $homeurl . "include/graphs/functions_pchart.php?static_graph=1&graph_type=line&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
 	}
 }
@@ -434,11 +388,11 @@ function stacked_bullet_chart($flash_chart, $chart_data, $width, $height,
 	$color, $legend, $long_index, $no_data_image, $xaxisname = "",
 	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
 	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white') {
-	
+
 	include_once('functions_d3.php');
-	
+
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-	
+
 	if (empty($chart_data)) {
 		return '<img src="' . $no_data_image . '" />';
 	}
@@ -462,11 +416,11 @@ function stacked_bullet_chart($flash_chart, $chart_data, $width, $height,
 			$temp[] = ($data['min'] != false) ? $data['min'] : 0;
 			$temp[] = ($data['value'] != false) ? $data['value'] : 0;
 			$temp[] = ($data['max'] != false) ? $data['max'] : 0;
-			
+
 			$legend[] = $data['label'];
 			array_push($new_data, $temp);
 			$temp = array();
-		} 
+		}
 		$graph = array();
 		$graph['data'] = $new_data;
 		$graph['width'] = $width;
@@ -479,27 +433,26 @@ function stacked_bullet_chart($flash_chart, $chart_data, $width, $height,
 		$graph['font'] = $font;
 		$graph['font_size'] = $font_size;
 		$graph['backgroundColor'] = $backgroundColor;
-		
+
 		$id_graph = serialize_in_temp($graph, null, $ttl);
-		
+
 		return "<img src='" . $homeurl . "include/graphs/functions_pchart.php?static_graph=1&graph_type=bullet_chart&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
 	}
-	
 }
 
 function stacked_gauge($flash_chart, $chart_data, $width, $height,
 	$color, $legend, $long_index, $no_data_image, $xaxisname = "",
 	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
 	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white') {
-	
+
 	include_once('functions_d3.php');
-	
+
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-	
+
 	if (empty($chart_data)) {
 		return '<img src="' . $no_data_image . '" />';
 	}
-	
+
 	return d3_gauges(
 			$chart_data,
 			$width,
@@ -521,17 +474,17 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color,
 	$dashboard = false, $vconsole = false, $series_type = array(),
 	$percentil_values = array(), $yellow_threshold = 0, $red_threshold = 0,
 	$threshold_data = array()) {
-	
+
 	include_once("functions_flot.php");
-	
+
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-	
+
 	if (empty($chart_data)) {
 		return '<img src="' . $no_data_image . '" />';
 	}
 
 	$menu = (!$dashboard && !$vconsole);
-	
+
 	if ($flash_chart) {
 		return flot_line_simple_graph(
 			$chart_data,
@@ -576,7 +529,7 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color,
 		$graph['backgroundColor'] = $backgroundColor;
 		$graph['percentil'] = $percentil_values;
 		$id_graph = serialize_in_temp($graph, null, $ttl);
-		
+
 		if(empty($homeurl)){
 			return "<img src='" . ui_get_full_url (false, false, false, false) . "include/graphs/functions_pchart.php?static_graph=1&graph_type=line&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
 		}else{
@@ -587,54 +540,38 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color,
 
 function kiviat_graph($graph_type, $flash_chart, $chart_data, $width,
 	$height, $no_data_image, $ttl = 1, $homedir="") {
-	
+
 	if (empty($chart_data)) {
 		return '<img src="' . $no_data_image . '" />';
 	}
-	
+
 	$graph = array();
 	$graph['data'] = $chart_data;
 	$graph['width'] = $width;
 	$graph['height'] = $height;
-	
+
 	$id_graph = serialize_in_temp($graph, null, $ttl);
-	
+
 	return "<img src='".$homedir."include/graphs/functions_pchart.php?static_graph=1&graph_type=".$graph_type."&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
 }
 
-function radar_graph($flash_chart, $chart_data, $width, $height,
-	$no_data_image, $ttl = 1, $homedir="") {
-	
-	return kiviat_graph('radar', $flash_chart, $chart_data, $width,
-		$height, $no_data_image, $ttl, $homedir);
-}
-
-function polar_graph($flash_chart, $chart_data, $width, $height,
-	$no_data_image, $ttl = 1, $homedir="") {
-	
-	return kiviat_graph('polar', $flash_chart, $chart_data, $width,
-		$height, $no_data_image, $ttl, $homedir="");
-}
-
-
 function hbar_graph($flash_chart, $chart_data, $width, $height,
 	$color, $legend, $long_index, $no_data_image, $xaxisname = "",
 	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
 	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white',
 	$tick_color = "white", $val_min=null, $val_max=null) {
-	
+
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-	
+
 	if (empty($chart_data)) {
 		return '<img src="' . $no_data_image . '" />';
 	}
-	
+
 	if ($flash_chart) {
 		return flot_hcolumn_chart(
 			$chart_data, $width, $height, $water_mark_url, $font, $font_size, $backgroundColor, $tick_color, $val_min, $val_max);
 	}
 	else {
-		
 		foreach ($chart_data as $key => $value) {
 			if(strlen($key) > 40){
 					if(strpos($key, ' - ') != -1){
@@ -648,8 +585,7 @@ function hbar_graph($flash_chart, $chart_data, $width, $height,
 				unset($chart_data[$key]);
 			}
 		}
-		
-		
+
 		$graph = array();
 		$graph['data'] = $chart_data;
 		$graph['width'] = $width;
@@ -663,9 +599,9 @@ function hbar_graph($flash_chart, $chart_data, $width, $height,
 		$graph['font'] = $font;
 		$graph['font_size'] = $font_size;
 		$graph['force_steps'] = $force_steps;
-		
+
 		$id_graph = serialize_in_temp($graph, null, $ttl);
-		
+
 		return "<img src='" . $homeurl . "include/graphs/functions_pchart.php?static_graph=1&graph_type=hbar&ttl=".$ttl."&id_graph=".$id_graph."'>";
 	}
 }
@@ -674,7 +610,7 @@ function pie3d_graph($flash_chart, $chart_data, $width, $height,
 	$others_str = "other", $homedir = "", $water_mark = "", $font = '',
 	$font_size = '', $ttl = 1, $legend_position = false, $colors = '',
 	$hide_labels = false) {
-	
+
 	return pie_graph('3d', $flash_chart, $chart_data, $width, $height,
 		$others_str, $homedir, $water_mark, $font, $font_size, $ttl,
 		$legend_position, $colors, $hide_labels);
@@ -684,9 +620,9 @@ function pie2d_graph($flash_chart, $chart_data, $width, $height,
 	$others_str = "other", $homedir="", $water_mark = "", $font = '',
 	$font_size = '', $ttl = 1, $legend_position = false, $colors = '',
 	$hide_labels = false) {
-	
+
 	return pie_graph('2d', $flash_chart, $chart_data, $width, $height,
-		$others_str, $homedir, $water_mark, $font, $font_size, $ttl, 
+		$others_str, $homedir, $water_mark, $font, $font_size, $ttl,
 		$legend_position, $colors, $hide_labels);
 }
 
@@ -694,23 +630,23 @@ function pie_graph($graph_type, $flash_chart, $chart_data, $width,
 	$height, $others_str = "other", $homedir="", $water_mark = "",
 	$font = '', $font_size = '', $ttl = 1, $legend_position = false,
 	$colors = '', $hide_labels = false) {
-	
+
 	if (empty($chart_data)) {
 		return graph_nodata_image($width, $height, 'pie');
 	}
-	
+
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-	
+
 	// This library allows only 8 colors
 	$max_values = 5;
-	
+
 	//Remove the html_entities
 	$temp = array();
 	foreach ($chart_data as $key => $value) {
 		$temp[io_safe_output($key)] = $value;
 	}
 	$chart_data = $temp;
-	
+
 	if (count($chart_data) > $max_values) {
 		$chart_data_trunc = array();
 		$n = 1;
@@ -728,7 +664,7 @@ function pie_graph($graph_type, $flash_chart, $chart_data, $width,
 		}
 		$chart_data = $chart_data_trunc;
 	}
-	
+
 	if ($flash_chart) {
 		return flot_pie_chart(array_values($chart_data),
 			array_keys($chart_data), $width, $height, $water_mark_url,
@@ -736,7 +672,6 @@ function pie_graph($graph_type, $flash_chart, $chart_data, $width,
 	}
 	else {
 		//TODO SET THE LEGEND POSITION
-		
 		$graph = array();
 		$graph['data'] = $chart_data;
 		$graph['width'] = $width;
@@ -746,9 +681,9 @@ function pie_graph($graph_type, $flash_chart, $chart_data, $width,
 		$graph['font_size'] = $font_size;
 		$graph['legend_position'] = $legend_position;
 		$graph['color'] = $colors;
-		
+
 		$id_graph = serialize_in_temp($graph, null, $ttl);
-		
+
 		switch ($graph_type) {
 			case "2d":
 				return "<img src='" . $homedir . "include/graphs/functions_pchart.php?static_graph=1&graph_type=pie2d&ttl=".$ttl."&id_graph=".$id_graph."'>";
@@ -764,17 +699,16 @@ function ring_graph($flash_chart, $chart_data, $width,
 	$height, $others_str = "other", $homedir="", $water_mark = "",
 	$font = '', $font_size = '', $ttl = 1, $legend_position = false,
 	$colors = '', $hide_labels = false,$background_color = 'white') {
-	
+
 	if (empty($chart_data)) {
 		return graph_nodata_image($width, $height, 'pie');
 	}
-	
+
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-	
+
 	// This library allows only 8 colors
 	$max_values = 18;
-	
-	
+
 	if ($flash_chart) {
 		return flot_custom_pie_chart ($flash_chart, $chart_data,
 		$width, $height, $colors, $module_name_list, $long_index,
@@ -784,7 +718,7 @@ function ring_graph($flash_chart, $chart_data, $width,
 	else {
 		$total_modules = $chart_data['total_modules'];
 		unset($chart_data['total_modules']);
-		
+
 		$max_values = 9;
 		//Remove the html_entities
 		$n = 0;
@@ -798,13 +732,13 @@ function ring_graph($flash_chart, $chart_data, $width,
 			$n++;
 		}
 		$chart_data = $temp;
-		
+
 		$chart_data_trunc = array();
 		$coloretes = array();
 		$n = 1;
 		//~ foreach ($chart_data as $key => $value) {
 			//~ if ($n < $max_values) {
-				
+
 				//~ $chart_data_trunc[$key] = $value;
 			//~ }
 			//~ else {
@@ -816,9 +750,8 @@ function ring_graph($flash_chart, $chart_data, $width,
 			//~ $n++;
 		//~ }
 		//~ $chart_data = $chart_data_trunc;
-		
+
 		//TODO SET THE LEGEND POSITION
-		
 		$graph = array();
 		$graph['data'] = $chart_data;
 		$graph['width'] = $width;
@@ -828,11 +761,11 @@ function ring_graph($flash_chart, $chart_data, $width,
 		$graph['font_size'] = $font_size;
 		$graph['legend_position'] = $legend_position;
 		$graph['legend'] = $legend;
-		
+
 		$id_graph = serialize_in_temp($graph, null, $ttl);
-		
+
 		return "<img src='" . $homedir . "include/graphs/functions_pchart.php?static_graph=1&graph_type=ring3d&ttl=".$ttl."&id_graph=".$id_graph."'>";
-				
+
 	}
 }
 
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 968c0d7600..575e36d7f4 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -861,1264 +861,6 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 	}
 }
 
-function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
-	colors, type, serie_types, water_mark, width, max_x, homeurl, unit,
-	font_size, font, menu, events, event_ids, legend_events, alerts,
-	alert_ids, legend_alerts, yellow_threshold, red_threshold,
-	force_integer, separator, separator2, 
-	yellow_up, red_up, yellow_inverse, red_inverse,
-	series_suffix_str, dashboard, vconsole, xaxisname,background_color,legend_color,
-	short_data) {
-
-	var threshold = true;
-	var thresholded = false;
-	font = font.split("/").pop().split(".").shift();
-
-	values = values.split(separator2);
-	serie_types = serie_types.split(separator);
-	labels_long = labels_long.split(separator);
-	labels = labels.split(separator);
-	//XXX 1827
-	//Translate datetime to utimestamp -> avoid convert datetime in server better...
-	$.each(labels, function (i,v) {
-		labels[i] = labels[i] * 1000;
-	});
-
-	legend = legend.split(separator);
-	events = events.split(separator);
-	event_ids = event_ids.split(separator);
-	if (alerts.length != 0)
-		alerts = alerts.split(separator);
-	else
-		alerts = [];
-	alert_ids = alert_ids.split(separator);
-	colors = colors.split(separator);
-
-	var eventsz = new Array();
-	$.each(events,function(i,v) {
-		eventsz[event_ids[i]] = v;
-	});
-
-	var alertsz = new Array();
-	$.each(alerts,function(i,v) {
-		alertsz[alert_ids[i]] = v;
-	});
-
-	switch (type) {
-		case 'line_simple':
-			stacked = null;
-			filled = false;
-			break;
-		case 'line_stacked':
-			stacked = 'stack';
-			filled = false;
-			break;
-		case 'area_simple':
-			stacked = null;
-			filled = true;
-			break;
-		case 'area_stacked':
-			stacked = 'stack';
-			filled = true;
-			break;
-	}
-
-	var datas = new Array();
-	var data_base = new Array();
-
-	// Prepared to turn series with a checkbox
-	// var showed = new Array();
-
-	var min_check = 0;
-	for (i = 0; i < values.length; i++) {
-		var serie = values[i].split(separator);
-		var aux = new Array();
-
-		$.each(serie, function(i, v) {
-			if(v < 0){
-				if(min_check > parseFloat(v)){
-					min_check = v;
-				}
-			}
-			// XXX 1827
-			//aux.push([i, v]);
-			aux.push([labels[i], v]);
-		});
-		
-		//XXX
-		var time_format_y = labels[labels.length - 1] - labels[0];
-		switch (serie_types[i]) {
-			case 'area':
-				line_show = true;
-				points_show = false; // XXX - false
-				filled = 0.2;
-				steps_chart = false;
-				break;
-			case 'line':
-			default:
-				line_show = true;
-				points_show = false;
-				filled = false;
-				steps_chart = false;
-				break;
-			case 'points':
-				line_show = false;
-				points_show = true;
-				filled = false;
-				steps_chart = false
-				break;
-			case 'unknown':
-			case 'boolean':
-				line_show = true;
-				points_show = false;
-				filled = true;
-				steps_chart = true;
-				break;
-		}
-
-		var serie_color;
-		if (colors[i] != '') {
-			serie_color = colors[i];
-		}
-		else {
-			serie_color = '#8c2';
-		}
-
-		var normalw = '#efe';
-		var warningw = '#ffe';
-		var criticalw = '#fee';
-		var normal = '#0f0';
-		var warning = '#ff0';
-		var critical = '#f00';
-	
-		var lineWidth = $('#hidden-line_width_graph').val() || 1;
-
-		// Data
-		data_base.push({
-			id: 'serie_' + i,
-			data: aux,
-			label: legend[i],
-			color: serie_color,
-			//threshold: [{ below: 80, color: "rgb(200, 20, 30)" } , { below: 65, color: "rgb(30, 200, 30)" }, { below: 50, color: "rgb(30, 200, 30)" }],
-			lines: {
-				show: line_show,
-				fill: filled,
-				lineWidth: lineWidth,
-				steps: steps_chart
-			},
-			points: { show: points_show }
-		});
-
-		// Prepared to turn series with a checkbox
-		// showed[i] = true;
-	}
-
-	max_x = data_base[0]['data'][data_base[0]['data'].length -1][0];
-
-	if(min_check != 0){
-		min_check = min_check -5;
-	}
-
-	// If threshold and up are the same, that critical or warning is disabled
-	if (yellow_threshold == yellow_up) yellow_inverse = false;
-	if (red_threshold == red_up) red_inverse = false;
-
-	//Array with points to be painted
-	var threshold_data = new Array();
-	//Array with some interesting points
-	var extremes = new Array ();
-	
-	yellow_threshold = parseFloat (yellow_threshold);
-	yellow_up = parseFloat (yellow_up);
-	red_threshold = parseFloat (red_threshold);
-	red_up = parseFloat (red_up);
-	var yellow_only_min = ((yellow_up == 0) && (yellow_threshold != 0));
-	red_only_min = ((red_up == 0) && (red_threshold != 0));
-	
-	if (threshold) {
-		// Warning interval. Change extremes depends on critical interval
-		if (yellow_inverse && red_inverse) {
-			if (red_only_min && yellow_only_min) {
-				// C: |--------         |
-				// W: |········====     |
-				
-				if (yellow_threshold > red_threshold) {
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_threshold;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-				}
-			} else if (!red_only_min && yellow_only_min) {
-				// C: |--------   ------|
-				// W: |········===·     |
-				
-				if (yellow_threshold > red_up) {
-					yellow_threshold = red_up;
-				}
-				if (yellow_threshold > red_threshold) {
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_threshold;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-				}
-			} else if (red_only_min && !yellow_only_min) {
-				// C: |-------          |
-				// W: |·······====   ===|
-				if (red_threshold < yellow_threshold) {
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_threshold;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-				}
-				
-				if (yellow_up < red_threshold) {
-					yellow_up = red_threshold;
-				}
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'warning_up',
-					data: [[max_x, yellow_up]],
-					label: null,
-					color: warning, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-				extremes['warning_up'] = yellow_up;
-				
-			} else {
-				if (yellow_threshold > red_threshold) {
-					// C: |--------   ------|
-					// W: |········===·  ···|
-					if (yellow_threshold > red_up) {
-						yellow_threshold = red_up;
-					}
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_threshold;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-				}
-				if (yellow_up < red_up) {
-					// C: |--------      ---|
-					// W: |·····  ·======···|
-					if (yellow_up < red_threshold) {
-						yellow_up = red_up;
-					}
-					threshold_data.push({ 
-						id: 'warning_normal_fup',
-						data: [[max_x, yellow_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: red_up - yellow_up, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fup_1'] = red_up;
-					extremes['warning_normal_fup_2'] = yellow_up;
-				}
-				// If warning is under critical completely do not paint anything yellow
-					// C: |--------    -----|
-					// W: |····          ···|
-			}
-		} else if (yellow_inverse && !red_inverse) {
-			if (red_only_min && yellow_only_min) {
-				// C: |            -----|
-				// W: |============···  |
-				if (yellow_threshold > red_threshold) {
-					yellow_threshold = red_threshold;
-				}
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'warning_down',
-					data: [[max_x, yellow_threshold]],
-					label: null,
-					color: warning, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-				extremes['warning_down'] = yellow_threshold;
-				
-			} else if (!red_only_min && yellow_only_min) {
-				// C: |      ----       |
-				// W: |======····===    |
-				
-				if (yellow_threshold > red_up) {
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_up, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_up;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-				}
-				
-				if (yellow_threshold > red_threshold) {
-					yellow_threshold = red_threshold;
-				}
-				threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-				extremes['warning_down'] = yellow_threshold;
-				
-			} else if (red_only_min && !yellow_only_min) {
-				if (yellow_threshold < red_threshold) {
-					// C: |            -----|
-					// W: |=======  ===·····|
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_down'] = yellow_threshold;
-					
-					if (red_threshold > yellow_up) {
-						threshold_data.push({
-							id: 'warning_normal_fup',
-							data: [[max_x, yellow_up]],
-							label: null,
-							color: warning, 
-							bars: {show: true, align: "left", barWidth: red_threshold - yellow_up, lineWidth: 0, horizontal: true}
-						});
-						extremes['warning_normal_fup_1'] = yellow_up;
-						extremes['warning_normal_fup_2'] = red_threshold;
-					}
-				} else {
-					// C: |     ------------|
-					// W: |=====··  ········|
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_down'] = red_threshold;
-				}
-			} else {
-				if (yellow_threshold > red_up) {
-					// C: |    -----        |
-					// W: |====·····===  ===|
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_down'] = red_threshold;
-					
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_up, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_up;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-					
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_up',
-						data: [[max_x, yellow_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_up'] = yellow_up;
-				} else if (red_threshold > yellow_up){
-					// C: |          -----  |
-					// W: |===    ===·····==|
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_down'] = yellow_threshold;
-					
-					threshold_data.push({
-						id: 'warning_normal_fup',
-						data: [[max_x, yellow_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: red_threshold - yellow_up, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fup_1'] = yellow_up;
-					extremes['warning_normal_fup_2'] = red_threshold;
-					
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_up',
-						data: [[max_x, red_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_up'] = red_up;
-				} else {
-					// C: |  --------       |
-					// W: |==·    ···=======|
-					if (yellow_threshold > red_threshold) {
-						yellow_threshold = red_threshold;
-					}
-					if (yellow_up < red_up) {
-						yellow_up = red_up;
-					}
-					
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_down'] = yellow_threshold;
-					
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_up',
-						data: [[max_x, yellow_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_up'] = yellow_up;
-				}
-			}
-		} else if (!yellow_inverse && red_inverse) {
-			if (yellow_only_min && red_only_min) {
-				// C: |-----            |
-				// W: |   ··============|
-				if (yellow_threshold < red_threshold) {
-					yellow_threshold = red_threshold;
-				}
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'warning_up',
-					data: [[max_x, yellow_threshold]],
-					label: null,
-					color: warning, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-				extremes['warning_up'] = yellow_threshold;
-				
-			} else if (!yellow_only_min && red_only_min) {
-				// C: |-----            |
-				// W: |   ··========    |
-				if (yellow_threshold < red_threshold) {
-					yellow_threshold = red_threshold;
-				}
-				if (yellow_up > red_threshold) {
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = yellow_up;
-				}
-			} else if (yellow_only_min && !red_only_min) {
-				// C: |-----      ------|
-				// W: |   ··======······|
-				if (yellow_threshold < red_threshold) {
-					yellow_threshold = red_threshold;
-				}
-				if (yellow_threshold < red_up) {
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (red_up - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = red_up;
-				}
-				// If warning is under critical completely do not paint anything yellow
-					// C: |--------    -----|
-					// W: |              ···|
-			} else {
-				if (red_up > yellow_threshold && red_threshold < yellow_up) {
-					// C: |-----      ------|
-					// W: |   ··======·     |
-					if (yellow_threshold < red_threshold) {
-						yellow_threshold = red_threshold;
-					}
-					if (yellow_up > red_up) {
-						yellow_up = red_up;
-					}
-					
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = yellow_up;
-				}
-			}
-		}
-			// If warning is under critical completely do not paint anything yellow
-				// C: |--------    -----|   or	// C: |--------    -----|
-				// W: |   ····          |		// W: |             ··  |
-		else {
-			if (red_only_min && yellow_only_min) {
-				if (yellow_threshold < red_threshold) {
-					// C: |        ---------|
-					// W: |   =====·········|
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (red_threshold - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = red_threshold;
-				}
-			} else if (red_only_min && !yellow_only_min) {
-				// C: |        ---------|
-				// W: |   =====···      |
-				if (yellow_up > red_threshold) {
-					yellow_up = red_threshold;
-				}
-				if (yellow_threshold < red_threshold) {
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = yellow_up;
-				}
-			} else if (!red_only_min && yellow_only_min) {
-				// C: |     -------     |
-				// W: |   ==·······=====|
-				
-				if (yellow_threshold < red_threshold) {
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: red_threshold - yellow_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = yellow_threshold;
-					extremes['warning_normal_fdown_2'] = red_threshold;
-				}
-				
-				if (yellow_threshold < red_up) {
-					yellow_threshold = red_up;
-				}
-				
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'warning_up',
-					data: [[max_x, yellow_threshold]],
-					label: null,
-					color: warning, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-				extremes['warning_up'] = yellow_threshold;
-				
-			} else {
-				if (red_threshold > yellow_threshold && red_up < yellow_up ) {
-					// C: |    ------       |
-					// W: |  ==······====   |
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: red_threshold - yellow_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = yellow_threshold;
-					extremes['warning_normal_fdown_2'] = red_threshold;
-					
-					threshold_data.push({
-						id: 'warning_normal_fup',
-						data: [[max_x, red_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_up - red_up, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fup_1'] = red_up;
-					extremes['warning_normal_fup_2'] = yellow_up;
-				} else if (red_threshold < yellow_threshold && red_up > yellow_up) {
-				// If warning is under critical completely do not paint anything yellow
-					// C: |  --------        |
-					// W: |    ····          |
-				} else {
-					// C: |     --------    |   or	// C: |     ------      |
-					// W: |   ==··          |		// W: |        ···====  |
-					if ((yellow_up > red_threshold) && (yellow_up < red_up)) {
-						yellow_up = red_threshold;
-					}
-					if ((yellow_threshold < red_up) && (yellow_threshold > red_threshold)) {
-						yellow_threshold = red_up;
-					}
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = yellow_up;
-				}
-			}
-		}
-		// Critical interval
-		if (red_inverse) {
-			if (!red_only_min) {
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'critical_up',
-					data: [[max_x, red_up]],
-					label: null,
-					color: critical, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-			}
-			threshold_data.push({ // barWidth will be correct on draw time
-				id: 'critical_down',
-				data: [[max_x, red_threshold]],
-				label: null,
-				color: critical, 
-				bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-			});
-		} else {
-			if (red_up == 0 && red_threshold != 0) {
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'critical_up',
-					data: [[max_x, red_threshold]],
-					label: null,
-					color: critical, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-			} else {
-				threshold_data.push({
-					id: 'critical_normal',
-					data: [[max_x, red_threshold]],
-					label: null,
-					color: critical, 
-					bars: {show: true, align: "left", barWidth: (red_up - red_threshold), lineWidth: 0, horizontal: true}
-				});
-			}
-		}
-		
-	}
-
-	// The first execution, the graph data is the base data
-	datas = data_base;
-
-	// minTickSize
-	var count_data = datas[0].data.length;
-	var min_tick_pixels = 80;
-	
-	if (unit != "") {
-		xaxisname = xaxisname + " (" + unit + ")"
-	}
-	
-	var options = {
-			series: {
-				stack: stacked,
-				shadowSize: 0.1
-			},
-			crosshair: { mode: 'xy' },
-			selection: { mode: 'x', color: '#777' },
-			export: {
-				export_data: true,
-				labels_long: labels_long,
-				homeurl: homeurl
-			},
-			grid: {
-				hoverable: true,
-				clickable: true,
-				borderWidth:1,
-				borderColor: '#C1C1C1',
-				tickColor: background_color,
-				color: legend_color
-			},
-			xaxes: [{
-				/*
-				axisLabelFontSizePixels: font_size,
-				axisLabelUseCanvas: false,
-				tickFormatter: xFormatter,
-				labelHeight: 50,
-				color: '',
-				font: font,
-				*/
-			// XXX 1827
-				axisLabelUseCanvas: false,
-				axisLabelFontSizePixels: font_size,
-				mode: "time",
-				tickFormatter: xFormatter,
-				// timeformat: "%Y/%m/%d %H:%M:%S",
-			}],
-			yaxes: [{
-				tickFormatter: yFormatter,
-				color: '',
-				alignTicksWithAxis: 1,
-				labelWidth: 30,
-				position: 'left',
-				font: font,
-				reserveSpace: true,
-				min: min_check
-			}],
-			legend: {
-				position: 'se',
-				container: $('#legend_' + graph_id),
-				labelFormatter: lFormatter
-			}
-		};
-	if (vconsole) {
-		options.grid['hoverable'] = false;
-		options.grid['clickable'] = false;
-		options.crosshair = false;
-		options.selection = false;
-	}
-	
-	var stack = 0, bars = true, lines = false, steps = false;
-	var plot = $.plot($('#' + graph_id), datas, options);
-	
-	// Re-calculate the graph height with the legend height
-	if (dashboard || vconsole) {
-		var hDiff = $('#'+graph_id).height() - $('#legend_'+graph_id).height();
-		if(/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ){
-		}
-		else {
-			$('#'+graph_id).css('height', hDiff);
-		}
-	}
-	
-	if (vconsole) {
-		var myCanvas = plot.getCanvas();
-		plot.setupGrid(); // redraw plot to new size
-		plot.draw();
-		var image = myCanvas.toDataURL("image/png");
-		return;
-	}
-	
-	// Adjust the overview plot to the width and position of the main plot
-	adjust_left_width_canvas(graph_id, 'overview_'+graph_id);
-	update_left_width_canvas(graph_id); 
-
-	// Adjust overview when main chart is resized
-	$('#'+graph_id).resize(function(){
-		update_left_width_canvas(graph_id);
-	});
-
-	// Adjust linked graph to the width and position of the main plot
-
-	// Miniplot
-	if (!vconsole) {
-		var overview = $.plot($('#overview_'+graph_id),datas, {
-			series: {
-				stack: stacked,
-				lines: { show: true, lineWidth: 1 },
-				shadowSize: 0
-			},
-			grid: { borderWidth: 1, hoverable: true, autoHighlight: false},
-			xaxis: { },
-				xaxes: [ {
-					tickFormatter: xFormatter,
-					minTickSize: steps,
-					color: ''
-					} ],
-			yaxis: {ticks: [], autoscaleMargin: 0.1 },
-			selection: {mode: 'x', color: '#777' },
-			legend: {show: false},
-			crosshair: {mode: 'x'}
-		});
-	}
-	// Connection between plot and miniplot
-
-	$('#' + graph_id).bind('plotselected', function (event, ranges) {
-		// do the zooming if exist menu to undo it
-		if (menu == 0) {
-			return;
-		}
-		
-		//XXX
-		dataInSelection = ranges.xaxis.to - ranges.xaxis.from;
-		//time_format_y = dataInSelection;
-		dataInPlot = plot.getData()[0].data.length;
-
-		factor = dataInSelection / dataInPlot;
-
-		new_steps = parseInt(factor * steps);
-
-		plot = $.plot($('#' + graph_id), data_base,
-			$.extend(true, {}, options, {
-				xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to},
-				xaxes: [ {
-						tickFormatter: xFormatter,
-						//XXX
-						//minTickSize: new_steps,
-						color: ''
-						} ],
-				legend: { show: false }
-			}));
-		if (thresholded) {
-			var zoom_data_threshold = new Array ();
-			
-			var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
-									red_threshold, extremes, red_up);
-			plot = $.plot($('#' + graph_id), data_base,
-			$.extend(true, {}, options, {
-				yaxis: {
-					max: y_recal.max,
-					min: y_recal.min
-				},
-				xaxis: {
-					min: plot.getAxes().xaxis.min,
-					max: plot.getAxes().xaxis.max
-				}
-			}));
-			zoom_data_threshold = add_threshold (data_base, threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
-										red_threshold, extremes, red_up);
-			plot.setData(zoom_data_threshold);
-			plot.draw();
-		}
-			
-
-		$('#menu_cancelzoom_' + graph_id)
-			.attr('src', homeurl + '/images/zoom_cross_grey.png');
-
-		currentRanges = ranges;
-		// don't fire event on the overview to prevent eternal loop
-		overview.setSelection(ranges, true);
-	});
-
-	$('#overview_' + graph_id)
-		.bind('plotselected', function (event, ranges) {
-			plot.setSelection(ranges);
-		});
-
-	var legends = $('#legend_' + graph_id + ' .legendLabel');
-
-	var updateLegendTimeout = null;
-	var latestPosition = null;
-	var currentPlot = null;
-	var currentRanges = null;
-
-	// Update legend with the data of the plot in the mouse position
-	function updateLegend() {
-		updateLegendTimeout = null;
-
-		var pos = latestPosition;
-
-		var axes = currentPlot.getAxes();
-		if (pos.x < axes.xaxis.min || pos.x > axes.xaxis.max ||
-			pos.y < axes.yaxis.min || pos.y > axes.yaxis.max) {
-			return;
-		}
-
-		var j, dataset = currentPlot.getData();
-
-		var i = 0;
-		for (k = 0; k < dataset.length; k++) {
-
-			// k is the real series counter
-			// i is the series counter without thresholds
-			var series = dataset[k];
-
-			if (series.label == null) {
-				continue;
-			}
-
-			// find the nearest points, x-wise
-			for (j = 0; j < series.data.length; ++j)
-				if (series.data[j][0] > pos.x) {
-					break;
-				}
-
-			var y = series.data[j][1];
-
-			var how_bigger = "";
-			if (y > 1000000) {
-				how_bigger = "M";
-				y = y / 1000000;
-			}
-			else if (y > 1000) {
-				how_bigger = "K";
-				y = y / 1000;
-			}
-			else if(y < -1000000) {
-				how_bigger = "M";
-				y = y / 1000000;
-			}
-			else if (y < -1000) {
-				how_bigger = "K";
-				y = y / 1000;	
-			}
-
-			if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) {
-				$('#timestamp_'+graph_id).show();
-				// If no legend, the timestamp labels are short and with value
-				if (legend.length == 0) {
-					$('#timestamp_'+graph_id).text(labels[j] + ' (' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + ')');
-				}
-				else {
-					var date_format = new Date(labels_long[j]*1000);
-
-					date_format = 
-								date_format.getDate() + "/" +
-								(date_format.getMonth() + 1) + "/" + 
-								date_format.getFullYear() + "\n" + 
-								date_format.getHours() + ":" + 
-								date_format.getMinutes() + ":" + 
-								date_format.getSeconds();
-
-					$('#timestamp_'+graph_id).text(date_format);
-				}
-				//$('#timestamp_'+graph_id).css('top', plot.offset().top-$('#timestamp_'+graph_id).height()*1.5);
-
-				var timesize = $('#timestamp_'+graph_id).width();
-
-				if (currentRanges != null) {
-					dataset = plot.getData();
-				}
-
-				var timenewpos = dataset[0].xaxis.p2c(pos.x)+$('.yAxis>div').eq(0).width();
-
-				var canvaslimit = plot.width();
-
-				if (timesize+timenewpos > canvaslimit) {
-					$('#timestamp_'+graph_id).css('left', timenewpos - timesize);
-					$('#timestamp_'+graph_id).css('top', 50);
-				}
-				else {
-					$('#timestamp_'+graph_id).css('left', timenewpos);
-					$('#timestamp_'+graph_id).css('top', 50);
-				}
-			}
-			else {
-				$('#timestamp_'+graph_id).hide();
-			}
-
-			var label_aux = series.label;
-
-			// The graphs of points type and unknown graphs will dont be updated
-			if (serie_types[i] != 'points' && series.label != $('#hidden-unknown_text').val()) {
-				$('#legend_' + graph_id + ' .legendLabel')
-					.eq(i).html(label_aux +	'= ' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + how_bigger + ' ' + unit);
-			}
-
-			$('#legend_' + graph_id + ' .legendLabel')
-				.eq(i).css('font-size',font_size+'pt');
-
-			$('#legend_' + graph_id + ' .legendLabel')
-				.eq(i).css('color','');
-
-			$('#legend_' + graph_id + ' .legendLabel')
-				.eq(i).css('font-family',font+'Font');
-
-			i++;
-		}
-	}
-
-	// Events
-	$('#' + graph_id).bind('plothover',  function (event, pos, item) {
-		overview.setCrosshair({ x: pos.x, y: 0 });
-		currentPlot = plot;
-		latestPosition = pos;
-		if (!updateLegendTimeout) {
-			updateLegendTimeout = setTimeout(updateLegend, 50);
-		}
-
-	});
-
-	$('#' + graph_id).bind("plotclick", function (event, pos, item) {
-		plot.unhighlight();
-		if (item && item.series.label != '' && (item.series.label == legend_events || item.series.label == legend_events+series_suffix_str || item.series.label == legend_alerts || item.series.label == legend_alerts+series_suffix_str)) {
-			plot.unhighlight();
-			var dataset  = plot.getData();
-
-			var extra_info = '<i>No info to show</i>';
-			var extra_show = false;
-
-			var coord_x = (item.dataIndex/item.series.xaxis.datamax)* (event.target.clientWidth - event.target.offsetLeft + 1) + event.target.offsetLeft;
-
-
-			$('#extra_'+graph_id).css('left',coord_x);
-			$('#extra_'+graph_id).css('top', event.target.offsetTop + 55 );
-
-			switch(item.series.label) {
-				case legend_alerts+series_suffix_str:
-				case legend_alerts:
-					extra_info = '<b>'+legend_alerts+':<br><span style="font-size:xx-small; font-weight: normal;">From: '+labels_long[item.dataIndex];
-					if (labels_long[item.dataIndex+1] != undefined) {
-						extra_info += '<br>To: '+labels_long[item.dataIndex+1];
-					}
-					extra_info += '</span></b>'+get_event_details(alertsz[item.dataIndex]);
-					extra_show = true;
-					break;
-				case legend_events+series_suffix_str:
-				case legend_events:
-					extra_info = '<b>'+legend_events+':<br><span style="font-size:xx-small; font-weight: normal;">From: '+labels_long[item.dataIndex];
-					if (labels_long[item.dataIndex+1] != undefined) {
-						extra_info += '<br>To: '+labels_long[item.dataIndex+1];
-					}
-					extra_info += '</span></b>'+get_event_details(eventsz[item.dataIndex]);
-					extra_show = true;
-					break;
-				default:
-					return;
-					break;
-			}
-
-			if (extra_show) {
-				$('#extra_'+graph_id).html(extra_info);
-				$('#extra_'+graph_id).css('display','');
-			}
-			plot.highlight(item.series, item.datapoint);
-		}
-		else {
-			$('#extra_'+graph_id).html('');
-			$('#extra_'+graph_id).css('display','none');
-		}
-	});
-
-	$('#overview_'+graph_id).bind('plothover',  function (event, pos, item) {
-		plot.setCrosshair({ x: pos.x, y: 0 });
-		currentPlot = overview;
-		latestPosition = pos;
-		if (!updateLegendTimeout) {
-			updateLegendTimeout = setTimeout(updateLegend, 50);
-		}
-	});
-
-	$('#'+graph_id).bind('mouseout',resetInteractivity);
-	$('#overview_'+graph_id).bind('mouseout',resetInteractivity);
-	
-	//~ // Reset interactivity styles
-	function resetInteractivity() {
-		$('#timestamp_'+graph_id).hide();
-		dataset = plot.getData();
-		for (i = 0; i < dataset.length; ++i) {
-			var series = dataset[i];
-			var label_aux = series.label;
-			$('#legend_' + graph_id + ' .legendLabel')
-				.eq(i).html(label_aux);
-		}
-		plot.clearCrosshair();
-		overview.clearCrosshair();
-	}
-
-	// Format functions
-	function xFormatter(v, axis) {
-		//XXX
-		/*
-			if ($period <= SECONDS_6HOURS) {
-				$time_format = 'H:i:s';
-			}
-			elseif ($period < SECONDS_1DAY) {
-				$time_format = 'H:i';
-			}
-			elseif ($period < SECONDS_15DAYS) {
-				$time_format = "M \nd H:i";
-			}
-			elseif ($period < SECONDS_1MONTH) {
-				$time_format = "M \nd H\h";
-			} 
-			elseif ($period < SECONDS_6MONTHS) {
-				$time_format = "M \nd H\h";
-			}
-			else {
-				$time_format = "Y M \nd H\h";
-			}	
-		*/
-
-		var d = new Date(v);
-		var result_date_format = 0;
-		
-	//	if(time_format_y > 86400000){ //DAY
-
-			result_date_format = 
-								(d.getDate() <10?'0':'') + d.getDate() + "/" +
-								(d.getMonth()<9?'0':'') + (d.getMonth() + 1) + "/" + 
-								d.getFullYear() + "\n" + 
-								(d.getHours()<10?'0':'') + d.getHours() + ":" + 
-								(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + 
-								(d.getSeconds()<10?'0':'') + d.getSeconds(); //+  ":" + d.getMilliseconds();
-	/*	}
-		else{
-			result_date_format = 	
-								d.getHours() + ":" + 
-								d.getMinutes() + ":" + 
-								d.getSeconds(); //+  ":" + d.getMilliseconds();
-		}
-	*/
-		//extra_css = '';
-		return '<div class='+font+' style="transform: rotate(-15deg); -ms-transform:rotate(-15deg); -moz-transform:rotate(-15deg); -webkit-transform:rotate(-15deg); -o-transform:rotate(-15deg); font-size:'+font_size+'pt; margin-top:15px;">'+result_date_format+'</div>';
-	}
-
-	function yFormatter(v, axis) {
-		axis.datamin = 0;
-		if (short_data) {
-			var formatted = number_format(v, force_integer, "");
-		}
-		else {
-			var formatted = v;
-		}
-
-		return '<div class='+font+' style="font-size:'+font_size+'pt;">'+formatted+'</div>';
-	}
-
-	function lFormatter(v, item) {
-		return '<div style="font-size:'+font_size+'pt;">'+v+'</div>';
-		// Prepared to turn series with a checkbox
-		//return '<div style=color:;font-size:'+font_size+'pt><input type="checkbox" id="' + graph_id + '_' + item.id +'" checked="checked" class="check_serie_'+graph_id+'">'+v+'</div>';
-	}
-	
-	if (menu) {
-		var parent_height;
-		$('#menu_overview_' + graph_id).click(function() {
-			$('#overview_' + graph_id).toggle();
-		});
-
-		//~ $('#menu_export_csv_' + graph_id).click(function() {
-			//~ exportData({ type: 'csv' });
-		//~ });
-		
-		$("#menu_export_csv_"+graph_id)
-			.click(function (event) {
-				event.preventDefault();
-				plot.exportDataCSV();
-		});
-		
-		//Not a correct call
-		//~ $('#menu_export_json_' + graph_id).click(function() {
-			//~ exportData({ type: 'json' });
-		//~ });
-		
-		//This is a correct call to export data in json
-		//~ $("#menu_export_json_"+graph_id)
-			//~ .click(function (event) {
-				//~ event.preventDefault();
-				//~ plot.exportDataJSON();
-		//~ });
-		
-		$('#menu_threshold_' + graph_id).click(function() {
-			datas = new Array();
-
-			if (thresholded) {
-				$.each(data_base, function() {
-					// Prepared to turning series
-					//if(showed[this.id.split('_')[1]]) {
-						datas.push(this);
-					//}
-				});
-				plot = $.plot($('#' + graph_id), data_base,
-					$.extend(true, {}, options, {
-						yaxis: {max: max_draw},
-						xaxis: {
-							min: plot.getAxes().xaxis.min,
-							max: plot.getAxes().xaxis.max
-						}
-					}));
-				thresholded = false;
-			}
-			else {
-				var max_draw = plot.getAxes().yaxis.datamax;
-				// Recalculate the y axis
-				var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
-										red_threshold, extremes, red_up);
-
-				plot = $.plot($('#' + graph_id), data_base,
-				$.extend(true, {}, options, {
-					yaxis: {
-						max: y_recal.max,
-						min: y_recal.min
-					},
-					xaxis: {
-						mode:"time",
-						min: plot.getAxes().xaxis.min,
-						max: plot.getAxes().xaxis.max
-					}
-				}));
-
-				datas = add_threshold (data_base, threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
-										red_threshold, extremes, red_up);
-
-				thresholded = true;
-				
-			}
-						
-			plot.setData(datas);
-			plot.draw();
-
-			//~ plot.setSelection(currentRanges);
-		});
-
-		$('#menu_cancelzoom_' + graph_id).click(function() {
-			// cancel the zooming
-			plot = $.plot($('#' + graph_id), data_base,
-				$.extend(true, {}, options, {
-					//XXX
-					xaxis: {max: max_x },
-					legend: { show: false }
-				}));
-			
-			$('#menu_cancelzoom_' + graph_id)
-				.attr('src', homeurl + '/images/zoom_cross.disabled.png');
-			overview.clearSelection();
-			currentRanges = null;
-			
-			thresholded = false;
-		});
-
-		// Adjust the menu image on top of the plot
-		// If there is no legend we increase top-padding to make space to the menu
-		if (legend.length == 0) {
-			$('#menu_' + graph_id).parent().css('padding-top',
-				$('#menu_' + graph_id).css('height'));
-		}
-
-		// Add bottom margin in the legend
-		// Estimated height of 24 (works fine with this data in all browsers)
-		menu_height = 24;
-		var legend_margin_bottom = parseInt(
-			$('#legend_'+graph_id).css('margin-bottom').split('px')[0]);
-		$('#legend_'+graph_id).css('margin-bottom', '10px');
-		parent_height = parseInt(
-			$('#menu_'+graph_id).parent().css('height').split('px')[0]);
-		adjust_menu(graph_id, plot, parent_height, width);
-	}
-	
-	if (!dashboard) {
-		if (water_mark)
-			set_watermark(graph_id, plot, $('#watermark_image_'+graph_id).attr('src'));
-		adjust_menu(graph_id, plot, parent_height, width);
-	}
-}
-
 function adjust_menu(graph_id, plot, parent_height, width) {
 	/*
 	if ($('#'+graph_id+' .xAxis .tickLabel').eq(0).css('width') != undefined) {
@@ -2369,7 +1111,7 @@ function add_threshold (data_base, threshold_data, y_min, y_max,
 			if (end > y_max) {
 				this.bars.barWidth = y_max - this.data[0][1];
 			}
-		}	
+		}
 		datas.push(this);
 	});
 	return datas;
@@ -2382,14 +1124,13 @@ function reduceText (text, maxLength) {
 	return str_cut + '...' + text.substr(-firstSlideEnd - 3);
 }
 
-function pandoraFlotAreaNew(
+function pandoraFlotArea(
 	graph_id, values, legend, agent_module_id,
 	series_type, watermark, date_array,
 	data_module_graph, show_elements_graph,
-	format_graph, force_integer, series_suffix_str, 
+	format_graph, force_integer, series_suffix_str,
 	background_color, legend_color, short_data
 ) {
-	console.log(legend);
 	//diferents vars
 	var unit      = format_graph.unit ? format_graph.unit : '';
 	var homeurl   = format_graph.homeurl;
@@ -2408,22 +1149,21 @@ function pandoraFlotAreaNew(
 	var yellow_threshold = parseFloat (data_module_graph.w_min);
 	var red_threshold    = parseFloat (data_module_graph.c_min);
 	var yellow_up 		 = parseFloat (data_module_graph.w_max);
-	var red_up 			 = parseFloat (data_module_graph.c_max);	
+	var red_up 			 = parseFloat (data_module_graph.c_max);
 	var yellow_inverse   = parseInt   (data_module_graph.w_inv);
 	var red_inverse      = parseInt   (data_module_graph.c_inv);
 
-
 	//XXXX ver que hay que hacer
 	var type          = 'area_simple';
 	//var xaxisname     = 'xaxisname';
-	
+
 	var labels_long   = '';
 	var min_check     = 0;
 	var water_mark    = '';
-	
+
 	var legend_events = null;
 	var legend_alerts = null;
-	
+
 	switch (type) {
 		case 'line_simple':
 			stacked = null;
@@ -2446,7 +1186,7 @@ function pandoraFlotAreaNew(
 	var datas     = new Array();
 	var data_base = new Array();
 	var lineWidth = $('#hidden-line_width_graph').val() || 1;
-	
+
 	i=0;
 	$.each(values, function (index, value) {
 		if (typeof value.data !== "undefined") {
@@ -2500,8 +1240,8 @@ function pandoraFlotAreaNew(
 	if (yellow_threshold == yellow_up){
 		yellow_inverse = false;
 	}
-	
-	if (red_threshold == red_up){ 
+
+	if (red_threshold == red_up){
 		red_inverse = false;
 	}
 
@@ -2512,7 +1252,7 @@ function pandoraFlotAreaNew(
 
 	var yellow_only_min = ((yellow_up == 0) && (yellow_threshold != 0));
 	var red_only_min    = ((red_up == 0) && (red_threshold != 0));
-	
+
 	//color
 	var normalw   = '#efe';
 	var warningw  = '#ffe';
@@ -3025,19 +1765,19 @@ function pandoraFlotAreaNew(
 	// minTickSize
 	var count_data = datas[0].data.length;
 	var min_tick_pixels = 80;
-	
+
 	var maxticks = date_array['period'] / 3600 /6;
 	var options = {
 			series: {
 				stack: stacked,
 				shadowSize: 0.1
 			},
-			crosshair: { 
+			crosshair: {
 				mode: 'xy'
 			},
-			selection: { 
+			selection: {
 				mode: 'x',
-				color: '#777' 
+				color: '#777'
 			},
 			export: {
 				export_data: true,
@@ -3080,7 +1820,7 @@ function pandoraFlotAreaNew(
 		options.crosshair = false;
 		options.selection = false;
 	}
-	
+
 	var stack = 0,
 		bars = true,
 		lines = false,
@@ -3097,7 +1837,7 @@ function pandoraFlotAreaNew(
 			$('#'+graph_id).css('height', hDiff);
 		}
 	}
-	
+
 	if (vconsole) {
 		var myCanvas = plot.getCanvas();
 		plot.setupGrid(); // redraw plot to new size
@@ -3105,10 +1845,10 @@ function pandoraFlotAreaNew(
 		var image = myCanvas.toDataURL("image/png");
 		return;
 	}
-	
+
 	// Adjust the overview plot to the width and position of the main plot
 	adjust_left_width_canvas(graph_id, 'overview_'+graph_id);
-	update_left_width_canvas(graph_id); 
+	update_left_width_canvas(graph_id);
 
 	// Adjust overview when main chart is resized
 	$('#'+graph_id).resize(function(){
@@ -3122,7 +1862,7 @@ function pandoraFlotAreaNew(
 		var overview = $.plot($('#overview_'+graph_id),datas, {
 			series: {
 				stack: stacked,
-				lines: { 
+				lines: {
 					show: true,
 					lineWidth: 1
 				},
@@ -3142,11 +1882,11 @@ function pandoraFlotAreaNew(
 				labelWidth: 70,
 			} ],
 			yaxis: {
-				ticks: [], 
+				ticks: [],
 				autoscaleMargin: 0.1
 			},
 			selection: {
-				mode: 'x', 
+				mode: 'x',
 				color: '#777'
 			},
 			legend: {
@@ -3177,13 +1917,13 @@ function pandoraFlotAreaNew(
 
 		plot = $.plot($('#' + graph_id), data_base,
 			$.extend(true, {}, options, {
-				grid: { 
-					borderWidth: 1, 
-					hoverable: true, 
+				grid: {
+					borderWidth: 1,
+					hoverable: true,
 					autoHighlight: true
 				},
-				xaxis: { 	
-					min: ranges.xaxis.from, 
+				xaxis: {
+					min: ranges.xaxis.from,
 					max: ranges.xaxis.to
 				},
 				xaxes: [{
@@ -3191,14 +1931,14 @@ function pandoraFlotAreaNew(
 					tickFormatter: xFormatter,
 					tickSize: [maxticks_zoom, 'hour']
 				}],
-				legend: { 
-					show: true 
+				legend: {
+					show: true
 				}
 		}));
 
 		if (thresholded) {
 			var zoom_data_threshold = new Array ();
-			
+
 			var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
 									red_threshold, extremes, red_up);
 
@@ -3216,11 +1956,10 @@ function pandoraFlotAreaNew(
 
 			zoom_data_threshold = add_threshold (data_base, threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
 										red_threshold, extremes, red_up);
-			
+
 			plot.setData(zoom_data_threshold);
 			plot.draw();
 		}
-			
 
 		$('#menu_cancelzoom_' + graph_id)
 			.attr('src', homeurl + '/images/zoom_cross_grey.png');
@@ -3242,7 +1981,6 @@ function pandoraFlotAreaNew(
 
 	// Update legend with the data of the plot in the mouse position
 	function updateLegend() {
-		console.log(currentPlot);
 		updateLegendTimeout = null;
 		var pos = latestPosition;
 		var axes = currentPlot.getAxes();
@@ -3252,20 +1990,20 @@ function pandoraFlotAreaNew(
 		}
 
 		$('#timestamp_'+graph_id).show();
-				
+
 		var d = new Date(pos.x);
-		var monthNames = [	
+		var monthNames = [
 			"Jan", "Feb", "Mar",
 			"Apr", "May", "Jun",
 			"Jul", "Aug", "Sep",
 			"Oct", "Nov", "Dec"
 		];
-		
-		date_format = 	(d.getDate() <10?'0':'') + d.getDate() + " " + 
+
+		date_format = 	(d.getDate() <10?'0':'') + d.getDate() + " " +
 						monthNames[d.getMonth()] + " " +
-						d.getFullYear() + "\n" + 
-						(d.getHours()<10?'0':'') + d.getHours() + ":" + 
-						(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + 
+						d.getFullYear() + "\n" +
+						(d.getHours()<10?'0':'') + d.getHours() + ":" +
+						(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" +
 						(d.getSeconds()<10?'0':'') + d.getSeconds();
 
 		$('#timestamp_'+graph_id).text(date_format);
@@ -3276,10 +2014,11 @@ function pandoraFlotAreaNew(
 
 		var timenewpos = dataset[0].xaxis.p2c(pos.x)+$('.yAxis>div').eq(0).width();
 		var canvaslimit = $('#'+graph_id).width();
-		
-		
-		$('#timestamp_'+graph_id).css('top', currentPlot.offset().top - $('#timestamp_'+graph_id).height()*2.5);
-	
+
+		$('#timestamp_'+graph_id)
+			.css('top', currentPlot.getPlotOffset().top -
+						$('#timestamp_'+graph_id).height() +
+						$('#legend_' + graph_id).height());
 
 		if (timesize+timenewpos > canvaslimit) {
 			$('#timestamp_'+graph_id).css('left', timenewpos - timesize);
@@ -3297,7 +2036,7 @@ function pandoraFlotAreaNew(
 			if (series.label == null) {
 				continue;
 			}
-			
+
 			// find the nearest points, x-wise
 			for (j = 0; j < series.data.length; ++j){
 				if (series.data[j][0] > pos.x) {
@@ -3324,19 +2063,19 @@ function pandoraFlotAreaNew(
 			}
 			else if (y < -1000) {
 				how_bigger = "K";
-				y = y / 1000;	
+				y = y / 1000;
 			}
 
 			var label_aux = legend[series.label] + series_suffix_str;
 
 			// The graphs of points type and unknown graphs will dont be updated
-			if (series_type[dataset[k]["label"]] != 'points' && 
+			if (series_type[dataset[k]["label"]] != 'points' &&
 				series_type[dataset[k]["label"]] != 'unknown' &&
 				series_type[dataset[k]["label"]] != 'percentil'
 			) {
 				$('#legend_' + graph_id + ' .legendLabel')
-					.eq(i).html(label_aux +	' value = ' + 
-					(short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + 
+					.eq(i).html(label_aux +	' value = ' +
+					(short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) +
 					how_bigger + ' ' + unit
 				);
 			}
@@ -3349,7 +2088,7 @@ function pandoraFlotAreaNew(
 
 			$('#legend_' + graph_id + ' .legendLabel')
 				.eq(i).css('font-family',font+'Font');
-			
+
 			i++;
 		}
 	}
@@ -3359,7 +2098,7 @@ function pandoraFlotAreaNew(
 		plot.setCrosshair({ x: pos.x, y: 0 });
 		currentPlot = plot;
 		latestPosition = pos;
-		console.log('entra');
+
 		if (!updateLegendTimeout) {
 			updateLegendTimeout = setTimeout(updateLegend, 50);
 		}
@@ -3369,7 +2108,6 @@ function pandoraFlotAreaNew(
 		overview.setCrosshair({ x: pos.x, y: 0 });
 		currentPlot = plot;
 		latestPosition = pos;
-		console.log('entra 2');
 		if (!updateLegendTimeout) {
 			updateLegendTimeout = setTimeout(updateLegend, 50);
 		}
@@ -3428,7 +2166,7 @@ function pandoraFlotAreaNew(
 
 	$('#'+graph_id).bind('mouseout',resetInteractivity);
 	$('#overview_'+graph_id).bind('mouseout',resetInteractivity);
-	
+
 	// Reset interactivity styles
 	function resetInteractivity() {
 		$('#timestamp_'+graph_id).hide();
@@ -3448,20 +2186,20 @@ function pandoraFlotAreaNew(
 		var d = new Date(v);
 		var result_date_format = 0;
 
-		var monthNames = [	
+		var monthNames = [
 			"Jan", "Feb", "Mar",
 			"Apr", "May", "Jun",
 			"Jul", "Aug", "Sep",
 			"Oct", "Nov", "Dec"
 		];
-		
+
 		result_date_format = (d.getDate() <10?'0':'') + d.getDate() + " " +
 							monthNames[d.getMonth()] + " " +
-							d.getFullYear() + "\n" + 
-							(d.getHours()<10?'0':'') + d.getHours() + ":" + 
-							(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + 
+							d.getFullYear() + "\n" +
+							(d.getHours()<10?'0':'') + d.getHours() + ":" +
+							(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" +
 							(d.getSeconds()<10?'0':'') + d.getSeconds();
-	
+
 		return '<div class='+font+' style="font-size:'+font_size+'pt; margin-top:15px;">'+result_date_format+'</div>';
 	}
 
@@ -3477,10 +2215,9 @@ function pandoraFlotAreaNew(
 	}
 
 	function lFormatter(v, item) {
-		console.log(v);
 		return '<div style="font-size:'+font_size+'pt;">'+legend[v]+'</div>';
 	}
-	
+
 	if (menu) {
 		var parent_height;
 		$('#menu_overview_' + graph_id).click(function() {
@@ -3490,25 +2227,25 @@ function pandoraFlotAreaNew(
 		//~ $('#menu_export_csv_' + graph_id).click(function() {
 			//~ exportData({ type: 'csv' });
 		//~ });
-		
+
 		$("#menu_export_csv_"+graph_id)
 			.click(function (event) {
 				event.preventDefault();
 				plot.exportDataCSV();
 		});
-		
+
 		//Not a correct call
 		//~ $('#menu_export_json_' + graph_id).click(function() {
 			//~ exportData({ type: 'json' });
 		//~ });
-		
+
 		//This is a correct call to export data in json
 		//~ $("#menu_export_json_"+graph_id)
 			//~ .click(function (event) {
 				//~ event.preventDefault();
 				//~ plot.exportDataJSON();
 		//~ });
-		
+
 		$('#menu_threshold_' + graph_id).click(function() {
 			datas = new Array();
 
@@ -3552,9 +2289,7 @@ function pandoraFlotAreaNew(
 										red_threshold, extremes, red_up);
 
 				thresholded = true;
-				
 			}
-						
 			plot.setData(datas);
 			plot.draw();
 
@@ -3567,12 +2302,10 @@ function pandoraFlotAreaNew(
 				$.extend(true, {}, options, {
 					legend: { show: true }
 				}));
-			
 			$('#menu_cancelzoom_' + graph_id)
 				.attr('src', homeurl + '/images/zoom_cross.disabled.png');
 			overview.clearSelection();
 			currentRanges = null;
-			
 			thresholded = false;
 		});
 
@@ -3592,7 +2325,7 @@ function pandoraFlotAreaNew(
 		parent_height = parseInt($('#menu_'+graph_id).parent().css('height').split('px')[0]);
 		adjust_menu(graph_id, plot, parent_height, width);
 	}
-	
+
 	if (!dashboard) {
 		if (water_mark)
 			set_watermark(graph_id, plot, $('#watermark_image_'+graph_id).attr('src'));
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 5356dd57b3..8fcaf060a5 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -176,417 +176,19 @@ function flot_line_simple_graph($chart_data, $width, $height, $color,
 		$threshold_data);
 }
 
-function flot_area_graph($chart_data, $width, $height, $color, $legend,
-	$long_index, $homeurl, $unit, $type, $water_mark, $serie_types,
-	$chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key,
-	$force_integer, $series_suffix_str = '', $menu = true,
-	$background_color = 'white', $dashboard = false, $vconsole = false, 
-	$agent_module_id = 0, $font = '', $font_size = 7, $xaxisname = '',
-	$percentil_values = array(), $threshold_data = array()) {
-	
-	global $config;
-	
-	include_javascript_dependencies_flot_graph();
-	
-	$menu = (int)$menu;
-	// Get a unique identifier to graph
-	$graph_id = uniqid('graph_');
-	
-	$background_style = '';
-	switch ($background_color) {
-		default:
-		case 'white':
-			$background_style = ' background: #fff; ';
-			break;
-		case 'black':
-			$background_style = ' background: #000; ';
-			break;
-		case 'transparent':
-			$background_style = '';
-			break;
-	}
-	
-	// Parent layer
-	$return = "<div class='parent_graph' style='width: " . ($width) . "px; " . $background_style . "'>";
-	// Set some containers to legend, graph, timestamp tooltip, etc.
-	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:$font_size"."pt !important;'></p>";
-	
-	if (!empty($threshold_data)) {
-		$yellow_up = $threshold_data['yellow_up'];
-		$red_up = $threshold_data['red_up'];
-		$yellow_inverse = $threshold_data['yellow_inverse'];
-		$red_inverse = $threshold_data['red_inverse'];
-	}
-	else {
-		// Get other required module datas to draw warning and critical
-		if ($agent_module_id == 0) {
-			$yellow_up = 0;
-			$red_up = 0;
-			$yellow_inverse = false;
-			$red_inverse = false;
-		} else {
-			$module_data = db_get_row_sql ('SELECT * FROM tagente_modulo WHERE id_agente_modulo = ' . $agent_module_id);
-			$yellow_up = $module_data['max_warning'];
-			$red_up = $module_data['max_critical'];
-			$yellow_inverse = !($module_data['warning_inverse'] == 0);
-			$red_inverse = !($module_data['critical_inverse'] == 0);
-		}
-	}
-	
-	if ($menu) {
-		$threshold = false;
-		if ($yellow_threshold != $yellow_up || $red_threshold != $red_up) {
-			$threshold = true;
-		}
-		
-		$nbuttons = 3;
-		
-		if ($threshold) {
-			$nbuttons++;
-		}
-		$menu_width = 25 * $nbuttons + 15;
-		if ( $dashboard == false AND $vconsole == false) {
-			$return .= "<div id='geneal_menu_$graph_id' class='menu_graph' style='
-							width: 30px;
-							height: 250px;
-							left: " . $width . "px;
-							position: absolute;
-							top: 0px;
-							background-color: white;'>";
-			$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='".$homeurl."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
-			if ($threshold) {
-				$return .= " <a href='javascript:'><img id='menu_threshold_$graph_id' src='".$homeurl."images/chart_curve_threshold.png' alt='".__('Warning and Critical thresholds')."' title='".__('Warning and Critical thresholds')."'></a>";
-			}
-			$return .= " <a href='javascript:'>
-				<img id='menu_overview_$graph_id' class='menu_overview' src='" . $homeurl . "images/chart_curve_overview.png' alt='" . __('Overview graph') . "' title='".__('Overview graph')."'></a>";
-			
-			// Export buttons
-			$return .= " <a href='javascript:'><img id='menu_export_csv_$graph_id' src='".$homeurl."images/csv_grey.png' alt='".__('Export to CSV')."' title='".__('Export to CSV')."'></a>";
-			// Button disabled. This feature works, but seems that is not useful enough to the final users.
-			//$return .= " <a href='javascript:'><img id='menu_export_json_$graph_id' src='".$homeurl."images/json.png' alt='".__('Export to JSON')."' title='".__('Export to JSON')."'></a>";
-			
-			$return .= "</div>";
-			$return .= "</div>";
-		}
-
-		if ($dashboard) {
-			$return .= "<div id='geneal_menu_$graph_id' class='menu_graph' style='
-							width: 30px;
-							height: 250px;
-							left: " . $width . "px;
-							position: absolute;
-							top: 0px;
-							background-color: white;'>";
-
-			$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='".$homeurl."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
-		
-			$return .= "</div>";
-			$return .= "</div>";
-		}
-	}
-
-	$return .= html_print_input_hidden('line_width_graph', $config['custom_graph_width'], true);
-	$return .= "<div id='timestamp_$graph_id' class='timestamp_graph' style='font-size:".$font_size."pt;display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px; z-index:1000;'></div>";
-	$return .= "<div id='$graph_id' class='";
-	if($type=='area_simple'){$return .= "noresizevc ";}
-	$return .= "graph $adapt_key' style='width: ".$width."px; height: ".$height."px;'></div>";
-	if ($menu) {
-		$height = 100;
-	}
-	else {
-		$height = 1;
-	}
-	if (!$vconsole)
-		$return .= "<div id='overview_$graph_id' class='overview_graph' style='display: none; margin-left:0px; margin-top:20px; margin-bottom:50px; width: ".$width."px; height: ".$height ."px;'></div>";
-	
-	if ($water_mark != '') {
-		$return .= "<div id='watermark_$graph_id' style='display:none; position:absolute;'><img id='watermark_image_$graph_id' src='$water_mark'></div>";
-		$watermark = 'true';
-	}
-	else {
-		$watermark = 'false';
-	}
-	
-	// Set a weird separator to serialize and unserialize passing data from php to javascript
-	$separator = ';;::;;';
-	$separator2 = ':,:,,,:,:';
-	
-	// Transform data from our format to library format
-	$legend2 = array();
-	$labels = array();
-	$a = array();
-	$vars = array();
-	$serie_types2 = array();
-	
-	$colors = array();
-	
-	$index = array_keys(reset($chart_data));
-	foreach ($index as $serie_key) {
-		if (isset($color[$serie_key])) {
-			$colors[] = $color[$serie_key]['color'];
-		}
-		else {
-			$colors[] = '';
-		}
-	}
-	foreach ($chart_data as $label => $values) {
-		$labels[] = $label;
-		
-		foreach($values as $key => $value) {
-			$jsvar = "data_" . $graph_id . "_" . $key;
-			
-			
-			if (!isset($serie_types[$key])) {
-				switch ($type) {
-					case 'line_simple':
-					case 'line_stacked':
-						$serie_types2[$jsvar] = 'line';
-						break;
-					case 'area_simple':
-					case 'area_stacked':
-					default:
-						$serie_types2[$jsvar] = 'area';
-						break;
-				}
-			}
-			else {
-				$serie_types2[$jsvar] = $serie_types[$key];
-			}
-			
-			
-			if ($serie_types2[$jsvar] == 'points' && $value == 0) {
-				$data[$jsvar][] = 'null';
-			}
-			else {
-				$data[$jsvar][] = $value;
-			}
-			
-			if (!isset($legend[$key])) {
-				$legend2[$jsvar] = 'null';
-			}
-			else {
-				$legend2[$jsvar] = $legend[$key];
-			}
-		}
-	}
-
-	if (!empty($percentil_values)) {
-		foreach($percentil_values as $key => $value) {
-			$jsvar = "percentil_" . $graph_id . "_" . $key;
-			$serie_types2[$jsvar] = 'line';
-			$data[$jsvar] = $value;
-		}
-	}
-	
-	// Store data series in javascript format
-	$jsvars = '';
-	$jsseries = array();
-	$values2 = array();
-	$i = 0;
-	$max_x = 0;
-	foreach ($data as $jsvar => $values) {
-		$n_values = count($values);
-		if ($n_values > $max_x) {
-			$max_x = $n_values;
-		}
-		
-		$values2[] = implode($separator,$values);
-		$i ++;
-	}
-	
-	$values = implode($separator2, $values2);
-	
-	// Max is "n-1" because start with 0 
-	$max_x--;
-	
-	$extra_width = (int)($width / 3);
-	
-	$return .= "<div id='extra_$graph_id' style='font-size: " . $font_size . "pt; display:none; position:absolute; overflow: auto; max-height: ".($height+50)."px; width: ".$extra_width."px; background:#fff; padding: 2px 2px 2px 2px; border: solid #000 1px;'></div>";
-	
-	// Process extra data
-	$events = array();
-	$event_ids = array();
-	$alerts = array();
-	$alert_ids = array();
-	$legend_events = '';
-	$legend_alerts = '';
-	
-	if (empty($chart_extra_data)) {
-		$chart_extra_data = array();
-	}
-	
-	foreach ($chart_extra_data as $i => $data) {
-		switch ($i) {
-			case 'legend_alerts':
-				$legend_alerts = $data;
-				break;
-			case 'legend_events':
-				$legend_events = $data;
-				break;
-			default:
-				if (isset($data['events'])) {
-					$event_ids[] = $i;
-					$events[$i] = $data['events'];
-				}
-				if (isset($data['alerts'])) {
-					$alert_ids[] = $i;
-					$alerts[$i] = $data['alerts'];
-				}
-				break;
-		}
-	}
-	
-	// Store serialized data to use it from javascript
-	$events = implode($separator,$events);
-	$event_ids = implode($separator,$event_ids);
-	$alerts = implode($separator,$alerts);
-	$alert_ids = implode($separator,$alert_ids);
-	$labels = implode($separator,$labels);
-	if (!empty($long_index)) {
-		$labels_long = implode($separator, $long_index);
-	}
-	else {
-		$labels_long = $labels;
-	}
-	if (!empty($legend)) {
-		$legend = io_safe_output(implode($separator, $legend));
-	}
-	$serie_types  = implode($separator, $serie_types2);
-	$colors  = implode($separator, $colors);
-	
-	// transform into string to pass to javascript
-	if ($force_integer) {
-		$force_integer = 'true';
-	}
-	else {
-		$force_integer = 'false';
-	}
-	
-	//modify internal grid lines and legend text color
-	
-	if(substr($background_style, -6, 4) == '#fff'){
-		$background_color = "#eee";
-		$legend_color = "#151515";
-		
-	}
-	else if(substr($background_style, -6, 4) == '#000'){
-		$background_color = "#151515";
-		$legend_color = "#BDBDBD";
-	}
-	else{
-		$background_color = "#A4A4A4";
-		$legend_color = "#A4A4A4";
-	}
-	
-	// Trick to get translated string from javascript
-	$return .= html_print_input_hidden('unknown_text', __('Unknown'),
-		true);
-
-	if (!isset($config["short_module_graph_data"]))
-		$config["short_module_graph_data"] = true;
-	
-	if ($config["short_module_graph_data"]) {
-		$short_data = true;
-	}
-	else {
-		$short_data = false;
-	}
-	
-	//html_debug_print($values);
-	// Javascript code
-	$return .= "<script type='text/javascript'>";
-	$return .= "$(document).ready( function () {";
-	$return .= "pandoraFlotArea(" .
-		"'$graph_id', \n" .
-		"'$values', \n" .
-		"'$labels', \n" .
-		"'$labels_long', \n" .
-		"'$legend', \n" .
-		"'$colors', \n" .
-		"'$type', \n" .
-		"'$serie_types', \n" .
-		"$watermark, \n" .
-		"$width, \n" .
-		"$max_x, \n" .
-		"'$homeurl', \n" .
-		"'$unit', \n" .
-		"$font_size, \n" .
-		"'$font', \n" .
-		"$menu, \n" .
-		"'$events', \n" .
-		"'$event_ids', \n" .
-		"'$legend_events', \n" .
-		"'$alerts', \n" .
-		"'$alert_ids', \n" .
-		"'$legend_alerts', \n" .
-		"'$yellow_threshold', \n" .
-		"'$red_threshold', \n" .
-		"$force_integer, \n" .
-		"'$separator', \n" .
-		"'$separator2', \n" .
-		"'$yellow_up', \n" .
-		"'$red_up', \n" .
-		"'$yellow_inverse', \n" .
-		"'$red_inverse', \n" .
-		"'$series_suffix_str',
-		" . json_encode($dashboard) . ",\n
-		" . json_encode($vconsole) . ",\n" .
-		"'$xaxisname', \n" .
-		"'$background_color', \n" .
-		"'$legend_color', \n" .
-		"'$short_data'
-	);";
-	$return .= "});";
-	$return .= "</script>";
-	
-	// Parent layer
-	$return .= "</div>";
-	
-	return $return;
-}
-
-
-
-
-
-
-
-function flot_area_graph_new (
+function flot_area_graph (
 	$agent_module_id, $array_data, $color,
 	$legend, $series_type, $date_array,
 	$data_module_graph, $show_elements_graph,
 	$format_graph, $water_mark, $series_suffix_str ) {
-	
+
 	global $config;
-	
+
 	include_javascript_dependencies_flot_graph();
 
 	// Get a unique identifier to graph
 	$graph_id = uniqid('graph_');
-	
 
-	//html_debug_print($agent_module_id);
-	//html_debug_print($array_data);
-	//html_debug_print($color);
-	//html_debug_print($legend);
-	//html_debug_print($series_type);
-	//html_debug_print($date_array);
-
-/*	
-	html_debug_print($water_mark);
-	html_debug_print($series_suffix_str);
-*/
-	//html_debug_print($series_suffix_str);
 	$background_style = '';
 	switch ($format_graph['background']) {
 		default:
@@ -600,64 +202,53 @@ function flot_area_graph_new (
 			$background_style = '';
 			break;
 	}
-		
+
 	// Parent layer
 	$return = "<div class='parent_graph' style='width: " . ($format_graph['width']) . "px; " . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
 	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:" . $format_graph['font_size'] ."pt !important;'></p>";
-	
-	/*
-	if (!empty($threshold_data)) {
-		$yellow_up = $threshold_data['yellow_up'];
-		$red_up = $threshold_data['red_up'];
-		$yellow_inverse = $threshold_data['yellow_inverse'];
-		$red_inverse = $threshold_data['red_inverse'];
-	}
-	else {
-	*/
 
-		$yellow_threshold = $data_module_graph['w_min'];
-		$red_threshold = $data_module_graph['c_min'];
-		// Get other required module datas to draw warning and critical
-		if ($agent_module_id == 0) {
-			$yellow_up = 0;
-			$red_up = 0;
-			$yellow_inverse = false;
-			$red_inverse = false;
-		} else {
-			$yellow_up = $data_module_graph['w_max'];
-			$red_up = $data_module_graph['c_max'];
-			$yellow_inverse = !($data_module_graph['w_inv'] == 0);
-			$red_inverse = !($data_module_graph['c_inv'] == 0);
-		}
-	//}
-	
+	$yellow_threshold = $data_module_graph['w_min'];
+	$red_threshold = $data_module_graph['c_min'];
+	// Get other required module datas to draw warning and critical
+	if ($agent_module_id == 0) {
+		$yellow_up = 0;
+		$red_up = 0;
+		$yellow_inverse = false;
+		$red_inverse = false;
+	} else {
+		$yellow_up = $data_module_graph['w_max'];
+		$red_up = $data_module_graph['c_max'];
+		$yellow_inverse = !($data_module_graph['w_inv'] == 0);
+		$red_inverse = !($data_module_graph['c_inv'] == 0);
+	}
+
 	if ($show_elements_graph['menu']) {
 		$return .= menu_graph(
-			$yellow_threshold, $red_threshold, 
-			$yellow_up, $red_up, $yellow_inverse, 
-			$red_inverse, $show_elements_graph['dashboard'], 
-			$show_elements_graph['vconsole'], 
-			$graph_id, $format_graph['width'], 
+			$yellow_threshold, $red_threshold,
+			$yellow_up, $red_up, $yellow_inverse,
+			$red_inverse, $show_elements_graph['dashboard'],
+			$show_elements_graph['vconsole'],
+			$graph_id, $format_graph['width'],
 			$format_graph['homeurl']
 		);
 	}
 
 	$return .= html_print_input_hidden('line_width_graph', $config['custom_graph_width'], true);
-	$return .= "<div id='timestamp_$graph_id' 
-					class='timestamp_graph' 
+	$return .= "<div id='timestamp_$graph_id'
+					class='timestamp_graph'
 					style='	font-size:".$format_graph['font_size']."pt;
-							display:none; position:absolute; 
-							background:#fff; border: solid 1px #aaa; 
+							display:none; position:absolute;
+							background:#fff; border: solid 1px #aaa;
 							padding: 2px; z-index:1000;'></div>";
 	$return .= "<div id='$graph_id' class='";
 
 	if($format_graph['type'] == 'area_simple'){
 		$return .= "noresizevc ";
 	}
-	
-	$return .= "graph" .$format_graph['adapt_key'] ."' 
-				style='	width: ".$format_graph['width']."px; 
+
+	$return .= "graph" .$format_graph['adapt_key'] ."'
+				style='	width: ".$format_graph['width']."px;
 						height: ".$format_graph['height']."px;'></div>";
 
 	if ($show_elements_graph['menu']) {
@@ -668,11 +259,11 @@ function flot_area_graph_new (
 	}
 
 	if (!$vconsole){
-		$return .= "<div 	id='overview_$graph_id' 
-							class='overview_graph' 
-							style='	display: none; margin-left:0px; 
-									margin-top:20px; margin-bottom:50px; 
-									width: ".$format_graph['width']."px; 
+		$return .= "<div 	id='overview_$graph_id'
+							class='overview_graph'
+							style='	display: none; margin-left:0px;
+									margin-top:20px; margin-bottom:50px;
+									width: ".$format_graph['width']."px;
 									height: ".$format_graph['height'] ."px;'></div>";
 	}
 	//XXXXTODO
@@ -684,23 +275,21 @@ function flot_area_graph_new (
 	else {
 		$watermark = 'false';
 	}
-	
 
 	foreach($series_type as $k => $v){
-		$series_type_unique["data_" . $graph_id . "_" . $k] = $v; 
-	}	
+		$series_type_unique["data_" . $graph_id . "_" . $k] = $v;
+	}
 
-	
 	// Store data series in javascript format
 	$extra_width = (int)($format_graph['width'] / 3);
-	$return .= "<div id='extra_$graph_id' 
-					style='font-size: " . $format_graph['font_size'] . "pt; 
-					display:none; position:absolute; overflow: auto; 
-					max-height: ".($format_graph['height']+50)."px; 
-					width: ".$extra_width."px; 
-					background:#fff; padding: 2px 2px 2px 2px; 
+	$return .= "<div id='extra_$graph_id'
+					style='font-size: " . $format_graph['font_size'] . "pt;
+					display:none; position:absolute; overflow: auto;
+					max-height: ".($format_graph['height']+50)."px;
+					width: ".$extra_width."px;
+					background:#fff; padding: 2px 2px 2px 2px;
 					border: solid #000 1px;'></div>";
-		
+
 	if(substr($background_style, -6, 4) == '#fff'){
 		$background_color = "#eee";
 		$legend_color = "#151515";
@@ -716,32 +305,32 @@ function flot_area_graph_new (
 
 	//XXXX force_integer TODO
 	$force_integer = 0;
-	
+
 	// Trick to get translated string from javascript
 	$return .= html_print_input_hidden('unknown_text', __('Unknown'), true);
 
 	if (!isset($config["short_module_graph_data"]))
 		$config["short_module_graph_data"] = true;
-	
+
 	if ($config["short_module_graph_data"]) {
 		$short_data = true;
 	}
 	else {
 		$short_data = false;
 	}
-	
+
 	$values              = json_encode($array_data);
 	$legend              = json_encode($legend);
 	$series_type         = json_encode($series_type);
 	$date_array          = json_encode($date_array);
-	$data_module_graph   = json_encode($data_module_graph); 
+	$data_module_graph   = json_encode($data_module_graph);
 	$show_elements_graph = json_encode($show_elements_graph);
 	$format_graph        = json_encode($format_graph);
 
 	// Javascript code
 	$return .= "<script type='text/javascript'>";
 	$return .= "$(document).ready( function () {";
-	$return .= "pandoraFlotAreaNew(" .
+	$return .= "pandoraFlotArea(" .
 		"'$graph_id', \n" .
 		"JSON.parse('$values'), \n" .
 		"JSON.parse('$legend'), \n" .
@@ -760,23 +349,17 @@ function flot_area_graph_new (
 	);";
 	$return .= "});";
 	$return .= "</script>";
-	
+
 	// Parent layer
 	$return .= "</div>";
-	
+
 	return $return;
 }
 
-
-
-
-
-
-
 function menu_graph(
-	$yellow_threshold, $red_threshold, 
-	$yellow_up, $red_up, $yellow_inverse, 
-	$red_inverse, $dashboard, $vconsole, 
+	$yellow_threshold, $red_threshold,
+	$yellow_up, $red_up, $yellow_inverse,
+	$red_inverse, $dashboard, $vconsole,
 	$graph_id, $width, $homeurl
 ){
 	$return = '';
@@ -784,9 +367,9 @@ function menu_graph(
 	if ($yellow_threshold != $yellow_up || $red_threshold != $red_up) {
 		$threshold = true;
 	}
-	
+
 	$nbuttons = 3;
-	
+
 	if ($threshold) {
 		$nbuttons++;
 	}
@@ -810,12 +393,12 @@ function menu_graph(
 		}
 		$return .= " <a href='javascript:'>
 			<img id='menu_overview_$graph_id' class='menu_overview' src='" . $homeurl . "images/chart_curve_overview.png' alt='" . __('Overview graph') . "' title='".__('Overview graph')."'></a>";
-		
+
 		// Export buttons
 		$return .= " <a href='javascript:'><img id='menu_export_csv_$graph_id' src='".$homeurl."images/csv_grey.png' alt='".__('Export to CSV')."' title='".__('Export to CSV')."'></a>";
 		// Button disabled. This feature works, but seems that is not useful enough to the final users.
 		//$return .= " <a href='javascript:'><img id='menu_export_json_$graph_id' src='".$homeurl."images/json.png' alt='".__('Export to JSON')."' title='".__('Export to JSON')."'></a>";
-		
+
 		$return .= "</div>";
 		$return .= "</div>";
 	}
@@ -835,35 +418,13 @@ function menu_graph(
 				"position: relative;".
 				"border-bottom: 0px;'>
 			<a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$homeurl."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
-	
+
 		$return .= "</div>";
 		$return .= "</div>";
 	}
 	return $return;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 ///////////////////////////////
 ///////////////////////////////
 ///////////////////////////////
diff --git a/pandora_console/mobile/operation/module_graph.php b/pandora_console/mobile/operation/module_graph.php
index 3af94962be..7719ae55ed 100644
--- a/pandora_console/mobile/operation/module_graph.php
+++ b/pandora_console/mobile/operation/module_graph.php
@@ -15,7 +15,7 @@
 class ModuleGraph {
 	private $correct_acl = false;
 	private $acl = "AR";
-	
+
 	private $id = 0;
 	private $id_agent = 0;
 	private $graph_type = "sparse";
@@ -31,14 +31,14 @@ class ModuleGraph {
 	private $unknown_graph = 1;
 	private $zoom = 1;
 	private $baseline = 0;
-	
+
 	private $module = null;
-	
+
 	function __construct() {
 		$system = System::getInstance();
-		
+
 		$this->start_date = date("Y-m-d");
-		
+
 		if ($system->checkACL($this->acl)) {
 			$this->correct_acl = true;
 		}
@@ -46,17 +46,17 @@ class ModuleGraph {
 			$this->correct_acl = false;
 		}
 	}
-	
+
 	private function getFilters() {
 		$system = System::getInstance();
-		
+
 		$this->id = (int)$system->getRequest('id', 0);
 		$this->id_agent = (int)$system->getRequest('id_agent', 0);
 		$this->module = modules_get_agentmodule($this->id);
 		$this->graph_type = return_graphtype($this->module["id_tipo_modulo"]);
-		
+
 		$period_hours = $system->getRequest('period_hours', false);
-		
+
 		if ($period_hours == false) {
 			$this->period = SECONDS_1DAY;
 		}
@@ -78,29 +78,29 @@ class ModuleGraph {
 		$this->unknown_graph = (int)$system->getRequest('unknown_graph', 0);
 		$this->zoom = (int)$system->getRequest('zoom', 1);
 		$this->baseline = (int)$system->getRequest('baseline', 0);
-		
+
 		$this->width = (int)$system->getRequest('width', 0);
 		$this->width -= 20; //Correct the width
 		$this->height = (int)$system->getRequest('height', 0);
-		
+
 		//Sancho says "put the height to 1/2 for to make more beautyful"
 		$this->height = $this->height / 1.5;
-		
+
 		$this->height -= 80; //Correct the height
-		
+
 		//For to avoid fucking IPHONES when they are in horizontal.
 		if ($this->height < 140) {
 			$this->height = 140;
 		}
-		
+
 	}
-	
+
 	public function ajax($parameter2 = false) {
-		
+
 		global $config;
-		
+
 		$system = System::getInstance();
-		
+
 		if (!$this->correct_acl) {
 			return;
 		}
@@ -110,23 +110,20 @@ class ModuleGraph {
 					$this->getFilters();
 					$correct = 0;
 					$graph = '';
-					
 					$correct = 1;
-					
 					$label = $this->module["nombre"];
 					$unit = db_get_value('unit', 'tagente_modulo',
 						'id_agente_modulo', $this->id);
-					
 					$utime = get_system_time ();
 					$current = date("Y-m-d", $utime);
-					
+
 					if ($this->start_date != $current)
 						$date = strtotime($this->start_date);
 					else
 						$date = $utime;
-					
+
 					$urlImage = ui_get_full_url(false);
-					
+
 					$time_compare = false;
 					if ($this->time_compare_separated) {
 						$time_compare = 'separated';
@@ -134,37 +131,10 @@ class ModuleGraph {
 					else if ($this->time_compare_overlapped) {
 						$time_compare = 'overlapped';
 					}
-					
+
 					ob_start();
 					switch ($this->graph_type) {
 						case 'boolean':
-							$graph = grafico_modulo_boolean (
-								$this->id,
-								$this->period,
-								$this->draw_events,
-								$this->width,
-								$this->height,
-								false,
-								$unit,
-								$this->draw_alerts,
-								$this->avg_only,
-								false,
-								$date,
-								false,
-								$urlImage,
-								'adapter_' . $this->graph_type,
-								$time_compare,
-								$this->unknown_graph, false);
-							if ($this->draw_events) {
-								$graph .= '<br>';
-								$graph .= graphic_module_events(
-									$this->id,
-									$this->width, $this->height,
-									$this->period, $config['homeurl'],
-									$this->zoom,
-									'adapted_' . $this->graph_type, $date);
-							}
-							break;
 						case 'sparse':
 							$graph = grafico_modulo_sparse(
 								$this->id,
@@ -223,38 +193,18 @@ class ModuleGraph {
 									$this->zoom, 'adapted_' . $this->graph_type, $date);
 							}
 							break;
-						case 'log4x':
-							$graph = grafico_modulo_log4x(
-								$this->id,
-								$this->period,
-								$this->draw_events,
-								$this->width,
-								$this->height,
-								false,
-								$unit_name,
-								$this->draw_alerts,
-								1,
-								$pure,
-								$date);
-							if ($this->draw_events) {
-								$graph .= '<br>';
-								$graph .= graphic_module_events($this->id,
-									$this->width, $this->height,
-									$this->period, $config['homeurl'], $this->zoom, '', $date);
-							}
-							break;
 						default:
 							$graph .= fs_error_image ('../images');
 							break;
 					}
 					$graph = ob_get_clean() . $graph;
-					
+
 					echo json_encode(array('correct' => $correct, 'graph' => $graph));
 					break;
 			}
 		}
 	}
-	
+
 	public function show() {
 		if (!$this->correct_acl) {
 			$this->show_fail_acl();
@@ -264,7 +214,7 @@ class ModuleGraph {
 			$this->showModuleGraph();
 		}
 	}
-	
+
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
@@ -275,7 +225,7 @@ class ModuleGraph {
 			$home = new Home();
 		$home->show($error);
 	}
-	
+
 	private function javascript_code() {
 		ob_start();
 		?>
@@ -283,24 +233,24 @@ class ModuleGraph {
 			$(document).ready(function() {
 				function load_graph() {
 					$("#loading_graph").show();
-					
-					 var heigth = $(document).height()
+
+					var heigth = $(document).height()
 							- $(".ui-header").height()
 							- $(".ui-collapsible").height()
 							- 55;
 					var width = $(document).width() - 25;
 					ajax_get_graph($("#id_module").val(), heigth, width);
 				}
-				
+
 				load_graph();
-				
+
 				// Detect orientation change to refresh dinamic content
 				window.addEventListener("resize", function() {
 					// Reload dinamic content
 					load_graph();
 				});
 			});
-			
+
 			function ajax_get_graph(id, heigth_graph, width_graph) {
 				postvars = {};
 				postvars["action"] = "ajax";
@@ -308,20 +258,20 @@ class ModuleGraph {
 				postvars["parameter2"] = "get_graph";
 				postvars["width"] = width_graph;
 				postvars["height"] = heigth_graph;
-				
+
 				postvars["draw_alerts"] = ($("input[name = 'draw_alerts']").is(":checked"))?1:0;
 				postvars["draw_events"] = ($("input[name = 'draw_events']").is(":checked"))?1:0;
 				postvars["time_compare_separated"] = ($("input[name = 'time_compare_separated']").is(":checked"))?1:0;
 				postvars["time_compare_overlapped"] = ($("input[name = 'time_compare_overlapped']").is(":checked"))?1:0;
 				postvars["unknown_graph"] = ($("input[name = 'unknown_graph']").is(":checked"))?1:0;;
 				postvars["avg_only"] = ($("input[name = 'avg_only']").is(":checked"))?1:0;;
-				
+
 				postvars["period_hours"] = $("input[name = 'period_hours']").val();
 				postvars["zoom"] = $("input[name = 'zoom']").val();
 				postvars["start_date"] = $("input[name = 'start_date']").val();
-				
+
 				postvars["id"] = id;
-				
+
 				$.ajax ({
 					type: "POST",
 					url: "index.php",
@@ -348,17 +298,17 @@ class ModuleGraph {
 		</script>
 		<?php
 		$javascript_code = ob_get_clean();
-		
+
 		return $javascript_code;
 	}
-	
+
 	private function showModuleGraph() {
 		$agent_alias = agents_get_alias($this->module['id_agente']);
-		
+
 		$ui = Ui::getInstance();
-		
+
 		$ui->createPage();
-		
+
 		if ($this->id_agent) {
 			$ui->createDefaultHeader(
 				sprintf(__("PandoraFMS: %s"), $this->module["nombre"]),
@@ -394,7 +344,7 @@ class ModuleGraph {
 						'label' => __('Show Alerts')
 						);
 					$ui->formAddCheckbox($options);
-					
+
 					$options = array(
 						'name' => 'draw_events',
 						'value' => 1,
@@ -402,7 +352,7 @@ class ModuleGraph {
 						'label' => __('Show Events')
 						);
 					$ui->formAddCheckbox($options);
-					
+
 					$options = array(
 						'name' => 'time_compare_separated',
 						'value' => 1,
@@ -410,7 +360,7 @@ class ModuleGraph {
 						'label' => __('Time compare (Separated)')
 						);
 					$ui->formAddCheckbox($options);
-					
+
 					$options = array(
 						'name' => 'time_compare_overlapped',
 						'value' => 1,
@@ -418,7 +368,7 @@ class ModuleGraph {
 						'label' => __('Time compare (Overlapped)')
 						);
 					$ui->formAddCheckbox($options);
-					
+
 					$options = array(
 						'name' => 'unknown_graph',
 						'value' => 1,
@@ -426,7 +376,7 @@ class ModuleGraph {
 						'label' => __('Show unknown graph')
 						);
 					$ui->formAddCheckbox($options);
-					
+
 					$options = array(
 						'name' => 'avg_only',
 						'value' => 1,
@@ -434,7 +384,7 @@ class ModuleGraph {
 						'label' => __('Avg Only')
 						);
 					$ui->formAddCheckbox($options);
-					
+
 					$options = array(
 						'label' => __('Time range (hours)'),
 						'name' => 'period_hours',
@@ -444,22 +394,21 @@ class ModuleGraph {
 						'step' => 4
 						);
 					$ui->formAddSlider($options);
-					
-					
+
 					$options = array(
 						'name' => 'start_date',
 						'value' => $this->start_date,
 						'label' => __('Begin date')
 						);
 					$ui->formAddInpuDate($options);
-					
+
 					$options = array(
 						'icon' => 'refresh',
 						'icon_pos' => 'right',
 						'text' => __('Update graph')
 						);
 					$ui->formAddSubmitButton($options);
-					
+
 				$html = $ui->getEndForm();
 				$ui->contentCollapsibleAddItem($html);
 			$ui->contentEndCollapsible();
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 8e27312304..04f4e3f2d8 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -36,7 +36,6 @@ check_login ();
 $server_id = (int) get_parameter("server");
 if (is_metaconsole() && !empty($server_id)) {
 	$server = metaconsole_get_connection_by_id($server_id);
-	
 	// Error connecting
 	if (metaconsole_connect($server) !== NOERR) {
 		echo "<html>";
@@ -72,7 +71,6 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		$refresh = (int) get_parameter ("refresh", -1);
 		if ($refresh > 0) {
 			$query = ui_get_url_refresh (false);
-			
 			echo '<meta http-equiv="refresh" content="'.$refresh.'; URL='.$query.'" />';
 		}
 		?>
@@ -89,10 +87,10 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 			window.onload = function() {
 				// Hack to repeat the init process to period select
 				var periodSelectId = $('[name="period"]').attr('class');
-				
+
 				period_select_init(periodSelectId);
 			};
-			
+
 			function show_others() {
 				if ($('#checkbox-avg_only').is(":checked") == true) {
 					$("#hidden-show_other").val(1);
@@ -118,18 +116,18 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		$id = (int) get_parameter ("id", 0);
 		// Agent id
 		$agent_id = (int) modules_get_agentmodule_agent($id);
-		
+
 		if (empty($id) || empty($agent_id)) {
 			ui_print_error_message(__('There was a problem locating the source of the graph'));
 			exit;
 		}
-		
+
 		// ACL
 		$permission = false;
 		$agent_group = (int) agents_get_agent_group($agent_id);
 		$strict_user = (bool) db_get_value("strict_acl", "tusuario",
 			"id_user", $config['id_user']);
-		
+
 		if (!empty($agent_group)) {
 			if ($strict_user) {
 				$permission = tags_check_acl_by_module($id, $config['id_user'], 'RR') === true;
@@ -138,24 +136,24 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 				$permission = check_acl($config['id_user'], $agent_group, "RR");
 			}
 		}
-		
+
 		if (!$permission) {
 			require ($config['homedir'] . "/general/noaccess.php");
 			exit;
 		}
-		
+
 		$draw_alerts = get_parameter("draw_alerts", 0);
 
 		if(isset($config['only_average'])){
 			$avg_only = $config['only_average'];
 		}
-		
+
 		$show_other = get_parameter('show_other',-1);
-		
+
 		if ($show_other != -1) {
 			$avg_only = $show_other;
 		}
-		
+
 		$period = get_parameter ("period");
 		$id = get_parameter ("id", 0);
 		$width = get_parameter ("width", STATWIN_DEFAULT_CHART_WIDTH);
@@ -196,53 +194,42 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 
 		// To avoid the horizontal overflow
 		$width -= 20;
-		
+
 		$time_compare = false;
-		
+
 		if ($time_compare_separated) {
 			$time_compare = 'separated';
 		}
 		else if ($time_compare_overlapped) {
 			$time_compare = 'overlapped';
 		}
-		
+
 		if ($zoom > 1) {
 			$height = $height * ($zoom / 2.1);
 			$width = $width * ($zoom / 1.4);
 		}
 		echo "<script type='text/javascript'>window.resizeTo($width + 190, $height + 260);</script>";
-		
+
 		// Build date
 		$date = strtotime("$start_date $start_time");
 		$now = time();
-		
+
 		if ($date > $now)
 			$date = $now;
-		
+
 		$urlImage = ui_get_full_url(false, false, false, false);
-		
+
 		$unit = db_get_value('unit', 'tagente_modulo', 'id_agente_modulo', $id);
-		
+
 		// log4x doesnt support flash yet
 		//
 		if ($config['flash_charts'] == 1)
 			echo '<div style="margin-left: 65px; padding-top: 10px;">';
 		else
 			echo '<div style="margin-left: 20px; padding-top: 10px;">';
-		
+
 		switch ($graph_type) {
 			case 'boolean':
-				echo grafico_modulo_boolean ($id, $period, $draw_events,
-					$width, $height, $label_graph, $unit, $draw_alerts,
-					$avg_only, false, $date, false, $urlImage,
-					'adapter_' . $graph_type, $time_compare,
-					$unknown_graph, true, $fullscale);
-				echo '<br>';
-				if ($show_events_graph)
-					echo graphic_module_events($id, $width, $height,
-						$period, $config['homeurl'], $zoom,
-						'adapted_' . $graph_type, $date, true);
-				break;
 			case 'sparse':
 				echo grafico_modulo_sparse ($id, $period, $draw_events,
 					$width, $height, $label_graph, $unit, $draw_alerts,
@@ -259,6 +246,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 						'adapted_' . $graph_type, $date, true);
 				break;
 			case 'string':
+				html_debug_print('entra x stats win hay que rehacer esta funcion');
 				echo grafico_modulo_string ($id, $period, $draw_events,
 					$width, $height, $label_graph, null, $draw_alerts, 1,
 					false, $date, false, $urlImage,
@@ -269,21 +257,12 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 						$period, $config['homeurl'], $zoom,
 						'adapted_' . $graph_type, $date, true);
 				break;
-			case 'log4x':
-				echo grafico_modulo_log4x ($id, $period, $draw_events,
-					$width, $height, $label_graph, $unit, $draw_alerts, 1,
-					$pure, $date);
-				echo '<br>';
-				if ($show_events_graph)
-					echo graphic_module_events($id, $width, $height,
-						$period, $config['homeurl'], $zoom, '', $date, true);
-				break;
 			default:
 				echo fs_error_image ('../images');
 				break;
 		}
 		echo '</div>';
-		
+
 		////////////////////////////////////////////////////////////////
 		// SIDE MENU
 		////////////////////////////////////////////////////////////////
@@ -293,22 +272,21 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		$params['top_text'] =  "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>" . html_print_image('images/wrench_blanco.png', true, array('width' => '16px'), false, false, true) . ' ' . __('Pandora FMS Graph configuration menu') . ui_print_help_icon ("graphs",true, $config["homeurl"], "images/help_w.png") . "</div>";
 		$params['body_text'] = "<div class='menu_sidebar_outer'>";
 		$params['body_text'] .=__('Please, make your changes and apply with the <i>Reload</i> button');
-		
+
 		// MENU
 		$params['body_text'] .= '<form method="get" action="stat_win.php">';
 		$params['body_text'] .= html_print_input_hidden ("id", $id, true);
 		$params['body_text'] .= html_print_input_hidden ("label", $label, true);
-		
+
 		if (!empty($server_id))
 			$params['body_text'] .= html_print_input_hidden ("server", $server_id, true);
-		
+
 		if (isset($_GET["type"])) {
 			$type = get_parameter_get ("type");
 			$params['body_text'] .= html_print_input_hidden ("type", $type, true);
 		}
-		
+
 		// FORM TABLE
-		
 		$table = html_get_predefined_table('transparent', 2);
 		$table->width = '98%';
 		$table->id = 'stat_win_form_div';
@@ -317,14 +295,14 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		//$table->size[0] = '50%';
 		$table->styleTable = 'border-spacing: 4px;';
 		$table->class = 'alternate';
-		
+
 		$data = array();
 		$data[0] = __('Refresh time');
 		$data[1] = html_print_extended_select_for_time("refresh",
 			$refresh, '', '', 0, 7, true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		if ($graph_type != "boolean" && $graph_type != "string") {
 			$data = array();
 			$data[0] = __('Avg. Only');
@@ -334,19 +312,19 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 			$table->data[] = $data;
 			$table->rowclass[] = '';
 		}
-		
+
 		$data = array();
 		$data[0] = __('Begin date');
 		$data[1] = html_print_input_text ("start_date", $start_date,'', 10, 20, true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = __('Begin time');
 		$data[1] = html_print_input_text ("start_time", $start_time,'', 10, 10, true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = __('Zoom factor');
 		$options = array ();
@@ -358,14 +336,14 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		$data[1] = html_print_select ($options, "zoom", $zoom, '', '', 0, true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = __('Time range');
 		$data[1] = html_print_extended_select_for_time('period',
 			$period, '', '', 0, 7, true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = __('Show events');
 		$disabled = false;
@@ -382,19 +360,19 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		}
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = __('Show alerts');
 		$data[1] = html_print_checkbox ("draw_alerts", 1, (bool) $draw_alerts, true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = __('Show event graph');
 		$data[1] = html_print_checkbox ("show_events_graph", 1, (bool) $show_events_graph, true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		switch ($graph_type) {
 			case 'boolean':
 			case 'sparse':
@@ -403,19 +381,19 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 				$data[1] = html_print_checkbox ("show_percentil", 1, (bool) $show_percentil, true);
 				$table->data[] = $data;
 				$table->rowclass[] ='';
-				
+
 				$data = array();
 				$data[0] = __('Time compare (Overlapped)');
 				$data[1] = html_print_checkbox ("time_compare_overlapped", 1, (bool) $time_compare_overlapped, true);
 				$table->data[] = $data;
 				$table->rowclass[] = '';
-				
+
 				$data = array();
 				$data[0] = __('Time compare (Separated)');
 				$data[1] = html_print_checkbox ("time_compare_separated", 1, (bool) $time_compare_separated, true);
 				$table->data[] = $data;
 				$table->rowclass[] = '';
-				
+
 				$data = array();
 				$data[0] = __('Show unknown graph');
 				$data[1] = html_print_checkbox ("unknown_graph", 1, (bool) $unknown_graph, true);
@@ -430,24 +408,24 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 								true, false);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$form_table = html_print_table($table, true);
-		
+
 		unset($table);
-		
+
 		$table = new stdClass();
 		$table->id = 'stat_win_form';
 		$table->width = '100%';
 		$table->cellspacing = 2;
 		$table->cellpadding = 2;
 		$table->class = 'databox';
-		
+
 		$data = array();
 		$data[0] = html_print_div(array('id' => 'field_list', 'content' => $form_table,
 			'style' => 'overflow: auto; height: 220px'), true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = '<div style="width:100%; text-align:right;">' .
 			html_print_submit_button(__('Reload'), "submit", false,
@@ -455,28 +433,28 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 			"</div>";
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$params['body_text'] .= html_print_table($table, true);
 		$params['body_text'] .= '</form>';
 		$params['body_text'] .= '</div>'; // outer
-		
+
 		// ICONS
 		$params['icon_closed'] = '/images/graphmenu_arrow_hide.png';
 		$params['icon_open'] = '/images/graphmenu_arrow.png';
-		
+
 		// SIZE
 		$params['width'] = 500;
-		
+
 		// POSITION
 		$params['position'] = 'left';
-		
+
 		html_print_side_layer($params);
-		
+
 		// Hidden div to forced title
 		html_print_div(array('id' => 'forced_title_layer',
 			'class' => 'forced_title_layer', 'hidden' => true));
 		?>
-		
+
 	</body>
 </html>
 
@@ -495,8 +473,7 @@ ui_include_time_picker(true);
 	$('#checkbox-time_compare_overlapped').click(function() {
 		$('#checkbox-time_compare_separated').removeAttr('checked');
 	});
-	
-	
+
 	<?php
 	//Resize window when show the overview graph.
 	if ($config['flash_charts']) {
@@ -508,7 +485,7 @@ ui_include_time_picker(true);
 			height_window = window.innerHeight;
 			width_window = window.innerWidth;
 		});
-		
+
 		$("*").filter(function() {
 			if (typeof(this.id) == "string")
 				return this.id.match(/menu_overview_graph.*/);
@@ -526,7 +503,7 @@ ui_include_time_picker(true);
 	<?php
 	}
 	?>
-	
+
 	// Add datepicker and timepicker
 	$("#text-start_date").datepicker({
 		dateFormat: "<?php echo DATE_FORMAT_JS; ?>"
@@ -542,14 +519,14 @@ ui_include_time_picker(true);
 		currentText: '<?php echo __('Now');?>',
 		closeText: '<?php echo __('Close');?>'
 	});
-	
+
 	$.datepicker.setDefaults($.datepicker.regional["<?php echo $custom_user_language; ?>"]);
-	
+
 	$(window).ready(function() {
 		$("#field_list").css('height', ($(window).height() - 160) + 'px');
 	});
-	
+
 	$(window).resize(function() {
 		$("#field_list").css('height', ($(window).height() - 160) + 'px');
 	});
-</script>
+</script>
\ No newline at end of file

From 51f22413a82b3f25b5be56a04c10be8244cb453f Mon Sep 17 00:00:00 2001
From: daniel <daniel@localhost.localdomain>
Date: Wed, 28 Feb 2018 08:46:51 +0100
Subject: [PATCH 010/146] fixed errors in graphs

---
 pandora_console/include/functions_graph.php   | 59 +++++++++++++------
 pandora_console/include/graphs/fgraph.php     |  6 +-
 .../include/graphs/flot/pandora.flot.js       | 26 +++++++-
 .../include/graphs/functions_flot.php         |  9 ++-
 4 files changed, 75 insertions(+), 25 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 1925a836d7..51f6063d7c 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -359,6 +359,7 @@ function grafico_modulo_sparse_data(
 	global $color;
 	global $legend;
 	global $series_type;
+	global $array_events_alerts;
 
 	if($show_elements_graph['fullscale']){
 		$array_data = fullscale_data(
@@ -483,25 +484,39 @@ function grafico_modulo_sparse_data(
 			$events_array = array();
 
 			if($events && is_array($events)){
-				$i=0;
+				$count_events=0;
+				$count_alerts=0;
 				foreach ($events as $k => $v) {
 					if (strpos($v["event_type"], "alert") !== false){
 						if($show_elements_graph['flag_overlapped']){
-							$alerts_array['data'][$i] = array( ($v['utimestamp'] + $date_array['period'] *1000) , $max * 1.10);
+							$alerts_array['data'][$count_alerts] = array(
+								($v['utimestamp'] + $date_array['period'] *1000),
+								$max * 1.10
+							);
 						}
 						else{
-							$alerts_array['data'][$i] = array( ($v['utimestamp']*1000) , $max * 1.10);
+							$alerts_array['data'][$count_alerts] = array(
+								($v['utimestamp']*1000),
+								$max * 1.10
+							);
 						}
+						$count_alerts++;
 					}
 					else{
 						if($show_elements_graph['flag_overlapped']){
-							$events_array['data'][$i] = array( ($v['utimestamp'] + $date_array['period'] *1000) , $max * 1.2);
+							$events_array['data'][$count_events] = array(
+								($v['utimestamp'] + $date_array['period'] *1000),
+								$max * 1.2
+							);
 						}
 						else{
-							$events_array['data'][$i] = array( ($v['utimestamp']*1000) , $max * 1.2);
+							$events_array['data'][$count_events] = array(
+								($v['utimestamp']*1000),
+								$max * 1.2
+							);
 						}
+						$count_events++;
 					}
-					$i++;
 				}
 			}
 		}
@@ -532,9 +547,10 @@ function grafico_modulo_sparse_data(
 		$caption = array();
 	}
 
-	//XXX
-	//$graph_stats = get_statwin_graph_statistics($chart, $series_suffix);
-	$color = color_graph_array($series_suffix, $show_elements_graph['flag_overlapped']);
+	$color = color_graph_array(
+		$series_suffix,
+		$show_elements_graph['flag_overlapped']
+	);
 
 	foreach ($color as $k => $v) {
 		if(is_array($array_data[$k])){
@@ -565,6 +581,8 @@ function grafico_modulo_sparse_data(
 			break;
 	}
 	$series_type['percentil' . $series_suffix] = 'percentil';
+
+	$array_events_alerts[$series_suffix] = $events;
 }
 
 function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
@@ -585,12 +603,15 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	global $color;
 	global $legend;
 	global $series_type;
+	global $array_events_alerts;
 
-	$array_data = array();
-	$caption = array();
-	$color = array();
-	$legend = array();
-	$series_type = array();
+	$array_data   = array();
+	$caption      = array();
+	$color        = array();
+	$legend       = array();
+	$series_type  = array();
+
+	$array_events_alerts = array();
 
 	//date start final period
 	if($date == 0){
@@ -751,6 +772,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 			false
 		)
 	);
+
 	//esto la sparse
 	//setup_watermark($water_mark, $water_mark_file, $water_mark_url);
 	// Check available data
@@ -767,7 +789,8 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 				$show_elements_graph,
 				$format_graph,
 				$water_mark,
-				$series_suffix_str
+				$series_suffix_str,
+				$array_events_alerts
 			);
 		}
 		else{
@@ -786,7 +809,8 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 				$show_elements_graph,
 				$format_graph,
 				$water_mark,
-				$series_suffix_str
+				$series_suffix_str,
+				$array_events_alerts
 			);
 		}
 		else{
@@ -806,7 +830,8 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 				$show_elements_graph,
 				$format_graph,
 				$water_mark,
-				$series_suffix_str
+				$series_suffix_str,
+				$array_events_alerts
 			);
 		}
 		else{
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index ba185c9344..5ad02f9de4 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -206,7 +206,8 @@ function area_graph(
 	$agent_module_id, $array_data, $color,
 	$legend, $series_type, $date_array,
 	$data_module_graph, $show_elements_graph,
-	$format_graph, $water_mark, $series_suffix_str
+	$format_graph, $water_mark, $series_suffix_str,
+	$array_events_alerts
 ) {
 	global $config;
 
@@ -224,7 +225,8 @@ function area_graph(
 			$show_elements_graph,
 			$format_graph,
 			$water_mark,
-			$series_suffix_str
+			$series_suffix_str,
+			$array_events_alerts
 		);
 	}
 	else {
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 575e36d7f4..db66b2cb60 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1129,8 +1129,10 @@ function pandoraFlotArea(
 	series_type, watermark, date_array,
 	data_module_graph, show_elements_graph,
 	format_graph, force_integer, series_suffix_str,
-	background_color, legend_color, short_data
+	background_color, legend_color, short_data,
+	events_array
 ) {
+	console.log(events_array);
 	//diferents vars
 	var unit      = format_graph.unit ? format_graph.unit : '';
 	var homeurl   = format_graph.homeurl;
@@ -1190,12 +1192,20 @@ function pandoraFlotArea(
 	i=0;
 	$.each(values, function (index, value) {
 		if (typeof value.data !== "undefined") {
+			if(index == 'alert') {
+				fill_color = '#ffff00';
+			}
+			else if(index == 'events') {
+				fill_color = '#ff66cc';
+			}
 			switch (series_type[index]) {
 				case 'area':
 					line_show   = true;
 					points_show = false; // XXX - false
 					filled      = 0.2;
 					steps_chart = false;
+					radius      = false;
+					fill_points = '';
 					break;
 				case 'percentil':
 				case 'line':
@@ -1204,12 +1214,16 @@ function pandoraFlotArea(
 					points_show = false;
 					filled      = false;
 					steps_chart = false;
+					radius      = false;
+					fill_points = '';
 					break;
 				case 'points':
 					line_show   = false;
 					points_show = true;
 					filled      = false;
-					steps_chart = false
+					steps_chart = false;
+					radius      = 3;
+					fill_points = fill_color;
 					break;
 				case 'unknown':
 				case 'boolean':
@@ -1217,6 +1231,8 @@ function pandoraFlotArea(
 					points_show = false;
 					filled      = true;
 					steps_chart = true;
+					radius      = false;
+					fill_points = '';
 					break;
 			}
 			data_base.push({
@@ -1230,7 +1246,11 @@ function pandoraFlotArea(
 					lineWidth: lineWidth,
 					steps: steps_chart
 				},
-				points: { show: points_show }
+				points: {
+					show: points_show,
+					radius: radius,
+					fillColor: fill_points
+				}
 			});
 			i++;
 		}
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 8fcaf060a5..2e1a74bfa5 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -180,7 +180,8 @@ function flot_area_graph (
 	$agent_module_id, $array_data, $color,
 	$legend, $series_type, $date_array,
 	$data_module_graph, $show_elements_graph,
-	$format_graph, $water_mark, $series_suffix_str ) {
+	$format_graph, $water_mark, $series_suffix_str,
+	$array_events_alerts ) {
 
 	global $config;
 
@@ -326,6 +327,7 @@ function flot_area_graph (
 	$data_module_graph   = json_encode($data_module_graph);
 	$show_elements_graph = json_encode($show_elements_graph);
 	$format_graph        = json_encode($format_graph);
+	$array_events_alerts = json_encode($array_events_alerts);
 
 	// Javascript code
 	$return .= "<script type='text/javascript'>";
@@ -345,8 +347,9 @@ function flot_area_graph (
 		"'$series_suffix_str', \n" .
 		"'$background_color', \n" .
 		"'$legend_color', \n" .
-		"'$short_data'
-	);";
+		"'$short_data', \n" .
+		"JSON.parse('$array_events_alerts')".
+	");";
 	$return .= "});";
 	$return .= "</script>";
 

From 3910b455ca7d50af8d612233638915f0aae00c00 Mon Sep 17 00:00:00 2001
From: daniel <daniel@localhost.localdomain>
Date: Wed, 28 Feb 2018 10:02:06 +0100
Subject: [PATCH 011/146] fixed errors

---
 pandora_console/include/functions_graph.php    |  2 ++
 .../include/graphs/flot/pandora.flot.js        | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 51f6063d7c..4ceb8b520f 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -583,6 +583,8 @@ function grafico_modulo_sparse_data(
 	$series_type['percentil' . $series_suffix] = 'percentil';
 
 	$array_events_alerts[$series_suffix] = $events;
+
+	$data_module_graph['series_suffix'] = $series_suffix;
 }
 
 function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index db66b2cb60..65638ad2f0 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1144,6 +1144,7 @@ function pandoraFlotArea(
 	var dashboard = show_elements_graph.dashboard;
 	var menu      = show_elements_graph.menu;
 	var max_x     = date_array['final_date'] *1000;
+	var s_suffix  = data_module_graph['series_suffix'];
 
 	//for threshold
 	var threshold        = true;
@@ -1192,12 +1193,19 @@ function pandoraFlotArea(
 	i=0;
 	$.each(values, function (index, value) {
 		if (typeof value.data !== "undefined") {
-			if(index == 'alert') {
+			console.log(index);
+			console.log(s_suffix);
+			if(index == 'alert' + s_suffix) {
+				console.log('entra');
 				fill_color = '#ffff00';
 			}
-			else if(index == 'events') {
+			else if(index == 'event' + s_suffix) {
+				console.log('entra2');
 				fill_color = '#ff66cc';
 			}
+			else{
+				fill_color = '';
+			}
 			switch (series_type[index]) {
 				case 'area':
 					line_show   = true;
@@ -1205,7 +1213,7 @@ function pandoraFlotArea(
 					filled      = 0.2;
 					steps_chart = false;
 					radius      = false;
-					fill_points = '';
+					fill_points = fill_color;
 					break;
 				case 'percentil':
 				case 'line':
@@ -1215,7 +1223,7 @@ function pandoraFlotArea(
 					filled      = false;
 					steps_chart = false;
 					radius      = false;
-					fill_points = '';
+					fill_points = fill_color;
 					break;
 				case 'points':
 					line_show   = false;
@@ -1232,7 +1240,7 @@ function pandoraFlotArea(
 					filled      = true;
 					steps_chart = true;
 					radius      = false;
-					fill_points = '';
+					fill_points = fill_color;
 					break;
 			}
 			data_base.push({

From 815e9c675997533b4f28e6b8fdcb301ad658d151 Mon Sep 17 00:00:00 2001
From: daniel <daniel@localhost.localdomain>
Date: Thu, 1 Mar 2018 09:46:52 +0100
Subject: [PATCH 012/146] fixed errors graph

---
 pandora_console/include/functions_graph.php   |   9 +-
 .../include/graphs/flot/pandora.flot.js       | 108 +++++++++++-------
 2 files changed, 73 insertions(+), 44 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 4ceb8b520f..5572877cae 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -506,13 +506,13 @@ function grafico_modulo_sparse_data(
 						if($show_elements_graph['flag_overlapped']){
 							$events_array['data'][$count_events] = array(
 								($v['utimestamp'] + $date_array['period'] *1000),
-								$max * 1.2
+								$max * 1.15
 							);
 						}
 						else{
 							$events_array['data'][$count_events] = array(
 								($v['utimestamp']*1000),
-								$max * 1.2
+								$max * 1.15
 							);
 						}
 						$count_events++;
@@ -583,8 +583,6 @@ function grafico_modulo_sparse_data(
 	$series_type['percentil' . $series_suffix] = 'percentil';
 
 	$array_events_alerts[$series_suffix] = $events;
-
-	$data_module_graph['series_suffix'] = $series_suffix;
 }
 
 function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
@@ -777,6 +775,9 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 
 	//esto la sparse
 	//setup_watermark($water_mark, $water_mark_file, $water_mark_url);
+
+	$data_module_graph['series_suffix'] = $series_suffix;
+
 	// Check available data
 	if ($show_elements_graph['compare'] === 'separated') {
 		if (!empty($array_data)) {
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 65638ad2f0..2015039c6e 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1132,7 +1132,6 @@ function pandoraFlotArea(
 	background_color, legend_color, short_data,
 	events_array
 ) {
-	console.log(events_array);
 	//diferents vars
 	var unit      = format_graph.unit ? format_graph.unit : '';
 	var homeurl   = format_graph.homeurl;
@@ -1144,7 +1143,6 @@ function pandoraFlotArea(
 	var dashboard = show_elements_graph.dashboard;
 	var menu      = show_elements_graph.menu;
 	var max_x     = date_array['final_date'] *1000;
-	var s_suffix  = data_module_graph['series_suffix'];
 
 	//for threshold
 	var threshold        = true;
@@ -1193,19 +1191,16 @@ function pandoraFlotArea(
 	i=0;
 	$.each(values, function (index, value) {
 		if (typeof value.data !== "undefined") {
-			console.log(index);
-			console.log(s_suffix);
-			if(index == 'alert' + s_suffix) {
-				console.log('entra');
-				fill_color = '#ffff00';
+			if(index.search("alert") >= 0){
+				fill_color = '#ff7f00';
 			}
-			else if(index == 'event' + s_suffix) {
-				console.log('entra2');
-				fill_color = '#ff66cc';
+			else if(index.search("event") >= 0){
+				fill_color = '#ff0000';
 			}
 			else{
-				fill_color = '';
+				fill_color = 'green';
 			}
+
 			switch (series_type[index]) {
 				case 'area':
 					line_show   = true;
@@ -1230,7 +1225,7 @@ function pandoraFlotArea(
 					points_show = true;
 					filled      = false;
 					steps_chart = false;
-					radius      = 3;
+					radius      = 1.5;
 					fill_points = fill_color;
 					break;
 				case 'unknown':
@@ -2143,41 +2138,74 @@ function pandoraFlotArea(
 
 	$('#' + graph_id).bind("plotclick", function (event, pos, item) {
 		plot.unhighlight();
-		if (item && item.series.label != '' && (item.series.label == legend_events || item.series.label == legend_events+series_suffix_str || item.series.label == legend_alerts || item.series.label == legend_alerts+series_suffix_str)) {
+		if(item && item.series.label != '' &&
+			( 	(item.series.label.search("alert") >= 0) ||
+				(item.series.label.search("event") >= 0)	)
+		){
 			plot.unhighlight();
-			var dataset  = plot.getData();
 
-			var extra_info = '<i>No info to show</i>';
-			var extra_show = false;
+			$('#extra_'+graph_id).css('width', '170px');
+			$('#extra_'+graph_id).css('height', '60px');
 
-			var coord_x = (item.dataIndex/item.series.xaxis.datamax)* (event.target.clientWidth - event.target.offsetLeft + 1) + event.target.offsetLeft;
+			var dataset         = plot.getData();
+			var extra_info      = '<i>No info to show</i>';
+			var extra_show      = false;
+			var extra_height    = $('#extra_'+graph_id).height();
+			var extra_width     = parseInt($('#extra_'+graph_id)
+									.css('width')
+									.split('px')[0]);
+			var events_data     = new Array();
+			var offset_graph    = plot.getPlotOffset();
+			var offset_relative = plot.offset();
+			var width_graph     = plot.width();
+			var height_legend   = $('#legend_' + graph_id).height();
+			var coord_x         = pos.pageX - offset_relative.left + offset_graph.left;
+			var coord_y         = offset_graph.top + height_legend + extra_height;
 
+			if(coord_x + extra_width > width_graph){
+				coord_x = coord_x - extra_width;
+			}
+
+			var coord_y = offset_graph.top + height_legend + extra_height;
 
 			$('#extra_'+graph_id).css('left',coord_x);
-			$('#extra_'+graph_id).css('top', event.target.offsetTop + 55 );
+			$('#extra_'+graph_id).css('top', coord_y );
 
-			switch(item.series.label) {
-				case legend_alerts+series_suffix_str:
-				case legend_alerts:
-					extra_info = '<b>'+legend_alerts+':<br><span style="font-size:xx-small; font-weight: normal;">From: '+labels_long[item.dataIndex];
-					if (labels_long[item.dataIndex+1] != undefined) {
-						extra_info += '<br>To: '+labels_long[item.dataIndex+1];
-					}
-					extra_info += '</span></b>'+get_event_details(alertsz[item.dataIndex]);
-					extra_show = true;
-					break;
-				case legend_events+series_suffix_str:
-				case legend_events:
-					extra_info = '<b>'+legend_events+':<br><span style="font-size:xx-small; font-weight: normal;">From: '+labels_long[item.dataIndex];
-					if (labels_long[item.dataIndex+1] != undefined) {
-						extra_info += '<br>To: '+labels_long[item.dataIndex+1];
-					}
-					extra_info += '</span></b>'+get_event_details(eventsz[item.dataIndex]);
-					extra_show = true;
-					break;
-				default:
-					return;
-					break;
+			if(	(item.series.label.search("alert") >= 0) ||
+				(item.series.label.search("event") >= 0)	){
+
+				$.each(events_array, function (i, v) {
+					$.each(v, function (index, value) {
+						if((value.utimestamp) == item.datapoint[0]/1000){
+							events_data = value;
+						}
+					});
+				});
+
+				if(events_data.event_type.search("alert") >= 0){
+					$extra_color = '#FFA631';
+				}
+				else if(events_data.event_type.search("critical") >= 0){
+					$extra_color = '#FC4444';
+				}
+				else if(events_data.event_type.search("warning") >= 0){
+					$extra_color = '#FAD403';
+				}
+				else if(events_data.event_type.search("unknown") >= 0){
+					$extra_color = '#3BA0FF';
+				}
+				else if(events_data.event_type.search("normal") >= 0){
+					$extra_color = '#80BA27';
+				}
+				else{
+					$extra_color = '#ffffff';
+				}
+
+				$('#extra_'+graph_id).css('background-color',$extra_color);
+
+				extra_info = '<b>'+events_data.evento+':';
+				extra_info += '<br><br><span style="font-weight: normal;">Time: '+events_data.timestamp;
+				extra_show = true;
 			}
 
 			if (extra_show) {

From af6f2519956dcff5855d407d5ecb31f91e02fb28 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 2 Mar 2018 13:13:55 +0100
Subject: [PATCH 013/146] [ACL] Now only RM can delete custom graphs

---
 pandora_console/godmode/reporting/graphs.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php
index f6afa3c423..5b5657007b 100644
--- a/pandora_console/godmode/reporting/graphs.php
+++ b/pandora_console/godmode/reporting/graphs.php
@@ -23,7 +23,7 @@ check_login ();
 $report_r = check_acl ($config['id_user'], 0, "RR");
 $report_w = check_acl ($config['id_user'], 0, "RW");
 $report_m = check_acl ($config['id_user'], 0, "RM");
-$access = ($report_r == true) ? 'RR' : (($report_w == true) ? 'RW' : (($report_m == true) ? 'RM' : 'RR'));
+
 if (!$report_r && !$report_w && !$report_m) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access Inventory Module Management");
@@ -31,6 +31,9 @@ if (!$report_r && !$report_w && !$report_m) {
 	return;
 }
 
+$access = ($report_r == true) ? 'RR' : (($report_w == true) ? 'RW' : (($report_m == true) ? 'RM' : 'RR'));
+$manage_group_all = users_can_manage_group_all($access);
+
 $activeTab = get_parameter('tab', 'main');
 
 $enterpriseEnable = false;
@@ -185,20 +188,21 @@ if (!empty ($graphs)) {
 		$data[2] = $graph["graphs_count"];
 		$data[3] = ui_print_group_icon($graph['id_group'],true);
 		
-		if (($report_w || $report_m) && users_can_manage_group_all($access)) {
+		$data[4] = '';
+		if (($report_w || $report_m) && $manage_group_all) {
 			$data[4] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id='.
 			$graph['id_graph'].'">'.html_print_image("images/config.png", true).'</a>';
-			
-			$data[4] .= '&nbsp;';
-			
+		}
+
+		$data[4] .= '&nbsp;';
+
+		if ($report_m && $manage_group_all) {
 			$data[4] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/graphs&delete_graph=1&id='
 				.$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\'))
 					return false;">' . html_print_image("images/cross.png", true, array('alt' => __('Delete'), 'title' => __('Delete'))) . '</a>' .
 					html_print_checkbox_extended ('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete" style="margin-left:2px;"', true);
-		} else {
-			if($op_column) $data[4] = '';
 		}
-		
+
 		array_push ($table->data, $data);
 	}
 

From 3fbd9adc3867e18cf2c50e7d73c3c1d060ee4081 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 24 Apr 2018 13:19:24 +0200
Subject: [PATCH 014/146] fixed graph

---
 pandora_console/include/functions_graph.php   |   7 +-
 pandora_console/include/graphs/fgraph.php     |  26 ++--
 .../include/graphs/flot/pandora.flot.js       | 121 +++++++++---------
 .../include/graphs/functions_flot.php         |  17 +--
 pandora_console/include/styles/pandora.css    |   3 +-
 pandora_console/mobile/include/style/main.css |   4 -
 .../operation/agentes/stat_win.php            |  22 ++--
 7 files changed, 94 insertions(+), 106 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 3a534f15de..74e8e52886 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -679,13 +679,14 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 
 	// ATTENTION: The min size is in constants.php
 	// It's not the same minsize for all graphs, but we are choosed a prudent minsize for all
+	/*
 	if ($height <= CHART_DEFAULT_HEIGHT) {
 		$height = CHART_DEFAULT_HEIGHT;
 	}
 	if ($width < CHART_DEFAULT_WIDTH) {
 		$width = CHART_DEFAULT_WIDTH;
 	}
-
+	*/
 	$format_graph = array();
 	$format_graph['width']      = $width;
 	$format_graph['height']     = $height;
@@ -2367,10 +2368,6 @@ function fullscale_data_combined($module_list, $period, $date, $flash_charts, $p
 		foreach ($data_uncompress as $key_data => $value_data) {
 			foreach ($value_data['data'] as $k => $v) {
 				$real_date = $v['utimestamp'];
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/develop
 				if(!isset($v['datos'])){
 					$v['datos'] = $previous_data;
 				}
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 347aeb37d1..6feb3f700b 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -251,20 +251,20 @@ function area_graph(
 		//XXXXX
 		//Corregir este problema
 		$graph = array();
-		$graph['data'] = $chart_data;
-		$graph['width'] = $width;
-		$graph['height'] = $height;
-		$graph['color'] = $color;
-		$graph['legend'] = $legend;
-		$graph['xaxisname'] = $xaxisname;
-		$graph['yaxisname'] = $yaxisname;
-		$graph['water_mark'] = $water_mark_file;
-		$graph['font'] = $font;
-		$graph['font_size'] = $font_size;
+		$graph['data']            = $chart_data;
+		$graph['width']           = $width;
+		$graph['height']          = $height;
+		$graph['color']           = $color;
+		$graph['legend']          = $legend;
+		$graph['xaxisname']       = $xaxisname;
+		$graph['yaxisname']       = $yaxisname;
+		$graph['water_mark']      = $water_mark_file;
+		$graph['font']            = $font;
+		$graph['font_size']       = $font_size;
 		$graph['backgroundColor'] = $backgroundColor;
-		$graph['unit'] = $unit;
-		$graph['series_type'] = $series_type;
-		$graph['percentil'] = $percentil_values;
+		$graph['unit']            = $unit;
+		$graph['series_type']     = $series_type;
+		$graph['percentil']       = $percentil_values;
 
 		$id_graph = serialize_in_temp($graph, null, $ttl);
 		// Warning: This string is used in the function "api_get_module_graph" from 'functions_api.php' with the regec patern "/<img src='(.+)'>/"
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 6f1c069158..60f7547dcd 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -959,12 +959,6 @@ function adjust_left_width_canvas(adapter_id, adapted_id) {
 	$('#'+adapted_id).css('margin-left', adapter_left_margin);
 }
 
-
-function update_left_width_canvas(graph_id) {
-	$('#overview_'+graph_id).width($('#'+graph_id).width());
-	$('#overview_'+graph_id).css('margin-left', $('#'+graph_id+' .yAxis .tickLabel').width());
-}
-
 function check_adaptions(graph_id) {
 	var classes = $('#'+graph_id).attr('class').split(' ');
 
@@ -1132,6 +1126,7 @@ function pandoraFlotArea(
 	background_color, legend_color, short_data,
 	events_array
 ) {
+	console.log(format_graph.font_size);
 	//diferents vars
 	var unit      = format_graph.unit ? format_graph.unit : '';
 	var homeurl   = format_graph.homeurl;
@@ -1156,8 +1151,6 @@ function pandoraFlotArea(
 
 	//XXXX ver que hay que hacer
 	var type          = 'area_simple';
-	//var xaxisname     = 'xaxisname';
-
 	var labels_long   = '';
 	var min_check     = 0;
 	var water_mark    = '';
@@ -1784,7 +1777,7 @@ function pandoraFlotArea(
 
 	// The first execution, the graph data is the base data
 	datas = data_base;
-
+	font_size = 8;
 	// minTickSize
 	var count_data = datas[0].data.length;
 	var min_tick_pixels = 80;
@@ -1799,7 +1792,7 @@ function pandoraFlotArea(
 				mode: 'xy'
 			},
 			selection: {
-				mode: 'x',
+				mode: 'xy',
 				color: '#777'
 			},
 			export: {
@@ -1885,38 +1878,48 @@ function pandoraFlotArea(
 		var overview = $.plot($('#overview_'+graph_id),datas, {
 			series: {
 				stack: stacked,
-				lines: {
-					show: true,
-					lineWidth: 1
-				},
-				shadowSize: 0
+				shadowSize: 0.1
+			},
+			crosshair: {
+				mode: 'xy'
+			},
+			selection: {
+				mode: 'xy',
+				color: '#777'
+			},
+			export: {
+				export_data: true,
+				labels_long: labels_long,
+				homeurl: homeurl
 			},
 			grid: {
-				borderWidth: 1,
-				borderColor: '#C1C1C1',
 				hoverable: true,
-				autoHighlight: false
+				clickable: true,
+				borderWidth:1,
+				borderColor: '#C1C1C1',
+				tickColor: background_color,
+				color: legend_color
 			},
-			xaxes: [ {
+			xaxes: [{
 				axisLabelFontSizePixels: font_size,
 				mode: "time",
 				tickFormatter: xFormatter,
 				tickSize: [maxticks, 'hour'],
-				labelWidth: 70,
-			} ],
-			yaxis: {
-				ticks: [],
-				autoscaleMargin: 0.1
-			},
-			selection: {
-				mode: 'x',
-				color: '#777'
-			},
+				labelWidth: 70
+			}],
+			yaxes: [{
+				tickFormatter: yFormatter,
+				color: '',
+				alignTicksWithAxis: 1,
+				labelWidth: 30,
+				position: 'left',
+				font: font,
+				reserveSpace: true,
+			}],
 			legend: {
-				show: false
-			},
-			crosshair: {
-				mode: 'x'
+				position: 'se',
+				container: $('#legend_' + graph_id),
+				labelFormatter: lFormatter
 			}
 		});
 	}
@@ -1954,6 +1957,19 @@ function pandoraFlotArea(
 					tickFormatter: xFormatter,
 					tickSize: [maxticks_zoom, 'hour']
 				}],
+				yaxis:{
+					min: ranges.yaxis.from,
+					max: ranges.yaxis.to
+				},
+				yaxes: [{
+					tickFormatter: yFormatter,
+					color: '',
+					alignTicksWithAxis: 1,
+					labelWidth: 30,
+					position: 'left',
+					font: font,
+					reserveSpace: true,
+				}],
 				legend: {
 					show: true
 				}
@@ -2121,7 +2137,6 @@ function pandoraFlotArea(
 		plot.setCrosshair({ x: pos.x, y: 0 });
 		currentPlot = plot;
 		latestPosition = pos;
-
 		if (!updateLegendTimeout) {
 			updateLegendTimeout = setTimeout(updateLegend, 50);
 		}
@@ -2285,31 +2300,20 @@ function pandoraFlotArea(
 	if (menu) {
 		var parent_height;
 		$('#menu_overview_' + graph_id).click(function() {
-			$('#overview_' + graph_id).toggle();
+			if($('#overview_' + graph_id).css('visibility') == 'visible'){
+				$('#overview_' + graph_id).css('visibility', 'hidden');
+			}
+			else{
+				$('#overview_' + graph_id).css('visibility', 'visible');
+			}
 		});
 
-		//~ $('#menu_export_csv_' + graph_id).click(function() {
-			//~ exportData({ type: 'csv' });
-		//~ });
-
 		$("#menu_export_csv_"+graph_id)
 			.click(function (event) {
 				event.preventDefault();
 				plot.exportDataCSV();
 		});
 
-		//Not a correct call
-		//~ $('#menu_export_json_' + graph_id).click(function() {
-			//~ exportData({ type: 'json' });
-		//~ });
-
-		//This is a correct call to export data in json
-		//~ $("#menu_export_json_"+graph_id)
-			//~ .click(function (event) {
-				//~ event.preventDefault();
-				//~ plot.exportDataJSON();
-		//~ });
-
 		$('#menu_threshold_' + graph_id).click(function() {
 			datas = new Array();
 
@@ -2408,12 +2412,6 @@ function adjust_menu(graph_id, plot, parent_height, width) {
 	var parent_height_new = 0;
 
 	var legend_height = parseInt($('#legend_'+graph_id).css('height').split('px')[0]) + parseInt($('#legend_'+graph_id).css('margin-top').split('px')[0]);
-	if ($('#overview_'+graph_id).css('display') == 'none') {
-		overview_height = 0;
-	}
-	else {
-		overview_height = parseInt($('#overview_'+graph_id).css('height').split('px')[0]) + parseInt($('#overview_'+graph_id).css('margin-top').split('px')[0]);
-	}
 
 	var menu_height = '25';
 
@@ -2422,13 +2420,9 @@ function adjust_menu(graph_id, plot, parent_height, width) {
 	}
 
 	offset = $('#' + graph_id)[0].offsetTop;
-	
+
 	$('#menu_' + graph_id).css('top', ((offset) + 'px'));
 
-	//$('#legend_' + graph_id).css('width',plot.width());
-
-	//~ $('#menu_' + graph_id).css('left', $('#'+graph_id)[0].offsetWidth);
-	
 	$('#menu_' + graph_id).show();
 }
 
@@ -2498,9 +2492,8 @@ function adjust_left_width_canvas(adapter_id, adapted_id) {
 	$('#'+adapted_id).css('margin-left', adapter_left_margin);
 }
 
-
 function update_left_width_canvas(graph_id) {
-	$('#overview_'+graph_id).width($('#'+graph_id).width() - 30);
+	$('#overview_'+graph_id).width($('#'+graph_id).width());
 	$('#overview_'+graph_id).css('margin-left', $('#'+graph_id+' .yAxis .tickLabel').width());
 }
 
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 8a00b5ee69..edc782f654 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -205,7 +205,7 @@ function flot_area_graph (
 	}
 
 	// Parent layer
-	$return = "<div class='parent_graph' style='width: " . ($format_graph['width']) . "px; " . $background_style . "'>";
+	$return = "<div class='parent_graph' style='width: " . ($format_graph['width']) . "; " . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
 	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:" . $format_graph['font_size'] ."pt !important;'></p>";
 
@@ -260,13 +260,14 @@ function flot_area_graph (
 	}
 
 	if (!$vconsole){
-		$return .= "<div 	id='overview_$graph_id'
-							class='overview_graph'
-							style='	display: none; margin-left:0px;
-									margin-top:20px; margin-bottom:50px;
-									width: ".$format_graph['width']."px;
-									height: ".$format_graph['height'] ."px;'></div>";
+		$return .= "<div id='overview_$graph_id'
+						class='overview_graph'
+						style='	 margin:0px; margin-top:30px; margin-bottom:50px;
+							visibility:hidden;
+							width: ".$format_graph['width'].";
+							height: 200px;'></div>";
 	}
+
 	//XXXXTODO
 	$water_mark = '';
 	if ($water_mark != '') {
@@ -377,7 +378,7 @@ function menu_graph(
 		$return .= "<div id='geneal_menu_$graph_id' class='menu_graph' style='
 						width: 30px;
 						height: 250px;
-						left: " . $width . "px;
+						left: 100%;
 						position: absolute;
 						top: 0px;
 						background-color: white;'>";
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 9b39270e66..f9a2539827 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4628,8 +4628,9 @@ form ul.form_flex li ul li{
 	border: 0px;
 }
 
+/*
 .tickLabel {
     white-space: nowrap;
     line-height: 1.05em!important;
 }
-
+*/
diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css
index 09f1cf373e..67cd549c76 100755
--- a/pandora_console/mobile/include/style/main.css
+++ b/pandora_console/mobile/include/style/main.css
@@ -316,10 +316,6 @@ div.graph {
 	margin: 0 auto;
 }
 
-.tickLabels * {
-	font-size: 10px !important;
-}
-
 table.alternate tr:nth-child(odd) td, table.alternate tr:nth-child(odd) th{
 	background-color: #ffffff;
 }
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 75a8f3c899..c56f855d6e 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -90,7 +90,6 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 			}
 		?>
 		<script type='text/javascript'>
-			<!--
 			window.onload = function() {
 				// Hack to repeat the init process to period select
 				var periodSelectId = $('[name="period"]').attr('class');
@@ -105,15 +104,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 				else {
 					$("#hidden-show_other").val(0);
 				}
-				// 
-				// if ($('#hidden-avg_only_sent').is(":checked") == true) {
-				// 	$("#hidden-avg_only_sent").val(1);
-				// }
-				// else {
-				// 	$("#hidden-avg_only_sent").val(0);
-				// }
 			}
-			//-->
 		</script>
 	</head>
 	<body bgcolor="#ffffff" style='background:#ffffff;'>
@@ -163,8 +154,14 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 
 		$period = get_parameter ("period");
 		$id = get_parameter ("id", 0);
+		
+//XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+		/*
 		$width = get_parameter ("width", STATWIN_DEFAULT_CHART_WIDTH);
 		$height = get_parameter ("height", STATWIN_DEFAULT_CHART_HEIGHT);
+		*/
+	
+
 		$label = get_parameter ("label", "");
 		$label_graph = base64_decode(get_parameter ("label", ""));
 		$start_date = get_parameter ("start_date", date("Y/m/d"));
@@ -189,7 +186,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 			}
 			elseif($config['full_scale_option'] == 2){
 				if($graph_type == 'boolean'){
-					$fullscale = 1;	
+					$fullscale = 1;
 				}else{
 					$fullscale = 0;
 				}
@@ -229,12 +226,14 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		$unit = db_get_value('unit', 'tagente_modulo', 'id_agente_modulo', $id);
 
 		// log4x doesnt support flash yet
-		//
 		if ($config['flash_charts'] == 1)
 			echo '<div style="margin-left: 65px; padding-top: 10px;">';
 		else
 			echo '<div style="margin-left: 20px; padding-top: 10px;">';
 
+		$width  = '90%';
+		$height = '450';
+
 		switch ($graph_type) {
 			case 'boolean':
 			case 'sparse':
@@ -488,6 +487,7 @@ ui_include_time_picker(true);
 		var show_overview = false;
 		var height_window;
 		var width_window;
+
 		$(window).ready(function() {
 			height_window = window.innerHeight;
 			width_window = window.innerWidth;

From 2a81703a68bf6fb3df3bb1e70fc8ff4cf6c7f6ef Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 26 Apr 2018 10:24:37 +0200
Subject: [PATCH 015/146] fixed minor error custom graph

---
 pandora_console/include/functions.php         |  19 +
 .../include/functions_custom_graphs.php       |   3 +-
 pandora_console/include/functions_graph.php   | 475 ++++++++++++------
 .../include/functions_reporting.php           |   3 +-
 .../include/graphs/flot/pandora.flot.js       |  27 +-
 .../include/graphs/functions_flot.php         |   9 +-
 .../operation/agentes/stat_win.php            |  47 +-
 7 files changed, 371 insertions(+), 212 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index bac879339a..ab5c20154f 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2988,4 +2988,23 @@ function legend_graph_array(
 
 	return $legend;
 }
+
+function series_type_graph_array( $series_suffix, $data_module_graph){
+	global $config;
+	global $series_type;
+
+	$series_type['event'.$series_suffix] = 'points';
+	$series_type['alert'.$series_suffix] = 'points';
+	$series_type['unknown'.$series_suffix] = 'unknown';
+	switch ($data_module_graph['id_module_type']) {
+		case 21: case 2: case 6:
+		case 18: case 9: case 31:
+			$series_type['sum'.$series_suffix] = 'boolean';
+			break;
+		default:
+			$series_type['sum'.$series_suffix] = 'area';
+			break;
+	}
+	$series_type['percentil' . $series_suffix] = 'percentil';
+}
 ?>
diff --git a/pandora_console/include/functions_custom_graphs.php b/pandora_console/include/functions_custom_graphs.php
index c7acc7b35a..e61b8cf09d 100644
--- a/pandora_console/include/functions_custom_graphs.php
+++ b/pandora_console/include/functions_custom_graphs.php
@@ -167,7 +167,8 @@ function custom_graphs_print($id_graph, $height, $width, $period,
 	$show_max = true, $show_min = true, $show_avg = true, $ttl = 1,
 	$dashboard = false, $vconsole = false, $percentil = null, 
 	$from_interface = false,$id_widget_dashboard=false, $fullscale = false) {
-	
+
+		html_debug_print('esta en esta otro arch');
 	global $config;
 	
 	if ($from_interface) {
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 74e8e52886..51b67ecf68 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -568,19 +568,10 @@ function grafico_modulo_sparse_data(
 		$data_module_graph
 	);
 
-	$series_type['event'.$series_suffix] = 'points';
-	$series_type['alert'.$series_suffix] = 'points';
-	$series_type['unknown'.$series_suffix] = 'unknown';
-	switch ($data_module_graph['id_module_type']) {
-		case 21: case 2: case 6:
-		case 18: case 9: case 31:
-			$series_type['sum'.$series_suffix] = 'boolean';
-			break;
-		default:
-			$series_type['sum'.$series_suffix] = 'area';
-			break;
-	}
-	$series_type['percentil' . $series_suffix] = 'percentil';
+	series_type_graph_array(
+		$series_suffix,
+		$data_module_graph
+	);
 
 	$array_events_alerts[$series_suffix] = $events;
 }
@@ -779,6 +770,11 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 
 	$data_module_graph['series_suffix'] = $series_suffix;
 
+
+
+html_debug_print($color);
+
+
 	// Check available data
 	if ($show_elements_graph['compare'] === 'separated') {
 		if (!empty($array_data)) {
@@ -845,6 +841,27 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 
 return $return;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 //de aki al final eliminar;
 
 	enterprise_include_once("include/functions_reporting.php");
@@ -1058,101 +1075,258 @@ function graph_get_formatted_date($timestamp, $format1, $format2) {
  * 
  * @return Mixed 
  */
-function graphic_combined_module ($module_list, $weight_list, $period,
-	$width, $height, $title, $unit_name, $show_events = 0,
-	$show_alerts = 0, $pure = 0, $stacked = 0, $date = 0,
-	$only_image = false, $homeurl = '', $ttl = 1, $projection = false,
-	$prediction_period = false, $background_color = 'white',
-	$name_list = array(), $unit_list = array(), $show_last = true, $show_max = true,
-	$show_min = true, $show_avg = true, $labels = array(), $dashboard = false,
-	$vconsole = false, $percentil = null, $from_interface = false, 
-	$id_widget_dashboard=false, $fullscale = false, $summatory = 0, $average = 0, $modules_series = 0) {
-	
+function graphic_combined_module ( $module_list, $weight_list, $period, $width, $height, $title, $unit_name,
+	$show_events = 0, $show_alerts = 0, $pure = 0, $stacked = 0, $date = 0, $only_image = false, $homeurl = '',
+	$ttl = 1, $projection = false, $prediction_period = false, $backgroundColor = 'white', $name_list = array(),
+	$unit_list = array(), $show_last = true, $show_max = true, $show_min = true, $show_avg = true, $labels = array(),
+	$dashboard = false, $vconsole = false, $percentil = null, $from_interface = false, $id_widget_dashboard=false,
+	$fullscale = false, $summatory = 0, $average = 0, $modules_series = 0 ) {
+
 	global $config;
 	global $graphic_type;
+	global $legend;
+	global $array_data;
 
-	if(!$fullscale || $stacked >= 4){
-		
-		$fullscale = 0;
-		$time_format_2 = '';
-		$temp_range = $period;
-		$unit_list_aux = array();
-	
-		if ($projection != false) {
-			if ($period < $prediction_period)
-				$temp_range = $prediction_period;
-		}
-		
-		// Set the title and time format
-		if ($temp_range <= SECONDS_1DAY) {
-			$time_format = 'Y M d H:i:s';
-		}
-		elseif ($temp_range < SECONDS_15DAYS) {
-			$time_format = 'Y M d';
-			$time_format_2 = 'H:i';
-			if ($projection != false) {
-				$time_format_2 = 'H\h';
+	$array_data  = array();
+	$legend      = array();
+	$caption     = array();
+	$series_type = array();
+
+	//date start final period
+	if($date == 0){
+		$date = get_system_time();
+	}
+
+	//XXX colocar
+/*
+	$weight_list
+	$stacked
+	$prediction_period
+	$name_list
+	$unit_list
+	$show_last
+	$show_max
+	$show_min
+	$show_avg
+	$labels
+	$from_interface
+	$summatory
+	$average
+	$modules_series
+*/
+
+	$date_array = array();
+	$date_array["period"]     = $period;
+	$date_array["final_date"] = $date;
+	$date_array["start_date"] = $date - $period;
+
+	//show elements in the graph
+	$menu = true;
+	if ($vconsole){
+		$menu = false;
+	}
+
+	$show_elements_graph = array();
+	$show_elements_graph['show_events']  = $show_events;
+	$show_elements_graph['show_alerts']  = $show_alerts;
+	$show_elements_graph['show_unknown'] = false; // dont use
+	$show_elements_graph['avg_only']     = false; // dont use
+	$show_elements_graph['fullscale']    = $fullscale;
+//XXXX
+	$show_elements_graph['show_title']   = $show_title; // dont use
+
+	$show_elements_graph['menu']         = $menu; // dont use
+	$show_elements_graph['adapt_key']    = ''; // dont use
+	$show_elements_graph['percentil']    = $percentil;
+	$show_elements_graph['projection']   = $projection;
+	$show_elements_graph['compare']      = false; //dont use
+	$show_elements_graph['dashboard']    = $dashboard;
+	$show_elements_graph['vconsole']     = $vconsole;
+	$show_elements_graph['pure']         = $pure;
+	$show_elements_graph['baseline']     = false; //dont use
+	$show_elements_graph['only_image']   = $only_image;
+	$show_elements_graph['return_data']  = true; //dont use
+	$show_elements_graph['id_widget']    = $id_widget_dashboard;
+
+
+
+	$format_graph = array();
+	$format_graph['width']      = $width;
+	$format_graph['height']     = $height;
+//XXXX
+	$format_graph['type_graph'] = $type_graph; //dont use
+
+	$format_graph['unit_name']  = $unit_name;
+	$format_graph['unit']       = ''; //dont use
+
+	$format_graph['title']      = $title;
+	$format_graph['homeurl']    = $homeurl;
+	$format_graph['ttl']        = $ttl;
+	$format_graph['background'] = $backgroundColor;
+	$format_graph['font']       = $config['fontpath'];
+	$format_graph['font-size']  = $config['font_size'];
+
+
+	$i=0;
+	foreach ($module_list as $key => $agent_module_id) {
+
+		$module_data = db_get_row_sql (
+			'SELECT * FROM tagente_modulo
+			WHERE id_agente_modulo = ' .
+			$agent_module_id
+		);
+
+		$data_module_graph = array();
+		$data_module_graph['history_db']     = db_search_in_history_db($date_array["start_date"]);
+		$data_module_graph['agent_name']     = modules_get_agentmodule_agent_name ($agent_module_id);
+		$data_module_graph['agent_id']       = $module_data['id_agente'];
+		$data_module_graph['module_name']    = $module_data['nombre'];
+		$data_module_graph['id_module_type'] = $module_data['id_tipo_modulo'];
+		$data_module_graph['module_type']    = modules_get_moduletype_name ($data_module_graph['id_module_type']);
+		$data_module_graph['uncompressed']   = is_module_uncompressed ($data_module_graph['module_type']);
+		$data_module_graph['w_min']    		 = $module_data['min_warning'];
+		$data_module_graph['w_max']   		 = $module_data['max_warning'];
+		$data_module_graph['w_inv']    		 = $module_data['warning_inverse'];
+		$data_module_graph['c_min']    		 = $module_data['min_critical'];
+		$data_module_graph['c_max']    		 = $module_data['max_critical'];
+		$data_module_graph['c_inv']    		 = $module_data['critical_inverse'];
+
+		grafico_modulo_sparse_data(
+			$agent_module_id,
+			$date_array,
+			$data_module_graph,
+			$show_elements_graph,
+			$format_graph,
+			array(),
+			$i,
+			$data_module_graph['agent_name']
+		);
+
+		$series_suffix     = $i;
+		$series_suffix_str = '';
+
+		$max = $array_data['sum' . $i]['max'];
+		$min = $array_data['sum' . $i]['min'];
+		$avg = $array_data['sum' . $i]['avg'];
+
+		$percentil_value = $array_data['percentil' . $i]['data'][0][1];
+
+		$color = color_graph_array(
+			$series_suffix,
+			$show_elements_graph['flag_overlapped']
+		);
+
+		foreach ($color as $k => $v) {
+			if(is_array($array_data[$k])){
+				$array_data[$k]['color'] = $v['color'];
 			}
 		}
-		elseif ($temp_range <= SECONDS_1MONTH) {
-			$time_format = 'Y M d';
-			$time_format_2 = 'H\h';
+
+		legend_graph_array(
+			$max, $min, $avg,
+			$series_suffix,
+			$str_series_suffix,
+			$format_graph,
+			$show_elements_graph,
+			$percentil_value,
+			$data_module_graph
+		);
+
+		series_type_graph_array(
+			$series_suffix,
+			$data_module_graph
+		);
+
+		//$array_events_alerts[$series_suffix] = $events;
+		$i++;
+	}
+
+	html_debug_print($legend);
+	html_debug_print($series_type);
+/*
+	foreach ($data_array_prepare as $key => $value) {
+		foreach ($value as $k => $v) {
+			$data_array[$k] = $v;
 		}
-		elseif ($temp_range <= SECONDS_1MONTH) {
-			$time_format = 'Y M d';
-			$time_format_2 = 'H\h';
-		}
-		elseif ($period < SECONDS_6MONTHS) {
-			$time_format = 'Y M d';
-			$time_format_2 = 'H\h';
-		}
-		else {
-			$time_format = "Y M d";
-			$time_format_2 = 'H\h';
-		}
-		
-		// Set variables
-		if ($date == 0)
-			$date = get_system_time();
-		$datelimit = $date - $period;
-		
-		$resolution = $config['graph_res'] * 50; //Number of points of the graph
-		if($resolution > $period){
-			$resolution = $period;
-		}
-		$interval = (int) ($period / $resolution);
-		
-		// If projection graph, fill with zero previous data to projection interval	
+	}
+*/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+///XXXXXXX esto lo que hay de aki para abajo
+
+/*
+		// If projection graph, fill with zero previous data to projection interval
 		if ($projection != false) {
 			$j = $datelimit;
 			$in_range = true;
 			while ($in_range) {
 				$timestamp_f = graph_get_formatted_date($j, $time_format, $time_format_2);
-				
+
 				$before_projection[$timestamp_f] = 0;
-				
+
 				if ($j > $date) {
 					$in_range = false;
 				}
 				$j = $j + $interval;
 			}
 		}
-		
+
 		// Added support for projection graphs (normal_module + 1(prediction data))
-		if ($projection !== false) { 
+		if ($projection !== false) {
 			$module_number = count ($module_list) + 1;
 		}
 		else {
 			$module_number = count ($module_list);
 		}
-		
+
 		$names_number = count($name_list);
 		$units_number = count($unit_list);
-		
+*/
 		// interval - This is the number of "rows" we are divided the time to fill data.
 		//    more interval, more resolution, and slower.
 		// periodo - Gap of time, in seconds. This is now to (now-periodo) secs
-		
 		// Init weights
 		for ($i = 0; $i < $module_number; $i++) {
 			if (! isset ($weight_list[$i])) {
@@ -1171,7 +1345,6 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 			$long_index[$timestamp_short] = date(
 			html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
 			$timestamp = $timestamp_short;*/
-			
 			$graph[$timestamp]['count'] = 0;
 			$graph[$timestamp]['timestamp_bottom'] = $timestamp;
 			$graph[$timestamp]['timestamp_top'] = $timestamp + $interval;
@@ -1180,25 +1353,25 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 			$graph[$timestamp]['event'] = 0;
 			$graph[$timestamp]['alert'] = 0;
 		}
-		$long_index = array();
-		
-		$graph_values = array();
-		$module_name_list = array();
-		$collector = 0;
-		$user = users_get_user_by_id($config['id_user']);
+
+		$long_index        = array();
+		$graph_values      = array();
+		$module_name_list  = array();
+		$collector         = 0;
+		$user              = users_get_user_by_id($config['id_user']);
 		$user_flash_charts = $user['flash_chart'];
-		
+
 		if ($user_flash_charts == 1)
 			$flash_charts = true;
 		elseif($user_flash_charts == -1)
 			$flash_charts = $config['flash_charts'];
 		elseif($user_flash_charts == 0)
 			$flash_charts = false;
-		
+
 		if ($only_image) {
 			$flash_charts = false;
 		}
-		
+
 		// Calculate data for each module
 		for ($i = 0; $i < $module_number; $i++) {
 			$automatic_custom_graph_meta = false;
@@ -1210,7 +1383,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 					$automatic_custom_graph_meta = true;
 				}
 			}
-			
+
 			$search_in_history_db = db_search_in_history_db($datelimit);
 			
 			// If its a projection graph,
@@ -1397,6 +1570,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 			// Calculate chart data
 			$last_known = $previous_data;
 			for ($l = 0; $l <= $resolution; $l++) {
+
 				$countAvg ++;
 				
 				$timestamp = $datelimit + ($interval * $l);
@@ -1560,11 +1734,11 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 				}
 			}
 		}
-		
+
 		$temp = array();
-		
-		if ($flash_charts === false && $stacked == CUSTOM_GRAPH_GAUGE) 
-			$stacked = CUSTOM_GRAPH_BULLET_CHART;	
+
+		if ($flash_charts === false && $stacked == CUSTOM_GRAPH_GAUGE)
+			$stacked = CUSTOM_GRAPH_BULLET_CHART;
 		switch ($stacked) {
 			case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD:
 			case CUSTOM_GRAPH_BULLET_CHART:
@@ -1596,14 +1770,14 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 							$automatic_custom_graph_meta = true;
 						}
 					}
-					
+
 					if ($automatic_custom_graph_meta)
 						$module = $module_item['module'];
 					else
 						$module = $module_item;
-					
+
 					$search_in_history_db = db_search_in_history_db($datelimit);
-					
+
 					$temp[$module] = modules_get_agentmodule($module);
 					$query_last_value = sprintf('
 						SELECT datos
@@ -1613,7 +1787,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 							ORDER BY utimestamp DESC',
 						$module, $date);
 					$temp_data = db_get_value_sql($query_last_value);
-									
+
 					if ($temp_data) {
 						if (is_numeric($temp_data))
 							$value = $temp_data;
@@ -1626,15 +1800,14 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 						else
 							$value = false;
 					}
-					
+
 					if ( !empty($labels) && isset($labels[$module]) ){
 	                    $label = io_safe_input($labels[$module]);
 	                }else{
 						$alias = db_get_value ("alias","tagente","id_agente",$temp[$module]['id_agente']);
 	                    $label = $alias . ': ' . $temp[$module]['nombre'];
 	                }
-						
-					
+
 					$temp[$module]['label'] = $label;
 					$temp[$module]['value'] = $value;
 					$temp_max = reporting_get_agentmodule_data_max($module,$period,$date);
@@ -1650,21 +1823,21 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 					if ($temp_min < 0)
 						$temp_min = 0;
 					$temp[$module]['min'] = ($temp_min === false) ? 0 : $temp_min;
-					
+
 					if ($config['metaconsole']) {
 						// Automatic custom graph from the report template in metaconsole
 						if (is_array($module_list[0])) {
 							metaconsole_restore_db();
 						}
 					}
-					
+
 				}
-				
+
 				break;
 			case CUSTOM_GRAPH_HBARS:
 			case CUSTOM_GRAPH_VBARS:
 				$datelimit = $date - $period;
-				
+
 				$label = '';
 				foreach ($module_list as $module_item) {
 					$automatic_custom_graph_meta = false;
@@ -1676,12 +1849,12 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 							$automatic_custom_graph_meta = true;
 						}
 					}
-					
+
 					if ($automatic_custom_graph_meta)
 						$module = $module_item['module'];
 					else
 						$module = $module_item;
-					
+
 					$module_data = modules_get_agentmodule($module);
 					$query_last_value = sprintf('
 						SELECT datos
@@ -1691,27 +1864,25 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 							ORDER BY utimestamp DESC',
 						$module, $date);
 					$temp_data = db_get_value_sql($query_last_value);
-					
+
 					$agent_name = io_safe_output(
 						modules_get_agentmodule_agent_name ($module));
-					
+
 					if (!empty($labels) && isset($labels[$module]) ){
 	                    $label = $labels[$module];
 	                }else {
 						$alias = db_get_value ("alias","tagente","id_agente",$module_data['id_agente']);
 	                    $label = $alias . " - " .$module_data['nombre'];
 	                }
-						
+
 					$temp[$label]['g'] = round($temp_data,4);
-					
-					
+
 					if ($config['metaconsole']) {
 						// Automatic custom graph from the report template in metaconsole
 						if (is_array($module_list[0])) {
 							metaconsole_restore_db();
 						}
 					}
-					
 				}
 				break;
 			case CUSTOM_GRAPH_PIE:
@@ -1727,12 +1898,12 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 							$automatic_custom_graph_meta = true;
 						}
 					}
-					
+
 					if ($automatic_custom_graph_meta)
 						$module = $module_item['module'];
 					else
 						$module = $module_item;
-					
+
 					$data_module = modules_get_agentmodule($module);
 					$query_last_value = sprintf('
 						SELECT datos
@@ -1743,7 +1914,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 							ORDER BY utimestamp DESC',
 						$module, $datelimit, $date);
 					$temp_data = db_get_value_sql($query_last_value);
-					
+
 					if ( $temp_data ){
 						if (is_numeric($temp_data))
 							$value = $temp_data;
@@ -1761,7 +1932,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 						$alias = db_get_value ("alias","tagente","id_agente",$data_module['id_agente']);
 						$label = io_safe_output($alias . ": " . $data_module['nombre']);
 					}
-					
+
 					$temp[$label] = array('value'=>$value,
 											'unit'=>$data_module['unit']);
 					if ($config['metaconsole']) {
@@ -1772,7 +1943,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 					}
 				}
 				$temp['total_modules'] = $total_modules;
-				
+
 				break;
 			case CUSTOM_GRAPH_GAUGE:
 				$datelimit = $date - $period;
@@ -1787,12 +1958,12 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 							$automatic_custom_graph_meta = true;
 						}
 					}
-					
+
 					if ($automatic_custom_graph_meta)
 						$module = $module_item['module'];
 					else
 						$module = $module_item;
-					
+
 					$temp[$module] = modules_get_agentmodule($module);
 					$query_last_value = sprintf('
 						SELECT datos
@@ -1812,10 +1983,10 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 						$value = false;
 					}
 					$temp[$module]['label'] = ($labels[$module] != '') ? $labels[$module] : $temp[$module]['nombre'];
-					
+
 					$temp[$module]['value'] = $value;
 					$temp[$module]['label'] = ui_print_truncate_text($temp[$module]['label'],"module_small",false,true,false,"..");
-					
+
 					if ($temp[$module]['unit'] == '%') {
 						$temp[$module]['min'] =	0;
 						$temp[$module]['max'] = 100;
@@ -1830,7 +2001,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 						$temp[$module]['max'] = ($max == 0 ) ? 100 : $max;
 					}
 					$temp[$module]['gauge'] = uniqid('gauge_');
-					
+
 					if ($config['metaconsole']) {
 						// Automatic custom graph from the report template in metaconsole
 						if (is_array($module_list[0])) {
@@ -1846,7 +2017,6 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 						foreach ($point as $timestamp_point => $point_value) {
 							$temp[$timestamp_point][$graph_group] = $point_value;
 						}
-						
 						$percentile_value = get_percentile($config['percentil'], $point);
 						$percentil_result[$graph_group] = array_fill ( 0, count($point), $percentile_value);
 						$series_type[$graph_group] = 'line';
@@ -1876,8 +2046,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 				}
 				break;
 		}
-	}
-	else{
+/*
 		$flash_charts = true;
 		if($ttl>1 || !$config['flash_charts']){
 			$flash_charts = false;
@@ -1952,23 +2121,23 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 				$series_type[$key] = 'line';
 			}
 		}
-	}
+*/
 
 	$graph_values = $temp;
-	
+
 	if($config["fixed_graph"] == false){
 		$water_mark = array(
 			'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
 			'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
 	}
-	
+
 	//Work around for fixed the agents name with huge size chars.
 	$fixed_font_size = $config['font_size'];
-	
+
 	//Set graph color
-	
+/*
 	$color = array();
-	
+
 	$color[0] = array('border' => '#000000',
 		'color' => $config['graph_color1'],
 		'alpha' => CHART_DEFAULT_ALPHA);
@@ -2014,7 +2183,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 	$color[15] = array('border' => '#000000',
 		'color' => COL_GRAPH13,
 		'alpha' => CHART_DEFAULT_ALPHA);
-		
+*/
 	if($id_widget_dashboard){
 		$opcion = unserialize(db_get_value_filter('options','twidget_dashboard',array('id' => $id_widget_dashboard)));
 		foreach ($module_list as $key => $value) {
@@ -2023,7 +2192,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 			}
 		}
 	}
-	
+
 	$threshold_data = array();
 
 	if ($from_interface) {
@@ -2120,7 +2289,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 				}
 			}
 		}
-		
+
 		if ($do_it_warning_min && $do_it_warning_max && $do_it_warning_inverse) {
 			$yellow_threshold = $compare_warning;
 			$threshold_data['yellow_up'] = $yellow_up;
@@ -2133,12 +2302,12 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 			$threshold_data['red_inverse'] = (bool)$red_inverse;
 		}
 	}
-	
+
 	//summatory and average series
 	if($stacked == CUSTOM_GRAPH_AREA  || $stacked == CUSTOM_GRAPH_LINE) {
 		//Fix pdf label
 		$static_pdf = strpos($module_name_list[0], '<span style');
-		
+
 		if($summatory && $average) {
 			foreach ($graph_values as $key => $value) {
 				$cont = count($value);
@@ -2150,7 +2319,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 					array_splice($graph_values[$key],0,count($graph_values[$key])-2);
 				}
 			}
-			
+
 			if(!$modules_series) {
 				if(empty($percentil)) {
 					array_splice($module_name_list,0,count($module_name_list));
@@ -2164,7 +2333,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 					array_unshift($module_name_list, __('summatory'));
 					array_unshift($module_name_list, __('average'));
 				}
-				
+
 			} else {
 				if(empty($percentil)) {
 					if($static_pdf === 0) {
@@ -2174,7 +2343,6 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 						array_push($module_name_list, __('summatory'));
 						array_push($module_name_list, __('average'));
 					}
-					
 				} else {
 					if($static_pdf === 0) {
 						array_splice($module_name_list,(count($module_name_list)/2),0,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
@@ -2183,11 +2351,8 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 						array_splice($module_name_list,(count($module_name_list)/2),0, __('average'));
 						array_splice($module_name_list,(count($module_name_list)/2),0,__('summatory'));
 					}
-					
 				}
-				
 			}
-			
 		} elseif($summatory) {
 			foreach ($graph_values as $key => $value) {
 				array_push($value,array_sum($value));
@@ -2208,7 +2373,6 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 				} else {
 					array_unshift($module_name_list, __('summatory'));
 				}
-				
 			} else {
 				if(empty($percentil)) {
 					if($static_pdf === 0) {
@@ -2216,17 +2380,14 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 					} else {
 						array_push($module_name_list,__('summatory'));
 					}
-					
 				} else {
 					if($static_pdf === 0) {
 						array_splice($module_name_list,(count($module_name_list)/2),0,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
 					} else {
 						array_splice($module_name_list,(count($module_name_list)/2),0,__('summatory'));
 					}
-					
 				}
 			}
-			
 		} elseif($average) {
 			foreach ($graph_values as $key => $value) {
 				$summ = array_sum($value) / count($value);
@@ -2236,7 +2397,6 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 					array_splice($graph_values[$key],0,count($graph_values[$key])-1);
 				}
 			}
-			
 			if(!$modules_series) {
 				if(empty($percentil)) {
 					array_splice($module_name_list,0,count($module_name_list));
@@ -2248,7 +2408,6 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 				} else {
 					array_unshift($module_name_list,__('average'));
 				}
-				
 			} else {
 				if(empty($percentil)) {
 					if($static_pdf === 0) {
@@ -2256,27 +2415,27 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 					} else {
 						array_push($module_name_list,__('average'));
 					}
-					
 				} else {
 					if($static_pdf === 0) {
 						array_splice($module_name_list,(count($module_name_list)/2),0,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
 					} else {
 						array_splice($module_name_list,(count($module_name_list)/2),0,__('average'));
 					}
-					
 				}
 			}
 		}
 	}
-	
+
 	switch ($stacked) {
 		case CUSTOM_GRAPH_AREA:
-			return area_graph($flash_charts, $graph_values, $width,
-				$height, $color, $module_name_list, $long_index,
-				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				$title, "", $homeurl, $water_mark, $config['fontpath'],
-				$fixed_font_size, $unit, $ttl, array(), array(), $yellow_threshold, $red_threshold,  '',
-				false, '', true, $background_color,$dashboard, $vconsole, 0, $percentil_result, $threshold_data);
+	//	html_debug_print('entra por este sitio');
+	//	html_debug_print($data_array);
+		//$array_data = $data_array;
+			return area_graph($agent_module_id, $array_data, $color,
+				$legend, $series_type, $date_array,
+				$data_module_graph, $show_elements_graph,
+				$format_graph, $water_mark, $series_suffix_str,
+				$array_events_alerts);
 			break;
 		default:
 		case CUSTOM_GRAPH_STACKED_AREA: 
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index be3dbad1a2..65e3b876bc 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -3603,6 +3603,7 @@ function reporting_prediction_date($report, $content) {
 function reporting_projection_graph($report, $content,
 	$type = 'dinamic', $force_width_chart = null,
 	$force_height_chart = null) {
+html_debug_print('esta en esta');
 	
 	global $config;
 	
@@ -6394,7 +6395,7 @@ function reporting_general($report, $content) {
 
 function reporting_custom_graph($report, $content, $type = 'dinamic',
 	$force_width_chart = null, $force_height_chart = null, $type_report = "custom_graph") {
-
+		html_debug_print('esta en esta 2');
 	global $config;
 	
 	require_once ($config["homedir"] . '/include/functions_graph.php');
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 60f7547dcd..9da94faff5 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -855,19 +855,19 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 	}
 }
 
+/*
 function adjust_menu(graph_id, plot, parent_height, width) {
-	/*
+
 	if ($('#'+graph_id+' .xAxis .tickLabel').eq(0).css('width') != undefined) {
 		left_ticks_width = $('#'+graph_id+' .xAxis .tickLabel').eq(0).css('width').split('px')[0];
 	}
 	else {
 		left_ticks_width = 0;
 	}
-	*/
 	var parent_height_new = 0;
 
 	var legend_height = parseInt($('#legend_'+graph_id).css('height').split('px')[0]) + parseInt($('#legend_'+graph_id).css('margin-top').split('px')[0]);
-	
+*/
 	/*
 	if ($('#overview_'+graph_id).css('display') == 'none') {
 		overview_height = 0;
@@ -876,6 +876,7 @@ function adjust_menu(graph_id, plot, parent_height, width) {
 		overview_height = parseInt($('#overview_'+graph_id).css('height').split('px')[0]) + parseInt($('#overview_'+graph_id).css('margin-top').split('px')[0]);
 	}
 	*/
+/*
 	var menu_height = '25';
 
 	if ($('#menu_'+graph_id).height() != undefined && $('#menu_'+graph_id).height() > 20) {
@@ -893,7 +894,10 @@ function adjust_menu(graph_id, plot, parent_height, width) {
 	$('#menu_' + graph_id).show();
 }
 
+
+
 function set_watermark(graph_id, plot, watermark_src) {
+console.log('entra setmark');
 	var img = new Image();
 	img.src = watermark_src;
 	var context = plot.getCanvas().getContext('2d');
@@ -1064,6 +1068,7 @@ function axis_thresholded (threshold_data, y_min, y_max, red_threshold, extremes
 	}
 	return y;
 }
+
 function add_threshold (data_base, threshold_data, y_min, y_max,
 						red_threshold, extremes, red_up) {
 
@@ -1117,7 +1122,7 @@ function reduceText (text, maxLength) {
 	var str_cut = text.substr(0, firstSlideEnd);
 	return str_cut + '...' + text.substr(-firstSlideEnd - 3);
 }
-
+*/
 function pandoraFlotArea(
 	graph_id, values, legend, agent_module_id,
 	series_type, watermark, date_array,
@@ -2300,12 +2305,15 @@ function pandoraFlotArea(
 	if (menu) {
 		var parent_height;
 		$('#menu_overview_' + graph_id).click(function() {
+			$('#overview_' + graph_id).toggle();
+			/*
 			if($('#overview_' + graph_id).css('visibility') == 'visible'){
 				$('#overview_' + graph_id).css('visibility', 'hidden');
 			}
 			else{
 				$('#overview_' + graph_id).css('visibility', 'visible');
 			}
+			*/
 		});
 
 		$("#menu_export_csv_"+graph_id)
@@ -2427,6 +2435,7 @@ function adjust_menu(graph_id, plot, parent_height, width) {
 }
 
 function set_watermark(graph_id, plot, watermark_src) {
+	console.log('entra por la watermark');
 	var img = new Image();
 	img.src = watermark_src;
 	var context = plot.getCanvas().getContext('2d');
@@ -2482,16 +2491,22 @@ function get_event_details (event_ids) {
 	return table;
 }
 
+
+//XXXXXXXXXX
+//Ajusta la grafica pequenña con el desplazamiento del eje y
+
 function adjust_left_width_canvas(adapter_id, adapted_id) {
 	var adapter_left_margin = $('#'+adapter_id+' .yAxis .tickLabel').width();
 	var adapted_pix = $('#'+adapted_id).width();
-	
 	var new_adapted_width = adapted_pix - adapter_left_margin;
-	
 	$('#'+adapted_id).width(new_adapted_width);
 	$('#'+adapted_id).css('margin-left', adapter_left_margin);
 }
 
+
+//XXXXXXXXXXX
+//Ajusta el ancho de la grafica pequeña con respecto a la grande
+
 function update_left_width_canvas(graph_id) {
 	$('#overview_'+graph_id).width($('#'+graph_id).width());
 	$('#overview_'+graph_id).css('margin-left', $('#'+graph_id+' .yAxis .tickLabel').width());
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index edc782f654..40134e8088 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -247,10 +247,10 @@ function flot_area_graph (
 	if($format_graph['type'] == 'area_simple'){
 		$return .= "noresizevc ";
 	}
-
+//XXXXXX  height: ".$format_graph['height']."px;'
 	$return .= "graph" .$format_graph['adapt_key'] ."'
 				style='	width: ".$format_graph['width']."px;
-						height: ".$format_graph['height']."px;'></div>";
+						height: 400px;'></div>";
 
 	if ($show_elements_graph['menu']) {
 		$format_graph['height'] = 100;
@@ -262,10 +262,7 @@ function flot_area_graph (
 	if (!$vconsole){
 		$return .= "<div id='overview_$graph_id'
 						class='overview_graph'
-						style='	 margin:0px; margin-top:30px; margin-bottom:50px;
-							visibility:hidden;
-							width: ".$format_graph['width'].";
-							height: 200px;'></div>";
+						style='margin:0px; margin-top:30px; margin-bottom:50px; display:none; width: ".$format_graph['width']."; height: 200px;'></div>";
 	}
 
 	//XXXXTODO
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index c56f855d6e..8252ff8c90 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -55,11 +55,11 @@ if (file_exists ('../../include/languages/'.$user_language.'.mo')) {
 
 echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>';
 
-$label = get_parameter('label');
-$label = base64_decode($label);
-$id = get_parameter('id');
+$label    = get_parameter('label');
+$label    = base64_decode($label);
+$id       = get_parameter('id');
 $id_agent = db_get_value ("id_agente","tagente_modulo","id_agente_modulo",$id);
-$alias = db_get_value ("alias","tagente","id_agente",$id_agent);
+$alias    = db_get_value ("alias","tagente","id_agente",$id_agent);
 //$agent = agents_get_agent_with_ip ("192.168.50.31");
 //$label = rawurldecode(urldecode(base64_decode(get_parameter('label', ''))));
 ?>
@@ -121,7 +121,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		}
 
 		// ACL
-		$permission = false;
+		$permission  = false;
 		$agent_group = (int) agents_get_agent_group($agent_id);
 		$strict_user = (bool) db_get_value("strict_acl", "tusuario",
 			"id_user", $config['id_user']);
@@ -153,14 +153,13 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		}
 
 		$period = get_parameter ("period");
-		$id = get_parameter ("id", 0);
-		
+		$id     = get_parameter ("id", 0);
+
 //XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 		/*
 		$width = get_parameter ("width", STATWIN_DEFAULT_CHART_WIDTH);
 		$height = get_parameter ("height", STATWIN_DEFAULT_CHART_HEIGHT);
 		*/
-	
 
 		$label = get_parameter ("label", "");
 		$label_graph = base64_decode(get_parameter ("label", ""));
@@ -212,7 +211,6 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 			$height = $height * ($zoom / 2.1);
 			$width = $width * ($zoom / 1.4);
 		}
-		echo "<script type='text/javascript'>window.resizeTo($width + 190, $height + 260);</script>";
 
 		// Build date
 		$date = strtotime("$start_date $start_time");
@@ -480,37 +478,6 @@ ui_include_time_picker(true);
 		$('#checkbox-time_compare_separated').removeAttr('checked');
 	});
 
-	<?php
-	//Resize window when show the overview graph.
-	if ($config['flash_charts']) {
-	?>
-		var show_overview = false;
-		var height_window;
-		var width_window;
-
-		$(window).ready(function() {
-			height_window = window.innerHeight;
-			width_window = window.innerWidth;
-		});
-
-		$("*").filter(function() {
-			if (typeof(this.id) == "string")
-				return this.id.match(/menu_overview_graph.*/);
-			else
-				return false;
-			}).click(function() {
-				if (show_overview) {
-					window.resizeTo(width_window, height_window);
-				}
-				else {
-					window.resizeTo(width_window, height_window + 150);
-				}
-				show_overview = !show_overview;
-			});
-	<?php
-	}
-	?>
-
 	// Add datepicker and timepicker
 	$("#text-start_date").datepicker({
 		dateFormat: "<?php echo DATE_FORMAT_JS; ?>"

From 30dc841bae259ab275082b22414e62b37b0a1f92 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 27 Apr 2018 10:03:05 +0200
Subject: [PATCH 016/146] custom graph

---
 pandora_console/include/functions.php         |  161 +-
 .../include/functions_custom_graphs.php       |   26 +-
 pandora_console/include/functions_graph.php   | 1321 +++++------------
 .../include/graphs/functions_flot.php         |   10 +-
 4 files changed, 477 insertions(+), 1041 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index ab5c20154f..edcb7c9034 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2818,6 +2818,95 @@ function color_graph_array($series_suffix, $compare = false){
 	//////////////////////////////////////////////////
 	// Color commented not to restrict serie colors //
 	//////////////////////////////////////////////////
+	$color_series = array();
+	$color_series[0] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color1'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[1] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color2'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[2] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color3'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[3] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color4'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[4] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color5'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[5] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color6'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[6] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color7'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[7] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color8'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[8] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color9'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[9] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color10'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[11] = array(
+		'border' => '#000000',
+		'color' => COL_GRAPH9,
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[12] = array(
+		'border' => '#000000',
+		'color' => COL_GRAPH10,
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[13] = array(
+		'border' => '#000000',
+		'color' => COL_GRAPH11,
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[14] = array(
+		'border' => '#000000',
+		'color' => COL_GRAPH12,
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+	$color_series[15] = array(
+		'border' => '#000000',
+		'color' => COL_GRAPH13,
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+
+
+/*
+	if($id_widget_dashboard){
+		$opcion = unserialize(db_get_value_filter('options','twidget_dashboard',array('id' => $id_widget_dashboard)));
+		foreach ($module_list as $key => $value) {
+			if(!empty($opcion[$value])){
+				$color[$key]['color'] = $opcion[$value];
+			}
+		}
+	}
+*/
+
 	if(!$compare) {
 		$color['event' . $series_suffix] =
 			array(	'border' => '#ff0000',
@@ -2843,23 +2932,8 @@ function color_graph_array($series_suffix, $compare = false){
 					'alpha' => CHART_DEFAULT_ALPHA
 				);
 
-		$color['max'.$series_suffix] =
-			array(	'border' => '#000000',
-					'color' => $config['graph_color3'],
-					'alpha' => CHART_DEFAULT_ALPHA
-				);
-
 		$color['sum'.$series_suffix] =
-			array(	'border' => '#000000',
-					'color' => $config['graph_color2'],
-					'alpha' => CHART_DEFAULT_ALPHA
-				);
-
-		$color['min'.$series_suffix] =
-			array(	'border' => '#000000',
-					'color' => $config['graph_color1'],
-					'alpha' => CHART_DEFAULT_ALPHA
-				);
+			$color_series[$series_suffix];
 
 		$color['unit'.$series_suffix] =
 			array(	'border' => null,
@@ -2898,23 +2972,8 @@ function color_graph_array($series_suffix, $compare = false){
 					'alpha' => CHART_DEFAULT_ALPHA
 				);
 
-		$color['max'.$series_suffix] =
-			array(	'border' => '#000000',
-					'color' => $config['graph_color3'],
-					'alpha' => CHART_DEFAULT_ALPHA
-				);
-
 		$color['sum'.$series_suffix] =
-			array(	'border' => '#000000',
-					'color' => '#b781c1',
-					'alpha' => CHART_DEFAULT_ALPHA
-				);
-
-		$color['min'.$series_suffix] =
-			array(	'border' => '#000000',
-					'color' => $config['graph_color1'],
-					'alpha' => CHART_DEFAULT_ALPHA
-				);
+			$color_series[$series_suffix];
 
 		$color['unit'.$series_suffix] =
 			array(	'border' => null,
@@ -2927,7 +2986,6 @@ function color_graph_array($series_suffix, $compare = false){
 					'color' => '#003333',
 					'alpha' => CHART_DEFAULT_ALPHA
 				);
-
 	}
 
 	return $color;
@@ -2946,8 +3004,15 @@ function legend_graph_array(
 	global $legend;
 	$unit = $format_graph['unit'];
 
-	$legend['sum'.$series_suffix] =
-		$data_module_graph['module_name'] . ' ' .
+	if (isset($show_elements_graph['labels']) && is_array($show_elements_graph['labels'])){
+		$legend['sum'.$series_suffix] = $show_elements_graph['labels'][$data_module_graph['module_id']] . ' ' ;
+	}
+	else{
+		$legend['sum'.$series_suffix] = $data_module_graph['agent_name']  . ' / ' .
+										$data_module_graph['module_name'] . ': ';
+	}
+
+	$legend['sum'.$series_suffix] .=
 		__('Min:') . remove_right_zeros(
 			number_format(
 				$min,
@@ -2977,13 +3042,25 @@ function legend_graph_array(
 		$legend['alert'.$series_suffix]     = __('Alert') . ' ' . $series_suffix_str;
 	}
 	if($show_elements_graph['percentil']){
-		$legend['percentil'.$series_suffix] = __('Percentil') . ' Value: ' .
-		remove_right_zeros(
-			number_format(
-				$percentil_value,
-				$config['graph_precision']
-			)
-		) . ' ' . $series_suffix_str;
+		$legend['percentil'.$series_suffix] =
+							__('Percentil') . ' ' .
+							$config['percentil']  .
+							'º ' . __('of module') . ' ';
+
+		if (isset($show_elements_graph['labels']) && is_array($show_elements_graph['labels'])){
+			$legend['percentil'.$series_suffix] .= $show_elements_graph['labels'][$data_module_graph['module_id']] . ' ' ;
+		}
+		else{
+			$legend['percentil'.$series_suffix] .= $data_module_graph['agent_name']  . ' / ' .
+													$data_module_graph['module_name'] . ': ' . ' Value: ';
+		}
+
+		$legend['percentil'.$series_suffix] .= remove_right_zeros(
+													number_format(
+														$percentil_value,
+														$config['graph_precision']
+													)
+												) . ' ' . $series_suffix_str;
 	}
 
 	return $legend;
diff --git a/pandora_console/include/functions_custom_graphs.php b/pandora_console/include/functions_custom_graphs.php
index e61b8cf09d..83ffb6e290 100644
--- a/pandora_console/include/functions_custom_graphs.php
+++ b/pandora_console/include/functions_custom_graphs.php
@@ -168,9 +168,8 @@ function custom_graphs_print($id_graph, $height, $width, $period,
 	$dashboard = false, $vconsole = false, $percentil = null, 
 	$from_interface = false,$id_widget_dashboard=false, $fullscale = false) {
 
-		html_debug_print('esta en esta otro arch');
 	global $config;
-	
+
 	if ($from_interface) {
 		if ($config["type_interface_charts"] == 'line') {
 			$graph_conf['stacked'] = CUSTOM_GRAPH_LINE;
@@ -187,29 +186,29 @@ function custom_graphs_print($id_graph, $height, $width, $period,
 			$graph_conf = db_get_row('tgraph', 'id_graph', $id_graph);
 		}
 	}
-	
+
 	if ($stacked === null) {
 		$stacked = $graph_conf['stacked'];
 	}
-	
+
 	$sources = false;
 	if ($id_graph == 0) {
 		$modules = $modules_param;
 		$count_modules = count($modules);
 		$weights = array_fill(0, $count_modules, 1);
-		
+
 		if ($count_modules > 0)
 			$sources = true;
 	}
 	else {
 		$sources = db_get_all_rows_field_filter('tgraph_source', 'id_graph',
 			$id_graph);
-		
+
 		$series = db_get_all_rows_sql('SELECT summatory_series,average_series,modules_series FROM tgraph WHERE id_graph = '.$id_graph);
 		$summatory = $series[0]['summatory_series'];
 		$average = $series[0]['average_series'];
 		$modules_series = $series[0]['modules_series'];
-		
+
 		$modules = array ();
 		$weights = array ();
 		$labels = array ();
@@ -224,22 +223,21 @@ function custom_graphs_print($id_graph, $height, $width, $period,
 			}
 		}
 	}
-		
-	
+
 	if ($sources === false) {
 		if ($return){
 			return false;
 		}
-		else{	
+		else{
 			ui_print_info_message ( array ( 'no_close' => true, 'message' =>  __('No items.') ) );
 			return;
 		}
 	}
-	
+
 	if (empty($homeurl)) {
 		$homeurl = ui_get_full_url(false, false, false, false);
 	}
-	
+
 	$output = graphic_combined_module($modules,
 		$weights,
 		$period,
@@ -273,8 +271,8 @@ function custom_graphs_print($id_graph, $height, $width, $period,
 		$fullscale,
 		$summatory,
 		$average,
-		$modules_series);	
-	
+		$modules_series);
+
 	if ($return)
 		return $output;
 	echo $output;
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 51b67ecf68..8a749ee4aa 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1072,8 +1072,8 @@ function graph_get_formatted_date($timestamp, $format1, $format2) {
  * @param bool Show the max value of the item on the list.
  * @param bool Show the min value of the item on the list.
  * @param bool Show the average value of the item on the list.
- * 
- * @return Mixed 
+ *
+ * @return Mixed
  */
 function graphic_combined_module ( $module_list, $weight_list, $period, $width, $height, $title, $unit_name,
 	$show_events = 0, $show_alerts = 0, $pure = 0, $stacked = 0, $date = 0, $only_image = false, $homeurl = '',
@@ -1085,12 +1085,11 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 	global $config;
 	global $graphic_type;
 	global $legend;
-	global $array_data;
+	global $series_type;
 
-	$array_data  = array();
-	$legend      = array();
-	$caption     = array();
-	$series_type = array();
+	$legend        = array();
+	$caption       = array();
+	$series_type   = array();
 
 	//date start final period
 	if($date == 0){
@@ -1099,7 +1098,6 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 
 	//XXX colocar
 /*
-	$weight_list
 	$stacked
 	$prediction_period
 	$name_list
@@ -1108,13 +1106,17 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 	$show_max
 	$show_min
 	$show_avg
-	$labels
 	$from_interface
 	$summatory
 	$average
 	$modules_series
 */
 
+html_debug_print($stacked);
+html_debug_print($name_list);
+html_debug_print($unit_list);
+html_debug_print($from_interface);
+
 	$date_array = array();
 	$date_array["period"]     = $period;
 	$date_array["final_date"] = $date;
@@ -1147,8 +1149,7 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 	$show_elements_graph['only_image']   = $only_image;
 	$show_elements_graph['return_data']  = true; //dont use
 	$show_elements_graph['id_widget']    = $id_widget_dashboard;
-
-
+	$show_elements_graph['labels']       = $labels;
 
 	$format_graph = array();
 	$format_graph['width']      = $width;
@@ -1166,8 +1167,24 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 	$format_graph['font']       = $config['fontpath'];
 	$format_graph['font-size']  = $config['font_size'];
 
+	/*
+	$user              = users_get_user_by_id($config['id_user']);
+	$user_flash_charts = $user['flash_chart'];
+
+	if ($user_flash_charts == 1)
+		$flash_charts = true;
+	elseif($user_flash_charts == -1)
+		$flash_charts = $config['flash_charts'];
+	elseif($user_flash_charts == 0)
+		$flash_charts = false;
+
+	if ($only_image) {
+		$flash_charts = false;
+	}
+	*/
 
 	$i=0;
+	$array_data = array();
 	foreach ($module_list as $key => $agent_module_id) {
 
 		$module_data = db_get_row_sql (
@@ -1190,8 +1207,10 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 		$data_module_graph['c_min']    		 = $module_data['min_critical'];
 		$data_module_graph['c_max']    		 = $module_data['max_critical'];
 		$data_module_graph['c_inv']    		 = $module_data['critical_inverse'];
+		$data_module_graph['module_id']      = $agent_module_id;
 
-		grafico_modulo_sparse_data(
+		//stract data
+		$array_data_module = grafico_modulo_sparse_data(
 			$agent_module_id,
 			$date_array,
 			$data_module_graph,
@@ -1205,6 +1224,16 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 		$series_suffix     = $i;
 		$series_suffix_str = '';
 
+		//convert to array graph and weight
+		foreach ($array_data_module as $key => $value) {
+			$array_data[$key] = $value;
+			if($weight_list[$i] > 1){
+				foreach ($value['data'] as $k => $v) {
+					$array_data[$key]['data'][$k][1] = $v[1] * $weight_list[$i];
+				}
+			}
+		}
+
 		$max = $array_data['sum' . $i]['max'];
 		$min = $array_data['sum' . $i]['min'];
 		$avg = $array_data['sum' . $i]['avg'];
@@ -1237,59 +1266,297 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 			$data_module_graph
 		);
 
+		if($config["fixed_graph"] == false){
+			$water_mark = array(
+				'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
+				'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
+		}
+
+		//Work around for fixed the agents name with huge size chars.
+		$fixed_font_size = $config['font_size'];
+
 		//$array_events_alerts[$series_suffix] = $events;
 		$i++;
 	}
 
-	html_debug_print($legend);
-	html_debug_print($series_type);
-/*
-	foreach ($data_array_prepare as $key => $value) {
-		foreach ($value as $k => $v) {
-			$data_array[$k] = $v;
-		}
+	if ($flash_charts === false && $stacked == CUSTOM_GRAPH_GAUGE)
+		$stacked = CUSTOM_GRAPH_BULLET_CHART;
+
+	switch ($stacked) {
+		case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD:
+		case CUSTOM_GRAPH_BULLET_CHART:
+			$datelimit = $date - $period;
+			if($stacked == CUSTOM_GRAPH_BULLET_CHART_THRESHOLD){
+				$acumulador = 0;
+				foreach ($module_list as $module_item) {
+					$module = $module_item;
+					$query_last_value = sprintf('
+						SELECT datos
+						FROM tagente_datos
+						WHERE id_agente_modulo = %d
+							AND utimestamp < %d
+							ORDER BY utimestamp DESC',
+						$module, $date);
+					$temp_data = db_get_value_sql($query_last_value);
+					if ($acumulador < $temp_data){
+						$acumulador = $temp_data;
+					}
+				}
+			}
+			foreach ($module_list as $module_item) {
+				$automatic_custom_graph_meta = false;
+				if ($config['metaconsole']) {
+					// Automatic custom graph from the report template in metaconsole
+					if (is_array($module_list[$i])) {
+						$server = metaconsole_get_connection_by_id ($module_item['server']);
+						metaconsole_connect($server);
+						$automatic_custom_graph_meta = true;
+					}
+				}
+
+				if ($automatic_custom_graph_meta)
+					$module = $module_item['module'];
+				else
+					$module = $module_item;
+
+				$search_in_history_db = db_search_in_history_db($datelimit);
+
+				$temp[$module] = modules_get_agentmodule($module);
+				$query_last_value = sprintf('
+					SELECT datos
+					FROM tagente_datos
+					WHERE id_agente_modulo = %d
+						AND utimestamp < %d
+						ORDER BY utimestamp DESC',
+					$module, $date);
+				$temp_data = db_get_value_sql($query_last_value);
+
+				if ($temp_data) {
+					if (is_numeric($temp_data))
+						$value = $temp_data;
+					else
+						$value = count($value);
+				}
+				else {
+					if ($flash_charts === false)
+						$value = 0;
+					else
+						$value = false;
+				}
+
+				if ( !empty($labels) && isset($labels[$module]) ){
+					$label = io_safe_input($labels[$module]);
+				}else{
+					$alias = db_get_value ("alias","tagente","id_agente",$temp[$module]['id_agente']);
+					$label = $alias . ': ' . $temp[$module]['nombre'];
+				}
+
+				$temp[$module]['label'] = $label;
+				$temp[$module]['value'] = $value;
+				$temp_max = reporting_get_agentmodule_data_max($module,$period,$date);
+				if ($temp_max < 0)
+					$temp_max = 0;
+				if (isset($acumulador)){
+					$temp[$module]['max'] = $acumulador;
+				}else{
+					$temp[$module]['max'] = ($temp_max === false) ? 0 : $temp_max;
+				}
+
+				$temp_min = reporting_get_agentmodule_data_min($module,$period,$date);
+				if ($temp_min < 0)
+					$temp_min = 0;
+				$temp[$module]['min'] = ($temp_min === false) ? 0 : $temp_min;
+
+				if ($config['metaconsole']) {
+					// Automatic custom graph from the report template in metaconsole
+					if (is_array($module_list[0])) {
+						metaconsole_restore_db();
+					}
+				}
+
+			}
+
+			break;
+		case CUSTOM_GRAPH_HBARS:
+		case CUSTOM_GRAPH_VBARS:
+			$datelimit = $date - $period;
+
+			$label = '';
+			foreach ($module_list as $module_item) {
+				$automatic_custom_graph_meta = false;
+				if ($config['metaconsole']) {
+					// Automatic custom graph from the report template in metaconsole
+					if (is_array($module_list[$i])) {
+						$server = metaconsole_get_connection_by_id ($module_item['server']);
+						metaconsole_connect($server);
+						$automatic_custom_graph_meta = true;
+					}
+				}
+
+				if ($automatic_custom_graph_meta)
+					$module = $module_item['module'];
+				else
+					$module = $module_item;
+
+				$module_data = modules_get_agentmodule($module);
+				$query_last_value = sprintf('
+					SELECT datos
+					FROM tagente_datos
+					WHERE id_agente_modulo = %d
+						AND utimestamp < %d
+						ORDER BY utimestamp DESC',
+					$module, $date);
+				$temp_data = db_get_value_sql($query_last_value);
+
+				$agent_name = io_safe_output(
+					modules_get_agentmodule_agent_name ($module));
+
+				if (!empty($labels) && isset($labels[$module]) ){
+					$label = $labels[$module];
+				}else {
+					$alias = db_get_value ("alias","tagente","id_agente",$module_data['id_agente']);
+					$label = $alias . " - " .$module_data['nombre'];
+				}
+
+				$temp[$label]['g'] = round($temp_data,4);
+
+				if ($config['metaconsole']) {
+					// Automatic custom graph from the report template in metaconsole
+					if (is_array($module_list[0])) {
+						metaconsole_restore_db();
+					}
+				}
+			}
+			break;
+		case CUSTOM_GRAPH_PIE:
+			$datelimit = $date - $period;
+			$total_modules = 0;
+			foreach ($module_list as $module_item) {
+				$automatic_custom_graph_meta = false;
+				if ($config['metaconsole']) {
+					// Automatic custom graph from the report template in metaconsole
+					if (is_array($module_list[$i])) {
+						$server = metaconsole_get_connection_by_id ($module_item['server']);
+						metaconsole_connect($server);
+						$automatic_custom_graph_meta = true;
+					}
+				}
+
+				if ($automatic_custom_graph_meta)
+					$module = $module_item['module'];
+				else
+					$module = $module_item;
+
+				$data_module = modules_get_agentmodule($module);
+				$query_last_value = sprintf('
+					SELECT datos
+					FROM tagente_datos
+					WHERE id_agente_modulo = %d
+						AND utimestamp > %d
+						AND utimestamp < %d
+						ORDER BY utimestamp DESC',
+					$module, $datelimit, $date);
+				$temp_data = db_get_value_sql($query_last_value);
+
+				if ( $temp_data ){
+					if (is_numeric($temp_data))
+						$value = $temp_data;
+					else
+						$value = count($value);
+				}
+				else {
+					$value = false;
+				}
+				$total_modules += $value;
+
+				if ( !empty($labels) && isset($labels[$module]) ){
+					$label = io_safe_output($labels[$module]);
+				}else {
+					$alias = db_get_value ("alias","tagente","id_agente",$data_module['id_agente']);
+					$label = io_safe_output($alias . ": " . $data_module['nombre']);
+				}
+
+				$temp[$label] = array('value'=>$value,
+										'unit'=>$data_module['unit']);
+				if ($config['metaconsole']) {
+					// Automatic custom graph from the report template in metaconsole
+					if (is_array($module_list[0])) {
+						metaconsole_restore_db();
+					}
+				}
+			}
+			$temp['total_modules'] = $total_modules;
+
+			break;
+		case CUSTOM_GRAPH_GAUGE:
+			$datelimit = $date - $period;
+			$i = 0;
+			foreach ($module_list as $module_item) {
+				$automatic_custom_graph_meta = false;
+				if ($config['metaconsole']) {
+					// Automatic custom graph from the report template in metaconsole
+					if (is_array($module_list[$i])) {
+						$server = metaconsole_get_connection_by_id ($module_item['server']);
+						metaconsole_connect($server);
+						$automatic_custom_graph_meta = true;
+					}
+				}
+
+				if ($automatic_custom_graph_meta)
+					$module = $module_item['module'];
+				else
+					$module = $module_item;
+
+				$temp[$module] = modules_get_agentmodule($module);
+				$query_last_value = sprintf('
+					SELECT datos
+					FROM tagente_datos
+					WHERE id_agente_modulo = %d
+						AND utimestamp < %d
+						ORDER BY utimestamp DESC',
+					$module, $date);
+				$temp_data = db_get_value_sql($query_last_value);
+				if ( $temp_data ) {
+					if (is_numeric($temp_data))
+						$value = $temp_data;
+					else
+						$value = count($value);
+				}
+				else {
+					$value = false;
+				}
+				$temp[$module]['label'] = ($labels[$module] != '') ? $labels[$module] : $temp[$module]['nombre'];
+
+				$temp[$module]['value'] = $value;
+				$temp[$module]['label'] = ui_print_truncate_text($temp[$module]['label'],"module_small",false,true,false,"..");
+
+				if ($temp[$module]['unit'] == '%') {
+					$temp[$module]['min'] =	0;
+					$temp[$module]['max'] = 100;
+				}
+				else {
+					$min = $temp[$module]['min'];
+					if ($temp[$module]['max'] == 0)
+						$max = reporting_get_agentmodule_data_max($module,$period,$date);
+					else
+						$max = $temp[$module]['max'];
+					$temp[$module]['min'] = ($min == 0 ) ? 0 : $min;
+					$temp[$module]['max'] = ($max == 0 ) ? 100 : $max;
+				}
+				$temp[$module]['gauge'] = uniqid('gauge_');
+
+				if ($config['metaconsole']) {
+					// Automatic custom graph from the report template in metaconsole
+					if (is_array($module_list[0])) {
+						metaconsole_restore_db();
+					}
+				}
+				$i++;
+			}
+			break;
+		default:
+			break;
 	}
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -1323,19 +1590,6 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 
 		$names_number = count($name_list);
 		$units_number = count($unit_list);
-*/
-		// interval - This is the number of "rows" we are divided the time to fill data.
-		//    more interval, more resolution, and slower.
-		// periodo - Gap of time, in seconds. This is now to (now-periodo) secs
-		// Init weights
-		for ($i = 0; $i < $module_number; $i++) {
-			if (! isset ($weight_list[$i])) {
-				$weight_list[$i] = 1;
-			}
-			else if ($weight_list[$i] == 0) {
-				$weight_list[$i] = 1;
-			}
-		}
 
 		$aux_array = array();
 		// Set data containers
@@ -1344,7 +1598,7 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 			$timestamp_short = date($time_format, $timestamp);
 			$long_index[$timestamp_short] = date(
 			html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
-			$timestamp = $timestamp_short;*/
+			$timestamp = $timestamp_short;*
 			$graph[$timestamp]['count'] = 0;
 			$graph[$timestamp]['timestamp_bottom'] = $timestamp;
 			$graph[$timestamp]['timestamp_top'] = $timestamp + $interval;
@@ -1358,841 +1612,42 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 		$graph_values      = array();
 		$module_name_list  = array();
 		$collector         = 0;
-		$user              = users_get_user_by_id($config['id_user']);
-		$user_flash_charts = $user['flash_chart'];
 
-		if ($user_flash_charts == 1)
-			$flash_charts = true;
-		elseif($user_flash_charts == -1)
-			$flash_charts = $config['flash_charts'];
-		elseif($user_flash_charts == 0)
-			$flash_charts = false;
 
-		if ($only_image) {
-			$flash_charts = false;
-		}
 
-		// Calculate data for each module
-		for ($i = 0; $i < $module_number; $i++) {
-			$automatic_custom_graph_meta = false;
-			if ($config['metaconsole']) {
-				// Automatic custom graph from the report template in metaconsole
-				if (is_array($module_list[$i])) {
-					$server = metaconsole_get_connection_by_id ($module_list[$i]['server']);
-					metaconsole_connect($server);
-					$automatic_custom_graph_meta = true;
-				}
-			}
 
-			$search_in_history_db = db_search_in_history_db($datelimit);
-			
-			// If its a projection graph,
-			// first module will be data and second will be the projection
-			
-			if ($projection != false && $i != 0) {
-				if ($automatic_custom_graph_meta)
-					$agent_module_id = $module_list[0]['module'];
-				else
-					$agent_module_id = $module_list[0];
-				$id_module_type = modules_get_agentmodule_type ($agent_module_id);
-				$module_type = modules_get_moduletype_name ($id_module_type);
-				$uncompressed_module = is_module_uncompressed ($module_type);
-			}
-			else {
-				if ($automatic_custom_graph_meta)
-					$agent_module_id = $module_list[$i]['module'];
-				else
-					$agent_module_id = $module_list[$i];
-				
-				$id_module_type = modules_get_agentmodule_type ($agent_module_id);
-				$module_type = modules_get_moduletype_name ($id_module_type);
-				$uncompressed_module = is_module_uncompressed ($module_type);
-			}
-			
-			if ($uncompressed_module) {
-				$avg_only = 1;
-			}
-			
-			// Get event data (contains alert data too)
-			if ($show_events == 1 || $show_alerts == 1) {
-				$events = db_get_all_rows_filter ('tevento',
-					array ('id_agentmodule' => $agent_module_id,
-						"utimestamp > $datelimit",
-						"utimestamp < $date",
-						'order' => 'utimestamp ASC'),
-					array ('evento', 'utimestamp', 'event_type'));
-				if ($events === false) {
-					$events = array ();
-				}
-			}
-			
-			// Get module data
-			$data = db_get_all_rows_filter ('tagente_datos',
-				array ('id_agente_modulo' => $agent_module_id,
-					"utimestamp > $datelimit",
-					"utimestamp < $date",
-					'order' => 'utimestamp ASC'),
-				array ('datos', 'utimestamp'), 'AND', $search_in_history_db);
-			
-			if ($data === false) {
-				$data = array ();
-			}
-			
-			// Uncompressed module data
-			if ($uncompressed_module) {
-				$min_necessary = 1;
-			
-			// Compressed module data
-			}
-			else {
-				// Get previous data
-				$previous_data = modules_get_previous_data ($agent_module_id, $datelimit);
-				if ($previous_data !== false) {
-					$previous_data['utimestamp'] = $datelimit;
-					array_unshift ($data, $previous_data);
-				}
-				
-				// Get next data
-				$nextData = modules_get_next_data ($agent_module_id, $date);
-				if ($nextData !== false) {
-					array_push ($data, $nextData);
-				}
-				else if (count ($data) > 0) {
-					// Propagate the last known data to the end of the interval
-					$nextData = array_pop ($data);
-					array_push ($data, $nextData);
-					$nextData['utimestamp'] = $date;
-					array_push ($data, $nextData);
-				}
-				
-				$min_necessary = 2;
-			}
-		
-			// Set initial conditions
-			$graph_values[$i] = array();
-			
-			// Check available data
-			if (count ($data) < $min_necessary) {
-				continue;
-			}
-			
-			// if(empty($aux_array)){
-			// 	foreach ($data as $key => $value) {
-			// 		$aux_array[$value['utimestamp']] = $value['datos'];
-			// 	}
-			// } else {
-				// foreach ($data as $key => $value) {
-				// 	if(array_key_exists($value['utimestamp'],$aux_array)){
-				// 		$aux_array[$value['utimestamp']] = $aux_array[$value['utimestamp']] + $value['datos'];
-				// 	} else {
-				// 		$aux_array[$value['utimestamp']] = $value['datos'];
-				// 	}
-				// }
-			// }
-			
-			if (!empty($name_list) && $names_number == $module_number && isset($name_list[$i])) {
-				if ($labels[$agent_module_id] != '')
-					$module_name_list[$i] = $labels[$agent_module_id];
-				else {
-					$agent_name = io_safe_output(
-						modules_get_agentmodule_agent_name ($agent_module_id));
-					$alias = db_get_value ("alias","tagente","nombre",$agent_name);
-					$module_name = io_safe_output(
-						modules_get_agentmodule_name ($agent_module_id));
-					
-					if ($flash_charts)
-						$module_name_list[$i] = '<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . $alias . " / " . $module_name. '</span>';
-					else
-						$module_name_list[$i] = $alias . " / " . $module_name;
-				}
-			}
-			else {
-				//Get and process agent name
-				$agent_name = io_safe_output(
-					modules_get_agentmodule_agent_name ($agent_module_id));
-				$alias = db_get_value ("alias","tagente","nombre",$agent_name);
-				$agent_name = ui_print_truncate_text($agent_name, 'agent_small', false, true, false, '...', false);
-				
-				$agent_id = agents_get_agent_id ($agent_name);
-				
-				if(empty($unit_list)){
-					$unit_aux = modules_get_unit($agent_module_id);
-					array_push($unit_list_aux,$unit_aux);
-				}
-				//Get and process module name
-				$module_name = io_safe_output(
-					modules_get_agentmodule_name ($agent_module_id));
-				$module_name = sprintf(__("%s"), $module_name);
-				$module_name = ui_print_truncate_text($module_name, 'module_small', false, true, false, '...', false);
-				
-				if ($flash_charts) {
-					if ($labels[$agent_module_id] != '')
-						$module_name_list[$i] = '<span style=\"font-size:' . 
-							($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . 
-							$labels[$agent_module_id] . '</span>';
-					else
-						$module_name_list[$i] = '<span style=\"font-size:' . 
-							($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . 
-							$alias . ' / ' . $module_name . '</span>';
-				}
-				else {
-					if ($labels[$agent_module_id] != '')
-						$module_name_list[$i] = $labels[$agent_module_id];
-					else
-						$module_name_list[$i] = $alias . ' / ' . $module_name;
-				}
-			}
-			
-			// Data iterator
-			$j = 0;
-			
-			// Event iterator
-			$k = 0;
-			
-			// Set initial conditions
-			
-			//$graph_values[$i] = array();
-			$temp_graph_values = array();
-			
-			if ($data[0]['utimestamp'] == $datelimit) {
-				$previous_data = $data[0]['datos'];
-				$j++;
-			}
-			else {
-				$previous_data = 0;
-			}
-			
-			$max = 0;
-			$min = null;
-			$avg = 0;
-			$countAvg = 0;
-		
-			// Calculate chart data
-			$last_known = $previous_data;
-			for ($l = 0; $l <= $resolution; $l++) {
 
-				$countAvg ++;
-				
-				$timestamp = $datelimit + ($interval * $l);
-				$timestamp_short = graph_get_formatted_date($timestamp, $time_format, $time_format_2);
-				
-				$long_index[$timestamp_short] = date(
-				html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
-				//$timestamp = $timestamp_short;
-				
-				$total = 0;
-				$count = 0;
-				
-				// Read data that falls in the current interval
-				$interval_min = $last_known;
-				$interval_max = $last_known;
-				
-				while (isset ($data[$j]) && $data[$j]['utimestamp'] >= $timestamp && $data[$j]['utimestamp'] < ($timestamp + $interval)) {
-					if ($data[$j]['datos'] > $interval_max) {
-						$interval_max = $data[$j]['datos'];
-					}
-					else if ($data[$j]['datos'] < $interval_max) {
-						$interval_min = $data[$j]['datos'];
-					}
-					$total += $data[$j]['datos'];
-					$last_known = $data[$j]['datos'];
-					$count++;
-					$j++;
-				}
-			
-				// Average
-				if ($count > 0) {
-					$total /= $count;
-				}
-				
-				// Read events and alerts that fall in the current interval
-				$event_value = 0;
-				$alert_value = 0;
-				while (isset ($events[$k]) && $events[$k]['utimestamp'] >= $timestamp && $events[$k]['utimestamp'] <= ($timestamp + $interval)) {
-					if ($show_events == 1) {
-						$event_value++;
-					}
-					if ($show_alerts == 1 && substr ($events[$k]['event_type'], 0, 5) == 'alert') {
-						$alert_value++;
-					}
-					$k++;
-				}
-				
-				// Data
-				if ($count > 0) {
-					//$graph_values[$i][$timestamp] = $total * $weight_list[$i];
-					$temp_graph_values[$timestamp_short] = $total * $weight_list[$i];
-				}
-				else {
-					// Compressed data
-					if ($uncompressed_module || ($timestamp > time ())) {
-						$temp_graph_values[$timestamp_short] = 0;
-					}
-					else {
-						$temp_graph_values[$timestamp_short] = $last_known * $weight_list[$i];
-					}
-				}
-				
-				//Extract max, min, avg
-				if ($max < $temp_graph_values[$timestamp_short]) {
-					$max = $temp_graph_values[$timestamp_short];
-				}
-				
-				if (isset($min)) {
-					if ($min > $temp_graph_values[$timestamp_short]) {
-						$min = $temp_graph_values[$timestamp_short];
-					}
-				}
-				else {
-					$min = $temp_graph_values[$timestamp_short];
-				}
-				$avg += $temp_graph_values[$timestamp_short];
-		
 				// Added to support projection graphs
 				if ($projection != false and $i != 0) {
 					$projection_data = array();
-					$projection_data = array_merge($before_projection, $projection); 
+					$projection_data = array_merge($before_projection, $projection);
 					$graph_values[$i] = $projection_data;
 				}
 				else {
-					$graph_values[$i] = $temp_graph_values; 
+					$graph_values[$i] = $temp_graph_values;
 				}
-			}
 
-			//Add the max, min and avg in the legend
-			$avg = round($avg / $countAvg, 1);
-			
 			$graph_stats = get_graph_statistics($graph_values[$i]);
-			
+
 			if (!isset($config["short_module_graph_data"]))
 				$config["short_module_graph_data"] = true;
-			
-			if ($config["short_module_graph_data"]) {
-				$min = $graph_stats['min'];
-				$max = $graph_stats['max'];
-				$avg = $graph_stats['avg'];
-				$last = $graph_stats['last'];
-				
-				if ($min > 1000000)
-					$min = sprintf("%sM", remove_right_zeros(number_format($min / 1000000, remove_right_zeros)));
-				else if ($min > 1000)
-					$min = sprintf("%sK", remove_right_zeros(number_format($min / 1000, $config['graph_precision'])));
-				
-				if ($max > 1000000)
-					$max = sprintf("%sM", remove_right_zeros(number_format($max / 1000000, $config['graph_precision'])));
-				else if ($max > 1000)
-					$max = sprintf("%sK", remove_right_zeros(number_format($max / 1000, $config['graph_precision'])));
-				
-				if ($avg > 1000000)
-					$avg = sprintf("%sM", remove_right_zeros(number_format($avg / 1000000, $config['graph_precision'])));
-				else if ($avg > 1000)
-					$avg = sprintf("%sK", remove_right_zeros(number_format($avg / 1000, $config['graph_precision'])));
-				
-				if ($last > 1000000)
-					$last = sprintf("%sM", remove_right_zeros(number_format($last / 1000000, $config['graph_precision'])));
-				else if ($last > 1000)
-					$last = sprintf("%sK", remove_right_zeros(number_format($last / 1000, $config['graph_precision'])));
-			}
-			else {
-				$min = remove_right_zeros(number_format($graph_stats['min'], $config['graph_precision']));
-				$max = remove_right_zeros(number_format($graph_stats['max'], $config['graph_precision']));
-				$avg = remove_right_zeros(number_format($graph_stats['avg'], $config['graph_precision']));
-				$last = remove_right_zeros(number_format($graph_stats['last'], $config['graph_precision']));
-			}
-			
-			
+
 			if (!empty($unit_list) && $units_number == $module_number && isset($unit_list[$i])) {
 				$unit = $unit_list[$i];
 			}else{
 				$unit = $unit_list_aux[$i];
 			}
-			
-			if ($projection == false or ($projection != false and $i == 0)) {
-				$module_name_list[$i] .= ": ";
-				if ($show_max)
-					$module_name_list[$i] .= __("Max") . ": $max $unit; ";
-				if ($show_min)
-					$module_name_list[$i] .= __("Min") . ": $min $unit; ";
-				if ($show_avg)
-					$module_name_list[$i] .= __("Avg") . ": $avg $unit";
-			}
-			
+
 			if ($weight_list[$i] != 1) {
 				//$module_name_list[$i] .= " (x". format_numeric ($weight_list[$i], 1).")";
 				$module_name_list[$i] .= " (x". format_numeric ($weight_list[$i], 1).")";
 			}
-			
-			//$graph_values[$module_name_list[$i]] = $graph_values[$i];
-			//unset($graph_values[$i]);
-			
-			//$graph_values[$i] = $graph_values[$i];
-			
-			if ($config['metaconsole']) {
-				// Automatic custom graph from the report template in metaconsole
-				if (is_array($module_list[0])) {
-					metaconsole_restore_db();
-				}
-			}
-		}
-
+*/
 		$temp = array();
 
-		if ($flash_charts === false && $stacked == CUSTOM_GRAPH_GAUGE)
-			$stacked = CUSTOM_GRAPH_BULLET_CHART;
-		switch ($stacked) {
-			case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD:
-			case CUSTOM_GRAPH_BULLET_CHART:
-				$datelimit = $date - $period;
-				if($stacked == CUSTOM_GRAPH_BULLET_CHART_THRESHOLD){
-					$acumulador = 0;
-					foreach ($module_list as $module_item) {
-						$module = $module_item;
-						$query_last_value = sprintf('
-							SELECT datos
-							FROM tagente_datos
-							WHERE id_agente_modulo = %d
-								AND utimestamp < %d
-								ORDER BY utimestamp DESC',
-							$module, $date);
-						$temp_data = db_get_value_sql($query_last_value);
-						if ($acumulador < $temp_data){
-							$acumulador = $temp_data;
-						}
-					}
-				}
-				foreach ($module_list as $module_item) {
-					$automatic_custom_graph_meta = false;
-					if ($config['metaconsole']) {
-						// Automatic custom graph from the report template in metaconsole
-						if (is_array($module_list[$i])) {
-							$server = metaconsole_get_connection_by_id ($module_item['server']);
-							metaconsole_connect($server);
-							$automatic_custom_graph_meta = true;
-						}
-					}
 
-					if ($automatic_custom_graph_meta)
-						$module = $module_item['module'];
-					else
-						$module = $module_item;
-
-					$search_in_history_db = db_search_in_history_db($datelimit);
-
-					$temp[$module] = modules_get_agentmodule($module);
-					$query_last_value = sprintf('
-						SELECT datos
-						FROM tagente_datos
-						WHERE id_agente_modulo = %d
-							AND utimestamp < %d
-							ORDER BY utimestamp DESC',
-						$module, $date);
-					$temp_data = db_get_value_sql($query_last_value);
-
-					if ($temp_data) {
-						if (is_numeric($temp_data))
-							$value = $temp_data;
-						else
-							$value = count($value);
-					}
-					else {
-						if ($flash_charts === false)
-							$value = 0;
-						else
-							$value = false;
-					}
-
-					if ( !empty($labels) && isset($labels[$module]) ){
-	                    $label = io_safe_input($labels[$module]);
-	                }else{
-						$alias = db_get_value ("alias","tagente","id_agente",$temp[$module]['id_agente']);
-	                    $label = $alias . ': ' . $temp[$module]['nombre'];
-	                }
-
-					$temp[$module]['label'] = $label;
-					$temp[$module]['value'] = $value;
-					$temp_max = reporting_get_agentmodule_data_max($module,$period,$date);
-					if ($temp_max < 0)
-						$temp_max = 0;
-					if (isset($acumulador)){
-						$temp[$module]['max'] = $acumulador;
-					}else{
-						$temp[$module]['max'] = ($temp_max === false) ? 0 : $temp_max;
-					}
-
-					$temp_min = reporting_get_agentmodule_data_min($module,$period,$date);
-					if ($temp_min < 0)
-						$temp_min = 0;
-					$temp[$module]['min'] = ($temp_min === false) ? 0 : $temp_min;
-
-					if ($config['metaconsole']) {
-						// Automatic custom graph from the report template in metaconsole
-						if (is_array($module_list[0])) {
-							metaconsole_restore_db();
-						}
-					}
-
-				}
-
-				break;
-			case CUSTOM_GRAPH_HBARS:
-			case CUSTOM_GRAPH_VBARS:
-				$datelimit = $date - $period;
-
-				$label = '';
-				foreach ($module_list as $module_item) {
-					$automatic_custom_graph_meta = false;
-					if ($config['metaconsole']) {
-						// Automatic custom graph from the report template in metaconsole
-						if (is_array($module_list[$i])) {
-							$server = metaconsole_get_connection_by_id ($module_item['server']);
-							metaconsole_connect($server);
-							$automatic_custom_graph_meta = true;
-						}
-					}
-
-					if ($automatic_custom_graph_meta)
-						$module = $module_item['module'];
-					else
-						$module = $module_item;
-
-					$module_data = modules_get_agentmodule($module);
-					$query_last_value = sprintf('
-						SELECT datos
-						FROM tagente_datos
-						WHERE id_agente_modulo = %d
-							AND utimestamp < %d
-							ORDER BY utimestamp DESC',
-						$module, $date);
-					$temp_data = db_get_value_sql($query_last_value);
-
-					$agent_name = io_safe_output(
-						modules_get_agentmodule_agent_name ($module));
-
-					if (!empty($labels) && isset($labels[$module]) ){
-	                    $label = $labels[$module];
-	                }else {
-						$alias = db_get_value ("alias","tagente","id_agente",$module_data['id_agente']);
-	                    $label = $alias . " - " .$module_data['nombre'];
-	                }
-
-					$temp[$label]['g'] = round($temp_data,4);
-
-					if ($config['metaconsole']) {
-						// Automatic custom graph from the report template in metaconsole
-						if (is_array($module_list[0])) {
-							metaconsole_restore_db();
-						}
-					}
-				}
-				break;
-			case CUSTOM_GRAPH_PIE:
-				$datelimit = $date - $period;
-				$total_modules = 0;
-				foreach ($module_list as $module_item) {
-					$automatic_custom_graph_meta = false;
-					if ($config['metaconsole']) {
-						// Automatic custom graph from the report template in metaconsole
-						if (is_array($module_list[$i])) {
-							$server = metaconsole_get_connection_by_id ($module_item['server']);
-							metaconsole_connect($server);
-							$automatic_custom_graph_meta = true;
-						}
-					}
-
-					if ($automatic_custom_graph_meta)
-						$module = $module_item['module'];
-					else
-						$module = $module_item;
-
-					$data_module = modules_get_agentmodule($module);
-					$query_last_value = sprintf('
-						SELECT datos
-						FROM tagente_datos
-						WHERE id_agente_modulo = %d
-							AND utimestamp > %d
-							AND utimestamp < %d
-							ORDER BY utimestamp DESC',
-						$module, $datelimit, $date);
-					$temp_data = db_get_value_sql($query_last_value);
-
-					if ( $temp_data ){
-						if (is_numeric($temp_data))
-							$value = $temp_data;
-						else
-							$value = count($value);
-					}
-					else {
-						$value = false;
-					}
-					$total_modules += $value;
-
-					if ( !empty($labels) && isset($labels[$module]) ){
-						$label = io_safe_output($labels[$module]);
-					}else {
-						$alias = db_get_value ("alias","tagente","id_agente",$data_module['id_agente']);
-						$label = io_safe_output($alias . ": " . $data_module['nombre']);
-					}
-
-					$temp[$label] = array('value'=>$value,
-											'unit'=>$data_module['unit']);
-					if ($config['metaconsole']) {
-						// Automatic custom graph from the report template in metaconsole
-						if (is_array($module_list[0])) {
-							metaconsole_restore_db();
-						}
-					}
-				}
-				$temp['total_modules'] = $total_modules;
-
-				break;
-			case CUSTOM_GRAPH_GAUGE:
-				$datelimit = $date - $period;
-				$i = 0;
-				foreach ($module_list as $module_item) {
-					$automatic_custom_graph_meta = false;
-					if ($config['metaconsole']) {
-						// Automatic custom graph from the report template in metaconsole
-						if (is_array($module_list[$i])) {
-							$server = metaconsole_get_connection_by_id ($module_item['server']);
-							metaconsole_connect($server);
-							$automatic_custom_graph_meta = true;
-						}
-					}
-
-					if ($automatic_custom_graph_meta)
-						$module = $module_item['module'];
-					else
-						$module = $module_item;
-
-					$temp[$module] = modules_get_agentmodule($module);
-					$query_last_value = sprintf('
-						SELECT datos
-						FROM tagente_datos
-						WHERE id_agente_modulo = %d
-							AND utimestamp < %d
-							ORDER BY utimestamp DESC',
-						$module, $date);
-					$temp_data = db_get_value_sql($query_last_value);
-					if ( $temp_data ) {
-						if (is_numeric($temp_data))
-							$value = $temp_data;
-						else
-							$value = count($value);
-					}
-					else {
-						$value = false;
-					}
-					$temp[$module]['label'] = ($labels[$module] != '') ? $labels[$module] : $temp[$module]['nombre'];
-
-					$temp[$module]['value'] = $value;
-					$temp[$module]['label'] = ui_print_truncate_text($temp[$module]['label'],"module_small",false,true,false,"..");
-
-					if ($temp[$module]['unit'] == '%') {
-						$temp[$module]['min'] =	0;
-						$temp[$module]['max'] = 100;
-					}
-					else {
-						$min = $temp[$module]['min'];
-						if ($temp[$module]['max'] == 0)
-							$max = reporting_get_agentmodule_data_max($module,$period,$date);
-						else
-							$max = $temp[$module]['max'];
-						$temp[$module]['min'] = ($min == 0 ) ? 0 : $min;
-						$temp[$module]['max'] = ($max == 0 ) ? 100 : $max;
-					}
-					$temp[$module]['gauge'] = uniqid('gauge_');
-
-					if ($config['metaconsole']) {
-						// Automatic custom graph from the report template in metaconsole
-						if (is_array($module_list[0])) {
-							metaconsole_restore_db();
-						}
-					}
-					$i++;
-				}
-				break;
-			default:
-				if (!is_null($percentil) && $percentil) {
-					foreach ($graph_values as $graph_group => $point) {
-						foreach ($point as $timestamp_point => $point_value) {
-							$temp[$timestamp_point][$graph_group] = $point_value;
-						}
-						$percentile_value = get_percentile($config['percentil'], $point);
-						$percentil_result[$graph_group] = array_fill ( 0, count($point), $percentile_value);
-						$series_type[$graph_group] = 'line';
-						$agent_name = io_safe_output(
-							modules_get_agentmodule_agent_alias ($module_list[$graph_group]));
-						$module_name = io_safe_output(
-							modules_get_agentmodule_name ($module_list[$graph_group]));
-						$module_name_list['percentil'.$graph_group] = __('Percentile %dº', $config['percentil']) . __(' of module ') . $agent_name .' / ' . $module_name . ' (' . $percentile_value . ' ' . $unit . ') ';
-					}
-				}
-				else {
-					foreach ($graph_values as $graph_group => $point) {
-						foreach ($point as $timestamp_point => $point_value) {
-							$temp[$timestamp_point][$graph_group] = $point_value;
-						}
-					}
-				}
-
-				//check min array two elements
-				if(count($temp) == 1){
-					$timestamp_short = graph_get_formatted_date($date, $time_format, $time_format_2);
-					foreach($temp as $key => $value){
-						foreach($value as $k => $v){
-							$temp[$timestamp_short][$k] = $v; 
-						}
-					}
-				}
-				break;
-		}
-/*
-		$flash_charts = true;
-		if($ttl>1 || !$config['flash_charts']){
-			$flash_charts = false;
-		}
-
-		$temp = fullscale_data_combined($module_list, $period, $date, $flash_charts, $percentil);
-
-		if (!is_null($percentil) && $percentil) {
-			if(isset($temp['percentil'])){
-				$percentil_result = array_pop($temp);
-			}
-		}
-
-		$resolution = count($temp); //Number of points of the graph
-		$interval = (int) ($period / $resolution);
-		$module_name_list = array();
-		
-		if($ttl>1 || !$config['flash_charts']){
-			$temp2 = array();
-			foreach ($temp as $key => $value) {
-				$real_date = date("Y/M/d", $key);
-				$real_date .= "\n";
-				$real_date .= date("   H:i:s", $key);
-				$temp2[$real_date] = $value;
-			}
-			$temp = $temp2;
-		}
-
-		foreach ($module_list as $key => $value) {
-			if (is_metaconsole() && is_array($value)) {
-				$server = metaconsole_get_connection_by_id ($value['server']);
-				metaconsole_connect($server);
-				$value = $value['module'];
-			}
-			if ($labels[$value] != ''){
-					$module_name_list[$key] = $labels[$value];
-			}
-			else {
-				$agent_name  = io_safe_output( modules_get_agentmodule_agent_name ($value) );
-				$alias       = db_get_value ("alias","tagente","nombre",$agent_name);
-				$module_name = io_safe_output( modules_get_agentmodule_name ($value) );
-
-				if ($flash_charts){
-					$module_name_list[$key] = '<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . $alias . " / " . $module_name. '</span>';
-				}
-				else{
-					$module_name_list[$key] = $alias . " / " . $module_name;
-				}
-			}
-			if (is_metaconsole() && is_array($value)) {
-				metaconsole_restore_db();
-			}
-		}
-
-		if (!is_null($percentil) && $percentil) {
-			foreach ($module_list as $key => $value) {
-				if (is_metaconsole() && is_array($value)) {
-					$server = metaconsole_get_connection_by_id ($value['server']);
-					metaconsole_connect($server);
-					$value = $value['module'];
-				}
-
-				$agent_name  = io_safe_output( modules_get_agentmodule_agent_name ($value) );
-				$alias       = db_get_value ("alias","tagente","nombre",$agent_name);
-				$module_name = io_safe_output( modules_get_agentmodule_name ($value) );
-
-				if (is_metaconsole() && is_array($value)) {
-					metaconsole_restore_db();
-				}
-
-				$module_name_list['percentil'.$key] = __('Percentile %dº', $config['percentil']) . __(' of module ') . $agent_name .' / ' . $module_name . ' (' . $percentil_result[$key][0] . ' ' . $unit . ') ';
-				$series_type[$key] = 'line';
-			}
-		}
-*/
-
-	$graph_values = $temp;
-
-	if($config["fixed_graph"] == false){
-		$water_mark = array(
-			'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
-			'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
-	}
-
-	//Work around for fixed the agents name with huge size chars.
-	$fixed_font_size = $config['font_size'];
 
 	//Set graph color
-/*
-	$color = array();
-
-	$color[0] = array('border' => '#000000',
-		'color' => $config['graph_color1'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[1] = array('border' => '#000000',
-		'color' => $config['graph_color2'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[2] = array('border' => '#000000',
-		'color' => $config['graph_color3'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[3] = array('border' => '#000000',
-		'color' => $config['graph_color4'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[4] = array('border' => '#000000',
-		'color' => $config['graph_color5'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[5] = array('border' => '#000000',
-		'color' => $config['graph_color6'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[6] = array('border' => '#000000',
-		'color' => $config['graph_color7'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[7] = array('border' => '#000000',
-		'color' => $config['graph_color8'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[8] = array('border' => '#000000',
-		'color' => $config['graph_color9'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[9] = array('border' => '#000000',
-		'color' => $config['graph_color10'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[11] = array('border' => '#000000',
-		'color' => COL_GRAPH9,
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[12] = array('border' => '#000000',
-		'color' => COL_GRAPH10,
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[13] = array('border' => '#000000',
-		'color' => COL_GRAPH11,
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[14] = array('border' => '#000000',
-		'color' => COL_GRAPH12,
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[15] = array('border' => '#000000',
-		'color' => COL_GRAPH13,
-		'alpha' => CHART_DEFAULT_ALPHA);
-*/
-	if($id_widget_dashboard){
-		$opcion = unserialize(db_get_value_filter('options','twidget_dashboard',array('id' => $id_widget_dashboard)));
-		foreach ($module_list as $key => $value) {
-			if(!empty($opcion[$value])){
-				$color[$key]['color'] = $opcion[$value];
-			}
-		}
-	}
-
 	$threshold_data = array();
 
 	if ($from_interface) {
@@ -2428,9 +1883,6 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 
 	switch ($stacked) {
 		case CUSTOM_GRAPH_AREA:
-	//	html_debug_print('entra por este sitio');
-	//	html_debug_print($data_array);
-		//$array_data = $data_array;
 			return area_graph($agent_module_id, $array_data, $color,
 				$legend, $series_type, $date_array,
 				$data_module_graph, $show_elements_graph,
@@ -2438,20 +1890,21 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 				$array_events_alerts);
 			break;
 		default:
-		case CUSTOM_GRAPH_STACKED_AREA: 
-			return stacked_area_graph($flash_charts, $graph_values,
+		case CUSTOM_GRAPH_STACKED_AREA:
+			html_debug_print('entra por akiiii');
+			return stacked_area_graph($flash_charts, $array_data,
 				$width, $height, $color, $module_name_list, $long_index,
 				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
 				$title, "", $water_mark, $config['fontpath'], $fixed_font_size,
 				"", $ttl, $homeurl, $background_color,$dashboard, $vconsole);
 			break;
-		case CUSTOM_GRAPH_LINE:  
+		case CUSTOM_GRAPH_LINE:
 			return line_graph($flash_charts, $graph_values, $width,
 				$height, $color, $module_name_list, $long_index,
 				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
 				$title, "", $water_mark, $config['fontpath'], $fixed_font_size,
-				$unit, $ttl, $homeurl, $background_color, $dashboard, 
-				$vconsole, $series_type, $percentil_result, $yellow_threshold, $red_threshold, $threshold_data); 
+				$unit, $ttl, $homeurl, $background_color, $dashboard,
+				$vconsole, $series_type, $percentil_result, $yellow_threshold, $red_threshold, $threshold_data);
 			break;
 		case CUSTOM_GRAPH_STACKED_LINE:
 			return stacked_line_graph($flash_charts, $graph_values,
@@ -2497,101 +1950,9 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 	}
 }
 
-function fullscale_data_combined($module_list, $period, $date, $flash_charts, $percentil){
-	global $config;
-	// Set variables
-	if ($date == 0){
-		$date = get_system_time();
-	}
-
-	$datelimit = $date - $period;
-	$count_data_all = 0;
-
-	foreach ($module_list as $key_module => $value_module) {
-		if (!is_null($percentil) && $percentil) {
-				$array_percentil = array();
-		}
-
-		if (is_metaconsole() && is_array($value_module)) {
-				$server = metaconsole_get_connection_by_id ($value_module['server']);
-				metaconsole_connect($server);
-				$previous_data   = modules_get_previous_data ($value_module['module'], $datelimit);
-				$data_uncompress = db_uncompress_module_data($value_module['module'], $datelimit, $date);
-				metaconsole_restore_db();
-		}
-		else{
-				$previous_data   = modules_get_previous_data ($value_module, $datelimit);
-				$data_uncompress = db_uncompress_module_data($value_module, $datelimit, $date);
-		}
-
-		foreach ($data_uncompress as $key_data => $value_data) {
-			foreach ($value_data['data'] as $k => $v) {
-				$real_date = $v['utimestamp'];
-				if(!isset($v['datos'])){
-					$v['datos'] = $previous_data;
-				}
-				else{
-					$previous_data = $v['datos'];
-				}
-
-				if (!is_null($percentil) && $percentil) {
-					$array_percentil[] = $v['datos'];
-				}
-
-				$data_all[$real_date][$key_module] = $v['datos'];
-			}
-		}
-
-		if (!is_null($percentil) && $percentil) {
-			$percentil_value = get_percentile($config['percentil'], $array_percentil);
-			$percentil_result[$key_module] = array_fill (0, count($data_all), $percentil_value);
-			if(count($data_all) > $count_data_all){
-				$count_data_all = count($data_all);
-			}
-		}
-	}
-
-	if (!is_null($percentil) && $percentil) {
-		foreach ($percentil_result as $k => $v){
-			if(count($v) < $count_data_all){
-				$percentil_result[$k] =  array_fill (0, $count_data_all, $v[0]);
-			}
-		}
-	}
-
-	$data_prev = array();
-	$data_all_rev = array();
-	ksort($data_all);
-
-	foreach ($data_all as $key => $value) {
-		if($flash_charts) {
-			$real_date = date("Y M d H:i:s", $key);
-		}
-		else{
-			$real_date = $key;
-		}
-
-		foreach ($module_list as $key_module => $value_module) {
-				if(!isset($value[$key_module])){
-						$data_all[$key][$key_module] = $data_prev[$key_module];
-				}
-				else{
-						$data_prev[$key_module] = $value[$key_module];
-				}
-		}
-		$data_all_rev[$real_date] = $data_all[$key];
-	}
-
-	if (!is_null($percentil) && $percentil) {
-			$data_all_rev['percentil'] = $percentil_result;
-	}
-
-	return $data_all_rev;
-}
-
 /**
  * Print a graph with access data of agents
- * 
+ *
  * @param integer id_agent Agent ID
  * @param integer width pie graph width
  * @param integer height pie graph height
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 40134e8088..1787ed1635 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -204,8 +204,9 @@ function flot_area_graph (
 			break;
 	}
 
+	///XXXXXXX los px caca
 	// Parent layer
-	$return = "<div class='parent_graph' style='width: " . ($format_graph['width']) . "; " . $background_style . "'>";
+	$return = "<div class='parent_graph' style='width: " . ($format_graph['width']) . "px; " . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
 	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:" . $format_graph['font_size'] ."pt !important;'></p>";
 
@@ -250,7 +251,7 @@ function flot_area_graph (
 //XXXXXX  height: ".$format_graph['height']."px;'
 	$return .= "graph" .$format_graph['adapt_key'] ."'
 				style='	width: ".$format_graph['width']."px;
-						height: 400px;'></div>";
+				height: ".$format_graph['height']."px;'></div>";
 
 	if ($show_elements_graph['menu']) {
 		$format_graph['height'] = 100;
@@ -260,8 +261,7 @@ function flot_area_graph (
 	}
 
 	if (!$vconsole){
-		$return .= "<div id='overview_$graph_id'
-						class='overview_graph'
+		$return .= "<div id='overview_$graph_id' class='overview_graph'
 						style='margin:0px; margin-top:30px; margin-bottom:50px; display:none; width: ".$format_graph['width']."; height: 200px;'></div>";
 	}
 
@@ -375,7 +375,7 @@ function menu_graph(
 		$return .= "<div id='geneal_menu_$graph_id' class='menu_graph' style='
 						width: 30px;
 						height: 250px;
-						left: 100%;
+						left:" . $width . "px;
 						position: absolute;
 						top: 0px;
 						background-color: white;'>";

From b11e256c8b2387010b8a1c602b203f28b10abf8f Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 27 Apr 2018 13:51:13 +0200
Subject: [PATCH 017/146] fixed custom graph

---
 pandora_console/include/functions_graph.php   |  66 +-----
 pandora_console/include/graphs/fgraph.php     | 199 +-----------------
 .../include/graphs/flot/pandora.flot.js       |  54 ++---
 .../include/graphs/functions_flot.php         |  98 +--------
 4 files changed, 48 insertions(+), 369 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 8a749ee4aa..6e82a125ba 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -965,7 +965,7 @@ return $return;
 			$config['homedir'] . "/images/logo_vertical_water.png",
 			'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
 	}
-	
+
 	if ($type_graph === 'area') {
 		if ($compare === 'separated') {
 			return
@@ -1008,29 +1008,7 @@ return $return;
 		}
 	}
 	elseif ($type_graph === 'line') {
-		if ($compare === 'separated') {
-			return
-				line_graph($flash_chart, $chart, $width, $height/2, $color,
-					$legend, $long_index,
-					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-					$title, $unit, $water_mark, $config['fontpath'],
-					$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor).
-				'<br>'.
-				line_graph($flash_chart, $chart_prev, $width, $height/2, $color,
-					$legend, $long_index,
-					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-					$title, $unit, $water_mark, $config['fontpath'],
-					$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor);
-		}
-		else {
-			// Color commented not to restrict serie colors
-			return
-				line_graph($flash_chart, $chart, $width, $height, $color,
-					$legend, $long_index,
-					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-					$title, $unit, $water_mark, $config['fontpath'],
-					$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor);
-		}
+
 	}
 }
 
@@ -1098,7 +1076,6 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 
 	//XXX colocar
 /*
-	$stacked
 	$prediction_period
 	$name_list
 	$unit_list
@@ -1112,7 +1089,6 @@ function graphic_combined_module ( $module_list, $weight_list, $period, $width,
 	$modules_series
 */
 
-html_debug_print($stacked);
 html_debug_print($name_list);
 html_debug_print($unit_list);
 html_debug_print($from_interface);
@@ -1134,9 +1110,7 @@ html_debug_print($from_interface);
 	$show_elements_graph['show_unknown'] = false; // dont use
 	$show_elements_graph['avg_only']     = false; // dont use
 	$show_elements_graph['fullscale']    = $fullscale;
-//XXXX
-	$show_elements_graph['show_title']   = $show_title; // dont use
-
+	$show_elements_graph['show_title']   = ''; // dont use
 	$show_elements_graph['menu']         = $menu; // dont use
 	$show_elements_graph['adapt_key']    = ''; // dont use
 	$show_elements_graph['percentil']    = $percentil;
@@ -1150,6 +1124,7 @@ html_debug_print($from_interface);
 	$show_elements_graph['return_data']  = true; //dont use
 	$show_elements_graph['id_widget']    = $id_widget_dashboard;
 	$show_elements_graph['labels']       = $labels;
+	$show_elements_graph['stacked']       = $stacked;
 
 	$format_graph = array();
 	$format_graph['width']      = $width;
@@ -1159,7 +1134,6 @@ html_debug_print($from_interface);
 
 	$format_graph['unit_name']  = $unit_name;
 	$format_graph['unit']       = ''; //dont use
-
 	$format_graph['title']      = $title;
 	$format_graph['homeurl']    = $homeurl;
 	$format_graph['ttl']        = $ttl;
@@ -1167,7 +1141,7 @@ html_debug_print($from_interface);
 	$format_graph['font']       = $config['fontpath'];
 	$format_graph['font-size']  = $config['font_size'];
 
-	/*
+	//for flash_charts
 	$user              = users_get_user_by_id($config['id_user']);
 	$user_flash_charts = $user['flash_chart'];
 
@@ -1181,12 +1155,10 @@ html_debug_print($from_interface);
 	if ($only_image) {
 		$flash_charts = false;
 	}
-	*/
 
 	$i=0;
 	$array_data = array();
 	foreach ($module_list as $key => $agent_module_id) {
-
 		$module_data = db_get_row_sql (
 			'SELECT * FROM tagente_modulo
 			WHERE id_agente_modulo = ' .
@@ -1882,37 +1854,17 @@ html_debug_print($from_interface);
 	}
 
 	switch ($stacked) {
+		default:
+		case CUSTOM_GRAPH_STACKED_LINE:
+		case CUSTOM_GRAPH_STACKED_AREA:
 		case CUSTOM_GRAPH_AREA:
+		case CUSTOM_GRAPH_LINE:
 			return area_graph($agent_module_id, $array_data, $color,
 				$legend, $series_type, $date_array,
 				$data_module_graph, $show_elements_graph,
 				$format_graph, $water_mark, $series_suffix_str,
 				$array_events_alerts);
 			break;
-		default:
-		case CUSTOM_GRAPH_STACKED_AREA:
-			html_debug_print('entra por akiiii');
-			return stacked_area_graph($flash_charts, $array_data,
-				$width, $height, $color, $module_name_list, $long_index,
-				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				$title, "", $water_mark, $config['fontpath'], $fixed_font_size,
-				"", $ttl, $homeurl, $background_color,$dashboard, $vconsole);
-			break;
-		case CUSTOM_GRAPH_LINE:
-			return line_graph($flash_charts, $graph_values, $width,
-				$height, $color, $module_name_list, $long_index,
-				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				$title, "", $water_mark, $config['fontpath'], $fixed_font_size,
-				$unit, $ttl, $homeurl, $background_color, $dashboard,
-				$vconsole, $series_type, $percentil_result, $yellow_threshold, $red_threshold, $threshold_data);
-			break;
-		case CUSTOM_GRAPH_STACKED_LINE:
-			return stacked_line_graph($flash_charts, $graph_values,
-				$width, $height, $color, $module_name_list, $long_index,
-				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				"", "", $water_mark, $config['fontpath'], $fixed_font_size,
-				"", $ttl, $homeurl, $background_color, $dashboard, $vconsole);
-			break;
 		case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD:
 		case CUSTOM_GRAPH_BULLET_CHART:
 			return stacked_bullet_chart($flash_charts, $graph_values,
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 6feb3f700b..a708a29263 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -250,6 +250,8 @@ function area_graph(
 	else {
 		//XXXXX
 		//Corregir este problema
+		//tener en cuenta stacked, area, line
+
 		$graph = array();
 		$graph['data']            = $chart_data;
 		$graph['width']           = $width;
@@ -278,132 +280,6 @@ function area_graph(
 	}
 }
 
-function stacked_area_graph($flash_chart, $chart_data, $width, $height,
-	$color, $legend, $long_index, $no_data_image, $xaxisname = "",
-	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
-	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white',
-	$dashboard = false, $vconsole = false, $agent_module_id) {
-
-	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-
-	if (empty($chart_data)) {
-		return '<img src="' . $no_data_image . '" />';
-	}
-
-	$menu = (!$dashboard && !$vconsole);
-
-	if ($flash_chart) {
-		return flot_area_stacked_graph(
-			$chart_data,
-			$width,
-			$height,
-			$color,
-			$legend,
-			$long_index,
-			$homeurl,
-			$font,
-			$font_size,
-			$unit,
-			$water_mark_url,
-			array(),
-			array(),
-			0,
-			0,
-			'',
-			false,
-			'',
-			$menu,
-			$backgroundColor,
-			$dashboard,
-			$vconsole,
-			$agent_module_id);
-	}
-	else {
-		//Stack the data
-		stack_data($chart_data, $legend, $color);
-
-		$graph = array();
-		$graph['data'] = $chart_data;
-		$graph['width'] = $width;
-		$graph['height'] = $height;
-		$graph['color'] = $color;
-		$graph['legend'] = $legend;
-		$graph['xaxisname'] = $xaxisname;
-		$graph['yaxisname'] = $yaxisname;
-		$graph['water_mark'] = $water_mark_file;
-		$graph['font'] = $font;
-		$graph['font_size'] = $font_size;
-		$graph['backgroundColor'] = $backgroundColor;
-
-		$id_graph = serialize_in_temp($graph, null, $ttl);
-
-		return "<img src='" . ui_get_full_url (false, false, false, false) .
-			"include/graphs/functions_pchart.php?static_graph=1&graph_type=stacked_area&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
-	}
-}
-
-function stacked_line_graph($flash_chart, $chart_data, $width, $height,
-	$color, $legend, $long_index, $no_data_image, $xaxisname = "",
-	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
-	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white',
-	$dashboard = false, $vconsole = false) {
-
-	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-
-	if (empty($chart_data)) {
-		return '<img src="' . $no_data_image . '" />';
-	}
-
-	$menu = (!$dashboard && !$vconsole);
-
-	if ($flash_chart) {
-		return flot_line_stacked_graph(
-			$chart_data,
-			$width,
-			$height,
-			$color,
-			$legend,
-			$long_index,
-			$homeurl,
-			$font,
-			$font_size,
-			$unit,
-			$water_mark_url,
-			array(),
-			array(),
-			0,
-			0,
-			'',
-			false,
-			'',
-			$menu,
-			$backgroundColor,
-			$dashboard,
-			$vconsole);
-	}
-	else {
-		//Stack the data
-		stack_data($chart_data, $legend, $color);
-
-		$graph = array();
-		$graph['data'] = $chart_data;
-		$graph['width'] = $width;
-		$graph['height'] = $height;
-		$graph['color'] = $color;
-		$graph['legend'] = $legend;
-		$graph['xaxisname'] = $xaxisname;
-		$graph['yaxisname'] = $yaxisname;
-		$graph['water_mark'] = $water_mark_file;
-		$graph['font'] = $font;
-		$graph['font_size'] = $font_size;
-		$graph['backgroundColor'] = $backgroundColor;
-
-		$id_graph = serialize_in_temp($graph, null, $ttl);
-
-		return "<img src='" . $homeurl . "include/graphs/functions_pchart.php?static_graph=1&graph_type=line&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
-	}
-}
-
 function stacked_bullet_chart($flash_chart, $chart_data, $width, $height,
 	$color, $legend, $long_index, $no_data_image, $xaxisname = "",
 	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
@@ -487,77 +363,6 @@ function stacked_gauge($flash_chart, $chart_data, $width, $height,
 			);
 }
 
-function line_graph($flash_chart, $chart_data, $width, $height, $color,
-	$legend, $long_index, $no_data_image, $xaxisname = "",
-	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
-	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white',
-	$dashboard = false, $vconsole = false, $series_type = array(),
-	$percentil_values = array(), $yellow_threshold = 0, $red_threshold = 0,
-	$threshold_data = array()) {
-
-	include_once("functions_flot.php");
-
-	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-
-	if (empty($chart_data)) {
-		return '<img src="' . $no_data_image . '" />';
-	}
-
-	$menu = (!$dashboard && !$vconsole);
-
-	if ($flash_chart) {
-		return flot_line_simple_graph(
-			$chart_data,
-			$width,
-			$height,
-			$color,
-			$legend,
-			$long_index,
-			$homeurl,
-			$font,
-			$font_size,
-			$unit,
-			$water_mark_url,
-			$series_type,
-			array(),
-			$yellow_threshold,
-			$red_threshold,
-			'',
-			false,
-			'',
-			$menu,
-			$backgroundColor,
-			$dashboard,
-			$vconsole,
-			false,
-			$percentil_values,
-			$threshold_data,
-			$xaxisname);
-	}
-	else {
-		$graph = array();
-		$graph['data'] = $chart_data;
-		$graph['width'] = $width;
-		$graph['height'] = $height;
-		$graph['color'] = $color;
-		$graph['legend'] = $legend;
-		$graph['xaxisname'] = $xaxisname;
-		$graph['yaxisname'] = $yaxisname;
-		$graph['water_mark'] = $water_mark_file;
-		$graph['font'] = $font;
-		$graph['font_size'] = $font_size;
-		$graph['backgroundColor'] = $backgroundColor;
-		$graph['percentil'] = $percentil_values;
-		$id_graph = serialize_in_temp($graph, null, $ttl);
-
-		if(empty($homeurl)){
-			return "<img src='" . ui_get_full_url (false, false, false, false) . "include/graphs/functions_pchart.php?static_graph=1&graph_type=line&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
-		}else{
-			return "<img src='" . $homeurl . "include/graphs/functions_pchart.php?static_graph=1&graph_type=line&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
-		}
-	}
-}
-
 function kiviat_graph($graph_type, $flash_chart, $chart_data, $width,
 	$height, $no_data_image, $ttl = 1, $homedir="") {
 
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 9da94faff5..19e63923e5 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1143,6 +1143,7 @@ function pandoraFlotArea(
 	var dashboard = show_elements_graph.dashboard;
 	var menu      = show_elements_graph.menu;
 	var max_x     = date_array['final_date'] *1000;
+	var type      = show_elements_graph.stacked;
 
 	//for threshold
 	var threshold        = true;
@@ -1155,30 +1156,29 @@ function pandoraFlotArea(
 	var red_inverse      = parseInt   (data_module_graph.c_inv);
 
 	//XXXX ver que hay que hacer
-	var type          = 'area_simple';
 	var labels_long   = '';
 	var min_check     = 0;
 	var water_mark    = '';
-
 	var legend_events = null;
 	var legend_alerts = null;
 
 	switch (type) {
-		case 'line_simple':
-			stacked = null;
-			filled  = false;
+		case 2:
+			stacked  = null;
+			filled_s = false;
 			break;
-		case 'line_stacked':
-			stacked = 'stack';
-			filled  = false;
+		case 3:
+			stacked  = 'stack';
+			filled_s = false;
 			break;
-		case 'area_simple':
-			stacked = null;
-			filled  = true;
+		default:
+		case 0:
+			stacked  = null;
+			filled_s = 0.2;
 			break;
-		case 'area_stacked':
-			stacked = 'stack';
-			filled  = true;
+		case 1:
+			stacked  = 'stack';
+			filled_s = 0.2;
 			break;
 	}
 
@@ -1203,7 +1203,7 @@ function pandoraFlotArea(
 				case 'area':
 					line_show   = true;
 					points_show = false; // XXX - false
-					filled      = 0.2;
+					filled      = filled_s;
 					steps_chart = false;
 					radius      = false;
 					fill_points = fill_color;
@@ -1230,7 +1230,7 @@ function pandoraFlotArea(
 				case 'boolean':
 					line_show   = true;
 					points_show = false;
-					filled      = true;
+					filled      = false;
 					steps_chart = true;
 					radius      = false;
 					fill_points = fill_color;
@@ -2448,7 +2448,7 @@ function set_watermark(graph_id, plot, watermark_src) {
 		if ($('#'+graph_id+' .yAxis .tickLabel').eq(0).css('height') != undefined) {
 			down_ticks_height = $('#'+graph_id+' .yAxis .tickLabel').eq(0).css('height').split('px')[0];
 		}
-		
+
 		var left_pos = parseInt(context.canvas.width - 3) - $('#watermark_image_'+graph_id)[0].width;
 		var top_pos  = 6;
 		//var top_pos = parseInt(context.canvas.height - down_ticks_height - 10) - $('#watermark_image_'+graph_id)[0].height;
@@ -2561,12 +2561,11 @@ function pad(input, length, padding) {
 }
 // Recalculate the threshold data depends on warning and critical
 function axis_thresholded (threshold_data, y_min, y_max, red_threshold, extremes, red_up) {
-	
 	var y = {
 		min: 0,
 		max: 0
 	};
-	
+
 	// Default values
 	var yaxis_resize = {
 		up: null,
@@ -2597,10 +2596,10 @@ function axis_thresholded (threshold_data, y_min, y_max, red_threshold, extremes
 			if (yaxis_resize['normal_down'] > this.data[0][1]) yaxis_resize['normal_down'] = this.data[0][1];
 		}
 	});
-	
+
 	// If you need to display a up or a down bar, display 10% of data height
 	var margin_up_or_down = (y_max - y_min)*0.10;
-	
+
 	// Calculate the new axis
 	y['max'] = yaxis_resize['normal_up'] > y_max ? yaxis_resize['normal_up'] : y_max;
 	y['min'] = yaxis_resize['normal_down'] > y_min ? yaxis_resize['normal_down'] : y_min;
@@ -2614,14 +2613,15 @@ function axis_thresholded (threshold_data, y_min, y_max, red_threshold, extremes
 			? yaxis_resize['up'] + margin_up_or_down
 			: y_min;
 	}
-	
+
 	return y;
 }
+
 function add_threshold (data_base, threshold_data, y_min, y_max,
 						red_threshold, extremes, red_up) {
-	
+
 	var datas = new Array ();
-	
+
 	$.each(data_base, function() {
 		// Prepared to turning series
 		//if(showed[this.id.split('_')[1]]) {
@@ -2637,7 +2637,7 @@ function add_threshold (data_base, threshold_data, y_min, y_max,
 		if (/_down/.test(this.id)){
 			var end;
 			if (/critical/.test(this.id)) {
-				 end = red_threshold;
+				end = red_threshold;
 			} else {
 				end = extremes[this.id];
 			}
@@ -2659,10 +2659,10 @@ function add_threshold (data_base, threshold_data, y_min, y_max,
 			if (end > y_max) {
 				this.bars.barWidth = y_max - this.data[0][1];
 			}
-		}	
+		}
 		datas.push(this);
 	});
-	
+
 	return datas;
 }
 
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 1787ed1635..0723a71ad0 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -20,17 +20,17 @@ global $config;
 
 function include_javascript_dependencies_flot_graph($return = false) {
 	global $config;
-	
+
 	static $is_include_javascript = false;
-	
+
 	if (!$is_include_javascript) {
 		$is_include_javascript = true;
-		
+
 		$metaconsole_hack = '';
 		if (defined('METACONSOLE')) {
 			$metaconsole_hack = '../../';
 		}
-		
+
 		// NOTE: jquery.flot.threshold is not te original file. Is patched to allow multiple thresholds and filled area
 		$output = '
 			<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="' . ui_get_full_url($metaconsole_hack . '/include/graphs/flot/excanvas.js') . '"></script><![endif]-->
@@ -58,12 +58,12 @@ function include_javascript_dependencies_flot_graph($return = false) {
 				ui_get_full_url($metaconsole_hack . '/include/graphs/flot/jquery.flot.exportdata.pandora.js') .'"></script>
 			<script language="javascript" type="text/javascript" src="'.
 				ui_get_full_url($metaconsole_hack . '/include/graphs/flot/jquery.flot.axislabels.js') .'"></script>
-			<script language="javascript" type="text/javascript" src="'.				
+			<script language="javascript" type="text/javascript" src="'.
 				ui_get_full_url($metaconsole_hack . '/include/graphs/flot/pandora.flot.js') .'"></script>';
 		$output .= "
 			<script type='text/javascript'>
 			var precision_graph = " . $config['graph_precision'] . ";
-			function pieHover(event, pos, obj) 
+			function pieHover(event, pos, obj)
 			{
 				if (!obj)
 					return;
@@ -78,8 +78,8 @@ function include_javascript_dependencies_flot_graph($return = false) {
 					}
 				});
 			}
-			
-			function pieClick(event, pos, obj) 
+
+			function pieClick(event, pos, obj)
 			{
 				if (!obj)
 					return;
@@ -87,10 +87,10 @@ function include_javascript_dependencies_flot_graph($return = false) {
 				alert(''+obj.series.label+': '+obj.series.data[0][1]+' ('+percent+'%)');
 			}
 			</script>";
-		
+
 		if (!$return)
 			echo $output;
-		
+
 		return $output;
 	}
 }
@@ -98,84 +98,6 @@ function include_javascript_dependencies_flot_graph($return = false) {
 ///////////////////////////////
 ////////// AREA GRAPHS ////////
 ///////////////////////////////
-function flot_area_stacked_graph($chart_data, $width, $height, $color,
-	$legend, $long_index, $homeurl = '', $font = '', $font_size = 7, 
-	$unit = '', $water_mark = '', $serie_types = array(), 
-	$chart_extra_data = array(), $yellow_threshold = 0, 
-	$red_threshold = 0, $adapt_key= '', $force_integer = false, 
-	$series_suffix_str = '', $menu = true, $background_color = 'white', 
-	$dashboard = false, $vconsole = false, $agent_module_id = 0) {
-	
-	global $config;
-	
-	return flot_area_graph($chart_data, $width, $height, $color,
-		$legend, $long_index, $homeurl, $unit, 'area_stacked',
-		$water_mark, $serie_types, $chart_extra_data, $yellow_threshold,
-		$red_threshold, $adapt_key, $force_integer, $series_suffix_str,
-		$menu, $background_color, $dashboard, $vconsole, 
-		$agent_module_id, $font, $font_size);
-}
-
-function flot_area_simple_graph($chart_data, $width, $height, $color,
-	$legend, $long_index, $homeurl = '', $unit = '', $water_mark = '',
-	$serie_types = array(), $chart_extra_data = array(),
-	$yellow_threshold = 0, $red_threshold = 0, $adapt_key= '',
-	$force_integer = false, $series_suffix_str = '', $menu = true,
-	$background_color = 'white', $dashboard = false, $vconsole = false, 
-	$agent_module_id = 0, $font = '', $font_size = 7, $xaxisname = '', 
-	$percentil_values = array(), $threshold_data = array()) {
-	
-	global $config;
-
-	return flot_area_graph($chart_data, $width, $height, $color,
-		$legend, $long_index, $homeurl, $unit, 'area_simple',
-		$water_mark, $serie_types, $chart_extra_data, $yellow_threshold,
-		$red_threshold, $adapt_key, $force_integer, $series_suffix_str,
-		$menu, $background_color, $dashboard, $vconsole, 
-		$agent_module_id, $font, $font_size, $xaxisname, $percentil_values,
-		$threshold_data);
-}
-
-function flot_line_stacked_graph($chart_data, $width, $height, $color,
-	$legend, $long_index, $homeurl = '', $font = '', $font_size = 7, 
-	$unit = '', $water_mark = '', $serie_types = array(), 
-	$chart_extra_data = array(), $yellow_threshold = 0, 
-	$red_threshold = 0, $adapt_key= '', $force_integer = false, 
-	$series_suffix_str = '', $menu = true, $background_color = 'white', 
-	$dashboard = false, $vconsole = false, $agent_module_id = 0,
-	$xaxisname = "") {
-	
-	global $config;
-	
-	return flot_area_graph($chart_data, $width, $height, $color,
-		$legend, $long_index, $homeurl, $unit, 'line_stacked',
-		$water_mark, $serie_types, $chart_extra_data, $yellow_threshold,
-		$red_threshold, $adapt_key, $force_integer, $series_suffix_str,
-		$menu, $background_color, $dashboard, $vconsole, 
-		$agent_module_id, $font, $font_size, $xaxisname);
-}
-
-function flot_line_simple_graph($chart_data, $width, $height, $color,
-	$legend, $long_index, $homeurl = '', $font = '', $font_size = 7, 
-	$unit = '', $water_mark = '', $serie_types = array(), 
-	$chart_extra_data = array(), $yellow_threshold = 0, 
-	$red_threshold = 0, $adapt_key= '', $force_integer = false, 
-	$series_suffix_str = '', $menu = true, $background_color = 'white', 
-	$dashboard = false, $vconsole = false, $agent_module_id = 0, 
-	$percentil_values = array(), $threshold_data = array(),
-	$xaxisname = '') {
-	
-	global $config;
-	
-	return flot_area_graph($chart_data, $width, $height, $color,
-		$legend, $long_index, $homeurl, $unit, 'line_simple',
-		$water_mark, $serie_types, $chart_extra_data, $yellow_threshold,
-		$red_threshold, $adapt_key, $force_integer, $series_suffix_str,
-		$menu, $background_color, $dashboard, $vconsole, 
-		$agent_module_id, $font, $font_size, $xaxisname, $percentil_values,
-		$threshold_data);
-}
-
 function flot_area_graph (
 	$agent_module_id, $array_data, $color,
 	$legend, $series_type, $date_array,

From 734c52d8bda4d76f3f7400892a085c59a310ce8f Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Fri, 4 May 2018 11:13:26 +0200
Subject: [PATCH 018/146] New graph thermometer - #2214

---
 .../godmode/reporting/graph_builder.main.php  |   3 +-
 pandora_console/include/constants.php         |   1 +
 pandora_console/include/functions_graph.php   |  73 ++++++
 pandora_console/include/graphs/fgraph.php     |  27 +++
 .../include/graphs/functions_d3.php           |  26 +-
 pandora_console/include/graphs/pandora.d3.js  | 222 ++++++++++++++++++
 .../operation/reporting/graph_viewer.php      |   7 +
 7 files changed, 357 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/reporting/graph_builder.main.php b/pandora_console/godmode/reporting/graph_builder.main.php
index 185f87f5ee..57e5dc9b82 100644
--- a/pandora_console/godmode/reporting/graph_builder.main.php
+++ b/pandora_console/godmode/reporting/graph_builder.main.php
@@ -173,7 +173,8 @@ $stackeds = array(
 	CUSTOM_GRAPH_GAUGE => __('Gauge'),
 	CUSTOM_GRAPH_HBARS => __('Horizontal bars'),
 	CUSTOM_GRAPH_VBARS => __('Vertical bars'),
-	CUSTOM_GRAPH_PIE => __('Pie')
+	CUSTOM_GRAPH_PIE => __('Pie'),
+	CUSTOM_GRAPH_THERMOMETER => __('Thermometer')
 	);
 html_print_select ($stackeds, 'stacked', $stacked);
 
diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index a4aaefbbe9..27f4421b3e 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -444,6 +444,7 @@ define("CUSTOM_GRAPH_LINE",			2);
 define("CUSTOM_GRAPH_STACKED_LINE",	3);
 define("CUSTOM_GRAPH_BULLET_CHART",	4);
 define("CUSTOM_GRAPH_GAUGE",		5);
+define("CUSTOM_GRAPH_THERMOMETER",		10);
 define("CUSTOM_GRAPH_HBARS",		6);
 define("CUSTOM_GRAPH_VBARS",		7);
 define("CUSTOM_GRAPH_PIE",			8);
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index b444231b54..7c4f2cc3cb 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1900,6 +1900,72 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 					$i++;
 				}
 				break;
+				case CUSTOM_GRAPH_THERMOMETER:
+					$datelimit = $date - $period;
+					$i = 0;
+					foreach ($module_list as $module_item) {
+						$automatic_custom_graph_meta = false;
+						if ($config['metaconsole']) {
+							// Automatic custom graph from the report template in metaconsole
+							if (is_array($module_list[$i])) {
+								$server = metaconsole_get_connection_by_id ($module_item['server']);
+								metaconsole_connect($server);
+								$automatic_custom_graph_meta = true;
+							}
+						}
+						
+						if ($automatic_custom_graph_meta)
+							$module = $module_item['module'];
+						else
+							$module = $module_item;
+						
+						$temp[$module] = modules_get_agentmodule($module);
+						$query_last_value = sprintf('
+							SELECT datos
+							FROM tagente_datos
+							WHERE id_agente_modulo = %d
+								AND utimestamp < %d
+								ORDER BY utimestamp DESC',
+							$module, $date);
+						$temp_data = db_get_value_sql($query_last_value);
+						if ( $temp_data ) {
+							if (is_numeric($temp_data))
+								$value = $temp_data;
+							else
+								$value = count($value);
+						}
+						else {
+							$value = false;
+						}
+						$temp[$module]['label'] = ($labels[$module] != '') ? $labels[$module] : $temp[$module]['nombre'];
+						
+						$temp[$module]['value'] = $value;
+						$temp[$module]['label'] = ui_print_truncate_text($temp[$module]['label'],"module_small",false,true,false,"..");
+						
+						if ($temp[$module]['unit'] == '%') {
+							$temp[$module]['min'] =	0;
+							$temp[$module]['max'] = 100;
+						}
+						else {
+							$min = $temp[$module]['min'];
+							if ($temp[$module]['max'] == 0)
+								$max = reporting_get_agentmodule_data_max($module,$period,$date);
+							else
+								$max = $temp[$module]['max'];
+							$temp[$module]['min'] = ($min == 0 ) ? 0 : $min;
+							$temp[$module]['max'] = ($max == 0 ) ? 100 : $max;
+						}
+						$temp[$module]['gauge'] = uniqid('gauge_');
+						
+						if ($config['metaconsole']) {
+							// Automatic custom graph from the report template in metaconsole
+							if (is_array($module_list[0])) {
+								metaconsole_restore_db();
+							}
+						}
+						$i++;
+					}
+					break;
 			default:
 				if (!is_null($percentil) && $percentil) {
 					foreach ($graph_values as $graph_group => $point) {
@@ -2376,6 +2442,13 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 				"", "", $water_mark, $config['fontpath'], $fixed_font_size,
 				"", $ttl, $homeurl, $background_color);
 			break;
+		case CUSTOM_GRAPH_THERMOMETER:
+				return stacked_thermometers($flash_charts, $graph_values,
+					$width, $height, $color, $module_name_list, $long_index,
+					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
+					"", "", $water_mark, $config['fontpath'], $fixed_font_size,
+					"", $ttl, $homeurl, $background_color);
+				break;			
 		case CUSTOM_GRAPH_HBARS:
 			return hbar_graph($flash_charts, $graph_values,
 				$width, $height, $color, $module_name_list, $long_index,
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 259876c896..ac6816ec58 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -531,6 +531,33 @@ function stacked_gauge($flash_chart, $chart_data, $width, $height,
 			);
 }
 
+function stacked_thermometers($flash_chart, $chart_data, $width, $height,
+	$color, $legend, $long_index, $no_data_image, $xaxisname = "",
+	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
+	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white') {
+	
+	include_once('functions_d3.php');
+	
+	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
+	
+	if (empty($chart_data)) {
+		return '<img src="' . $no_data_image . '" />';
+	}
+	
+	return d3_thermometers(
+			$chart_data,
+			$width,
+			$height,
+			$color,
+			$legend,
+			$homeurl,
+			$unit,
+			$font,
+			$font_size + 2,
+			$no_data_image
+			);
+}
+
 function line_graph($flash_chart, $chart_data, $width, $height, $color,
 	$legend, $long_index, $no_data_image, $xaxisname = "",
 	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php
index dde10a1e0a..f740f2feff 100644
--- a/pandora_console/include/graphs/functions_d3.php
+++ b/pandora_console/include/graphs/functions_d3.php
@@ -285,6 +285,31 @@ function d3_gauges($chart_data, $width, $height, $color, $legend,
 	return $output;
 }
 
+function d3_thermometers($chart_data, $width, $height, $color, $legend,
+				$homeurl, $unit, $font, $font_size, $no_data_image) {
+	global $config;
+	
+	foreach ($chart_data as $key => $value) {
+		$chart_data[$key]['agent_name'] = agents_get_alias($chart_data[$key]['id_agente']);
+		$chart_data[$key]['label'] = io_safe_output($chart_data[$key]['label']);
+	}
+	
+	if (is_array($chart_data))
+		$data = json_encode($chart_data);
+	$output = include_javascript_d3(true);
+	
+	$count = 0;
+	
+	$output .= "<div id='thermometers_div' style='float:left; overflow: hidden; margin-left: 10px;'></div>";
+	
+	$output .= "<script language=\"javascript\" type=\"text/javascript\">
+					var data = $data;
+					createthermometers(data, '$width', '$height','$font_size','$no_data_image','$font');
+				</script>";
+
+	return $output;
+}
+
 function ux_console_phases_donut ($phases, $id, $return = false) {
 	global $config;
 
@@ -638,7 +663,6 @@ function print_clock_digital_1 ($time_format, $timezone, $clock_animation,$width
 				    </g>
 				  </g>
 				</svg>
-				
 				';
 				
 				
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 6f4a59cab1..5c2f2e0c10 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1061,6 +1061,228 @@ function createGauges(data, width, height, font_size, no_data_image, font) {
 	
 }
 
+function createthermometers(data, width, height, font_size, no_data_image, font) {
+	
+for (var variable in data) {
+	module_data = data[variable];
+}
+
+// var svg = d3.select('.databox,.filters td')
+
+var svg = d3.select('#thermometers_div')
+		.append("svg")
+			.attr("width", 250)
+			.attr("height", 400);
+	
+	
+var rect = svg.append("rect")
+		.attr("x", 50)
+		.attr("y", 50)
+		.attr("width", 150)
+		.attr("height", 330)
+		.attr("fill", "black")
+		.attr("stroke-width", 5)
+		.attr("stroke", "rgb(37,133,177)")
+		.attr("rx", "10")
+		.attr("ry", "10")
+		.attr("fill", "rgb(235,235,235)");
+		
+		var circle = svg.append("circle")
+				.attr("cx", 130)
+				.attr("cy", 280)
+				.attr("r", 12)
+				.attr("height", 300)
+				.attr("fill", "rgb(74,185,197)");
+				
+		var progress_back = svg.append('rect')
+			.attr('fill', 'rgb(51,51,53)')
+			.attr('height', 200)
+			.attr('width', 12)
+			.attr('x', 123)
+			.attr('y', 70);
+			
+			
+			
+var defs = svg.append("defs");
+
+var gradient = defs.append("linearGradient")
+   .attr("id", "svgGradient")
+   .attr("x1", "0%")
+   .attr("x2", "0%")
+   .attr("y1", "100%")
+   .attr("y2", "0%");
+	 
+gradient.append("stop")
+   .attr('class', 'start')
+   .attr("offset", "0%")
+   .attr("stop-color", "rgb(74,185,197)");
+
+	 if(parseFloat(module_data.value) >= parseFloat(module_data.min_warning) && parseFloat(module_data.value) < parseFloat(module_data.min_critical)){
+	 		gradient.append("stop")
+	 		   .attr('class', 'end')
+	 		   .attr("offset", "100%")
+	 		   .attr("stop-color", "yellow");
+	 	}
+	 	else if((module_data.min_critical != 0 && module_data.max_critical != 0) && parseFloat(module_data.value) >= parseFloat(module_data.min_critical) && (parseFloat(module_data.value) <= parseFloat(module_data.max_critical) || parseFloat(module_data.max_critical) == 0)){
+	 		gradient.append("stop")
+	 		   .attr('class', 'end')
+	 		   .attr("offset", "100%")
+	 		   .attr("stop-color", "red");
+	 	}
+	 	else{
+	 		gradient.append("stop")
+	 			 .attr('class', 'end')
+	 			 .attr("offset", "100%")
+	 			 .attr("stop-color", "rgb(130,185,46)");
+	 	}
+
+		var progress_front = svg.append('rect')
+			.attr('fill', 'red')
+			.attr('height', 0)
+			.attr('width', 12)
+			.attr('x', 123)
+			.attr('y', 270)
+			.attr("fill", "url(#svgGradient)");
+			
+			if(module_data.value.toString().indexOf('.') != -1){
+				if(Math.trunc(module_data.value).toString().length > 1){
+						module_data.value = Math.trunc(module_data.value);
+				}
+				else {
+						module_data.value = parseFloat(module_data.value).toFixed(2);
+				}
+			}
+		
+			if(module_data.value >= 1000){
+				module_data.value_label = Math.trunc(module_data.value/1000);
+				var text = svg.append("text")
+						.attr("x", 100)
+						.attr("y", 320)
+						.style("font-size", "1.5em")
+						.text(module_data.value_label+"k"+" ["+module_data.unit+"]");
+			}
+			else{
+				var text = svg.append("text")
+						.attr("x", 100)
+						.attr("y", 320)
+						.style("font-size", "1.5em")
+						.text(module_data.value+" ["+module_data.unit+"]");
+			}
+			
+			
+			agent_text = module_data.agent_name;
+			
+			if(agent_text.length > 12){
+				agent_text = agent_text.substring(0, 10)+"...";
+			}
+			
+			var text = svg.append("text")
+					.attr("x", 65)
+					.attr("y", 370)
+					.style("font-size", "1.5em")
+					.text(agent_text);
+					
+					
+			label_text = module_data.label;
+					
+			if(label_text.length > 12){
+				label_text = label_text.substring(0, 10)+"...";
+			}
+			
+			var text = svg.append("text")
+					.attr("x", 65)
+					.attr("y", 350)
+					.style("font-size", "1.5em")
+					.text(label_text);
+					
+			var temp_sum = module_data.max-module_data.min;
+			var div_sum = (temp_sum/10);
+			var max_temp = module_data.max;
+			var min_temp = module_data.min;
+			var y = 75;
+			
+			var count = 0;
+			
+			var startPercent = 0;
+			var endPercent = module_data.value * 200 / max_temp;
+			
+			var step = endPercent / 20;
+			
+			while (max_temp >= min_temp) {
+								
+				if(count != 9){
+						if(max_temp.toString().indexOf('.') != -1){
+							if(Math.trunc(max_temp).toString().length > 1){
+									max_temp = Math.trunc(max_temp);
+							}
+							else {
+									max_temp = parseFloat(max_temp).toFixed(2);
+							}
+						}
+					
+						if(max_temp >= 1000){
+							max_temp_label = Math.trunc(max_temp/1000);
+							var text = svg.append("text")
+									.attr("x", 160)
+									.attr("y", y)
+									.style("font-size", "1.2em")
+									.text(max_temp_label+'k');
+						}
+						else{
+							var text = svg.append("text")
+									.attr("x", 160)
+									.attr("y", y)
+									.style("font-size", "1.2em")
+									.text(max_temp);
+						}
+						
+						var line = svg.append("line")
+								.attr("x1", 142)
+								.attr("y1", y-4)
+								.attr("x2", 153)
+								.attr("y2", y-4)
+								.attr("stroke", "black")
+								.style("font-size", "1.2em")
+								.text(max_temp);
+						
+						y += 20;
+				
+				max_temp = max_temp-div_sum;
+			}
+			if(count==10){
+				max_temp = module_data.min;
+			}
+			
+			count++;
+			}
+			
+			
+			
+			function updateProgress(bar_progress) {
+				var bar_progress = Number(bar_progress);
+				progress_front.attr('height', (bar_progress));
+				progress_front.attr('y', (270-bar_progress));
+			}
+
+			var bar_progress = startPercent;
+
+			(function loops() {
+				updateProgress(bar_progress);
+
+				if (bar_progress < endPercent) {
+					bar_progress += step;
+					setTimeout(loops, 30);
+				}
+				else{					
+					delete data[module_data['id_agente_modulo']];
+					if(Object.keys(data).length > 0){
+						createthermometers(data, width, height, font_size, no_data_image, font)
+					}
+				}
+			})();
+			
+}
+
 
 function Gauge(placeholderName, configuration, font)
 {
diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php
index e2b4fee3bb..f5d1143623 100644
--- a/pandora_console/operation/reporting/graph_viewer.php
+++ b/pandora_console/operation/reporting/graph_viewer.php
@@ -124,6 +124,12 @@ if ($view_graph) {
 		$height = $graph["height"];
 	}
 	
+	if ($stacked == CUSTOM_GRAPH_THERMOMETER ){
+		// Use the defined graph height, that's why
+		// the user can setup graph height.
+		$height = $graph["height"];
+	}
+	
 	$name = $graph["name"];
 	if (($graph["private"]==1) && ($graph["id_user"] != $id_user)) {
 		db_pandora_audit("ACL Violation",
@@ -235,6 +241,7 @@ if ($view_graph) {
 	$stackeds[CUSTOM_GRAPH_HBARS] = __('Horizontal Bars');
 	$stackeds[CUSTOM_GRAPH_VBARS] = __('Vertical Bars');
 	$stackeds[CUSTOM_GRAPH_PIE] = __('Pie');
+	$stackeds[CUSTOM_GRAPH_THERMOMETER] = __('Thermometer');
 	html_print_select ($stackeds, 'stacked', $stacked , '', '', -1, false, false);
 	echo "</td>";
 

From 614db8b523aae65034fd367ddd18f2235b61bb88 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 9 May 2018 11:49:12 +0200
Subject: [PATCH 019/146] [Rebranding] Added product name and copyright notice
 to setup

---
 pandora_console/include/functions.php        | 28 ++++++++++++++++++++
 pandora_console/include/functions_config.php |  6 ++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 6c4d0a8199..d0d4fd30da 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2811,4 +2811,32 @@ function validate_address($address){
 	}
 	return true;
 }
+
+/**
+ * Get the product name.
+ *
+ * @return string If the installation is open, it will be 'Pandora FMS'.
+ * 		If the product name stored is empty, it returns 'Pandora FMS' too.
+ */
+function get_product_name () {
+	$stored_name = enterprise_hook('enterprise_get_product_name');
+	if (empty($stored_name) || $stored_name == ENTERPRISE_NOT_HOOK) {
+		return "Pandora FMS";
+	}
+	return $stored_name;
+}
+
+/**
+ * Get the copyright notice.
+ *
+ * @return string If the installation is open, it will be 'Artica ST'.
+ * 		If the product name stored is empty, it returns 'Artica ST' too.
+ */
+function get_copyright_notice () {
+	$stored_name = enterprise_hook('enterprise_get_copyright_notice');
+	if (empty($stored_name) || $stored_name == ENTERPRISE_NOT_HOOK) {
+		return "Ártica ST";
+	}
+	return $stored_name;
+}
 ?>
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 87c8e9cb6a..4f78bdf79d 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -249,7 +249,11 @@ function config_update_config () {
 							$error_update[] = __('Metaconsole agent cache');
 						if (!config_update_value ('log_collector', (bool)get_parameter('log_collector')))
 							$error_update[] = __('Activate Log Collector');
-						
+						if (!config_update_value ('rb_product_name', (string)get_parameter('rb_product_name')))
+							$error_update[] = __('Product name');
+						if (!config_update_value ('rb_copyright_notice', (string)get_parameter('rb_copyright_notice')))
+							$error_update[] = __('Copyright notice');
+
 						$inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array());
 						if (!config_update_value ('inventory_changes_blacklist', implode(',',$inventory_changes_blacklist)))
 							$error_update[] = __('Inventory changes blacklist');

From a3ebd008764e17b7f6c3d6cb5c2c957a22976fa7 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 9 May 2018 13:12:03 +0200
Subject: [PATCH 020/146] [Rebranding] Node setup and footer

---
 pandora_console/general/footer.php            |  4 +--
 pandora_console/general/login_required.php    |  2 +-
 pandora_console/godmode/setup/setup_auth.php  |  2 +-
 .../godmode/setup/setup_general.php           | 27 ++++++-------------
 .../godmode/setup/setup_visuals.php           | 12 ++++-----
 pandora_console/include/functions_config.php  |  6 ++---
 6 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php
index 99cebe8f2d..33c8493e26 100644
--- a/pandora_console/general/footer.php
+++ b/pandora_console/general/footer.php
@@ -45,11 +45,11 @@ else{
 	$build_package_version = $current_package;
 }
 
-echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_package_version, $config["MR"]));
+echo sprintf(__('%s %s - Build %s - MR %s', get_product_name(), $pandora_version, $build_package_version, $config["MR"]));
 
 echo '</a><br />';
 echo '<a class="white footer">'. __('Page generated at') . ' '. date('F j, Y h:i a'); //Always use timestamp here
-echo '</a><br /><span style="color:#eff">'.__("&reg; Ártica ST").'</span>';
+echo '</a><br /><span style="color:#eff">&reg; '.get_copyright_notice().'</span>';
 
 if (isset ($config['debug'])) {
 	$cache_info = array();
diff --git a/pandora_console/general/login_required.php b/pandora_console/general/login_required.php
index 5cb52604c5..e6486665ea 100644
--- a/pandora_console/general/login_required.php
+++ b/pandora_console/general/login_required.php
@@ -83,7 +83,7 @@ echo '<div id="login_id_dialog" title="' .
 		$table->size[1] = '60%';
 		$table->border = '5px solid';
 		
-		$table->data[0][0] = __('Language code for Pandora');
+		$table->data[0][0] = __('Language code');
 		$table->data[0][1] = html_print_select_from_sql (
 			'SELECT id_language, name FROM tlanguage',
 			'language', $config['language'] , '', '', '', true);
diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index 96893aa091..3adf8adf8a 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -185,7 +185,7 @@ $no_autocreate_rows = array();
 $ldap_rows = array();
 
 // Method
-$auth_methods = array ('mysql' => __('Local Pandora FMS'), 'ldap' => __('ldap'));
+$auth_methods = array ('mysql' => __('Local %s', get_product_name()), 'ldap' => __('ldap'));
 if (enterprise_installed()) {
 	add_enterprise_auth_methods($auth_methods);
 }
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index b27cc2a7c5..352f2dda56 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -49,7 +49,7 @@ if ($current_system_lang == "") {
 	$current_system_lang = "en";
 }
 
-$table->data[0][0] = __('Language code for Pandora');
+$table->data[0][0] = __('Language code');
 $table->data[0][1] = html_print_select_from_sql (
 	'SELECT id_language, name FROM tlanguage',
 	'language', $current_system_lang , '', '', '', true);
@@ -72,7 +72,7 @@ $table->data[10][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('a
 $table->data[10][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('autoupdate', 0, '', $config["autoupdate"], true);
 
 $table->data[11][0] = __('Enforce https');
-$table->data[11][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to Pandora FMS Console. Do you want to continue?') . "')) return false", '', true) .'&nbsp;&nbsp;';
+$table->data[11][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to %s Console. Do you want to continue?', get_product_name()) . "')) return false", '', true) .'&nbsp;&nbsp;';
 $table->data[11][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('https', 0, '', $config["https"], true);
 
 $table->data[12][0] = __('Use cert of SSL');
@@ -99,7 +99,7 @@ $table->data[16][0] = __('API password') .
 	ui_print_help_tip (__("Please be careful if you put a password put https access."), true);
 $table->data[16][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true);
 
-$table->data[17][0] = __('Enable GIS features in Pandora Console');
+$table->data[17][0] = __('Enable GIS features');
 $table->data[17][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('activate_gis', 1, '', $config["activate_gis"], true).'&nbsp;&nbsp;';
 $table->data[17][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('activate_gis', 0, '', $config["activate_gis"], true);
 
@@ -141,7 +141,6 @@ $table->data[23][1] .= '<a id="change_timezone">'.html_print_image ('images/penc
 $table->data[23][1] .= "&nbsp;&nbsp;". html_print_select($zone_name, 'zone', $zone_selected, 'show_timezone();', '', '', true);
 $table->data[23][1] .= "&nbsp;&nbsp;". html_print_select($timezone_n, 'timezone', $config["timezone"], '', '', '', true);
 
-
 $sounds = get_sounds();
 $table->data[24][0] = __('Sound for Alert fired');
 $table->data[24][1] = html_print_select($sounds, 'sound_alert', $config['sound_alert'], 'replaySound(\'alert\');', '', '', true);
@@ -159,12 +158,12 @@ $table->data[26][1] .= ' <a href="javascript: toggleButton(\'warning\');">' . ht
 $table->data[26][1] .= '<div id="layer_sound_warning"></div>';
 
 $table->data[28][0] = __('Public URL');
-$table->data[28][0] .= ui_print_help_tip(__('Set this value when your PandoraFMS across inverse proxy or for example with mod_proxy of Apache.') .
-	' '.__('Without the index.php such as http://domain/pandora_url/'), true);
+$table->data[28][0] .= ui_print_help_tip(__('Set this value when your %s across inverse proxy or for example with mod_proxy of Apache.', get_product_name()) .
+	' '.__('Without the index.php such as http://domain/console_url/'), true);
 $table->data[28][1] = html_print_input_text ('public_url', $config['public_url'], '', 40, 255, true);
 
 $table->data[29][0] = __('Referer security');
-$table->data[29][0] .= ui_print_help_tip(__('When it is set as "yes" in some important sections check if the user have gone from url Pandora.'), true);
+$table->data[29][0] .= ui_print_help_tip(__("If enabled, actively checks if the user comes from %s's URL", get_product_name()), true);
 $table->data[29][1] = __('Yes') . '&nbsp;&nbsp;&nbsp;' .
 	html_print_radio_button ('referer_security', 1, '', $config["referer_security"], true) .
 	'&nbsp;&nbsp;';
@@ -281,20 +280,10 @@ function show_timezone () {
 }
 
 $(document).ready (function () {
-	
+
 	$("#zone").attr("hidden", true);
 	$("#timezone").attr("hidden", true);
-	
-	$("input[name='acl_enterprise']").click(function() {
-		flag = $(this).is(':checked');
-		if (flag == true) {
-			<?php
-			echo "if (! confirm ('" . __('If Enterprise ACL System is enabled without rules you will lose access to Pandora FMS Console (even admin). Do you want to continue?') . "')) return false;";
-			?>
-		}
-	});
-	
-	
+
 	$("#change_timezone").click(function () {
 		$("#zone").attr("hidden", false);
 		$("#timezone").attr("hidden", false);
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index bbe0e20d27..3e7eda10f1 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -386,7 +386,7 @@ $table_font->data[$row][1] = html_print_select($font_size_array, 'font_size',
 $row++;
 
 $table_font->data[$row][0] = __('Agent size text') .
-	ui_print_help_tip(__('When the agent name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
+	ui_print_help_tip(__('When the agent name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), true);
 $table_font->data[$row][1] = __('Small:') .
 	html_print_input_text ('agent_size_text_small', $config["agent_size_text_small"], '', 3, 3, true);
 $table_font->data[$row][1] .= ' ' . __('Normal:') .
@@ -394,19 +394,19 @@ $table_font->data[$row][1] .= ' ' . __('Normal:') .
 $row++;
 
 $table_font->data[$row][0] = __('Module size text') .
-	ui_print_help_tip(__('When the module name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
+	ui_print_help_tip(__('When the module name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), true);
 $table_font->data[$row][1] = __('Small:') .
 	html_print_input_text ('module_size_text_small', $config["module_size_text_small"], '', 3, 3, true);
 $table_font->data[$row][1] .= ' ' . __('Normal:') .
 	html_print_input_text ('module_size_text_medium', $config["module_size_text_medium"], '', 3, 3, true);
 $row++;
 
-$table_font->data[$row][0] = __('Description size text') . ui_print_help_tip(__('When the description name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
+$table_font->data[$row][0] = __('Description size text') . ui_print_help_tip(__('If the description name has a lot of characters, in some places in %s Console it is necessary to truncate it to N characters.', get_product_name()), true);
 $table_font->data[$row][1] = html_print_input_text ('description_size_text', $config["description_size_text"], '', 3, 3, true);
 $row++;
 
 $table_font->data[$row][0] = __('Item title size text') .
-	ui_print_help_tip(__('When the item title name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
+	ui_print_help_tip(__('When the item title name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console.', get_product_name()), true);
 $table_font->data[$row][1] = html_print_input_text('item_title_size_text',
 	$config["item_title_size_text"], '', 3, 3, true);
 $row++;
@@ -488,7 +488,7 @@ if (!enterprise_installed()) {
 	$disabled_graph_precision = true;
 }
 
-$table_chars->data[$row][0] = __('Data precision in PandoraFMS');
+$table_chars->data[$row][0] = __('Data precision');
 $table_chars->data[$row][0] .= ui_print_help_tip(__('Number of decimals shown. It must be a number between 0 and 5, except in graphs.'), true);
 $table_chars->data[$row][1] = html_print_input_text ('graph_precision', $config["graph_precision"], '', 5, 5, true, $disabled_graph_precision, false, "onChange=\"change_precision()\"");
 $row++;
@@ -665,7 +665,7 @@ $table_other->data['custom_report_front-font'][1] = html_print_select ($_fonts,
 $table_other->data['custom_report_front-logo'][0] =  __('Custom report front') . ' - ' .
 	__('Custom logo') .
 	ui_print_help_tip(
-		__("The dir of custom logos is in your www Pandora Console in \"images/custom_logo\". You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), true);
+		__("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), true);
 $table_other->data['custom_report_front-logo'][1] = html_print_select(
 	$customLogos,
 	'custom_report_front_logo',
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 4f78bdf79d..776a0e5b03 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -126,7 +126,7 @@ function config_update_config () {
 			switch ($section_setup) {
 				case 'general':
 					if (!config_update_value ('language', (string) get_parameter ('language')))
-						$error_update[] = __('Language code for Pandora');
+						$error_update[] = __('Language settings');
 					if (!config_update_value ('remote_config', (string) get_parameter ('remote_config')))
 						$error_update[] = __('Remote config directory');
 					if (!config_update_value ('loginhash_pwd', io_input_password((string) get_parameter ('loginhash_pwd'))))
@@ -149,9 +149,7 @@ function config_update_config () {
 					if (!config_update_value ('api_password', io_input_password(get_parameter('api_password'))))
 						$error_update[] = __('API password');
 					if (!config_update_value ('activate_gis', (bool) get_parameter ('activate_gis')))
-						$error_update[] = __('Enable GIS features in Pandora Console');
-					if (!config_update_value ('integria_enabled', get_parameter ('integria_enabled')))
-						$error_update[] = __('Enable Integria incidents in Pandora Console');
+						$error_update[] = __('Enable GIS features');
 					if (!config_update_value ('integria_inventory', get_parameter ('integria_inventory')))
 						$error_update[] = __('Integria inventory');
 					if (!config_update_value ('integria_api_password', io_input_password(get_parameter ('integria_api_password'))))

From 34b953964a34fc2aeecbcfde2a5267a14e7b154c Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 9 May 2018 13:42:20 +0200
Subject: [PATCH 021/146] [Rebranding] Added rebranding to extensions

---
 pandora_console/extensions/api_checker.php     |  2 +-
 pandora_console/extensions/db_status.php       |  8 ++++----
 pandora_console/extensions/net_tools.php       | 10 +++++-----
 pandora_console/extensions/pandora_logs.php    |  2 +-
 pandora_console/extensions/realtime_graphs.php | 12 ++++++------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pandora_console/extensions/api_checker.php b/pandora_console/extensions/api_checker.php
index 6aecf21073..24f7bc31ed 100755
--- a/pandora_console/extensions/api_checker.php
+++ b/pandora_console/extensions/api_checker.php
@@ -101,7 +101,7 @@ function extension_api_checker() {
 	$table->data[] = $row;
 	
 	$row = array();
-	$row[] = __("Pandora Console URL");
+	$row[] = __("%s Console URL", get_product_name());
 	$row[] = html_print_input_text('pandora_url', $pandora_url, '', 50, 255, true);
 	$table->data[] = $row;
 	
diff --git a/pandora_console/extensions/db_status.php b/pandora_console/extensions/db_status.php
index d184850a34..84cf67022d 100755
--- a/pandora_console/extensions/db_status.php
+++ b/pandora_console/extensions/db_status.php
@@ -180,10 +180,10 @@ function extension_db_check_tables_differences($connection_test,
 	$diff_tables = array_diff($tables_test, $tables_system);
 	
 	ui_print_result_message(
-		empty($diff_tables),
-		__('Successful the DB Pandora has all tables'),
-		__('Pandora DB could not retrieve all tables. The missing tables are (%s)',
-			implode(", ", $diff_tables)));
+		!empty($diff_tables),
+		__('Success! %s DB contains all tables', get_product_name()),
+		__('%s DB could not retrieve all tables. The missing tables are (%s)',
+			get_product_name(), implode(", ", $diff_tables)));
 	
 	if (!empty($diff_tables)) {
 		foreach ($diff_tables as $table) {
diff --git a/pandora_console/extensions/net_tools.php b/pandora_console/extensions/net_tools.php
index 2f18a569d4..a223f6aa96 100644
--- a/pandora_console/extensions/net_tools.php
+++ b/pandora_console/extensions/net_tools.php
@@ -313,23 +313,23 @@ function godmode_net_tools() {
 	$table->data = array();
 	
 	$table->data[0][0] = __("Traceroute path");
-	$table->data[0][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the traceroute system.'), true);
+	$table->data[0][0] .= ui_print_help_tip(__('If empty, %s will search the traceroute system.', get_product_name()), true);
 	$table->data[0][1] = html_print_input_text('traceroute_path', $traceroute_path, '', 40, 255, true);
 	
 	$table->data[1][0] = __("Ping path");
-	$table->data[1][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the ping system.'), true);
+	$table->data[1][0] .= ui_print_help_tip(__('If empty, %s will search the ping system.', get_product_name()), true);
 	$table->data[1][1] = html_print_input_text('ping_path', $ping_path, '', 40, 255, true);
 	
 	$table->data[2][0] = __("Nmap path");
-	$table->data[2][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the nmap system.'), true);
+	$table->data[2][0] .= ui_print_help_tip(__('If empty, %s will search the nmap system.', get_product_name()), true);
 	$table->data[2][1] = html_print_input_text('nmap_path', $nmap_path, '', 40, 255, true);
 	
 	$table->data[3][0] = __("Dig path");
-	$table->data[3][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the dig system.'), true);
+	$table->data[3][0] .= ui_print_help_tip(__('If empty, %s will search the dig system', get_product_name()), true);
 	$table->data[3][1] = html_print_input_text('dig_path', $dig_path, '', 40, 255, true);
 	
 	$table->data[4][0] = __("Snmpget path");
-	$table->data[4][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the snmpget system.'), true);
+	$table->data[4][0] .= ui_print_help_tip(__('If empty, %s will search the snmpget system.', get_product_name()), true);
 	$table->data[4][1] = html_print_input_text('snmpget_path', $snmpget_path, '', 40, 255, true);
 	
 	echo '<form id="form_setup" method="post" >';
diff --git a/pandora_console/extensions/pandora_logs.php b/pandora_console/extensions/pandora_logs.php
index 4241018a16..71cf847fa5 100644
--- a/pandora_console/extensions/pandora_logs.php
+++ b/pandora_console/extensions/pandora_logs.php
@@ -69,7 +69,7 @@ function pandoralogs_extension_main () {
 	
 	ui_print_page_header (__("System logfile viewer"), "images/extensions.png", false, "", true, "" );
 	
-	echo "<p>" . __('Use this tool to view your Pandora FMS logfiles directly on the console') . "</p>";
+	echo "<p>" . __('Use this tool to view your %s logfiles directly on the console', get_product_name()) . "</p>";
 
 	echo "<p>" . __('You can choose the amount of information shown in general setup (Log size limit in system logs viewer extension), ' . $config['max_log_size'] * 1000 . 'B at the moment') . "</p>";
 	
diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php
index 0f0fdf6990..e8cac701bb 100644
--- a/pandora_console/extensions/realtime_graphs.php
+++ b/pandora_console/extensions/realtime_graphs.php
@@ -63,12 +63,12 @@ function pandora_realtime_graphs () {
 	$table->style['snmp_oid'] = 'font-weight: bold;';
 	$table->data = array ();
 	
-	$graph_fields['cpu_load'] = __('Pandora Server CPU');
-	$graph_fields['pending_packets'] = __('Pandora Server Pending packets');
-	$graph_fields['disk_io_wait'] = __('Pandora Server Disk IO Wait');
-	$graph_fields['apache_load'] = __('Pandora Server Apache load');
-	$graph_fields['mysql_load'] = __('Pandora Server MySQL load');
-	$graph_fields['server_load'] = __('Pandora Server load');
+	$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['snmp_interface'] = __('SNMP Interface throughput');
 	
 	$graph = get_parameter('graph', 'cpu_load');

From b9504038fa64078a11dccb4f19944f355c28de71 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 9 May 2018 15:16:39 +0200
Subject: [PATCH 022/146] [Rebranding] First tasks

---
 .../general/firts_task/custom_graphs.php           |  7 ++++---
 pandora_console/general/firts_task/map_builder.php | 14 +++++++++-----
 .../general/firts_task/planned_downtime.php        |  9 +++++----
 pandora_console/general/firts_task/tags.php        |  6 +++---
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/pandora_console/general/firts_task/custom_graphs.php b/pandora_console/general/firts_task/custom_graphs.php
index 2d63aa4382..a951bb4966 100644
--- a/pandora_console/general/firts_task/custom_graphs.php
+++ b/pandora_console/general/firts_task/custom_graphs.php
@@ -29,9 +29,10 @@ ui_print_info_message ( array('no_close'=>true, 'message'=>  __('There are no cu
 	</div>
 	<div class="text_task">
 		<h3> <?php echo __('Create Custom Graph'); ?></h3>
-		<p id="description_task"> <?php echo __("Graphs are designed to show the data collected by Pandora FMS in a temporary scale defined by the user.
-				Pandora FMS Graphs display data in real time. They are generated every time the operator requires any of them and display the up-to-date state.
-				There are two types of graphs: The agent's automated graphs and the graphs the user customizes by using one or more modules to do so."); ?></p>
+		<p id="description_task"> <?php echo __("Graphs are designed to show the data collected by %s in a temporary scale defined by the user.
+				%s Graphs display data in real time. They are generated every time the operator requires any of them and display the up-to-date state.
+				There are two types of graphs: The agent's automated graphs and the graphs the user customizes by using one or more modules to do so.",
+				get_product_name(), get_product_name()); ?></p>
 		<form action="index.php?sec=reporting&sec2=godmode/reporting/graph_builder" method="post">
 			<input type="submit" class="button_task" value="<?php echo __('Create Custom Graph'); ?>" />
 		</form>
diff --git a/pandora_console/general/firts_task/map_builder.php b/pandora_console/general/firts_task/map_builder.php
index 26409ce803..e9f7451236 100755
--- a/pandora_console/general/firts_task/map_builder.php
+++ b/pandora_console/general/firts_task/map_builder.php
@@ -33,11 +33,15 @@ if ($vconsoles_write || $vconsoles_manage) {
 	</div>
 	<div class="text_task">
 		<h3> <?php echo __('Create Visual Console'); ?></h3>
-		<p id="description_task"> <?php echo __("Pandora FMS allows you to create visual maps in which each user is able to create his own monitoring map.
-			The new visual console editor is much more practical, although the old visual console editor had its advantages. 
-			Within the new visual console, we've been successful in imitating the sensation and touch of a drawing application like GIMP. 
-			We've also simplified the editor by dividing it into several subject-matter tabs named 'Data', 'Preview', 'Wizard', 'List of Elements' and 'Editor'.
-			The elements the Pandora FMS Visual Map was designed to handle are 'static image', 'percentage bar', 'module graph' and 'simple value'. "); ?></p>
+		<p id="description_task"> <?php echo __(
+			"%s allows users to create visual maps on which each user is able to create his or her " .
+			"own monitoring map. The new visual console editor is much more practical, although the prior " .
+			"visual console editor had its advantages. On the new visual console, we've been successful in " .
+			"imitating the sensation and touch of a drawing application like GIMP. We've also simplified the " .
+			"editor by dividing it into several subject-divided tabs named 'Data', 'Preview', 'Wizard', 'List of " .
+			"Elements' and 'Editor'. The items the %s Visual Map was designed to handle are " .
+			"'static images', 'percentage bars', 'module graphs' and 'simple values'.",
+			get_product_name(), get_product_name()); ?></p>
 		<form action="index.php?sec=network&amp;sec2=godmode/reporting/visual_console_builder" method="post">
 			<?php html_print_input_hidden ('edit_layout', 1); ?>
 			<input type="submit" class="button_task" value="<?php echo __('Create Visual Console'); ?>" />
diff --git a/pandora_console/general/firts_task/planned_downtime.php b/pandora_console/general/firts_task/planned_downtime.php
index 052e12df9c..e8f38d35e9 100644
--- a/pandora_console/general/firts_task/planned_downtime.php
+++ b/pandora_console/general/firts_task/planned_downtime.php
@@ -26,10 +26,11 @@ ui_require_css_file ('firts_task');
 	</div>
 	<div class="text_task">
 		<h3> <?php echo __('Create Planned Downtime'); ?></h3>
-		<p id="description_task"> <?php echo __("Pandora FMS contains a scheduled downtime management system. 
-						This system was designed to deactivate the alerts in the intervals whenever there is down time by deactivating the agent.
-						If an agent is deactivated, it doesn't collect information. In a down time, the down-time intervals aren't taken into 
-						account for most of the metrics or types of reports, because the agents don't contain any data within those intervals. "); ?></p>
+		<p id="description_task"> <?php echo __("%s contains a scheduled downtime management system.
+						This system was designed to deactivate alerts during specific intervals whenever there is down time by deactivating the agent.
+						If an agent is deactivated, it doesn't gather information. During down time, down-time intervals aren't taken into
+						account for most metrics or report types, because agents don't contain any data within those intervals.",
+						get_product_name()); ?></p>
 		<form action="index.php?sec=estado&amp;sec2=godmode/agentes/planned_downtime.editor" method="post">
 			<input type="submit" class="button_task" value="<?php echo __('Create Planned Downtime'); ?>" />
 		</form>
diff --git a/pandora_console/general/firts_task/tags.php b/pandora_console/general/firts_task/tags.php
index 037f7ef2e5..e0069e55c0 100755
--- a/pandora_console/general/firts_task/tags.php
+++ b/pandora_console/general/firts_task/tags.php
@@ -26,9 +26,9 @@ ui_require_css_file ('firts_task');
 	</div>
 	<div class="text_task">
 		<h3> <?php echo __('Create Tags'); ?></h3>
-		<p id="description_task"> <?php echo __("From Pandora FMS versions 5 and above, the access to modules can be configured by a tags system.
-								Tags are configured on the system and be assigned to the chosen modules. 
-								The user's access can be limited to modules with certain tags in this way. "); ?></p>
+		<p id="description_task"> <?php echo __("Access to modules can be configured by a tagging system.
+								Tags are configured on the system and are assigned to the chosen modules.
+								A user's access can therefore be restricted to modules with certain tags."); ?></p>
 		<form action="index.php?sec=gmodules&sec2=godmode/tag/edit_tag&action=new" method="post">
 			<input type="submit" class="button_task" value="<?php echo __('Create Tags'); ?>" />
 		</form>

From 33abfa7f9d2945fe94c17fa1462f509106ae76a5 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 9 May 2018 18:50:45 +0200
Subject: [PATCH 023/146] [Rebranding] Other general source files. Removed
 unreached code oon general/logon_ok.php

---
 pandora_console/general/alert_enterprise.php  |  26 +--
 pandora_console/general/header.php            |   8 +-
 pandora_console/general/login_help_dialog.php |   5 +-
 .../general/login_identification_wizard.php   |  12 +-
 pandora_console/general/login_page.php        |  29 +--
 pandora_console/general/login_required.php    |   4 +-
 pandora_console/general/logon_ok.php          | 202 +-----------------
 pandora_console/general/noaccess.php          |   9 +-
 pandora_console/general/pandora_help.php      |   4 +-
 pandora_console/include/styles/pandora.css    |   4 +
 10 files changed, 59 insertions(+), 244 deletions(-)

diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php
index 66d6e36b09..3b099fe677 100644
--- a/pandora_console/general/alert_enterprise.php
+++ b/pandora_console/general/alert_enterprise.php
@@ -93,15 +93,17 @@ switch ($tipo) {
 	
 	case "helpmodal":
 	
-	echo __("This is the online help for Pandora FMS console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use Pandora FMS. Official documentation of Pandora FMS is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.<br><br>
-	<a href='https://pandorafms.org/en/docs/monitoring-documentation/' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>");
+	echo __("This is the online help for %s console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use %s. Official documentation of %s is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.<br><br>
+  <a href='https://pandorafms.org/en/docs/monitoring-documentation/' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>",
+  get_product_name(), get_product_name(), get_product_name());
 	
 	break;
 	
 	case "noaccess":
 	
-	echo __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br/> <br/>
-	Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+	echo __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br> <br>
+    Please know that all attempts to access this page are recorded in security logs of %s System Database.',
+    get_product_name());
 	
 	break;
 	
@@ -111,13 +113,13 @@ switch ($tipo) {
 
   echo 
     '<p>' .
-    	__('The Update Manager client is included on Pandora FMS. It helps system administrators update their Pandora FMS automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
+    	__('The Update Manager client is included on %s. It helps system administrators update their %s automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.', get_product_name(), get_product_name()) .
     '</p>' .
     '<p>' .
     	__('<b>OpenSource version updates are automated packages generated each week. These updates come WITHOUT ANY warranty or support. If your system is corrupted or a feature stops working properly, you will need to recover a backup by yourself.</b>') .
     '</p>' .
     '<p>' .
-    	__('The Enterprise version comes with a different update system, with fully tested, professionally-supported packages, and our support team is there to help you in case of problems or queries. Update Manager is another feature present in the Enterprise version and not included in the OpenSource version. There are lots of advanced business-oriented features contained in Pandora FMS Enterprise Edition. For more information visit <a href="http://pandorafms.com">pandorafms.com</a>') .
+    	__('The Enterprise version comes with a different update system, with fully tested, professionally-supported packages, and our support team is there to help you in case of problems or queries. Update Manager is another feature present in the Enterprise version and not included in the OpenSource version. There are lots of advanced business-oriented features contained in %s Enterprise Edition. For more information visit <a href="http://pandorafms.com">pandorafms.com</a>', get_product_name()) .
     '</p>'
     ;
     	
@@ -125,13 +127,13 @@ switch ($tipo) {
     	
     	echo 
       '<p>' .
-    		__('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
+    		__('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is included on %s. It helps system administrators update their %s automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.', get_product_name(), get_product_name()) .
     	'</p>' .
     	'<p>' .
-    		__('Update Manager is one of the most advanced features of Pandora FMS Enterprise version, for more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.') .
+    		__('The Update Manager is one of the most advanced features on the %s Enterprise Edition. For more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.', get_product_name()) .
     	'</p>' .
     	'<p>' .
-    		__('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, please remove the remote server address from the Update Manager plugin setup.') .
+    		__('Update Manager sends anonymous information about %s usage (number of agents and modules running). To disable it, please remove the remote server address from the Update Manager plugin setup.', get_product_name()) .
     	'</p>'
     ;
     }
@@ -142,13 +144,13 @@ switch ($tipo) {
       <br><br><img style='width:105px' src='".$config['homeurl']."images/logo_oracle.png'><img style='width:105px' src='".$config['homeurl']."images/logo_citrix.png'><img style='width:105px' src='".$config['homeurl']."images/logo_sap.png'><img style='width:105px' src='".$config['homeurl']."images/logo_exchange.png'><br><br><span style='font-style:italic;'>* Todos los logotipos pertenecen a marcas registradas</span>");
       break;
     case "massivemodal":
-      echo __("Do you want to consolidate all your system monitoring? Do you have many systems, making it difficult to manage them in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? Pandora FMS Enterprise Policies are exactly what you need; you'll save time, effort and annoyances. More information <a href='pandorafms.com'>pandorafms.com</a>");
+      echo __("Do you want to consolidate all your system monitoring? Do you have many systems, making it difficult to manage them in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? %s Enterprise Policies are exactly what you need; you'll save time, effort and annoyances. More information <a href='pandorafms.com'>pandorafms.com</a>", get_product_name());
       break;
     case "eventsmodal":
-      echo __("Pandora FMS Enterprise also features event correlation. Through correlation you can generate realtime alerts and / or new events based on logical rules. This allows you to automate troubleshooting. If you know the value of working with events, event correlation will take you to a new level.");
+      echo __("%s Enterprise also features event correlation. Through correlation you can generate realtime alerts and / or new events based on logical rules. This allows you to automate troubleshooting. If you know the value of working with events, event correlation will take you to a new level.", get_product_name());
       break;
     case "reportingmodal":
-      echo __("Report generating on the Enterprise version is also more powerful: it has wizards, you can schedule emails in PDF to be sent according to the schedule you decide, and it has a template system to create personalized reports quickly for each of your customers. It will even allow your customers to generate their own reports from templates created by you. If reports are key to your business, Pandora FMS Enterprise version is for you.");
+      echo __("Report generating on the Enterprise version is also more powerful: it has wizards, you can schedule emails in PDF to be sent according to the schedule you decide, and it has a template system to create personalized reports quickly for each of your customers. It will even allow your customers to generate their own reports from templates created by you. If reports are key to your business, %s Enterprise version is for you.", get_product_name());
       break;
     case "visualmodal":  
       echo __("These options are only effective on the Enterprise version.");
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 2ac1e34df4..d08ab8ae16 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -31,14 +31,14 @@ config_check();
 					$custom_logo = 'images/custom_logo/' . $config['custom_logo'];
 					
 					if (!defined ('PANDORA_ENTERPRISE')) {
-						$logo_title = 'Pandora FMS Opensource';
+						$logo_title = get_product_name() . ' Opensource';
 						$custom_logo = 'images/custom_logo/pandora_logo_head_3.png';
 					}
 					else {
 						if (file_exists(ENTERPRISE_DIR . '/' . $custom_logo)) {
 							$custom_logo = ENTERPRISE_DIR . '/' . $custom_logo;
 						}
-						$logo_title = 'Pandora FMS Enterprise';
+						$logo_title = get_product_name() . ' Enterprise';
 					}
 					
 					echo html_print_image($custom_logo, true,
@@ -166,8 +166,8 @@ config_check();
 								true,
 								array("id" => 'clippy',
 									"class" => 'clippy',
-									"alt" => __('Pandora FMS assistant'),
-									'title' => __('Pandora FMS assistant'))) .
+									"alt" => __('%s assistant', get_product_name()),
+									'title' => __('%s assistant', get_product_name()))) .
 						'</a>';
 				}
 				
diff --git a/pandora_console/general/login_help_dialog.php b/pandora_console/general/login_help_dialog.php
index 631d9d5ce1..c3b05e8553 100644
--- a/pandora_console/general/login_help_dialog.php
+++ b/pandora_console/general/login_help_dialog.php
@@ -36,10 +36,11 @@ if (is_ajax()) {
 
 // Prints help dialog information
 echo '<div id="login_help_dialog" title="' .
-	__('Welcome to Pandora FMS') . '" style="">';
+	__('Welcome to %s', get_product_name()) . '" style="">';
 	
 	echo '<div style="font-size: 10pt; margin: 20px;">';
-	echo __('If this is your first time with Pandora FMS, we propose you a few links to learn more about Pandora FMS. Monitoring could be overwhelm, but take your time to learn how to use the power of Pandora FMS!');
+	echo __("If this is your first time using %s, we suggest a few links that'll help you learn more about the software. Monitoring can be overwhelming, but take your time to learn how to harness the power of %s!",
+			get_product_name(), get_product_name());
 	echo '</div>';
 	
 	echo '<div style="">';
diff --git a/pandora_console/general/login_identification_wizard.php b/pandora_console/general/login_identification_wizard.php
index 1f5cabd740..57b5b63ba3 100644
--- a/pandora_console/general/login_identification_wizard.php
+++ b/pandora_console/general/login_identification_wizard.php
@@ -138,17 +138,17 @@ if ($email == 'admin@example.com') $email = '';
 
 // Prints accept register license
 echo '<div id="login_accept_register" title="' .
-	__('The Pandora FMS community wizard') . '" style="">';
+	__('The %s community wizard', get_product_name()) . '" style="">';
 	echo '<div style="margin: 5px 0 10px; float: left; padding-left: 15px;">';
 		echo html_print_image ('images/pandora_circle_big.png', true);
 	echo '</div>';
 	echo '<div style="font-size: 12pt; margin: 5px 20px; float: left; padding-top: 23px;">';
-		echo __('Stay up to date with the Pandora FMS community') . ".";
+		echo __('Stay up to date with the %s community', get_product_name()) . ".";
 	echo '</div>';
 	
 	echo '<div id="license_newsletter">';
-		echo '<p>' . __("When you subscribe to the Pandora FMS Update Manager service, you accept that we register your Pandora instance as an identifier on the database owned by Artica TS. This data will solely be used to provide you with information about Pandora FMS and will not be conceded to third parties. You'll be able to unregister from said database at any time from the Update Manager options") . '.</p>';
-		echo '<p>' . __("In the same fashion, when subscribed to the newsletter you accept that your email will pass on to a database property of Artica TS. This data will solely be used to provide you with information about Pandora FMS and will not be conceded to third parties. You'll be able to unregister from said database at any time from the newsletter subscription options") . '.</p>';
+		echo '<p>' . __("When you subscribe to the %s Update Manager service, you accept that we register your %s instance as an identifier on the database owned by Artica TS. This data will solely be used to provide you with information about %s and will not be conceded to third parties. You can unregister from said database at any time from the Update Manager options.", get_product_name(), get_product_name(), get_product_name()) . '</p>';
+		echo '<p>' . __("In the same fashion, when subscribed to the newsletter you accept that your email will pass on to a database property of Artica TS. This data will solely be used to provide you with information about %s and will not be conceded to third parties. You can unregister from said database at any time from the newsletter subscription options.", get_product_name()) . '</p>';
 	echo '</div>';
 	
 	echo '<div style="position:absolute; margin: 0 auto; bottom: 0px; padding-top:10px; position:relative; border: 1px solid #FFF;">';
@@ -161,7 +161,7 @@ echo '<div id="login_accept_register" title="' .
 		echo '</div>';
 		echo '<div style="float: left; margin-left: 0px; width: 50%; text-align: left;">';
 			html_print_checkbox('register', 1, false, false, false, 'cursor: \'pointer\'');
-			echo '&nbsp;<span style="font-size: 12px;" id="label-register">' .__("Join the Pandora FMS community") . '!</span><br>';
+			echo '&nbsp;<span style="font-size: 12px;" id="label-register">' .__('Join the %s community!', get_product_name()) . '!</span><br>';
 			html_print_checkbox('newsletter', 1, false, false, false, 'cursor: \'pointer\'');
 			echo '&nbsp;<span style="font-size: 12px;" id="label-newsletter">' .__("Subscribe to our newsletter") . '</span>';
 			echo "<br>";
@@ -176,7 +176,7 @@ echo '</div>';
 
 // Print yes or not dialog
 echo '<div id="login_registration_yesno" title="' .
-	__('Pandora FMS instance identification wizard') . '" style="">';
+	__("%s instance identification wizard", get_product_name()) . '" style="">';
 	echo '<div style="font-size: 12pt; margin: 20px;">';
 		echo __("Do you want to continue without any registration") . "?";
 	echo '</div>';
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 7a99ae494c..f34d11e8d0 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -50,7 +50,7 @@ if (!isset($login_screen)) {
 switch ($login_screen) {
 	case 'login':
 		$logo_link = 'http://www.pandorafms.com';
-		$logo_title = __('Go to Pandora FMS Website');
+		$logo_title = __('Go to %s Website', get_product_name());
 		break;
 	case 'logout':
 	case 'double_auth':
@@ -250,17 +250,17 @@ echo '<div class="login_page">';
 	echo '</form></div>';
 	echo '<div class="login_data">';
 		echo '<div class ="text_banner_login">';
-			echo '<div><span class="span1">';
+			echo '<div><span class="span1 pandora_upper">';
 				if(file_exists (ENTERPRISE_DIR . "/load_enterprise.php")){
 					if($config['custom_title1_login']){
 						echo io_safe_output($config['custom_title1_login']);
 					}
 					else{
-						echo __('WELCOME TO PANDORA FMS');
+						echo __('WELCOME TO %s', get_product_name());
 					}
 				}
 				else{
-					echo __('WELCOME TO PANDORA FMS');
+					echo __('WELCOME TO %s', get_product_name());
 				}
 			echo '</span></div>';
 			echo '<div><span class="span2">';
@@ -380,7 +380,7 @@ 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 is over. Please close your browser window to close this Pandora session.') .'</p>';
+					echo '<p>' . __('Your session has ended. Please close your browser window to close this %s session.', get_product_name()) .'</p>';
 				echo '</div>';
 				echo '<div class="button_message_alert">';
 					html_print_submit_button("Ok", 'hide-login-logout', false);  
@@ -393,7 +393,7 @@ if ($login_screen == 'logout'){
 switch ($login_screen) {
 	case 'error_authconfig':
 	case 'error_dbconfig':
-		$title = __('Problem with Pandora FMS database');
+		$title = __('Problem with %s database', get_product_name());
 		$message = __('Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file.<i><br/><br/>
 		Probably your database, hostname, user or password values are incorrect or
 		the database server is not running.').'<br /><br />';
@@ -404,21 +404,22 @@ switch ($login_screen) {
 		
 		if ($error_code == 'error_authconfig') {
 			$message .= '<br/><br/>';
-			$message .= __('If you have modified auth system, this problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:<br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>');
+			$message .= __('If you have modified the auth system, the origin of this problem could be that %s cannot override the authorization variables from the config database. Please remove them from your database by executing:<br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>', get_product_name());
 		}
 		break;
 	case 'error_emptyconfig':
 		$title = __('Empty configuration table');
 		$message = __('Cannot load configuration variables from database. Please check your database setup in the
-		<b>include/config.php</b> file.<i><br><br>
-		Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date.
-		<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
-		permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i>').'<br /><br />';
+			<b>include/config.php</b> file.<i><br><br>
+			Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date.
+			<br><br>%s Console cannot find <i>include/config.php</i> or this file has invalid
+			permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i>',
+		get_product_name()).'<br /><br />';
 		break;
 	case 'error_noconfig':
 		$title = __('No configuration file found');
-		$message = __('Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
-		permissions and HTTP server cannot read it. Please read documentation to fix this problem.').'<br /><br />';
+		$message = __('%s Console cannot find <i>include/config.php</i> or this file has invalid
+		permissions and HTTP server cannot read it. Please read documentation to fix this problem.', get_product_name()).'<br /><br />';
 		if (file_exists('install.php')) {
 			$link_start = '<a href="install.php">';
 			$link_end = '</a>';
@@ -433,7 +434,7 @@ switch ($login_screen) {
 	case 'error_install':
 		$title = __('Installer active');
 		$message = __('For security reasons, normal operation is not possible until you delete installer file.
-		Please delete the <i>./install.php</i> file before running Pandora FMS Console.');
+		Please delete the <i>./install.php</i> file before running %s Console.', get_product_name());
 		break;
 	case 'error_perms':
 		$title = __('Bad permission for include/config.php');
diff --git a/pandora_console/general/login_required.php b/pandora_console/general/login_required.php
index e6486665ea..1535829991 100644
--- a/pandora_console/general/login_required.php
+++ b/pandora_console/general/login_required.php
@@ -66,10 +66,10 @@ if ($email == 'admin@example.com') $email = '';
 
 // Prints first step pandora registration
 echo '<div id="login_id_dialog" title="' .
-	__('Pandora FMS instance identification wizard') . '" style="display: none;">';
+	__('%s instance identification wizard', get_product_name()) . '" style="display: none;">';
 	
 	echo '<div style="font-size: 10pt; margin: 20px;">';
-	echo __('Please fill the following information in order to configure your Pandora FMS instance successfully') . '.';
+	echo __('Please fill the following information in order to configure your %s instance successfully', get_product_name()) . '.';
 	echo '</div>';
 	
 	echo '<div style="">';
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index 3a43795fd5..76c42ff43a 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -29,8 +29,6 @@ require_once ("include/functions_reporting.php");
 require_once ("include/functions_tactical.php");
 require_once ($config["homedir"] . '/include/functions_graph.php');
 
-//ui_print_page_header (__('Welcome to Pandora FMS Web Console'),'',false,"",false);
-
 if (tags_has_user_acl_tags()) {
 	ui_print_tags_warning();
 }
@@ -111,7 +109,7 @@ if (!empty($all_data)) {
 			$table->data = array ();
 			$table->headstyle[0] = 'text-align:center;';
 			$table->width = "100%";
-			$table->head[0] = '<span>' . __('Pandora FMS Overview') . '</span>';
+			$table->head[0] = '<span>' . __('%s Overview', get_product_name()) . '</span>';
 			$table->head_colspan[0] = 4;
 			
 			// Indicators
@@ -226,7 +224,7 @@ if (!empty($all_data)) {
 			$table->head[2] = __('Date');
 			$table->head[3] = __('Source IP');
 			$table->head[4] = __('Comments');
-			$table->title = '<span>' . __('This is your last activity in Pandora FMS console') . '</span>';
+			$table->title = '<span>' . __('This is your last activity performed on the %s console', get_product_name()) . '</span>';
 			
 			switch ($config["dbtype"]) {
 				case "mysql":
@@ -294,198 +292,4 @@ if (!empty($all_data)) {
 		</td>
 		
 	</tr>
-</table>
-<?php
-return;
-// ---------------------------------------------------------------------
-// Site news !
-// ---------------------------------------------------------------------
-
-//echo '<div id="left_column_logon_ok" id="leftcolumn">';
-echo '<div style="width:30%; float:left;" id="leftcolumn">';
-
-///////////////
-// Overview Table
-///////////////
-
-$table->class = "databox";
-$table->cellpadding = 4;
-$table->cellspacing = 4;
-$table->head = array ();
-$table->data = array ();
-$table->style[0] = 'text-align:center;';
-$table->width = "100%";
-$table->head[0] = '<span>' . __('Pandora FMS Overview') . '</span>';
-$table->head_colspan[0] = 4;
-
-// Indicators
-$tdata = array();
-$tdata[0] = reporting_get_stats_indicators($data);
-$table->rowclass[] = '';
-
-$table->data[] = $tdata;
-
-// Alerts
-$tdata = array();
-$tdata[0] = reporting_get_stats_alerts($data);
-$table->rowclass[] = '';
-$table->data[] = $tdata;
-
-// Modules by status
-$tdata = array();
-$tdata[0] = reporting_get_stats_modules_status($data);
-$table->rowclass[] = '';
-$table->data[] = $tdata;
-
-// Total agents and modules
-$tdata = array();
-$tdata[0] = reporting_get_stats_agents_monitors($data);
-$table->rowclass[] = '';
-$table->data[] = $tdata;
-
-// Users
-$tdata = array();
-$tdata[0] = reporting_get_stats_users($data);
-$table->rowclass[] = '';
-$table->data[] = $tdata;
-
-html_print_table($table);
-unset($table);
-
-
-
-
-
-echo '</div>';
-
-
-// ---------------------------------------------------------------------------
-// Site stats (global!)
-// ---------------------------------------------------------------------------
-//echo '<div id="right_column_logon_ok" id="rightcolumn">';
-echo '<div style="width: 50%; float:left;" id="rightcolumn">';
-
-$options = array();
-	$options['id_user'] = $config['id_user'];
-	$options['modal'] = false;
-	$options['limit'] = 3;
-	$news = get_news($options);
-	
-	
-	if (!empty($news)) {
-		//////////////////NEWS BOARD/////////////////////////////
-		echo '<div id="news_board">';
-		
-		echo '<table cellpadding="4" cellspacing="4" class="databox">';
-		echo '<tr><th><span>' . __('News board') . '</span></th></tr>';
-		if ($config["prominent_time"] == "timestamp") {
-			$comparation_suffix = "";
-		}
-		else {
-			$comparation_suffix = __('ago');
-		}
-		foreach ($news as $article) {
-			$text = io_safe_output($article["text"]);
-			
-			
-			echo '<tr><th><b>'.$article["subject"].'</b></th></tr>';
-			echo '<tr><td>' . __('by') . ' <b>' .
-				$article["author"] . '</b> <i>' . ui_print_timestamp ($article["timestamp"], true).'</i> ' . $comparation_suffix . '</td></tr>';
-			echo '<tr><td class="datos">';
-			echo nl2br($text);
-			echo '</td></tr>';
-		}
-		echo '</table>';
-		echo '</div>'; // News board
-		
-		
-		
-		echo '<br><br>';
-		
-		//////////////////END OF NEWS BOARD/////////////////////////////
-	}
-	
-	//////////////////LAST ACTIVITY/////////////////////////////
-	
-	// Show last activity from this user
-	echo '<div id="activity">';
-	
-	$table->width = '100%'; //Don't specify px
-	$table->data = array ();
-	$table->size = array ();
-	$table->size[2] = '150px';
-	$table->size[3] = '130px';
-	$table->size[5] = '200px';
-	$table->head = array ();
-	$table->head[0] = __('User');
-	$table->head[1] = '';
-	$table->head[2] = __('Action');
-	$table->head[3] = __('Date');
-	$table->head[4] = __('Source IP');
-	$table->head[5] = __('Comments');
-	$table->title = '<span>' . __('This is your last activity in Pandora FMS console') . '</span>';
-	
-	switch ($config["dbtype"]) {
-		case "mysql":
-			$sql = sprintf ("SELECT id_usuario,accion,fecha,ip_origen,descripcion,utimestamp
-				FROM tsesion
-				WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - " . SECONDS_1WEEK . ") 
-					AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 10", $config["id_user"]);
-			break;
-		case "postgresql":
-			$sql = sprintf ("SELECT \"id_usuario\", accion, fecha, \"ip_origen\", descripcion, utimestamp
-				FROM tsesion
-				WHERE (\"utimestamp\" > ceil(date_part('epoch', CURRENT_TIMESTAMP)) - " . SECONDS_1WEEK . ") 
-					AND \"id_usuario\" = '%s' ORDER BY \"utimestamp\" DESC LIMIT 10", $config["id_user"]);
-			break;
-		case "oracle":
-			$sql = sprintf ("SELECT id_usuario, accion, fecha, ip_origen, descripcion, utimestamp
-				FROM tsesion
-				WHERE ((utimestamp > ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (" . SECONDS_1DAY . ")) - " . SECONDS_1WEEK . ") 
-					AND id_usuario = '%s') AND rownum <= 10 ORDER BY utimestamp DESC", $config["id_user"]);
-			break;
-	}
-	
-	$sessions = db_get_all_rows_sql ($sql);
-	
-	if ($sessions === false)
-		$sessions = array ();
-	
-	foreach ($sessions as $session) {
-		$data = array ();
-		
-		switch ($config["dbtype"]) {
-			case "mysql":
-			case "oracle":
-				$session_id_usuario = $session['id_usuario'];
-				$session_ip_origen = $session['ip_origen'];
-				break;
-			case "postgresql":
-				$session_id_usuario = $session['id_usuario'];
-				$session_ip_origen = $session['ip_origen'];
-				break;
-		}
-		
-		
-		$data[0] = '<strong>' . $session_id_usuario . '</strong>';
-		$data[1] = ui_print_session_action_icon ($session['accion'], true);
-		$data[2] = $session['accion'];
-		$data[3] =  ui_print_help_tip($session['fecha'], true) . human_time_comparation($session['utimestamp'], 'tiny');
-		$data[4] = $session_ip_origen;
-		$data[5] = io_safe_output ($session['descripcion']);
-		
-		array_push ($table->data, $data);
-	}
-	echo "<div style='width:100%; overflow-x:auto;'>";
-	html_print_table ($table);
-	unset($table);
-	echo "</div>";
-	echo "</div>"; // activity
-	
-	//////////////////END OF LAST ACTIVIYY/////////////////////////////
-	
-
-
-echo "</div>";
-echo "<div style='clear:both'></div>";
-?>
+</table>
\ No newline at end of file
diff --git a/pandora_console/general/noaccess.php b/pandora_console/general/noaccess.php
index 7a916b81eb..5c58f5c89c 100644
--- a/pandora_console/general/noaccess.php
+++ b/pandora_console/general/noaccess.php
@@ -112,7 +112,7 @@ position:absolute;background:black;opacity:0.6;z-index:-1;left:0px;top:0px;width
 	
 	<div class='modalheade'>
 	<span class='modalheadertex'>
-	You don't have access to this page
+		<?php echo __("You don't have access to this page");?>
 	</span>
 	<img class='modalclose cerrar' src='<?php echo $config['homeurl'];?>images/icono_cerrar.png'>
 	
@@ -121,8 +121,11 @@ position:absolute;background:black;opacity:0.6;z-index:-1;left:0px;top:0px;width
 	<div class='modalconten'>
 	<img class='modalcontentim' src='<?php echo $config['homeurl'];?>images/access_denied.png'>
 	<div class='modalcontenttex'>
-		Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br/> <br/>
-		Please know that all attempts to access this page are recorded in security logs of Pandora System Database	
+		<?php
+			echo __("Access to this page is restricted to authorized users only, please contact system administrator if you need assistance.");
+			echo "<br/> <br/>";
+			echo __("Please know that all attempts to access this page are recorded in security logs of %s System Database", get_product_name());
+		?>
 	
 	</div>
 
diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php
index 2fe5a22700..8d04fb6bde 100644
--- a/pandora_console/general/pandora_help.php
+++ b/pandora_console/general/pandora_help.php
@@ -21,7 +21,7 @@ require_once ("../include/functions_html.php");
 ?>
 <html style="height:100%; margin-top: 25px; margin-left: 15px; margin-right: 15px; background-color: #333;"><head><title>
 <?php
-	echo __('Pandora FMS help system');
+	echo __('%s help system', get_product_name());
 ?>
 </title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
@@ -77,7 +77,7 @@ if (! $id || ! file_exists ($help_file)) {
 	echo "<div style='text-align: center; background-color: #fff'>";
 
 	echo "</div>";
-	echo '<div class="msg" style="padding-left: 30px;padding-right: 30px;padding-bottom: 15px;">'.__('Pandora FMS help system has been called with a help reference that currently don\'t exist. There is no help content to show.').'</div></div></div>';
+	echo '<div class="msg" style="padding-left: 30px;padding-right: 30px;padding-bottom: 15px;">'.__("%s help system has been called with a help reference that currently don't exist. There is no help content to show.", get_product_name()).'</div></div></div>';
 	echo '<br /><br />';
 	echo '<div style="text-align: center; padding: 5px; font-family: verdana, arial; font-size: 11px;">';
 	include ('footer.php');
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index b1467fa7d1..293045208f 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4649,4 +4649,8 @@ form ul.form_flex li ul li{
 	margin-left: 20px;
 	margin-right: 20px;
 	text-align: center;
+}
+
+.pandora_upper {
+	text-transform: uppercase;
 }
\ No newline at end of file

From f758124531481603b29e70186ef5b42746c27f2b Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 10 May 2018 08:43:09 +0200
Subject: [PATCH 024/146] fixed treshold graph

---
 .../reporting_builder.item_editor.php         |    3 +-
 pandora_console/include/functions_graph.php   |  105 +-
 .../include/functions_reporting.php           |   83 +-
 .../graphs/flot/jquery.flot.threshold.js      |  140 +-
 .../flot/jquery.flot.threshold.multiple.js    |  189 ++
 .../include/graphs/flot/pandora.flot.js       | 1716 ++++++++---------
 .../include/graphs/functions_flot.php         |   10 +-
 .../operation/agentes/stat_win.php            |    4 +-
 8 files changed, 1201 insertions(+), 1049 deletions(-)
 create mode 100644 pandora_console/include/graphs/flot/jquery.flot.threshold.multiple.js

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 8018d90243..a2abf23274 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -2912,7 +2912,7 @@ function chooseType() {
 		
 		case 'simple_graph':
 			$("#row_time_compare_overlapped").show();
-			$("#row_only_avg").show();
+			// $("#row_only_avg").show();
 			$("#row_fullscale").show();
 			if ($("#checkbox-percentil").prop("checked"))
 				$("#row_percentil").show();
@@ -2923,7 +2923,6 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_show_in_landscape").show();
 			$("#row_time_compare_overlapped").show();
 			$("#row_historical_db_check").hide();
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 6e82a125ba..8906f835e0 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -465,6 +465,23 @@ function grafico_modulo_sparse_data(
 			}
 		}
 
+//XXXX que hacer con baseline
+		/*
+		// Get baseline data
+		$baseline_data = array();
+		if ($baseline) {
+			$baseline_data = array ();
+			if ($baseline == 1) {
+				$baseline_data = enterprise_hook(
+					'reporting_enterprise_get_baseline',
+					array ($agent_module_id, $period, $width, $height , $title, $unit_name, $date));
+				if ($baseline_data === ENTERPRISE_NOT_HOOK) {
+					$baseline_data = array ();
+				}
+			}
+		}
+		*/
+
 		if ($show_elements_graph['show_events']  ||
 			$show_elements_graph['show_alerts'] ) {
 
@@ -504,16 +521,34 @@ function grafico_modulo_sparse_data(
 					}
 					else{
 						if($show_elements_graph['flag_overlapped']){
-							$events_array['data'][$count_events] = array(
-								($v['utimestamp'] + $date_array['period'] *1000),
-								$max * 1.15
-							);
+							if( ( strstr($v['event_type'], 'going_up') ) ||
+									( strstr($v['event_type'], 'going_down') ) ){
+								$events_array['data'][$count_events] = array(
+									(($v['utimestamp'] + 1 + $date_array['period']) * 1000),
+									$max * 1.15
+								);
+							}
+							else{
+								$events_array['data'][$count_events] = array(
+									($v['utimestamp'] + $date_array['period'] *1000),
+									$max * 1.15
+								);
+							}
 						}
 						else{
-							$events_array['data'][$count_events] = array(
-								($v['utimestamp']*1000),
-								$max * 1.15
-							);
+							if( ( strstr($v['event_type'], 'going_up') ) ||
+									( strstr($v['event_type'], 'going_down') ) ){
+								$events_array['data'][$count_events] = array(
+									(($v['utimestamp'] + 1) *1000),
+									$max * 1.15
+								);
+							}
+							else{
+								$events_array['data'][$count_events] = array(
+									($v['utimestamp']*1000),
+									$max * 1.15
+								);
+							}
 						}
 						$count_events++;
 					}
@@ -574,6 +609,7 @@ function grafico_modulo_sparse_data(
 	);
 
 	$array_events_alerts[$series_suffix] = $events;
+
 }
 
 function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
@@ -770,11 +806,6 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 
 	$data_module_graph['series_suffix'] = $series_suffix;
 
-
-
-html_debug_print($color);
-
-
 	// Check available data
 	if ($show_elements_graph['compare'] === 'separated') {
 		if (!empty($array_data)) {
@@ -1124,14 +1155,12 @@ html_debug_print($from_interface);
 	$show_elements_graph['return_data']  = true; //dont use
 	$show_elements_graph['id_widget']    = $id_widget_dashboard;
 	$show_elements_graph['labels']       = $labels;
-	$show_elements_graph['stacked']       = $stacked;
+	$show_elements_graph['stacked']      = $stacked;
 
 	$format_graph = array();
-	$format_graph['width']      = $width;
+	$format_graph['width']      = $width . "px";
 	$format_graph['height']     = $height;
-//XXXX
-	$format_graph['type_graph'] = $type_graph; //dont use
-
+	$format_graph['type_graph'] = ''; //dont use
 	$format_graph['unit_name']  = $unit_name;
 	$format_graph['unit']       = ''; //dont use
 	$format_graph['title']      = $title;
@@ -1615,7 +1644,7 @@ html_debug_print($from_interface);
 				$module_name_list[$i] .= " (x". format_numeric ($weight_list[$i], 1).")";
 			}
 */
-		$temp = array();
+	//	$temp = array();
 
 
 
@@ -1853,6 +1882,8 @@ html_debug_print($from_interface);
 		}
 	}
 
+	$graph_values = $temp;
+
 	switch ($stacked) {
 		default:
 		case CUSTOM_GRAPH_STACKED_LINE:
@@ -4060,11 +4091,12 @@ function graph_netflow_host_traffic ($data, $unit, $width = 700, $height = 700)
 function graphic_module_events ($id_module, $width, $height, $period = 0, $homeurl = '', $zoom = 0, $adapt_key = '', $date = false, $stat_win = false) {
 	global $config;
 	global $graphic_type;
-	
+
 	$data = array ();
-	
+$width = 90;
+$height = 100;
 	$resolution = $config['graph_res'] * ($period * 2 / $width); // Number of "slices" we want in graph
-	
+
 	$interval = (int) ($period / $resolution);
 	if ($date === false) {
 		$date = get_system_time ();
@@ -4073,7 +4105,7 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
 	$periodtime = floor ($period / $interval);
 	$time = array ();
 	$data = array ();
-	
+
 	// Set the title and time format
 	if ($period <= SECONDS_6HOURS) {
 		$time_format = 'H:i:s';
@@ -4093,7 +4125,7 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
 	else {
 		$time_format = "Y M d H\h";
 	}
-	
+
 	$legend = array();
 	$cont = 0;
 	for ($i = 0; $i < $interval; $i++) {
@@ -4105,10 +4137,10 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
 		else {
 			$name = $bottom;
 		}
-		
+
 		$top = $datelimit + ($periodtime * ($i + 1));
-		
-		$events = db_get_all_rows_filter ('tevento', 
+
+		$events = db_get_all_rows_filter ('tevento',
 			array ('id_agentmodule' => $id_module,
 				'utimestamp > '.$bottom,
 				'utimestamp < '.$top),
@@ -4120,7 +4152,6 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
 				if (empty($event['utimestamp'])) {
 					continue;
 				}
-			
 				switch($event['event_type']) {
 					case 'going_down_normal':
 					case 'going_up_normal':
@@ -4144,9 +4175,9 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
 				}
 			}
 		}
-		
+
 		$data[$cont]['utimestamp'] = $periodtime;
-		
+
 		if (!empty($events)) {
 			switch ($status) {
 				case 'warning':
@@ -4167,11 +4198,11 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
 			$data[$cont]['data'] = 1;
 		}
 		$current_timestamp = $bottom;
-		
-		$legend[] = date($time_format, $current_timestamp);	
+
+		$legend[] = date($time_format, $current_timestamp);
 		$cont++;
 	}
-	
+
 	$pixels_between_xdata = 25;
 	$max_xdata_display = round($width / $pixels_between_xdata);
 	$ndata = count($data);
@@ -4181,14 +4212,14 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
 	else {
 		$xdata_display = $max_xdata_display;
 	}
-	
+
 	$step = round($ndata/$xdata_display);
-	
+
 	$colors = array(1 => '#38B800', 2 => '#FFFF00', 3 => '#FF0000', 4 => '#C3C3C3');
-	
+
 	// Draw slicebar graph
 	if ($config['flash_charts']) {
-		echo flot_slicesbar_graph($data, $period, $width, 15, $legend, $colors, $config['fontpath'], $config['round_corner'], $homeurl, '', $adapt_key, $stat_win);
+		echo flot_slicesbar_graph($data, $period, $width, 50, $legend, $colors, $config['fontpath'], $config['round_corner'], $homeurl, '', $adapt_key, $stat_win);
 	}
 	else {
 		echo slicesbar_graph($data, $period, $width, 15, $colors, $config['fontpath'], $config['round_corner'], $homeurl);
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 65e3b876bc..0314649410 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -1199,11 +1199,7 @@ function reporting_event_top_n($report, $content, $type = 'dinamic',
 						ui_print_truncate_text($agent_name[$i], $truncate_size, false, true, false, "...") .
 						' - ' . 
 						ui_print_truncate_text($module_name[$i], $truncate_size, false, true, false, "...");
-					
-					
-					
-					//Dirty hack, maybe I am going to apply a job in Apple
-					//https://www.imperialviolet.org/2014/02/22/applebug.html
+
 					$item_name_key_pie = $item_name;
 					$exist_key = true;
 					while ($exist_key) {
@@ -1255,11 +1251,7 @@ function reporting_event_top_n($report, $content, $type = 'dinamic',
 						' - ' . 
 						ui_print_truncate_text($module_name[$i],
 							$truncate_size, false, true, false, "...");
-					
-					
-					
-					//Dirty hack, maybe I am going to apply a job in Apple
-					//https://www.imperialviolet.org/2014/02/22/applebug.html
+
 					$item_name_key_pie = $item_name;
 					$exist_key = true;
 					while ($exist_key) {
@@ -3485,7 +3477,7 @@ function reporting_netflow($report, $content, $type,
 function reporting_simple_baseline_graph($report, $content,
 	$type = 'dinamic', $force_width_chart = null,
 	$force_height_chart = null) {
-	
+
 	global $config;
 	
 	if ($config['metaconsole']) {
@@ -3603,8 +3595,7 @@ function reporting_prediction_date($report, $content) {
 function reporting_projection_graph($report, $content,
 	$type = 'dinamic', $force_width_chart = null,
 	$force_height_chart = null) {
-html_debug_print('esta en esta');
-	
+
 	global $config;
 	
 	if ($config['metaconsole']) {
@@ -3820,7 +3811,7 @@ function reporting_agent_configuration($report, $content) {
 
 function reporting_value($report, $content, $type,$pdf) {
 	global $config;
-	
+
 	$return = array();
 	switch ($type) {
 		case 'max':
@@ -6395,7 +6386,7 @@ function reporting_general($report, $content) {
 
 function reporting_custom_graph($report, $content, $type = 'dinamic',
 	$force_width_chart = null, $force_height_chart = null, $type_report = "custom_graph") {
-		html_debug_print('esta en esta 2');
+
 	global $config;
 	
 	require_once ($config["homedir"] . '/include/functions_graph.php');
@@ -6541,36 +6532,28 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 
 function reporting_simple_graph($report, $content, $type = 'dinamic',
 	$force_width_chart = null, $force_height_chart = null) {
-	
+
 	global $config;
-	
-	
+
 	if ($config['metaconsole']) {
 		$id_meta = metaconsole_get_id_server($content["server_name"]);
-		
-		
+
 		$server = metaconsole_get_connection_by_id ($id_meta);
 		metaconsole_connect($server);
 	}
-	
-	
+
 	$return = array();
 	$return['type'] = 'simple_graph';
-	
+
 	if (empty($content['name'])) {
 		$content['name'] = __('Simple graph');
 	}
-	
-	
-	
+
 	$module_name = io_safe_output(
 		modules_get_agentmodule_name($content['id_agent_module']));
 	$agent_name = io_safe_output(
 		modules_get_agentmodule_agent_alias ($content['id_agent_module']));
-	
-	
-	
-	
+
 	$return['title'] = $content['name'];
 	$return['subtitle'] = $agent_name . " - " . $module_name;
 	$return['agent_name'] = $agent_name;
@@ -6580,10 +6563,10 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 		$report,
 		$content);
 	$label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
-	 if ($label != '') {
-		 $label = reporting_label_macro($content, $label);
-	 }
-	
+	if ($label != '') {
+		$label = reporting_label_macro($content, $label);
+	}
+
 	$only_avg = true;
 	// Due to database compatibility problems, the 'only_avg' value
 	// is stored into the json contained into the 'style' column.
@@ -6594,31 +6577,29 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 	if (isset($content['style']['fullscale'])) {
 		$fullscale = (bool) $content['style']['fullscale'];
 	}
-	
+
 	$moduletype_name = modules_get_moduletype_name(
 		modules_get_agentmodule_type(
 			$content['id_agent_module']));
-	
+
 	$return['chart'] = '';
+
 	// Get chart
-	reporting_set_conf_charts($width, $height, $only_image, $type,
-		$content, $ttl);
-	
+	reporting_set_conf_charts($width, $height, $only_image, $type, $content, $ttl);
+
 	if (!empty($force_width_chart)) {
 		$width = $force_width_chart;
 	}
-	
+
 	if (!empty($force_height_chart)) {
 		$height = $force_height_chart;
 	}
-	
+
 	switch ($type) {
 		case 'dinamic':
 		case 'static':
 			if (preg_match ("/string/", $moduletype_name)) {
-				
 				$urlImage = ui_get_full_url(false, false, false, false);
-				
 				$return['chart'] = grafico_modulo_string(
 					$content['id_agent_module'],
 					$content['period'],
@@ -6635,7 +6616,7 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 					$urlImage,
 					"",
 					$ttl);
-				
+
 			}
 			else {
 				// HACK it is saved in show_graph field.
@@ -6643,13 +6624,13 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 				if ($content['show_graph']) {
 					$time_compare_overlapped = 'overlapped';
 				}
-				
+
 				$return['chart'] = grafico_modulo_sparse(
 					$content['id_agent_module'],
 					$content['period'],
 					false,
-					$width,
-					$height,
+					'90%',
+					400,
 					$label,
 					'',
 					false,
@@ -6681,18 +6662,18 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 				$content['id_agent_module'],
 				$content['period'],
 				$report["datetime"]);
-			
+
 			foreach ($data as $d) {
 				$return['chart'][$d['utimestamp']] = $d['data'];
 			}
-			
+
 			break;
 	}
-	
+
 	if ($config['metaconsole']) {
 		metaconsole_restore_db();
 	}
-	
+
 	return reporting_check_structure_content($return);
 }
 
diff --git a/pandora_console/include/graphs/flot/jquery.flot.threshold.js b/pandora_console/include/graphs/flot/jquery.flot.threshold.js
index 8c99c401d8..5167b6421f 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.threshold.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.threshold.js
@@ -1,56 +1,52 @@
 /* Flot plugin for thresholding data.
-
 Copyright (c) 2007-2014 IOLA and Ole Laursen.
 Licensed under the MIT license.
-
 The plugin supports these options:
-
-	series: {
-		threshold: {
-			below: number
-			color: colorspec
-		}
-	}
-
+    series: {
+        threshold: {
+            below: number,
+            above: mumber,
+            color: colorspec
+        }
+    }
 It can also be applied to a single series, like this:
-
-	$.plot( $("#placeholder"), [{
-		data: [ ... ],
-		threshold: { ... }
-	}])
-
+    $.plot( $("#placeholder"), [{
+        data: [ ... ],
+        threshold: { ... }
+    }])
 An array can be passed for multiple thresholding, like this:
-
-	threshold: [{
-		below: number1
-		color: color1
-	},{
-		below: number2
-		color: color2
-	}]
-
+    threshold: [{
+        below: number1,
+        color: color1
+    },{
+        above: number2,
+        color: color2
+    }]
 These multiple threshold objects can be passed in any order since they are
 sorted by the processing function.
-
 The data points below "below" are drawn with the specified color. This makes
 it easy to mark points below 0, e.g. for budget data.
-
 Internally, the plugin works by splitting the data into two series, above and
 below the threshold. The extra series below the threshold will have its label
 cleared and the special "originSeries" attribute set to the original series.
 You may need to check for this in hover events.
-
 */
 
-(function ($) {
+(function($) {
     var options = {
         series: { threshold: null } // or { below: number, color: color spec}
     };
-    
+
     function init(plot) {
-        function thresholdData(plot, s, datapoints, below, color) {
-            var ps = datapoints.pointsize, i, x, y, p, prevp,
-                thresholded = $.extend({}, s); // note: shallow copy
+        function thresholdData(plot, s, datapoints, below, above, color) {
+
+            var origpoints = datapoints.points,
+                ps = datapoints.pointsize,
+                addCrossingPoints = s.lines.show,
+                thresholded = $.extend({}, s), // note: shallow copy
+                threspoints = [],
+                newpoints = [],
+                prevp, i, x, y, p, m;
 
             thresholded.datapoints = { points: [], pointsize: ps, format: datapoints.format };
             thresholded.label = null;
@@ -58,85 +54,101 @@ You may need to check for this in hover events.
             thresholded.threshold = null;
             thresholded.originSeries = s;
             thresholded.data = [];
- 
-            var origpoints = datapoints.points,
-                addCrossingPoints = s.lines.show;
-
-            var threspoints = [];
-            var newpoints = [];
-            var m;
 
             for (i = 0; i < origpoints.length; i += ps) {
                 x = origpoints[i];
                 y = origpoints[i + 1];
 
                 prevp = p;
-                if (y < below)
+                if (y < below || y > above) {
                     p = threspoints;
-                else
+                } else {
                     p = newpoints;
+                }
 
-                if (addCrossingPoints && prevp != p && x != null
-                    && i > 0 && origpoints[i - ps] != null) {
+                if (addCrossingPoints && prevp !== p && x != null && i > 0 && origpoints[i - ps] != null) {
                     var interx = x + (below - y) * (x - origpoints[i - ps]) / (y - origpoints[i - ps + 1]);
                     prevp.push(interx);
                     prevp.push(below);
-                    for (m = 2; m < ps; ++m)
+                    for (m = 2; m < ps; ++m) {
                         prevp.push(origpoints[i + m]);
-                    
+                    }
+
                     p.push(null); // start new segment
                     p.push(null);
-                    for (m = 2; m < ps; ++m)
+                    for (m = 2; m < ps; ++m) {
                         p.push(origpoints[i + m]);
+                    }
                     p.push(interx);
                     p.push(below);
-                    for (m = 2; m < ps; ++m)
+                    for (m = 2; m < ps; ++m) {
                         p.push(origpoints[i + m]);
+                    }
                 }
 
                 p.push(x);
                 p.push(y);
-                for (m = 2; m < ps; ++m)
+                for (m = 2; m < ps; ++m) {
                     p.push(origpoints[i + m]);
+                }
             }
 
             datapoints.points = newpoints;
             thresholded.datapoints.points = threspoints;
-            
+
             if (thresholded.datapoints.points.length > 0) {
                 var origIndex = $.inArray(s, plot.getData());
                 // Insert newly-generated series right after original one (to prevent it from becoming top-most)
                 plot.getData().splice(origIndex + 1, 0, thresholded);
             }
-                
+
             // FIXME: there are probably some edge cases left in bars
         }
-        
+
         function processThresholds(plot, s, datapoints) {
-            if (!s.threshold)
+            if (!s.threshold) {
                 return;
-            
+            }
+
             if (s.threshold instanceof Array) {
                 s.threshold.sort(function(a, b) {
                     return a.below - b.below;
                 });
-                
+
                 $(s.threshold).each(function(i, th) {
-                    thresholdData(plot, s, datapoints, th.below, th.color);
+                    thresholdData(plot, s, datapoints, th.below, th.above, th.color);
                 });
-            }
-            else {
-                thresholdData(plot, s, datapoints, s.threshold.below, s.threshold.color);
+            } else {
+                thresholdData(plot, s, datapoints, s.threshold.below, s.threshold.above, s.threshold.color);
             }
         }
-        
+
         plot.hooks.processDatapoints.push(processThresholds);
+
+        function processThresholdsLegend(ctx, canvas, s) {
+            if (!s.threshold) {
+                return;
+            }
+
+            var color = s.threshold.color ? s.threshold.color : "black";
+
+            $(".legendLabel").each(function() {
+                if ($(this).text() === s.label)
+                {
+                    var legend = $(this).prev().find("div > div");
+                    legend.css("border-right-color", color);
+                    legend.css("border-bottom-color", color);
+                }
+            });
+        }
+
+        plot.hooks.drawSeries.push(processThresholdsLegend);
     }
-    
+
     $.plot.plugins.push({
         init: init,
         options: options,
-        name: 'threshold',
-        version: '1.2'
+        name: "threshold",
+        version: "1.3"
     });
-})(jQuery);
+})(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/flot/jquery.flot.threshold.multiple.js b/pandora_console/include/graphs/flot/jquery.flot.threshold.multiple.js
new file mode 100644
index 0000000000..627eba3e4d
--- /dev/null
+++ b/pandora_console/include/graphs/flot/jquery.flot.threshold.multiple.js
@@ -0,0 +1,189 @@
+/*
+Flot plugin for specifying range of thresolds on data. 
+Controlled through the option "constraints" in a specific series
+
+usage -
+  $.plot($("#placeholder"), [{ data: [ ... ], constraints: [constraint1, constraint2]},{data:[...],constraints:[...]}])
+  
+  where constraint1 = {
+					    threshold: 2,
+					    color: "rgb(0,0,0)",
+					    evaluate : function(y,threshold){ return y < threshold; }
+					  }
+	threshold -> y-limit on the plot.
+	evaluate  -> the function which defines the limit.This function defines wheteher y < threshold or y > threshold.
+	color     -> the color with which to plot portion of the graph which satisfies the limit condition.
+	 
+
+
+Internally, the plugin works by splitting the data into different series, one for each constraint.
+
+*/
+(function($){
+  
+    
+  function init(plot){
+   
+    function plotWithMultipleThresholds(plot,s,datapoints){
+			if(s.data && s.data.length > 0 && s.constraints && s.constraints.length>0){
+			   var series = new Graph(s.data,s.constraints).getPlotData();
+				for(var i=0;i<series.length;i++){
+				var ss = $.extend({},s);
+				ss.constraints = [];
+				ss.data = series[i].data;
+				ss.color = series[i].color;
+				plot.getData().push(ss);
+			}
+		}
+    }
+	
+	function Graph(dataset, constraints) {
+	this._constraints = _getSortedConstraints(dataset,constraints);
+	this._dataset = dataset;
+	this._plotData = [];
+		
+	this.getPlotData = function() {
+		
+		if(this._constraints.length == 0)return [];
+		
+		for ( var i = this._constraints.length - 1; i >= 0 ; i--) {
+			var constraint = this._constraints[i];
+			if(null != constraint.threshold){
+			var set = new Resolve(this._dataset).using(constraint.threshold, constraint.evaluate);
+			this._plotData.push( {
+				data : set,
+				color : constraint.color
+			});
+			}
+		}
+		return this._plotData;
+	};
+
+    function Resolve(originalPonits) {
+		this._originalPoints = originalPonits;
+		this._data = [];
+		this._getPointOnThreshold = _getPointOnThreshold;
+		this.using = using ;
+		
+		function using(threshold, evaluate) {
+			var count = 0;
+			for ( var i = 0; i < this._originalPoints.length; i++) {
+				var currentPoint = this._originalPoints[i];
+				if (evaluate(currentPoint[1],threshold)) {
+					if (i > 0
+							&& (this._data.length == 0 || this._data[count - 1] == null)) {
+						this._data[count++] = this._getPointOnThreshold(threshold,this._originalPoints[i - 1], currentPoint);
+					}
+					this._data[count++] = currentPoint;
+				} else {
+					if (this._data.length > 0 && this._data[count - 1] != null) {
+						this._data[count++] = this._getPointOnThreshold(threshold,this._originalPoints[i - 1], currentPoint);
+						this._data[count++] = null;
+						this._data[count++] = null;
+					}
+				}
+			}
+			return this._data;
+		}
+		
+			function _getPointOnThreshold(threshold, prevP, currP) {
+			var currentX = currP[0];
+			var currentY = currP[1];
+
+			var prevX = prevP[0];
+			var prevY = prevP[1];
+
+			var slope = (threshold - currentY)
+					/ (prevY - currentY);
+			var xOnConstraintLine = slope * (prevX - currentX) + currentX;
+
+			return [ xOnConstraintLine, threshold ];
+		}	
+	}
+
+	function _getSortedConstraints(originalpoints,constraints){
+		
+		var dataRange = _findMaxAndMin(originalpoints);
+		
+		if(undefined == dataRange)return [];
+		
+		var max = dataRange.max;
+		var min = dataRange.min;
+		var thresholdRanges = [];
+		var sortedConstraints = [];
+		for(var i = 0; i < constraints.length ; i++){
+			var constraint = constraints[i];
+			var range = 0;
+			if(constraint.evaluate(min,constraint.threshold)){
+			   range = Math.abs(constraint.threshold - min);
+			}else{
+				range = Math.abs(max - constraint.threshold);
+			}
+			thresholdRanges.push({constraint:constraint,range:range});
+		}
+		QuickSort(thresholdRanges,function(obj1,obj2){ return obj1.range < obj2.range;});
+		for(var i=thresholdRanges.length-1;i>=0;i--){
+			sortedConstraints[i] = thresholdRanges[i].constraint;
+		}
+		return sortedConstraints;
+	}
+
+	function _findMaxAndMin(dataset){
+		if(undefined == dataset)return undefined;
+		var arr = [];
+		for( var i=0;i<dataset.length;i++){
+		   arr[i] = dataset[i][1];
+		}
+		QuickSort(arr,function(p1,p2){return p1 < p2;});
+		return { min:arr[0],max:arr[arr.length-1]};
+	}
+	
+}
+
+    function QuickSort(dataset,comparator){
+		sort(dataset, 0, dataset.length-1, comparator);
+		
+		function sort(array, left, right,comparator){
+			if(right > left){
+			   var pivotIndex = Math.floor(( left + right )/2);
+			   var pivotNewIndex = partition(array,left,right,pivotIndex,comparator);
+			   sort(array, left, pivotNewIndex - 1,comparator);
+			   sort(array, pivotNewIndex + 1, right,comparator);
+			  
+			}
+	   }
+	   
+	   function partition(array,left,right,pivotIndex,comparator){
+			var pivot = array[pivotIndex];
+			swap(array,pivotIndex,right);
+			var storeIndex = left;
+			for( var i= left ; i < right ; i++){
+				if(comparator(array[i] , pivot)){
+				   swap(array,i,storeIndex);
+				   storeIndex = storeIndex + 1;
+				}
+			}
+			swap(array,storeIndex,right);
+		
+		return storeIndex;
+	   }
+	   
+	   function swap(array,index1,index2){
+		var temp = array[index1];
+		array[index1] = array[index2];
+		array[index2] = temp;
+	   }
+    }
+
+
+    plot.hooks.processRawData.push(plotWithMultipleThresholds);
+ }
+  
+$.plot.plugins.push({
+        init: init,
+        name: 'multiple.threshold',
+        version: '1.0'
+    });
+})(jQuery);
+
+
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 19e63923e5..88df07cd3b 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -693,7 +693,7 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 	if (full_legend != false) {
 		full_legend = full_legend.split(separator);
 	}
-	
+
 	// Check possible adapt_keys on classes
 	check_adaptions(graph_id);
 
@@ -806,7 +806,7 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
     			var to = legend[item.seriesIndex+1];
     			//current date
     			var dateObj = new Date();
-    
+
     			if (full_legend != "") {
     				newdate = full_legend[item.seriesIndex];
     				newdate2 = full_legend[item.seriesIndex+1];
@@ -817,11 +817,11 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
     				var year = dateObj.getUTCFullYear();
     					newdate = year + "/" + month + "/" + day;
     			}
-    
+
     			if(!to){
     				to= '23:59';
     			}
-    
+
     			if (full_legend != "") {
     				if (newdate2 == undefined) {
     					window.location='index.php?sec=eventos&sec2=operation/events/events&id_agent='+id_agent+'&date_from='+newdate+'&time_from='+from+'&status=-1';
@@ -855,274 +855,6 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 	}
 }
 
-/*
-function adjust_menu(graph_id, plot, parent_height, width) {
-
-	if ($('#'+graph_id+' .xAxis .tickLabel').eq(0).css('width') != undefined) {
-		left_ticks_width = $('#'+graph_id+' .xAxis .tickLabel').eq(0).css('width').split('px')[0];
-	}
-	else {
-		left_ticks_width = 0;
-	}
-	var parent_height_new = 0;
-
-	var legend_height = parseInt($('#legend_'+graph_id).css('height').split('px')[0]) + parseInt($('#legend_'+graph_id).css('margin-top').split('px')[0]);
-*/
-	/*
-	if ($('#overview_'+graph_id).css('display') == 'none') {
-		overview_height = 0;
-	}
-	else {
-		overview_height = parseInt($('#overview_'+graph_id).css('height').split('px')[0]) + parseInt($('#overview_'+graph_id).css('margin-top').split('px')[0]);
-	}
-	*/
-/*
-	var menu_height = '25';
-
-	if ($('#menu_'+graph_id).height() != undefined && $('#menu_'+graph_id).height() > 20) {
-		menu_height = $('#menu_'+graph_id).height();
-	}
-
-	offset = $('#' + graph_id)[0].offsetTop;
-	
-	$('#menu_' + graph_id).css('top', ((offset) + 'px'));
-
-	//$('#legend_' + graph_id).css('width',plot.width());
-
-	//~ $('#menu_' + graph_id).css('left', $('#'+graph_id)[0].offsetWidth);
-	
-	$('#menu_' + graph_id).show();
-}
-
-
-
-function set_watermark(graph_id, plot, watermark_src) {
-console.log('entra setmark');
-	var img = new Image();
-	img.src = watermark_src;
-	var context = plot.getCanvas().getContext('2d');
-
-	// Once it's loaded draw the image on the canvas.
-	img.addEventListener('load', function () {
-		//~ // Now resize the image: x, y, w, h.
-
-		var down_ticks_height = 0;
-		if ($('#'+graph_id+' .yAxis .tickLabel').eq(0).css('height') != undefined) {
-			down_ticks_height = $('#'+graph_id+' .yAxis .tickLabel').eq(0).css('height').split('px')[0];
-		}
-		
-		var left_pos = parseInt(context.canvas.width - 3) - $('#watermark_image_'+graph_id)[0].width;
-		var top_pos  = 6;
-		//var top_pos = parseInt(context.canvas.height - down_ticks_height - 10) - $('#watermark_image_'+graph_id)[0].height;
-		//var left_pos = 380;
-		context.drawImage(this, left_pos, top_pos);
-
-	}, false);
-}
-
-function get_event_details (event_ids) {
-	table = '';
-	if (typeof(event_ids) != "undefined") {
-		var inputs = [];
-		var table;
-		inputs.push ("get_events_details=1");
-		inputs.push ("event_ids="+event_ids);
-		inputs.push ("page=include/ajax/events");
-
-		// Autologin
-		if ($('#hidden-loginhash').val() != undefined) {
-			inputs.push ("loginhash=" + $('#hidden-loginhash').val());
-			inputs.push ("loginhash_data=" + $('#hidden-loginhash_data').val());
-			inputs.push ("loginhash_user=" + $('#hidden-loginhash_user').val());
-		}
-
-		jQuery.ajax ({
-			data: inputs.join ("&"),
-			type: 'GET',
-			url: action="../../ajax.php",
-			timeout: 10000,
-			dataType: 'html',
-			async: false,
-			success: function (data) {
-				table = data;
-				//forced_title_callback();
-			}
-		});
-	}
-
-	return table;
-}
-
-function adjust_left_width_canvas(adapter_id, adapted_id) {
-	var adapter_left_margin = $('#'+adapter_id+' .yAxis .tickLabel').width();
-	var adapted_pix = $('#'+adapted_id).width();
-	
-	var new_adapted_width = adapted_pix - adapter_left_margin;
-	
-	$('#'+adapted_id).width(new_adapted_width);
-	$('#'+adapted_id).css('margin-left', adapter_left_margin);
-}
-
-function check_adaptions(graph_id) {
-	var classes = $('#'+graph_id).attr('class').split(' ');
-
-	$.each(classes, function(i,v) {
-		// If has a class starting with adapted, we adapt it
-		if (v.split('_')[0] == 'adapted') {
-			var adapter_id = $('.adapter_'+v.split('_')[1]).attr('id');
-			adjust_left_width_canvas(adapter_id, graph_id);
-		}
-	});
-}
-
-function number_format(number, force_integer, unit, short_data) {
-	if (force_integer) {
-		if (Math.round(number) != number) {
-			return '';
-		}
-	}
-	else {
-		short_data ++;
-		decimals = pad(1, short_data, 0);
-		number = Math.round(number * decimals) / decimals;
-	}
-
-	var shorts = ["", "K", "M", "G", "T", "P", "E", "Z", "Y"];
-	var pos = 0;
-	while (1) {
-		if (number >= 1000) { //as long as the number can be divided by 1000
-			pos++; //Position in array starting with 0
-			number = number / 1000;
-		}
-		else if (number <= -1000) {
-			pos++;
-			number = number / 1000;
-		}
-		else {
-			break;
-		}
-	}
-	return number + ' ' + shorts[pos] + unit;
-}
-
-function pad(input, length, padding) { 
-	var str = input + "";
-	return (length <= str.length) ? str : pad(str+padding, length, padding);
-}
-
-// Recalculate the threshold data depends on warning and critical
-function axis_thresholded (threshold_data, y_min, y_max, red_threshold, extremes, red_up) {
-	
-	var y = {
-		min: 0,
-		max: 0
-	};
-	
-	// Default values
-	var yaxis_resize = {
-		up: null,
-		normal_up: 0,
-		normal_down: 0,
-		down: null
-	};
-
-	// Resize the y axis to display all intervals
-	$.each(threshold_data, function() {
-		if (/_up/.test(this.id)){
-			yaxis_resize['up'] = this.data[0][1];
-		}
-		if (/_down/.test(this.id)){
-			if (/critical/.test(this.id)) {
-				yaxis_resize['down'] = red_threshold;
-			} else {
-				yaxis_resize['down'] = extremes[this.id];
-			}
-		}
-		if (/_normal/.test(this.id)){
-			var end;
-			if (/critical/.test(this.id)) {
-				end = red_up;
-			} else {
-				end = extremes[this.id + '_2'];
-			}
-			if (yaxis_resize['normal_up'] < end) yaxis_resize['normal_up'] = end;
-			if (yaxis_resize['normal_down'] > this.data[0][1]) yaxis_resize['normal_down'] = this.data[0][1];
-		}
-	});
-	
-	// If you need to display a up or a down bar, display 10% of data height
-	var margin_up_or_down = (y_max - y_min)*0.10;
-	
-	// Calculate the new axis
-	y['max'] = yaxis_resize['normal_up'] > y_max ? yaxis_resize['normal_up'] : y_max;
-	y['min'] = yaxis_resize['normal_down'] > y_min ? yaxis_resize['normal_down'] : y_min;
-	if (yaxis_resize['up'] !== null) {
-		y['max'] = (yaxis_resize['up'] + margin_up_or_down) < y_max
-			? y_max
-			: yaxis_resize['up'] + margin_up_or_down;
-	}
-	if (yaxis_resize['down'] !== null) {
-		y['min'] = (yaxis_resize['down'] - margin_up_or_down) < y_min
-			? yaxis_resize['up'] + margin_up_or_down
-			: y_min;
-	}
-	return y;
-}
-
-function add_threshold (data_base, threshold_data, y_min, y_max,
-						red_threshold, extremes, red_up) {
-
-	var datas = new Array ();
-	$.each(data_base, function() {
-		// Prepared to turning series
-		//if(showed[this.id.split('_')[1]]) {
-			datas.push(this);
-		//}
-	});
-
-	// Resize the threshold data
-	$.each(threshold_data, function() {
-		if (/_up/.test(this.id)){
-			this.bars.barWidth = y_max - this.data[0][1];
-		}
-		if (/_down/.test(this.id)){
-			var end;
-			if (/critical/.test(this.id)) {
-				end = red_threshold;
-			} else {
-				end = extremes[this.id];
-			}
-			this.bars.barWidth = end - y_min;
-			this.data[0][1] = y_min;
-		}
-		if (/_normal/.test(this.id)){
-			var end;
-			if (/critical/.test(this.id)) {
-				end = red_up;
-			} else {
-				end = extremes[this.id + '_2'];
-			}
-			if (this.data[0][1] < y_min) {
-				this.bars.barWidth = end - y_min;
-				this.data[0][1] = y_min;
-				end = this.bars.barWidth + this.data[0][1];
-			}
-			if (end > y_max) {
-				this.bars.barWidth = y_max - this.data[0][1];
-			}
-		}
-		datas.push(this);
-	});
-	return datas;
-}
-
-function reduceText (text, maxLength) {
-	if (text.length <= maxLength) return text
-	var firstSlideEnd = parseInt((maxLength - 3) / 2);
-	var str_cut = text.substr(0, firstSlideEnd);
-	return str_cut + '...' + text.substr(-firstSlideEnd - 3);
-}
-*/
 function pandoraFlotArea(
 	graph_id, values, legend, agent_module_id,
 	series_type, watermark, date_array,
@@ -1131,7 +863,7 @@ function pandoraFlotArea(
 	background_color, legend_color, short_data,
 	events_array
 ) {
-	console.log(format_graph.font_size);
+
 	//diferents vars
 	var unit      = format_graph.unit ? format_graph.unit : '';
 	var homeurl   = format_graph.homeurl;
@@ -1142,9 +874,14 @@ function pandoraFlotArea(
 	var vconsole  = show_elements_graph.vconsole;
 	var dashboard = show_elements_graph.dashboard;
 	var menu      = show_elements_graph.menu;
+	var min_x     = date_array['start_date'] *1000;
 	var max_x     = date_array['final_date'] *1000;
 	var type      = show_elements_graph.stacked;
 
+	if(typeof type === 'undefined' || type == ''){
+		type = format_graph.type_graph;
+	}
+
 	//for threshold
 	var threshold        = true;
 	var thresholded      = false;
@@ -1155,6 +892,9 @@ function pandoraFlotArea(
 	var yellow_inverse   = parseInt   (data_module_graph.w_inv);
 	var red_inverse      = parseInt   (data_module_graph.c_inv);
 
+	//XXXXX
+	var markins_graph    = true;
+
 	//XXXX ver que hay que hacer
 	var labels_long   = '';
 	var min_check     = 0;
@@ -1162,7 +902,587 @@ function pandoraFlotArea(
 	var legend_events = null;
 	var legend_alerts = null;
 
+
+	// If threshold and up are the same, that critical or warning is disabled
+	if (yellow_threshold == yellow_up){
+		yellow_inverse = false;
+	}
+
+	if (red_threshold == red_up){
+		red_inverse = false;
+	}
+
+	//Array with points to be painted
+	var threshold_data = new Array();
+	//Array with some interesting points
+	var extremes = new Array ();
+
+	var yellow_only_min = ((yellow_up == 0) && (yellow_threshold != 0));
+	var red_only_min    = ((red_up == 0) && (red_threshold != 0));
+
+	//color
+	var normalw   = '#efe';
+	var warningw  = '#ffe';
+	var criticalw = '#fee';
+	var normal    = '#0f0';
+	var warning   = 'yellow';
+	var critical  = 'red';
+
+	if (threshold) {
+		// Warning interval. Change extremes depends on critical interval
+		if (yellow_inverse && red_inverse) {
+			if (red_only_min && yellow_only_min) {
+				// C: |--------         |
+				// W: |········====     |
+				if (yellow_threshold > red_threshold) {
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning,
+						bars: {
+							show: true,
+							align: "left",
+							barWidth: yellow_threshold - red_threshold,
+							lineWidth: 0,
+							horizontal: true,
+							fillColor: {
+								colors: [
+									{
+										opacity: 0.1
+									},
+									{
+										opacity: 0.1
+									}
+								]
+							}
+						},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+
+					extremes['warning_normal_fdown_1'] = red_threshold;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+				}
+			} else if (!red_only_min && yellow_only_min) {
+				// C: |--------   ------|
+				// W: |········===·     |
+				if (yellow_threshold > red_up) {
+					yellow_threshold = red_up;
+				}
+				if (yellow_threshold > red_threshold) {
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_fdown_1'] = red_threshold;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+				}
+			} else if (red_only_min && !yellow_only_min) {
+				// C: |-------          |
+				// W: |·······====   ===|
+				if (red_threshold < yellow_threshold) {
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_fdown_1'] = red_threshold;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+				}
+
+				if (yellow_up < red_threshold) {
+					yellow_up = red_threshold;
+				}
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'warning_up',
+					data: [[max_x, yellow_up]],
+					label: null,
+					color: warning,
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+					highlightColor: 'rgba(254, 255, 198, 0)'
+				});
+				extremes['warning_up'] = yellow_up;
+			} else {
+				if (yellow_threshold > red_threshold) {
+					// C: |--------   ------|
+					// W: |········===·  ···|
+					if (yellow_threshold > red_up) {
+						yellow_threshold = red_up;
+					}
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_fdown_1'] = red_threshold;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+				}
+				if (yellow_up < red_up) {
+					// C: |--------      ---|
+					// W: |·····  ·======···|
+					if (yellow_up < red_threshold) {
+						yellow_up = red_up;
+					}
+					threshold_data.push({
+						id: 'warning_normal_fup',
+						data: [[max_x, yellow_up]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: red_up - yellow_up, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_fup_1'] = red_up;
+					extremes['warning_normal_fup_2'] = yellow_up;
+				}
+				// If warning is under critical completely do not paint anything yellow
+					// C: |--------    -----|
+					// W: |····          ···|
+			}
+		} else if (yellow_inverse && !red_inverse) {
+			if (red_only_min && yellow_only_min) {
+				// C: |            -----|
+				// W: |============···  |
+				if (yellow_threshold > red_threshold) {
+					yellow_threshold = red_threshold;
+				}
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'warning_down',
+					data: [[max_x, yellow_threshold]],
+					label: null,
+					color: warning,
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+					highlightColor: 'rgba(254, 255, 198, 0)'
+				});
+				extremes['warning_down'] = yellow_threshold;
+
+			} else if (!red_only_min && yellow_only_min) {
+				// C: |      ----       |
+				// W: |======····===    |
+
+				if (yellow_threshold > red_up) {
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_up]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: yellow_threshold - red_up, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_fdown_1'] = red_up;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+				}
+
+				if (yellow_threshold > red_threshold) {
+					yellow_threshold = red_threshold;
+				}
+				threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+				extremes['warning_down'] = yellow_threshold;
+
+			} else if (red_only_min && !yellow_only_min) {
+				if (yellow_threshold < red_threshold) {
+					// C: |            -----|
+					// W: |=======  ===·····|
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_down'] = yellow_threshold;
+
+					if (red_threshold > yellow_up) {
+						threshold_data.push({
+							id: 'warning_normal_fup',
+							data: [[max_x, yellow_up]],
+							label: null,
+							color: warning,
+							bars: {show: true, align: "left", barWidth: red_threshold - yellow_up, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+							highlightColor: 'rgba(254, 255, 198, 0)'
+						});
+						extremes['warning_normal_fup_1'] = yellow_up;
+						extremes['warning_normal_fup_2'] = red_threshold;
+					}
+				} else {
+					// C: |     ------------|
+					// W: |=====··  ········|
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_down'] = red_threshold;
+				}
+			} else {
+				if (yellow_threshold > red_up) {
+					// C: |    -----        |
+					// W: |====·····===  ===|
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, red_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_down'] = red_threshold;
+
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, red_up]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: yellow_threshold - red_up, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_fdown_1'] = red_up;
+					extremes['warning_normal_fdown_2'] = yellow_threshold;
+
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_up',
+						data: [[max_x, yellow_up]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_up'] = yellow_up;
+				} else if (red_threshold > yellow_up){
+					// C: |          -----  |
+					// W: |===    ===·····==|
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_down'] = yellow_threshold;
+
+					threshold_data.push({
+						id: 'warning_normal_fup',
+						data: [[max_x, yellow_up]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: red_threshold - yellow_up, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_fup_1'] = yellow_up;
+					extremes['warning_normal_fup_2'] = red_threshold;
+
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_up',
+						data: [[max_x, red_up]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_up'] = red_up;
+				} else {
+					// C: |  --------       |
+					// W: |==·    ···=======|
+					if (yellow_threshold > red_threshold) {
+						yellow_threshold = red_threshold;
+					}
+					if (yellow_up < red_up) {
+						yellow_up = red_up;
+					}
+
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_down',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_down'] = yellow_threshold;
+
+					threshold_data.push({ // barWidth will be correct on draw time
+						id: 'warning_up',
+						data: [[max_x, yellow_up]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_up'] = yellow_up;
+				}
+			}
+		} else if (!yellow_inverse && red_inverse) {
+			if (yellow_only_min && red_only_min) {
+				// C: |-----            |
+				// W: |   ··============|
+				if (yellow_threshold < red_threshold) {
+					yellow_threshold = red_threshold;
+				}
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'warning_up',
+					data: [[max_x, yellow_threshold]],
+					label: null,
+					color: warning,
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+					highlightColor: 'rgba(254, 255, 198, 0)'
+				});
+				extremes['warning_up'] = yellow_threshold;
+			} else if (!yellow_only_min && red_only_min) {
+				// C: |-----            |
+				// W: |   ··========    |
+				if (yellow_threshold < red_threshold) {
+					yellow_threshold = red_threshold;
+				}
+				if (yellow_up > red_threshold) {
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = yellow_up;
+				}
+			} else if (yellow_only_min && !red_only_min) {
+				// C: |-----      ------|
+				// W: |   ··======······|
+				if (yellow_threshold < red_threshold) {
+					yellow_threshold = red_threshold;
+				}
+				if (yellow_threshold < red_up) {
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: (red_up - yellow_threshold), lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = red_up;
+				}
+				// If warning is under critical completely do not paint anything yellow
+					// C: |--------    -----|
+					// W: |              ···|
+			} else {
+				if (red_up > yellow_threshold && red_threshold < yellow_up) {
+					// C: |-----      ------|
+					// W: |   ··======·     |
+					if (yellow_threshold < red_threshold) {
+						yellow_threshold = red_threshold;
+					}
+					if (yellow_up > red_up) {
+						yellow_up = red_up;
+					}
+
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = yellow_up;
+				}
+			}
+		}
+			// If warning is under critical completely do not paint anything yellow
+				// C: |--------    -----|   or	// C: |--------    -----|
+				// W: |   ····          |		// W: |             ··  |
+		else {
+			if (red_only_min && yellow_only_min) {
+				if (yellow_threshold < red_threshold) {
+					// C: |        ---------|
+					// W: |   =====·········|
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: (red_threshold - yellow_threshold), lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = red_threshold;
+				}
+			} else if (red_only_min && !yellow_only_min) {
+				// C: |        ---------|
+				// W: |   =====···      |
+				if (yellow_up > red_threshold) {
+					yellow_up = red_threshold;
+				}
+				if (yellow_threshold < red_threshold) {
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = yellow_up;
+				}
+			} else if (!red_only_min && yellow_only_min) {
+				// C: |     -------     |
+				// W: |   ==·······=====|
+				if (yellow_threshold < red_threshold) {
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: red_threshold - yellow_threshold, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_fdown_1'] = yellow_threshold;
+					extremes['warning_normal_fdown_2'] = red_threshold;
+				}
+
+				if (yellow_threshold < red_up) {
+					yellow_threshold = red_up;
+				}
+
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'warning_up',
+					data: [[max_x, yellow_threshold]],
+					label: null,
+					color: warning,
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+					highlightColor: 'rgba(254, 255, 198, 0)'
+				});
+				extremes['warning_up'] = yellow_threshold;
+
+			} else {
+				if (red_threshold > yellow_threshold && red_up < yellow_up ) {
+					// C: |    ------       |
+					// W: |  ==······====   |
+					threshold_data.push({
+						id: 'warning_normal_fdown',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: red_threshold - yellow_threshold, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_fdown_1'] = yellow_threshold;
+					extremes['warning_normal_fdown_2'] = red_threshold;
+
+					threshold_data.push({
+						id: 'warning_normal_fup',
+						data: [[max_x, red_up]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: yellow_up - red_up, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_fup_1'] = red_up;
+					extremes['warning_normal_fup_2'] = yellow_up;
+				} else if (red_threshold < yellow_threshold && red_up > yellow_up) {
+				// If warning is under critical completely do not paint anything yellow
+					// C: |  --------        |
+					// W: |    ····          |
+				} else {
+					// C: |     --------    |   or	// C: |     ------      |
+					// W: |   ==··          |		// W: |        ···====  |
+					if ((yellow_up > red_threshold) && (yellow_up < red_up)) {
+						yellow_up = red_threshold;
+					}
+					if ((yellow_threshold < red_up) && (yellow_threshold > red_threshold)) {
+						yellow_threshold = red_up;
+					}
+					threshold_data.push({
+						id: 'warning_normal',
+						data: [[max_x, yellow_threshold]],
+						label: null,
+						color: warning,
+						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+						highlightColor: 'rgba(254, 255, 198, 0)'
+					});
+					extremes['warning_normal_1'] = yellow_threshold;
+					extremes['warning_normal_2'] = yellow_up;
+				}
+			}
+		}
+
+		// Critical interval
+		if (red_inverse) {
+			if (!red_only_min) {
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'critical_up',
+					data: [[max_x, red_up]],
+					label: null,
+					color: critical,
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+					highlightColor: 'rgba(254, 236, 234, 0)'
+				});
+				extremes['critical_normal_1'] = red_threshold;
+				extremes['critical_normal_2'] = red_up;
+			}
+			threshold_data.push({ // barWidth will be correct on draw time
+				id: 'critical_down',
+				data: [[max_x, red_threshold]],
+				label: null,
+				color: critical,
+				bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+				highlightColor: 'rgba(254, 236, 234, 0)'
+			});
+			extremes['critical_normal_3'] = red_threshold;
+			extremes['critical_normal_4'] = red_threshold;
+		} else {
+			if (red_up == 0 && red_threshold != 0) {
+				threshold_data.push({ // barWidth will be correct on draw time
+					id: 'critical_up',
+					data: [[max_x, red_threshold]],
+					label: null,
+					color: critical,
+					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+					highlightColor: 'rgba(254, 236, 234, 0)'
+				});
+				extremes['critical_normal_1'] = red_threshold;
+				extremes['critical_normal_2'] = red_up;
+			} else {
+				threshold_data.push({
+					id: 'critical_normal',
+					data: [[max_x, red_threshold]],
+					label: null,
+					color: critical,
+					bars: {show: true, align: "left", barWidth: (red_up - red_threshold), lineWidth: 0, horizontal: true, fillColor: { colors: [ { opacity: 0.1 }, { opacity: 0.1 } ] }},
+					highlightColor: 'rgba(254, 236, 234, 0)'
+				});
+				extremes['critical_normal_1'] = red_threshold;
+				extremes['critical_normal_2'] = red_up;
+			}
+		}
+	}
+
 	switch (type) {
+		case 'line':
 		case 2:
 			stacked  = null;
 			filled_s = false;
@@ -1172,13 +1492,14 @@ function pandoraFlotArea(
 			filled_s = false;
 			break;
 		default:
+		case 'area':
 		case 0:
 			stacked  = null;
-			filled_s = 0.2;
+			filled_s = 0.3;
 			break;
 		case 1:
 			stacked  = 'stack';
-			filled_s = 0.2;
+			filled_s = 0.3;
 			break;
 	}
 
@@ -1230,12 +1551,13 @@ function pandoraFlotArea(
 				case 'boolean':
 					line_show   = true;
 					points_show = false;
-					filled      = false;
+					filled      = filled_s;
 					steps_chart = true;
 					radius      = false;
 					fill_points = fill_color;
 					break;
 			}
+
 			data_base.push({
 				id: 'serie_' + i,
 				data: value.data,
@@ -1249,537 +1571,15 @@ function pandoraFlotArea(
 				},
 				points: {
 					show: points_show,
-					radius: radius,
+					radius: 3,
 					fillColor: fill_points
 				}
 			});
+
 			i++;
 		}
 	});
 
-	// If threshold and up are the same, that critical or warning is disabled
-	if (yellow_threshold == yellow_up){
-		yellow_inverse = false;
-	}
-
-	if (red_threshold == red_up){
-		red_inverse = false;
-	}
-
-	//Array with points to be painted
-	var threshold_data = new Array();
-	//Array with some interesting points
-	var extremes = new Array ();
-
-	var yellow_only_min = ((yellow_up == 0) && (yellow_threshold != 0));
-	var red_only_min    = ((red_up == 0) && (red_threshold != 0));
-
-	//color
-	var normalw   = '#efe';
-	var warningw  = '#ffe';
-	var criticalw = '#fee';
-	var normal    = '#0f0';
-	var warning   = '#ff0';
-	var critical  = '#f00';
-
-	if (threshold) {
-		// Warning interval. Change extremes depends on critical interval
-		if (yellow_inverse && red_inverse) {
-			if (red_only_min && yellow_only_min) {
-				// C: |--------         |
-				// W: |········====     |
-				
-				if (yellow_threshold > red_threshold) {
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_threshold;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-				}
-			} else if (!red_only_min && yellow_only_min) {
-				// C: |--------   ------|
-				// W: |········===·     |
-				
-				if (yellow_threshold > red_up) {
-					yellow_threshold = red_up;
-				}
-				if (yellow_threshold > red_threshold) {
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_threshold;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-				}
-			} else if (red_only_min && !yellow_only_min) {
-				// C: |-------          |
-				// W: |·······====   ===|
-				if (red_threshold < yellow_threshold) {
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_threshold;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-				}
-				
-				if (yellow_up < red_threshold) {
-					yellow_up = red_threshold;
-				}
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'warning_up',
-					data: [[max_x, yellow_up]],
-					label: null,
-					color: warning, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-				extremes['warning_up'] = yellow_up;
-				
-			} else {
-				if (yellow_threshold > red_threshold) {
-					// C: |--------   ------|
-					// W: |········===·  ···|
-					if (yellow_threshold > red_up) {
-						yellow_threshold = red_up;
-					}
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_threshold;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-				}
-				if (yellow_up < red_up) {
-					// C: |--------      ---|
-					// W: |·····  ·======···|
-					if (yellow_up < red_threshold) {
-						yellow_up = red_up;
-					}
-					threshold_data.push({ 
-						id: 'warning_normal_fup',
-						data: [[max_x, yellow_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: red_up - yellow_up, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fup_1'] = red_up;
-					extremes['warning_normal_fup_2'] = yellow_up;
-				}
-				// If warning is under critical completely do not paint anything yellow
-					// C: |--------    -----|
-					// W: |····          ···|
-			}
-		} else if (yellow_inverse && !red_inverse) {
-			if (red_only_min && yellow_only_min) {
-				// C: |            -----|
-				// W: |============···  |
-				if (yellow_threshold > red_threshold) {
-					yellow_threshold = red_threshold;
-				}
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'warning_down',
-					data: [[max_x, yellow_threshold]],
-					label: null,
-					color: warning, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-				extremes['warning_down'] = yellow_threshold;
-				
-			} else if (!red_only_min && yellow_only_min) {
-				// C: |      ----       |
-				// W: |======····===    |
-				
-				if (yellow_threshold > red_up) {
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_up, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_up;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-				}
-				
-				if (yellow_threshold > red_threshold) {
-					yellow_threshold = red_threshold;
-				}
-				threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-				extremes['warning_down'] = yellow_threshold;
-				
-			} else if (red_only_min && !yellow_only_min) {
-				if (yellow_threshold < red_threshold) {
-					// C: |            -----|
-					// W: |=======  ===·····|
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_down'] = yellow_threshold;
-					
-					if (red_threshold > yellow_up) {
-						threshold_data.push({
-							id: 'warning_normal_fup',
-							data: [[max_x, yellow_up]],
-							label: null,
-							color: warning, 
-							bars: {show: true, align: "left", barWidth: red_threshold - yellow_up, lineWidth: 0, horizontal: true}
-						});
-						extremes['warning_normal_fup_1'] = yellow_up;
-						extremes['warning_normal_fup_2'] = red_threshold;
-					}
-				} else {
-					// C: |     ------------|
-					// W: |=====··  ········|
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_down'] = red_threshold;
-				}
-			} else {
-				if (yellow_threshold > red_up) {
-					// C: |    -----        |
-					// W: |====·····===  ===|
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, red_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_down'] = red_threshold;
-					
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, red_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_threshold - red_up, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = red_up;
-					extremes['warning_normal_fdown_2'] = yellow_threshold;
-					
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_up',
-						data: [[max_x, yellow_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_up'] = yellow_up;
-				} else if (red_threshold > yellow_up){
-					// C: |          -----  |
-					// W: |===    ===·····==|
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_down'] = yellow_threshold;
-					
-					threshold_data.push({
-						id: 'warning_normal_fup',
-						data: [[max_x, yellow_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: red_threshold - yellow_up, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fup_1'] = yellow_up;
-					extremes['warning_normal_fup_2'] = red_threshold;
-					
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_up',
-						data: [[max_x, red_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_up'] = red_up;
-				} else {
-					// C: |  --------       |
-					// W: |==·    ···=======|
-					if (yellow_threshold > red_threshold) {
-						yellow_threshold = red_threshold;
-					}
-					if (yellow_up < red_up) {
-						yellow_up = red_up;
-					}
-					
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_down',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_down'] = yellow_threshold;
-					
-					threshold_data.push({ // barWidth will be correct on draw time
-						id: 'warning_up',
-						data: [[max_x, yellow_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_up'] = yellow_up;
-				}
-			}
-		} else if (!yellow_inverse && red_inverse) {
-			if (yellow_only_min && red_only_min) {
-				// C: |-----            |
-				// W: |   ··============|
-				if (yellow_threshold < red_threshold) {
-					yellow_threshold = red_threshold;
-				}
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'warning_up',
-					data: [[max_x, yellow_threshold]],
-					label: null,
-					color: warning, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-				extremes['warning_up'] = yellow_threshold;
-				
-			} else if (!yellow_only_min && red_only_min) {
-				// C: |-----            |
-				// W: |   ··========    |
-				if (yellow_threshold < red_threshold) {
-					yellow_threshold = red_threshold;
-				}
-				if (yellow_up > red_threshold) {
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = yellow_up;
-				}
-			} else if (yellow_only_min && !red_only_min) {
-				// C: |-----      ------|
-				// W: |   ··======······|
-				if (yellow_threshold < red_threshold) {
-					yellow_threshold = red_threshold;
-				}
-				if (yellow_threshold < red_up) {
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (red_up - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = red_up;
-				}
-				// If warning is under critical completely do not paint anything yellow
-					// C: |--------    -----|
-					// W: |              ···|
-			} else {
-				if (red_up > yellow_threshold && red_threshold < yellow_up) {
-					// C: |-----      ------|
-					// W: |   ··======·     |
-					if (yellow_threshold < red_threshold) {
-						yellow_threshold = red_threshold;
-					}
-					if (yellow_up > red_up) {
-						yellow_up = red_up;
-					}
-					
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = yellow_up;
-				}
-			}
-		}
-			// If warning is under critical completely do not paint anything yellow
-				// C: |--------    -----|   or	// C: |--------    -----|
-				// W: |   ····          |		// W: |             ··  |
-		else {
-			if (red_only_min && yellow_only_min) {
-				if (yellow_threshold < red_threshold) {
-					// C: |        ---------|
-					// W: |   =====·········|
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (red_threshold - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = red_threshold;
-				}
-			} else if (red_only_min && !yellow_only_min) {
-				// C: |        ---------|
-				// W: |   =====···      |
-				if (yellow_up > red_threshold) {
-					yellow_up = red_threshold;
-				}
-				if (yellow_threshold < red_threshold) {
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = yellow_up;
-				}
-			} else if (!red_only_min && yellow_only_min) {
-				// C: |     -------     |
-				// W: |   ==·······=====|
-				
-				if (yellow_threshold < red_threshold) {
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: red_threshold - yellow_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = yellow_threshold;
-					extremes['warning_normal_fdown_2'] = red_threshold;
-				}
-				
-				if (yellow_threshold < red_up) {
-					yellow_threshold = red_up;
-				}
-				
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'warning_up',
-					data: [[max_x, yellow_threshold]],
-					label: null,
-					color: warning, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-				extremes['warning_up'] = yellow_threshold;
-				
-			} else {
-				if (red_threshold > yellow_threshold && red_up < yellow_up ) {
-					// C: |    ------       |
-					// W: |  ==······====   |
-					threshold_data.push({
-						id: 'warning_normal_fdown',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: red_threshold - yellow_threshold, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fdown_1'] = yellow_threshold;
-					extremes['warning_normal_fdown_2'] = red_threshold;
-					
-					threshold_data.push({
-						id: 'warning_normal_fup',
-						data: [[max_x, red_up]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: yellow_up - red_up, lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_fup_1'] = red_up;
-					extremes['warning_normal_fup_2'] = yellow_up;
-				} else if (red_threshold < yellow_threshold && red_up > yellow_up) {
-				// If warning is under critical completely do not paint anything yellow
-					// C: |  --------        |
-					// W: |    ····          |
-				} else {
-					// C: |     --------    |   or	// C: |     ------      |
-					// W: |   ==··          |		// W: |        ···====  |
-					if ((yellow_up > red_threshold) && (yellow_up < red_up)) {
-						yellow_up = red_threshold;
-					}
-					if ((yellow_threshold < red_up) && (yellow_threshold > red_threshold)) {
-						yellow_threshold = red_up;
-					}
-					threshold_data.push({
-						id: 'warning_normal',
-						data: [[max_x, yellow_threshold]],
-						label: null,
-						color: warning, 
-						bars: {show: true, align: "left", barWidth: (yellow_up - yellow_threshold), lineWidth: 0, horizontal: true}
-					});
-					extremes['warning_normal_1'] = yellow_threshold;
-					extremes['warning_normal_2'] = yellow_up;
-				}
-			}
-		}
-		// Critical interval
-		if (red_inverse) {
-			if (!red_only_min) {
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'critical_up',
-					data: [[max_x, red_up]],
-					label: null,
-					color: critical, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-			}
-			threshold_data.push({ // barWidth will be correct on draw time
-				id: 'critical_down',
-				data: [[max_x, red_threshold]],
-				label: null,
-				color: critical, 
-				bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-			});
-		} else {
-			if (red_up == 0 && red_threshold != 0) {
-				threshold_data.push({ // barWidth will be correct on draw time
-					id: 'critical_up',
-					data: [[max_x, red_threshold]],
-					label: null,
-					color: critical, 
-					bars: {show: true, align: "left", barWidth: 1, lineWidth: 0, horizontal: true}
-				});
-			} else {
-				threshold_data.push({
-					id: 'critical_normal',
-					data: [[max_x, red_threshold]],
-					label: null,
-					color: critical, 
-					bars: {show: true, align: "left", barWidth: (red_up - red_threshold), lineWidth: 0, horizontal: true}
-				});
-			}
-		}
-		
-	}
-
 	// The first execution, the graph data is the base data
 	datas = data_base;
 	font_size = 8;
@@ -1794,7 +1594,8 @@ function pandoraFlotArea(
 				shadowSize: 0.1
 			},
 			crosshair: {
-				mode: 'xy'
+				mode: 'xy',
+				color: 'grey'
 			},
 			selection: {
 				mode: 'xy',
@@ -1811,7 +1612,8 @@ function pandoraFlotArea(
 				borderWidth:1,
 				borderColor: '#C1C1C1',
 				tickColor: background_color,
-				color: legend_color
+				color: legend_color,
+				autoHighlight: true
 			},
 			xaxes: [{
 				axisLabelFontSizePixels: font_size,
@@ -1946,69 +1748,92 @@ function pandoraFlotArea(
 			}
 		}
 
-		plot = $.plot($('#' + graph_id), data_base,
-			$.extend(true, {}, options, {
-				grid: {
-					borderWidth: 1,
-					hoverable: true,
-					autoHighlight: true
-				},
-				xaxis: {
-					min: ranges.xaxis.from,
-					max: ranges.xaxis.to
-				},
-				xaxes: [{
-					mode: "time",
-					tickFormatter: xFormatter,
-					tickSize: [maxticks_zoom, 'hour']
-				}],
-				yaxis:{
-					min: ranges.yaxis.from,
-					max: ranges.yaxis.to
-				},
-				yaxes: [{
-					tickFormatter: yFormatter,
-					color: '',
-					alignTicksWithAxis: 1,
-					labelWidth: 30,
-					position: 'left',
-					font: font,
-					reserveSpace: true,
-				}],
-				legend: {
-					show: true
-				}
-		}));
-
 		if (thresholded) {
-			var zoom_data_threshold = new Array ();
+			data_base_treshold = add_threshold (
+				data_base,
+				threshold_data,
+				ranges.yaxis.from,
+				ranges.yaxis.to,
+				red_threshold,
+				extremes,
+				red_up,
+				markins_graph
+			);
 
-			var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
-									red_threshold, extremes, red_up);
-
-			plot = $.plot($('#' + graph_id), data_base,
-			$.extend(true, {}, options, {
-				yaxis: {
-					max: y_recal.max,
-					min: y_recal.min
-				},
-				xaxis: {
-					min: plot.getAxes().xaxis.min,
-					max: plot.getAxes().xaxis.max
-				}
+			plot = $.plot($('#' + graph_id), data_base_treshold,
+				$.extend(true, {}, options, {
+					grid: {
+						borderWidth: 1,
+						hoverable: true,
+						autoHighlight: true
+					},
+					xaxis: {
+						min: ranges.xaxis.from,
+						max: ranges.xaxis.to
+					},
+					xaxes: [{
+						mode: "time",
+						tickFormatter: xFormatter,
+						tickSize: [maxticks_zoom, 'hour']
+					}],
+					yaxis:{
+						min: ranges.yaxis.from,
+						max: ranges.yaxis.to
+					},
+					yaxes: [{
+						tickFormatter: yFormatter,
+						color: '',
+						alignTicksWithAxis: 1,
+						labelWidth: 30,
+						position: 'left',
+						font: font,
+						reserveSpace: true,
+					}],
+					legend: {
+						show: true
+					}
+			}));
+		}
+		else{
+			plot = $.plot($('#' + graph_id), data_base,
+				$.extend(true, {}, options, {
+					grid: {
+						borderWidth: 1,
+						hoverable: true,
+						autoHighlight: true
+					},
+					xaxis: {
+						min: ranges.xaxis.from,
+						max: ranges.xaxis.to
+					},
+					xaxes: [{
+						mode: "time",
+						tickFormatter: xFormatter,
+						tickSize: [maxticks_zoom, 'hour']
+					}],
+					yaxis:{
+						min: ranges.yaxis.from,
+						max: ranges.yaxis.to
+					},
+					yaxes: [{
+						tickFormatter: yFormatter,
+						color: '',
+						alignTicksWithAxis: 1,
+						labelWidth: 30,
+						position: 'left',
+						font: font,
+						reserveSpace: true,
+					}],
+					legend: {
+						show: true
+					}
 			}));
-
-			zoom_data_threshold = add_threshold (data_base, threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
-										red_threshold, extremes, red_up);
-
-			plot.setData(zoom_data_threshold);
-			plot.draw();
 		}
 
 		$('#menu_cancelzoom_' + graph_id)
 			.attr('src', homeurl + '/images/zoom_cross_grey.png');
 
-		currentRanges = ranges;
+	//	currentRanges = ranges;
 		// don't fire event on the overview to prevent eternal loop
 		overview.setSelection(ranges, true);
 	});
@@ -2158,7 +1983,7 @@ function pandoraFlotArea(
 
 	$('#' + graph_id).bind("plotclick", function (event, pos, item) {
 		plot.unhighlight();
-		if(item && item.series.label != '' &&
+		if(item && item.series.label != '' && item.series.label != null &&
 			( 	(item.series.label.search("alert") >= 0) ||
 				(item.series.label.search("event") >= 0)	)
 		){
@@ -2196,7 +2021,8 @@ function pandoraFlotArea(
 
 				$.each(events_array, function (i, v) {
 					$.each(v, function (index, value) {
-						if((value.utimestamp) == item.datapoint[0]/1000){
+						if(value.utimestamp == item.datapoint[0]/1000 ||
+							value.utimestamp == (item.datapoint[0]/1000) - 1){
 							events_data = value;
 						}
 					});
@@ -2327,14 +2153,16 @@ function pandoraFlotArea(
 
 			if (thresholded) {
 				$.each(data_base, function() {
-					// Prepared to turning series
-					//if(showed[this.id.split('_')[1]]) {
 						datas.push(this);
-					//}
 				});
+
+				delete data_base[0].threshold;
+
 				plot = $.plot($('#' + graph_id), data_base,
 					$.extend(true, {}, options, {
-						yaxis: {max: max_draw},
+						yaxis: {
+							max: max_draw
+						},
 						xaxis: {
 							min: plot.getAxes().xaxis.min,
 							max: plot.getAxes().xaxis.max
@@ -2344,36 +2172,51 @@ function pandoraFlotArea(
 			}
 			else {
 				var max_draw = plot.getAxes().yaxis.datamax;
-				// Recalculate the y axis
-				var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
-										red_threshold, extremes, red_up);
 
-				plot = $.plot($('#' + graph_id), data_base,
+				if(!thresholded){
+					// Recalculate the y axis
+					var y_recal = axis_thresholded(
+						threshold_data,
+						plot.getAxes().yaxis.min,
+						plot.getAxes().yaxis.max,
+						red_threshold, extremes,
+						red_up
+					);
+				}
+				else{
+					var y_recal = plot.getAxes().yaxis.max
+				}
+
+				datas_treshold = add_threshold (
+					data_base,
+					threshold_data,
+					plot.getAxes().yaxis.min,
+					plot.getAxes().yaxis.max,
+					red_threshold,
+					extremes,
+					red_up,
+					markins_graph
+				);
+
+				plot = $.plot($('#' + graph_id), datas_treshold,
 						$.extend(true, {}, options, {
 							yaxis: {
 								max: y_recal.max,
-								min: y_recal.min
 							},
 							xaxis: {
-								//mode:"time",
-								//min: plot.getAxes().xaxis.min,
-								//max: plot.getAxes().xaxis.max
+								min: plot.getAxes().xaxis.min,
+								max: plot.getAxes().xaxis.max
 							}
 						}));
 
-				datas = add_threshold (data_base, threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
-										red_threshold, extremes, red_up);
-
 				thresholded = true;
 			}
-			plot.setData(datas);
-			plot.draw();
 
-			//~ plot.setSelection(currentRanges);
 		});
 
 		$('#menu_cancelzoom_' + graph_id).click(function() {
 			// cancel the zooming
+			delete data_base[0].threshold;
 			plot = $.plot($('#' + graph_id), data_base,
 				$.extend(true, {}, options, {
 					legend: { show: true }
@@ -2494,7 +2337,6 @@ function get_event_details (event_ids) {
 
 //XXXXXXXXXX
 //Ajusta la grafica pequenña con el desplazamiento del eje y
-
 function adjust_left_width_canvas(adapter_id, adapted_id) {
 	var adapter_left_margin = $('#'+adapter_id+' .yAxis .tickLabel').width();
 	var adapted_pix = $('#'+adapted_id).width();
@@ -2506,7 +2348,6 @@ function adjust_left_width_canvas(adapter_id, adapted_id) {
 
 //XXXXXXXXXXX
 //Ajusta el ancho de la grafica pequeña con respecto a la grande
-
 function update_left_width_canvas(graph_id) {
 	$('#overview_'+graph_id).width($('#'+graph_id).width());
 	$('#overview_'+graph_id).css('margin-left', $('#'+graph_id+' .yAxis .tickLabel').width());
@@ -2551,14 +2392,15 @@ function number_format(number, force_integer, unit, short_data) {
 			break;
 		}
 	}
-	
+
 	return number + ' ' + shorts[pos] + unit;
 }
 
-function pad(input, length, padding) { 
+function pad(input, length, padding) {
 	var str = input + "";
 	return (length <= str.length) ? str : pad(str+padding, length, padding);
 }
+
 // Recalculate the threshold data depends on warning and critical
 function axis_thresholded (threshold_data, y_min, y_max, red_threshold, extremes, red_up) {
 	var y = {
@@ -2617,23 +2459,41 @@ function axis_thresholded (threshold_data, y_min, y_max, red_threshold, extremes
 	return y;
 }
 
+//add treshold
 function add_threshold (data_base, threshold_data, y_min, y_max,
-						red_threshold, extremes, red_up) {
-
+						red_threshold, extremes, red_up, markins_graph) {
 	var datas = new Array ();
 
 	$.each(data_base, function() {
-		// Prepared to turning series
-		//if(showed[this.id.split('_')[1]]) {
-			datas.push(this);
-		//}
+		datas.push(this);
 	});
 
+	var threshold_array = [];
+
 	// Resize the threshold data
-	$.each(threshold_data, function() {
+	$.each(threshold_data, function(index, value) {
+		threshold_array[index] = [];
+
 		if (/_up/.test(this.id)){
 			this.bars.barWidth = y_max - this.data[0][1];
+
+			if (/critical/.test(this.id)){
+				threshold_array[index]['min']   = this.data[0][1];
+				threshold_array[index]['max']   = y_max;
+				threshold_array[index]['color'] = "red";
+			}
+			else{
+				threshold_array[index]['min']   = this.data[0][1];
+				threshold_array[index]['max']   = y_max;
+				threshold_array[index]['color'] = "yellow";
+			}
+
+			if(y_min > this.data[0][1]){
+				this.bars.barWidth = this.bars.barWidth - (y_min - this.data[0][1]);
+				this.data[0][1] = y_min;
+			}
 		}
+
 		if (/_down/.test(this.id)){
 			var end;
 			if (/critical/.test(this.id)) {
@@ -2641,28 +2501,104 @@ function add_threshold (data_base, threshold_data, y_min, y_max,
 			} else {
 				end = extremes[this.id];
 			}
+
 			this.bars.barWidth = end - y_min;
 			this.data[0][1] = y_min;
+
+			if (/critical/.test(this.id)){
+				threshold_array[index]['min']   = this.data[0][1];
+				threshold_array[index]['max']   = this.bars.barWidth;
+				threshold_array[index]['color'] = "red";
+			}
+			else{
+				threshold_array[index]['min']   = this.data[0][1];
+				threshold_array[index]['max']   = this.bars.barWidth;
+				threshold_array[index]['color'] = "yellow";
+			}
 		}
+
 		if (/_normal/.test(this.id)){
 			var end;
 			if (/critical/.test(this.id)) {
 				end = red_up;
+				threshold_array[index]['min']   = this.data[0][1];
+				threshold_array[index]['max']   = end;
+				threshold_array[index]['color'] = "red";
 			} else {
-				end = extremes[this.id + '_2'];
+				end = extremes[this.id + '_1'];
+				threshold_array[index]['min']   = this.data[0][1];
+				threshold_array[index]['max']   = end;
+				threshold_array[index]['color'] = "yellow";
 			}
+
+
 			if (this.data[0][1] < y_min) {
 				this.bars.barWidth = end - y_min;
 				this.data[0][1] = y_min;
 				end = this.bars.barWidth + this.data[0][1];
+
+				if (/critical/.test(this.id)){
+					threshold_array[index]['min']   = this.data[0][1];
+					threshold_array[index]['max']   = this.data[0][1] + this.bars.barWidth;
+					threshold_array[index]['color'] = "red";
+				}
+				else{
+					threshold_array[index]['min']   = this.data[0][1];
+					threshold_array[index]['max']   = this.data[0][1] + this.bars.barWidth;
+					threshold_array[index]['color'] = "yellow";
+				}
+
 			}
+
 			if (end > y_max) {
 				this.bars.barWidth = y_max - this.data[0][1];
+
+				if (/critical/.test(this.id)){
+					threshold_array[index]['min']   = this.data[0][1];
+					threshold_array[index]['max']   = this.data[0][1] + this.bars.barWidth;
+					threshold_array[index]['color'] = "red";
+				}
+				else{
+					threshold_array[index]['min']   = this.data[0][1];
+					threshold_array[index]['max']   = this.data[0][1] + this.bars.barWidth;
+					threshold_array[index]['color'] = "yellow";
+				}
+
 			}
 		}
-		datas.push(this);
+
+		if(markins_graph && this.bars.barWidth > 0){
+			datas.push(this);
+		}
 	});
 
+	var extreme_treshold_array = [];
+	var i = 0;
+	var flag = true;
+console.log(threshold_array);
+	$.each(threshold_array, function(index, value) {
+		flag = true;
+		extreme_treshold_array[i] = {
+						'below': value['max'],
+						'color': value['color'],
+					}
+		i++;
+		$.each(threshold_array, function(i, v) {
+			if(value['min'] == v['max']){
+				return flag = false;
+			}
+		});
+		if(flag){
+			extreme_treshold_array[i] = {
+				'below': value['min'],
+				'color': datas[0].color,
+			}
+			i++;
+		}
+	});
+
+	datas[0].threshold = extreme_treshold_array;
+
 	return datas;
 }
 
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 0723a71ad0..c246a45768 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -52,6 +52,8 @@ function include_javascript_dependencies_flot_graph($return = false) {
 				ui_get_full_url($metaconsole_hack . '/include/graphs/flot/jquery.flot.resize.min.js') .'"></script>
 			<script language="javascript" type="text/javascript" src="'.
 				ui_get_full_url($metaconsole_hack . '/include/graphs/flot/jquery.flot.threshold.js') .'"></script>
+			<script language="javascript" type="text/javascript" src="'.
+				ui_get_full_url($metaconsole_hack . '/include/graphs/flot/jquery.flot.threshold.multiple.js') .'"></script>
 			<script language="javascript" type="text/javascript" src="'.
 				ui_get_full_url($metaconsole_hack . '/include/graphs/flot/jquery.flot.symbol.min.js') .'"></script>
 			<script language="javascript" type="text/javascript" src="'.
@@ -128,7 +130,7 @@ function flot_area_graph (
 
 	///XXXXXXX los px caca
 	// Parent layer
-	$return = "<div class='parent_graph' style='width: " . ($format_graph['width']) . "px; " . $background_style . "'>";
+	$return = "<div class='parent_graph' style='width: " . ($format_graph['width']) . "; " . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
 	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:" . $format_graph['font_size'] ."pt !important;'></p>";
 
@@ -297,7 +299,7 @@ function menu_graph(
 		$return .= "<div id='geneal_menu_$graph_id' class='menu_graph' style='
 						width: 30px;
 						height: 250px;
-						left:" . $width . "px;
+						left:100%;
 						position: absolute;
 						top: 0px;
 						background-color: white;'>";
@@ -677,10 +679,10 @@ function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $
 	
 	// Set some containers to legend, graph, timestamp tooltip, etc.
 	if ($stat_win) {
-		$return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width."px; height: ".$height."px; display: inline-block;'></div>";
+		$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."px; height: ".$height."px;'></div>";
+		$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>";
 	
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 8252ff8c90..a2c92376ed 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -244,10 +244,12 @@ $alias    = db_get_value ("alias","tagente","id_agente",$id_agent);
 					(($show_percentil)? $config['percentil'] : null),
 					false, false, $config['type_module_charts'], $fullscale);
 				echo '<br>';
-				if ($show_events_graph)
+				if ($show_events_graph){
+					$width = '500';
 					echo graphic_module_events($id, $width, $height,
 						$period, $config['homeurl'], $zoom,
 						'adapted_' . $graph_type, $date, true);
+					}
 				break;
 			case 'string':
 				html_debug_print('entra x stats win hay que rehacer esta funcion');

From d663553e8dc412d54ecc973b079024b28a883d21 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 13:08:34 +0200
Subject: [PATCH 025/146] [Rebranding] Open godmode/agentes

---
 pandora_console/godmode/agentes/agent_manager.php    |  4 ++--
 .../godmode/agentes/configurar_agente.php            |  6 +++---
 pandora_console/godmode/agentes/modificar_agente.php |  2 +-
 .../godmode/agentes/module_manager_editor.php        |  7 +------
 .../godmode/agentes/planned_downtime.editor.php      | 12 ++++++------
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 89ac922aed..151b47e03a 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -409,8 +409,8 @@ if($id_agente){
 	}
 
 	$table->data[2][0] = __('Safe operation mode')
-		. ui_print_help_tip(__('This mode allow Pandora FMS to disable all modules 
-		of this agent while the selected module is on CRITICAL status'), true);
+		. ui_print_help_tip(__('This mode allow %s to disable all modules 
+		of this agent while the selected module is on CRITICAL status', get_product_name()), true);
 	$table->data[2][1] = html_print_checkbox('safe_mode', 1, $safe_mode, true);
 	$table->data[2][1] .= "&nbsp;&nbsp;" .  __('Module') . "&nbsp;" . html_print_select ($safe_mode_modules, "safe_mode_module", $safe_mode_module, "", "", 0, true);
 }
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 5cf8e8a03d..c21b47733f 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1791,7 +1791,7 @@ if ($updateGIS) {
 			"altitude" => $previusAgentGISData['stored_altitude'],
 			"start_timestamp" => $previusAgentGISData['start_timestamp'],
 			"end_timestamp" => date( 'Y-m-d H:i:s'),
-			"description" => __('Save by Pandora Console'),
+			"description" => __('Save by %s Console', get_product_name()),
 			"manual_placement" => $previusAgentGISData['manual_placement'],
 			"number_of_packages" => $previusAgentGISData['number_of_packages'],
 			"tagente_id_agente" => $previusAgentGISData['tagente_id_agente']
@@ -1806,7 +1806,7 @@ if ($updateGIS) {
 			"stored_altitude" => $lastAltitude,
 			"start_timestamp" => date( 'Y-m-d H:i:s'),
 			"manual_placement" => 1,
-			"description" => __('Update by Pandora Console')),
+			"description" => __('Update by %s Console', get_product_name())),
 			array("tagente_id_agente" => $idAgente));
 	}
 	else {
@@ -1819,7 +1819,7 @@ if ($updateGIS) {
 			"stored_latitude" => $lastLatitude,
 			"stored_altitude" => $lastAltitude,
 			"manual_placement" => 1,
-			"description" => __('Insert by Pandora Console')
+			"description" => __('Insert by %s Console', get_product_name())
 		));
 	}
 }
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 8e66d50d4e..7dfd56cec6 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -60,7 +60,7 @@ $viewtab['active'] = false;
 $onheader = array('view' => $viewtab);
 
 // Header
-ui_print_page_header (__('Agents defined in Pandora'), "images/agent_mc.png", false, "", true, $onheader);
+ui_print_page_header (__('Agents defined in %s', get_product_name()), "images/agent_mc.png", false, "", true, $onheader);
 
 // Perform actions
 $agent_to_delete = (int)get_parameter('borrar_agente');
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index 921296545d..4efa2767ba 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -493,12 +493,7 @@ switch ($moduletype) {
 	/* WARNING: type 7 is reserved on enterprise */
 	default:
 		if (enterprise_include ('godmode/agentes/module_manager_editor.php') === ENTERPRISE_NOT_HOOK) {
-			ui_print_error_message(sprintf(__('DEBUG: Invalid module type specified in %s:%s'), __FILE__, __LINE__));
-			echo __('Most likely you have recently upgraded from an earlier version of Pandora and either <br />
-				1) forgot to use the database converter<br />
-				2) used a bad version of the database converter (see Bugreport #2124706 for the solution)<br />
-				3) found a new bug - please report a way to duplicate this error');
-			
+			ui_print_error_message(sprintf(__('Invalid module type')));
 			return;
 		}
 		break;
diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php
index d9646c5a98..12bf4e274c 100644
--- a/pandora_console/godmode/agentes/planned_downtime.editor.php
+++ b/pandora_console/godmode/agentes/planned_downtime.editor.php
@@ -522,9 +522,9 @@ $table->data[5][1] = "
 					"</td>
 				<td>".
 				html_print_input_text ('once_date_from', $once_date_from, '', 10, 10, true, $disabled_in_execution) .
-				ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
+				ui_print_help_tip(__('Date format is YY/MM/DD'), true) .
 				html_print_input_text ('once_time_from', $once_time_from, '', 9, 9, true, $disabled_in_execution) .
-				ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
+				ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true) .
 				"</td>
 			</tr>
 			<tr>
@@ -533,9 +533,9 @@ $table->data[5][1] = "
 					"</td>
 				<td>".
 				html_print_input_text ('once_date_to', $once_date_to, '', 10, 10, true) .
-				ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
+				ui_print_help_tip(__('Date format is YY/MM/DD'), true) .
 				html_print_input_text ('once_time_to', $once_time_to, '', 9, 9, true) .
-				ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
+				ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true) .
 				"</td>
 			</tr>
 		</table>
@@ -603,7 +603,7 @@ $table->data[5][1] = "
 							html_print_input_text (
 								'periodically_time_from',
 								$periodically_time_from, '', 7, 7, true, $disabled_in_execution) . 
-							ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds').
+							ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds.').
 								".<br>".__('The end time must be higher than the start time'), true) .
 							"</td>
 							<td>" . __('To hour:') . "</td>
@@ -611,7 +611,7 @@ $table->data[5][1] = "
 							html_print_input_text (
 								'periodically_time_to',
 								$periodically_time_to, '', 7, 7, true, $disabled_in_execution) .
-							ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds').
+							ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds.').
 								".<br>".__('The end time must be higher than the start time'), true) .
 							"</td>
 						</tr>

From 358847ecef76182ec1f8c04367dc52ecce7c8661 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 15:43:46 +0200
Subject: [PATCH 026/146] [Rebranding] Open godmode/<others>

---
 pandora_console/godmode/admin_access_logs.php                 | 2 +-
 pandora_console/godmode/alerts/configure_alert_template.php   | 4 ++--
 pandora_console/godmode/groups/group_list.php                 | 2 +-
 pandora_console/godmode/groups/modu_group_list.php            | 2 +-
 pandora_console/godmode/reporting/graph_builder.main.php      | 3 ---
 .../godmode/reporting/reporting_builder.item_editor.php       | 4 ++--
 .../godmode/reporting/visual_console_builder.wizard.php       | 2 +-
 pandora_console/godmode/servers/manage_recontask_form.php     | 3 +--
 pandora_console/godmode/servers/modificar_server.php          | 2 +-
 pandora_console/godmode/servers/plugin.php                    | 2 +-
 pandora_console/godmode/servers/recon_script.php              | 2 +-
 11 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php
index c3a8c9d0b0..8dce0c02a9 100644
--- a/pandora_console/godmode/admin_access_logs.php
+++ b/pandora_console/godmode/admin_access_logs.php
@@ -30,7 +30,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) {
 	exit;
 }
 
-ui_print_page_header (__('Pandora audit')." &raquo; ".__('Review Logs'), "images/gm_log.png", false, "", true );
+ui_print_page_header (__('%s audit', get_product_name())." &raquo; ".__('Review Logs'), "images/gm_log.png", false, "", true );
 
 $offset = get_parameter ("offset", 0);
 $tipo_log = get_parameter ("tipo_log", 'all');
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index cdd9186946..8bf72aa53a 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -538,11 +538,11 @@ if ($step == 2) {
 	$table->data[0][3] = html_print_checkbox ('special_day', 1, $special_day, true);
 	
 	$table->data[1][0] = __('Time from') . ' ' .
-		ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
+		ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
 	$table->data[1][1] = html_print_input_text ('time_from', $time_from, '', 7, 8,
 		true);
 	$table->data[1][2] = __('Time to') . ' ' .
-		ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
+		ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
 	$table->data[1][3] = html_print_input_text ('time_to', $time_to, '', 7, 8,
 		true);
 	
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index d47f9e17e4..cda1a32143 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -193,7 +193,7 @@ if (defined('METACONSOLE')) {
 }
 else {
 	
-	ui_print_page_header (__("Groups defined in Pandora"),
+	ui_print_page_header (__("Groups defined in %s", get_product_name()),
 		"images/group.png", false, "", true, "");
 	$sec = 'gagente';
 
diff --git a/pandora_console/godmode/groups/modu_group_list.php b/pandora_console/godmode/groups/modu_group_list.php
index e9f538f619..508e6d32bd 100644
--- a/pandora_console/godmode/groups/modu_group_list.php
+++ b/pandora_console/godmode/groups/modu_group_list.php
@@ -52,7 +52,7 @@ if (is_ajax ()) {
 
 if (!is_metaconsole()) {
 	// Header
-	ui_print_page_header (__("Module groups defined in Pandora"), "images/module_group.png", false, "", true, "");
+	ui_print_page_header (__("Module groups defined in %s", get_product_name()), "images/module_group.png", false, "", true, "");
 }
 $create_group = (bool) get_parameter ('create_group');
 $update_group = (bool) get_parameter ('update_group');
diff --git a/pandora_console/godmode/reporting/graph_builder.main.php b/pandora_console/godmode/reporting/graph_builder.main.php
index 185f87f5ee..fcc654ab12 100644
--- a/pandora_console/godmode/reporting/graph_builder.main.php
+++ b/pandora_console/godmode/reporting/graph_builder.main.php
@@ -59,8 +59,6 @@ if ($edit_graph) {
 	$graphInTgraph = db_get_row_sql("SELECT * FROM tgraph WHERE id_graph = " . $id_graph);
 	$stacked = $graphInTgraph['stacked'];
 	$period = $graphInTgraph['period'];
-	$name = $graphInTgraph['name'];
-	$description = $graphInTgraph['description'];
 	$id_group = $graphInTgraph['id_group'];
 	$width = $graphInTgraph['width'];
 	$height = $graphInTgraph['height'];
@@ -80,7 +78,6 @@ else {
 	$id_agent = 0;
 	$id_module = 0;
 	$id_group = 0;
-	$name = "Pandora FMS combined graph";
 	$width = 550;
 	$height = 210;
 	$period = SECONDS_1DAY;
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 8018d90243..4033e7616f 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -888,7 +888,7 @@ You can of course remove the warnings, that's why we include the source and do n
 						<td>
 							<?php
 							echo __('Time from') .
-							ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
+							ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
 							?>
 						</td>
 						<td colspan="6"><?php html_print_input_text ('time_from', $time_from, '', 7, 8);?></td>
@@ -897,7 +897,7 @@ You can of course remove the warnings, that's why we include the source and do n
 						<td>
 							<?php
 							echo __('Time to') .
-							ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
+							ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
 							?>
 						</td>
 						<td colspan="6"><?php html_print_input_text ('time_to', $time_to, '', 7, 8);?></td>
diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
index 42d6d608cd..dea672b5eb 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
@@ -328,7 +328,7 @@ $table->data["all_8"][2] = '<span id="parent_column_2_item_in_visual_map">' .
 	__('Item in the map') . '</span>' .
 	'<span id="parent_column_2_relationship">' .
 	ui_print_help_tip(
-		__('The parent relationships in Pandora will be drawn in the map.'), true) .
+		__('The parenting relationships in %s will be drawn on the map.', get_product_name()), true) .
 	'</span>';
 $table->data["all_8"][3] = '<span id="parent_column_3_item_in_visual_map">' .
 	html_print_select($parents, 'item_in_the_map', 0, '',
diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php
index 9725af7ef6..d33e0ee19c 100644
--- a/pandora_console/godmode/servers/manage_recontask_form.php
+++ b/pandora_console/godmode/servers/manage_recontask_form.php
@@ -186,11 +186,10 @@ if (!$modify){
 	ui_print_page_header (__('Manage recontask'), "", false, "recontask", true);
 }
 
-
 $is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
 if ($is_windows) {
 	echo '<div class="notify">';
-	echo __('Warning') . ": " . __("By default, in Windows, Pandora FMS only support Standard network sweep, not custom scripts");
+	echo __('Warning') . ": " . __("By default, in Windows, %s only support Standard network sweep, not custom scripts", get_product_name());
 	echo '</div>';
 }
 
diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index 2a45ce650e..aab4a3f918 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -82,7 +82,7 @@ elseif (isset($_GET["server_remote"])) {
 }
 else {
 	// Header
-	ui_print_page_header (__('Pandora servers'), "images/gm_servers.png", false, "servers", true);
+	ui_print_page_header (__('%s servers', get_product_name()), "images/gm_servers.png", false, "servers", true);
 
 	// Move SNMP modules back to the enterprise server
 	if (isset($_GET["server_reset_snmp_enterprise"])) {
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index b8d130715f..93ed8841f7 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -561,7 +561,7 @@ else {
 		$sec = 'advanced';
 	}
 	else {
-		ui_print_page_header (__('Plugins registered in Pandora FMS'), "images/gm_servers.png", false, "", true);
+		ui_print_page_header (__('Plug-ins registered on %s', get_product_name()), "images/gm_servers.png", false, "", true);
 
 		$is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
 		if ($is_windows) {
diff --git a/pandora_console/godmode/servers/recon_script.php b/pandora_console/godmode/servers/recon_script.php
index 0d0965c10f..be8af68434 100644
--- a/pandora_console/godmode/servers/recon_script.php
+++ b/pandora_console/godmode/servers/recon_script.php
@@ -225,7 +225,7 @@ if (($create != "") OR ($view != "")) {
 	echo '</form></table>';
 }
 else {
-	ui_print_page_header (__('Recon scripts registered in Pandora FMS'), "images/gm_servers.png", false, "", true);
+	ui_print_page_header (__('Recon scripts registered on %s', get_product_name()), "images/gm_servers.png", false, "", true);
 	
 	// Update reconscript
 	if (isset($_GET["update_reconscript"])) { // if modified any parameter

From d9e35b366802faf1f517cd155b1d963046af17b6 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 17:08:30 +0200
Subject: [PATCH 027/146] [Rebranding] Open git status

---
 pandora_console/include/ajax/update_manager.ajax.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/ajax/update_manager.ajax.php b/pandora_console/include/ajax/update_manager.ajax.php
index 80c62539da..839695b841 100644
--- a/pandora_console/include/ajax/update_manager.ajax.php
+++ b/pandora_console/include/ajax/update_manager.ajax.php
@@ -237,7 +237,7 @@ if ($install_package) {
 		}
 
 		update_manager_enterprise_set_version($version);
-		db_pandora_audit("Update Pandora", "Update version: $version of Pandora FMS by ".$config['id_user']);
+		db_pandora_audit("Update " . get_product_name(), "Update version: $version of " . get_product_name() ." by ".$config['id_user']);
 		
 		$return["status"] = "success";
 		echo json_encode($return);
@@ -252,6 +252,7 @@ if ($install_package) {
 }
 
 if ($check_install_package) {
+	
 	// 1 second
 	//sleep(1);
 	// Half second

From c3beafc49961240d606656f15049a88908df1f48 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 17:15:37 +0200
Subject: [PATCH 028/146] [Rebranding] Open godmode/update_manager and
 godmode/users

---
 .../godmode/update_manager/update_manager.offline.php     | 2 +-
 pandora_console/godmode/users/configure_profile.php       | 8 ++++----
 pandora_console/godmode/users/configure_user.php          | 2 +-
 pandora_console/godmode/users/profile_list.php            | 6 +++---
 pandora_console/godmode/users/user_list.php               | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pandora_console/godmode/update_manager/update_manager.offline.php b/pandora_console/godmode/update_manager/update_manager.offline.php
index afad03cc2c..fccdab6b0b 100644
--- a/pandora_console/godmode/update_manager/update_manager.offline.php
+++ b/pandora_console/godmode/update_manager/update_manager.offline.php
@@ -37,7 +37,7 @@ $baseurl = ui_get_full_url(false, false, false, false);
 	var drop_the_package_here_or = "<?php echo __('Drop the package here or'); ?>\n";
 	var browse_it = "<?php echo __('browse it'); ?>\n";
 	var the_package_has_been_uploaded_successfully = "<?php echo __('The package has been uploaded successfully.'); ?>\n";
-	var remember_that_this_package_will = "<?php echo __('Remember that this package will override the actual Pandora FMS files and it is recommended to do a backup before continue with the update.'); ?>\n";
+	var remember_that_this_package_will = "<?php echo __("Please keep in mind that this package is going to override your actual %s files and that it's recommended to conduct a backup before continuing the updating process.", get_product_name()); ?>\n";
 	var click_on_the_file_below_to_begin = "<?php echo __('Click on the file below to begin.'); ?>\n";
 	var updating = "<?php echo __('Updating'); ?>\n";
 	var package_updated_successfully = "<?php echo __('Package updated successfully.'); ?>\n";
diff --git a/pandora_console/godmode/users/configure_profile.php b/pandora_console/godmode/users/configure_profile.php
index 9e71de2399..7ba51d3791 100644
--- a/pandora_console/godmode/users/configure_profile.php
+++ b/pandora_console/godmode/users/configure_profile.php
@@ -46,7 +46,7 @@ if (!is_metaconsole()) {
 
 	$buttons[$tab]['active'] = true;
 
-	ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined in Pandora'), "images/gm_users.png", false, "", true, $buttons);
+	ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined on %s', get_product_name()), "images/gm_users.png", false, "", true, $buttons);
 	$sec2 = 'gusuarios';
 }
 else {
@@ -211,8 +211,8 @@ if ($id_profile || $new_profile) {
 				' Visual console edit: ' . $vconsole_edit .
 				' Visual console management: ' . $vconsole_management .
 				
-				' Pandora Management: ' . $pandora_management;
-		
+				' ' . get_product_name() . ' Management: ' . $pandora_management;
+
 		enterprise_hook('audit_pandora_enterprise', array($id_audit, $info));
 		
 		
@@ -361,7 +361,7 @@ if ($id_profile || $new_profile) {
 	
 	// Pandora
 	$row = array();
-	$row['name'] = __('Pandora management');
+	$row['name'] = __('%s management', get_product_name());
 	$row['input'] = html_print_checkbox ('pandora_management', 1, $pandora_management, true);
 	$table->data['PM'] = $row;
 	$table->data[] = '<hr>';
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index b2cb189449..eb89c22389 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -148,7 +148,7 @@ if ($new_user && $config['admin_can_add_user']) {
 
 if ($create_user) {
 	if (! $config['admin_can_add_user']) {
-		ui_print_error_message (__('The current authentication scheme doesn\'t support creating users from Pandora FMS'));
+		ui_print_error_message (__('The current authentication scheme doesn\'t support creating users on %s', get_product_name()));
 		return;
 	}
 	
diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php
index f593be58d0..4fba678f3c 100644
--- a/pandora_console/godmode/users/profile_list.php
+++ b/pandora_console/godmode/users/profile_list.php
@@ -50,7 +50,7 @@ if (!defined('METACONSOLE')) {
 			
 	$buttons[$tab]['active'] = true;
 
-	ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined in Pandora'), "images/gm_users.png", false, "profile", true, $buttons);
+	ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined on %s', get_product_name()), "images/gm_users.png", false, "profile", true, $buttons);
 	$sec = 'gusuarios';
 }
 else {
@@ -205,7 +205,7 @@ if ($update_profile) {
 				"Visual console view":"'.$vconsole_view.'",
 				"Visual console edit":"'.$vconsole_edit.'",
 				"Visual console management":"'.$vconsole_management.'",
-				"Pandora Management":"'.$pandora_management.'"}';
+				"'.get_product_name().' Management":"'.$pandora_management.'"}';
 			
 			db_pandora_audit("User management",
 				"Update profile ". $name, false, false, $info);
@@ -252,7 +252,7 @@ if ($create_profile) {
 				"Visual console view":"'.$vconsole_view.'",
 				"Visual console edit":"'.$vconsole_edit.'",
 				"Visual console management":"'.$vconsole_management.'",
-				"Pandora Management":"'.$pandora_management.'"}';
+				"'.get_product_name().' Management":"'.$pandora_management.'"}';
 			
 			db_pandora_audit("User management",
 				"Created profile ". $name, false, false, $info);
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 13cdba54c1..4cd8f86139 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -118,7 +118,7 @@ else {
 	
 	$buttons[$tab]['active'] = true;
 	
-	ui_print_page_header (__('User management').' &raquo; '.__('Users defined in Pandora'), "images/gm_users.png", false, "", true, $buttons);
+	ui_print_page_header (__('User management').' &raquo; '.__('Users defined on %s', get_product_name()), "images/gm_users.png", false, "", true, $buttons);
 	
 	$sec = 'gusuarios';
 	
@@ -486,7 +486,7 @@ if ($config["admin_can_add_user"] !== false) {
 	echo '</form>';
 }
 else {
-	echo '<i>'.__('The current authentication scheme doesn\'t support creating users from Pandora FMS').'</i>';
+	echo '<i>'.__("The current authentication scheme doesn't support creating users on %s", get_product_name()).'</i>';
 }
 echo '</div>';
 

From e796b844d319ed0159dd5236ef722ac13d9765a6 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 18:19:47 +0200
Subject: [PATCH 029/146] [Rebranding] Open include/* (not the root files)

---
 pandora_console/include/help/clippy/homepage.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/help/clippy/homepage.php b/pandora_console/include/help/clippy/homepage.php
index be52096875..e6219ee19d 100644
--- a/pandora_console/include/help/clippy/homepage.php
+++ b/pandora_console/include/help/clippy/homepage.php
@@ -57,7 +57,7 @@ function clippy_start_page_homepage() {
 		'intro' => 
 			'<div class="clippy_body" style="text-align: left; padding-left: 20px; padding-right: 20px;">'.
 			__('Hi, can I help you?') . '<br/><br/>' .
-			__('Let me introduce my self: I am Pandorin, the annoying assistant of Pandora FMS. You can follow my steps to do basic tasks in Pandora FMS or you can close me and never see me again.') .
+			__('Let me introduce my self: I am Pandorin, the annoying assistant of %s. You can follow my steps to do basic tasks in %s or you can close me and never see me again.', get_product_name(), get_product_name()) .
 			'<br /> ' .
 			'<br /> ' .
 			'<div class="clippy_body" style="font-size: 7pt;">' .
@@ -82,7 +82,7 @@ function clippy_start_page_homepage() {
 			'<ul style="text-align: left; margin-left: 10px; list-style-type: disc;">' .
 				'<li>' .
 					"<a href='javascript: clippy_go_link_show_help(\"index.php?sec=gagente&sec2=godmode/agentes/modificar_agente\", \"monitoring_server_step_1\");'>" . 
-						__('Ping to a Linux or Windows server with a Pandora FMS agent') .
+						__('Ping a Linux or Windows server using a %s agent.', get_product_name()) .
 					'</a>' .
 				'</li>' .
 				'<li>' .
@@ -206,7 +206,7 @@ function clippy_start_page_homepage() {
 	$return_tours['tours']['email_alert_module_step_1']['steps'] = array();
 	$return_tours['tours']['email_alert_module_step_1']['steps'][] = array(
 		'element'=> '#clippy',
-		'intro' => __('The first thing you have to do  is to setup the config email in the Pandora FMS Server.') .
+		'intro' => __('The first thing you have to do is to setup the e-mail config on the %s Server.', get_product_name()) .
 			'<br />' .
 			ui_print_help_icon ('context_pandora_server_email', true, '', 'images/help.png') .
 			'<br />' .

From 8a1f5c87ec1a9bb55fa5a4ec773aaa585a21f6f3 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 18:56:59 +0200
Subject: [PATCH 030/146] [Rebranding] Open API

---
 pandora_console/include/api.php           |  2 +-
 pandora_console/include/functions_api.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/api.php b/pandora_console/include/api.php
index c4727e1591..591c353d11 100644
--- a/pandora_console/include/api.php
+++ b/pandora_console/include/api.php
@@ -63,7 +63,7 @@ switch($info) {
 			$config["MR"] = 0;
 		}
 		
-		echo 'Pandora FMS ' . $pandora_version . ' - ' . $build_version . " MR" . $config["MR"];
+		echo get_product_name() . ' ' . $pandora_version . ' - ' . $build_version . " MR" . $config["MR"];
 
 		exit;
 }
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index a4a737b280..b65f17dbda 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1358,7 +1358,7 @@ function api_set_new_agent($thrash1, $thrash2, $other, $thrash3) {
 		returnError('id_os_not_exist', 'The OS don`t exist.');
 	}
 	else if (db_get_value_sql($sql1) === false) {
-		returnError('server_not_exist', 'The Pandora Server don`t exist.');
+		returnError('server_not_exist', 'The ' . get_product_name() . ' Server don`t exist.');
 	}
 	else {
 		$idAgente = db_process_sql_insert ('tagente', 
@@ -7721,9 +7721,9 @@ function api_set_gis_agent_only_position($id_agent, $trash1, $other, $return_typ
 		if ($correct) {
 			$correct = agents_update_gis($id_agent, $latitude,
 				$longitude, $altitude, 0, 1, date( 'Y-m-d H:i:s'), null,
-				1, __('Save by Pandora Console'),
-				__('Update by Pandora Console'),
-				__('Insert by Pandora Console'));
+				1, __('Save by %s Console', get_product_name()),
+				__('Update by %s Console', get_product_name()),
+				__('Insert by %s Console', get_product_name()));
 		}
 	}
 	
@@ -9111,7 +9111,7 @@ function api_set_create_event($id, $trash1, $other, $returnType) {
 			$values['source'] = $other['data'][14];
 		}
 		else {
-			$values['source'] = "Pandora";
+			$values['source'] = get_product_name();
 		}
 		
 		if ($other['data'][15] != '') {

From 0d6115726a91b7f6bf4f21650199bdc7f03b578e Mon Sep 17 00:00:00 2001
From: Fermin <mferminhh@gmail.com>
Date: Fri, 11 May 2018 12:49:16 +0200
Subject: [PATCH 031/146] [Rebranding] Open include root files (except
 networkmaps related sources)

---
 pandora_console/include/functions_clippy.php  |  2 +-
 pandora_console/include/functions_config.php  |  6 +-
 pandora_console/include/functions_events.php  |  4 +-
 pandora_console/include/functions_groups.php  |  2 +-
 .../include/functions_reporting_html.php      |  4 +-
 pandora_console/include/functions_servers.php | 14 ++--
 pandora_console/include/functions_ui.php      | 64 ++-----------------
 .../include/functions_update_manager.php      |  3 +-
 8 files changed, 26 insertions(+), 73 deletions(-)

diff --git a/pandora_console/include/functions_clippy.php b/pandora_console/include/functions_clippy.php
index a68a1e65aa..59b07737e5 100644
--- a/pandora_console/include/functions_clippy.php
+++ b/pandora_console/include/functions_clippy.php
@@ -125,7 +125,7 @@ function clippy_write_javascript_helps_steps($tours) {
 	if (!empty($steps)) {
 		foreach ($steps as $iterator => $element) {
 			$steps[$iterator]['intro'] = 
-				"<div id='clippy_head_title'>"  . __("Pandora FMS assistant") . "</div>" .
+				"<div id='clippy_head_title'>"  . __("%s assistant", get_product_name()) . "</div>" .
 				$steps[$iterator]['intro'];
 		}
 		
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 776a0e5b03..7a54b60679 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -2041,7 +2041,7 @@ function config_check () {
 	// ~ about 50 hr
 	if ($last_maintance > 190000) {
 		set_pandora_error_for_header(
-			__('Your database is not well maintained. Seems that it have more than 48hr without a proper maintance. Please review Pandora FMS documentation about how to execute this maintance process (pandora_db.pl) and enable it as soon as possible'),
+			__("Your database is not maintained correctly. It seems that more than 48hrs have passed without proper maintenance. Please review documents of %s on how to perform this maintenance process (DB Tool) and enable it as soon as possible.", get_product_name()),
 			__("Database maintance problem"));
 	}
 	
@@ -2062,7 +2062,7 @@ function config_check () {
 	
 	if ($develop_bypass == 1) {
 		set_pandora_error_for_header(
-			__('Your Pandora FMS has the "develop_bypass" mode enabled. This is a developer mode and should be disabled in a production system. This value is written in the main index.php file'),
+			__('Your %s has the "develop_bypass" mode enabled. This is a developer mode and should be disabled in a production system. This value is written in the main index.php file', get_product_name()),
 			__("Developer mode is enabled"));
 	}
 	
@@ -2079,7 +2079,7 @@ function config_check () {
 		if ($_SESSION['new_update'] == 'new') {
 			set_pandora_error_for_header(
 				__('There is a new update available. Please<a style="font-weight:bold;" href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online"> go to Administration:Setup:Update Manager</a> for more details.'),
-				__("New update of Pandora Console"));
+				__("New %s Console update", get_product_name()));
 		}
 	}
 	
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index e9faaba84e..a33862889a 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -703,10 +703,12 @@ function events_create_event ($event, $id_group, $id_agent, $status = 0,
 	$id_user = "", $event_type = "unknown", $priority = 0,
 	$id_agent_module = 0, $id_aam = 0, $critical_instructions = '',
 	$warning_instructions = '', $unknown_instructions = '',
-	$source="Pandora", $tags="", $custom_data="", $server_id = 0, $id_extra ="") {
+	$source=false, $tags="", $custom_data="", $server_id = 0, $id_extra ="") {
 	
 	global $config;
 	
+	if ($source === false) $source = get_product_name();
+
 	$table_events = 'tevento';
 	if (defined ('METACONSOLE')) {
 		$table_events = 'tmetaconsole_event';
diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php
index ada8e71a14..b22bbad3ce 100644
--- a/pandora_console/include/functions_groups.php
+++ b/pandora_console/include/functions_groups.php
@@ -2174,7 +2174,7 @@ function groups_get_group_to_list($group, $groups_count, &$symbolBranchs, $has_c
 		else {
 			$data[5] .= '&nbsp;&nbsp;' .
 				ui_print_help_tip(
-					__('You can not delete the last group in Pandora. A common installation must has almost one group.'), true);
+					__('You cannot delete the last group. A common installation must have at least one group.'), true);
 		}
 	}
 	
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 52d124421f..e9d336ec6c 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -880,7 +880,7 @@ function reporting_html_event_report_group($table, $item, $pdf = 0) {
 			if (!empty($event['id_agente']))
 				$data[] = agents_get_alias($event['id_agente']);
 			else
-				$data[] = __('Pandora System');
+				$data[] = __('%s System', get_product_name());
 			$data[] = get_priority_name ($event['criticity']);
 			if (empty($event['id_usuario']) && $event['estado'] == EVENT_VALIDATE) {
 				$data[] = '<i>' . __('System') . '</i>';
@@ -3729,7 +3729,7 @@ function reporting_get_last_activity() {
 	$table->head[3] = __('Date');
 	$table->head[4] = __('Source IP');
 	$table->head[5] = __('Comments');
-	$table->title = '<span>' . __('Last activity in Pandora FMS console') . '</span>';
+	$table->title = '<span>' . __('Last activity in %s console', get_product_name()) . '</span>';
 	
 	switch ($config["dbtype"]) {
 		case "mysql":
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index 33ed8e8bfd..101613adf7 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -753,25 +753,25 @@ function servers_show_type ($id) {
 	
 	switch ($id) {
 		case 1:
-			return html_print_image("images/database.png", true, array("title" => "Pandora FMS Data server"));
+			return html_print_image("images/database.png", true, array("title" => get_product_name() . " Data server"));
 			break;
 		case 2:
-			return html_print_image("images/network.png", true, array("title" => "Pandora FMS Network server"));
+			return html_print_image("images/network.png", true, array("title" => get_product_name() . " Network server"));
 			break;
 		case 4:
-			return html_print_image("images/plugin.png", true, array("title" => "Pandora FMS Plugin server"));
+			return html_print_image("images/plugin.png", true, array("title" => get_product_name() . " Plugin server"));
 			break;
 		case 5:
-			return html_print_image("images/chart_bar.png", true, array("title" => "Pandora FMS Prediction server"));
+			return html_print_image("images/chart_bar.png", true, array("title" => get_product_name() . " Prediction server"));
 			break;
 		case 6:
-			return html_print_image("images/wmi.png", true, array("title" => "Pandora FMS WMI server"));
+			return html_print_image("images/wmi.png", true, array("title" => get_product_name() . " WMI server"));
 			break;
 		case 7:
-			return html_print_image("images/server_web.png", true, array("title" => "Pandora FMS WEB server"));
+			return html_print_image("images/server_web.png", true, array("title" => get_product_name() . " WEB server"));
 			break;
 		case 8:
-			return html_print_image("images/module-wux.png", true, array("title" => "Pandora FMS WUX server"));
+			return html_print_image("images/module-wux.png", true, array("title" => get_product_name() . " WUX server"));
 			break;
 		default:
 			return "--";
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index caffcad739..4fc40ba611 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1346,7 +1346,7 @@ function ui_process_page_head ($string, $bitfield) {
 		}
 	}
 	$output .= "\n\t";
-	$output .= '<title>Pandora FMS - '.__('the Flexible Monitoring System').'</title>
+	$output .= '<title>' . get_product_name() . ' - '.__('the Flexible Monitoring System').'</title>
 		<meta http-equiv="expires" content="never" />
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 		<meta http-equiv="Content-Style-Type" content="text/css" />
@@ -3719,62 +3719,12 @@ function ui_print_agent_autocomplete_input($parameters) {
  * 
  * @param string error code
  */
-function ui_get_error ($error_code) {
-	switch($error_code) {
-		case 'error_authconfig':
-		case 'error_dbconfig':
-			$title = __('Problem with Pandora FMS database');
-			$message = __('Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file.<i><br/><br/>
-			Probably your database, hostname, user or password values are incorrect or
-			the database server is not running.').'<br /><br />';
-			$message .= '<span class="red">';
-			$message .= '<b>' . __('DB ERROR') . ':</b><br>';
-			$message .= db_get_last_error();
-			$message .= '</span>';
-			
-			if ($error_code == 'error_authconfig') {
-				$message .= '<br/><br/>';
-				$message .= __('If you have modified auth system, this problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:<br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>');
-			}
-			break;
-		case 'error_emptyconfig':
-			$title = __('Empty configuration table');
-			$message = __('Cannot load configuration variables from database. Please check your database setup in the
-			<b>include/config.php</b> file.<i><br><br>
-			Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date.
-			<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
-			permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i>').'<br /><br />';
-			break;
-		case 'error_noconfig':
-			$title = __('No configuration file found');
-			$message = __('Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
-			permissions and HTTP server cannot read it. Please read documentation to fix this problem.').'<br /><br />';
-			if (file_exists('install.php')) {
-				$link_start = '<a href="install.php">';
-				$link_end = '</a>';
-			}
-			else {
-				$link_start = '';
-				$link_end = '';
-			}
-			
-			$message .= sprintf(__('You may try to run the %s<b>installation wizard</b>%s to create one.'), $link_start, $link_end);
-			break;
-		case 'error_install':
-			$title = __('Installer active');
-			$message = __('For security reasons, normal operation is not possible until you delete installer file.
-			Please delete the <i>./install.php</i> file before running Pandora FMS Console.');
-			break;
-		case 'error_perms':
-			$title = __('Bad permission for include/config.php');
-			$message = __('For security reasons, <i>config.php</i> must have restrictive permissions, and "other" users
-			should not read it or write to it. It should be written only for owner
-			(usually www-data or http daemon user), normal operation is not possible until you change
-			permissions for <i>include/config.php</i> file. Please do it, it is for your security.');
-			break;
-	}
-	
-	return array('title' => $title, 'message' => $message);
+function ui_get_error ($error_code = '') {
+	// FIXME: Deprecated. Pandora shouldn't go inside this
+	return array(
+		'title' => __('Unhandled error'),
+		'message' => __('An unhandled error occurs')
+	);
 }
 
 function ui_include_time_picker($echo_tags = false) {
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index ba6508fa19..ae08fb214b 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -183,7 +183,8 @@ function update_manager_install_package_step2() {
 	}
 	
 	update_manager_enterprise_set_version($version);
-	db_pandora_audit("Update Pandora", "Update version: $version of Pandora FMS by ".$config['id_user']);
+	$product_name = get_product_name();
+	db_pandora_audit("Update $product_name", "Update version: $version of $product_name by ".$config['id_user']);
 	
 	$return["status"] = "success";
 	$return["message"]= __("The package is installed.");

From 9cf7fee2c091e3588cee2e748af5ae217e120985 Mon Sep 17 00:00:00 2001
From: Fermin <mferminhh@gmail.com>
Date: Fri, 11 May 2018 14:24:26 +0200
Subject: [PATCH 032/146] [Rebranding] Open mobile console

---
 pandora_console/mobile/include/system.class.php   | 8 ++++++++
 pandora_console/mobile/include/ui.class.php       | 4 ++--
 pandora_console/mobile/include/user.class.php     | 2 +-
 pandora_console/mobile/index.php                  | 2 +-
 pandora_console/mobile/operation/agent.php        | 4 ++--
 pandora_console/mobile/operation/agents.php       | 2 +-
 pandora_console/mobile/operation/alerts.php       | 2 +-
 pandora_console/mobile/operation/events.php       | 4 ++--
 pandora_console/mobile/operation/groups.php       | 2 +-
 pandora_console/mobile/operation/module_graph.php | 6 +++---
 pandora_console/mobile/operation/modules.php      | 2 +-
 pandora_console/mobile/operation/networkmap.php   | 2 +-
 pandora_console/mobile/operation/networkmaps.php  | 2 +-
 pandora_console/mobile/operation/tactical.php     | 2 +-
 pandora_console/mobile/operation/visualmap.php    | 2 +-
 pandora_console/mobile/operation/visualmaps.php   | 2 +-
 16 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/pandora_console/mobile/include/system.class.php b/pandora_console/mobile/include/system.class.php
index 4c98ee9f63..c46522129c 100644
--- a/pandora_console/mobile/include/system.class.php
+++ b/pandora_console/mobile/include/system.class.php
@@ -129,5 +129,13 @@ class System {
 			return false;
 		}
 	}
+
+	public function getDefaultACLFailText() {
+		return 
+			__("Access to this page is restricted to authorized users only, please contact your system administrator if you should need help.") .
+			"<br><br>" .
+			__("Please remember that any attempts to access this page will be recorded on the %s System Database.", get_product_name())
+		;
+	}
 }
 ?>
\ No newline at end of file
diff --git a/pandora_console/mobile/include/ui.class.php b/pandora_console/mobile/include/ui.class.php
index 2ef68dc749..e423e52fd8 100755
--- a/pandora_console/mobile/include/ui.class.php
+++ b/pandora_console/mobile/include/ui.class.php
@@ -165,7 +165,7 @@ class Ui {
 	
 	public function createDefaultHeader($title = false, $left_button = false) {
 		if ($title === false) {
-			$title = __('Pandora FMS mobile');
+			$title = __('%s : Mobile', get_product_name());
 		}
 		
 		if ($left_button === false) {
@@ -254,7 +254,7 @@ class Ui {
 		}
 		
 		return "<div id='footer' style='text-align: center;'>\n"
-			. sprintf(__('Pandora FMS %s - Build %s', $pandora_version, $build_version)) . "<br />\n"
+			. sprintf(__('%s %s - Build %s', get_product_name(), $pandora_version, $build_version)) . "<br />\n"
 			. __('Generated at') . ' '. ui_print_timestamp ($time, true, array ("prominent" => "timestamp")) . "\n"
 			. "</div>";
 	}
diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index 2c22a355e7..e596f4c1cd 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -218,7 +218,7 @@ class User {
 			$options['dialog_id'] = 'logout_dialog';
 			$options['type'] = 'onStart';
 			$options['title_text'] = __('Login out');
-			$options['content_text'] = __('Your session is over. Please close your browser window to close this Pandora session.');
+			$options['content_text'] = __('Your session has ended. Please close your browser window to close this %s session.', get_product_name());
 			$ui->addDialog($options);
 			
 		}
diff --git a/pandora_console/mobile/index.php b/pandora_console/mobile/index.php
index 8e7bd9c8ad..6623965f1a 100644
--- a/pandora_console/mobile/index.php
+++ b/pandora_console/mobile/index.php
@@ -230,7 +230,7 @@ switch ($action) {
 				if (!$permission) {
 					$error['type'] = 'onStart';
 					$error['title_text'] = __('You don\'t have access to this page');
-					$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+					$error['content_text'] = System::getDefaultACLFailText();
 					if (class_exists("HomeEnterprise"))
 						$home = new HomeEnterprise();
 					else
diff --git a/pandora_console/mobile/operation/agent.php b/pandora_console/mobile/operation/agent.php
index 927647c672..4e99f657fb 100644
--- a/pandora_console/mobile/operation/agent.php
+++ b/pandora_console/mobile/operation/agent.php
@@ -85,7 +85,7 @@ class Agent {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
@@ -136,7 +136,7 @@ class Agent {
 						'href' => 'index.php?page=agents' . $agents_filter_q_param)));
 		}
 		else {
-			$ui->createDefaultHeader(__("PandoraFMS: Agents"));
+			$ui->createDefaultHeader(__("Agents"));
 		}
 		$ui->showFooter(false);
 		$ui->beginContent();
diff --git a/pandora_console/mobile/operation/agents.php b/pandora_console/mobile/operation/agents.php
index 5dbe1c9ee8..040fa58ee6 100644
--- a/pandora_console/mobile/operation/agents.php
+++ b/pandora_console/mobile/operation/agents.php
@@ -164,7 +164,7 @@ class Agents {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/alerts.php b/pandora_console/mobile/operation/alerts.php
index b3ebfeded6..8a9e67f47e 100644
--- a/pandora_console/mobile/operation/alerts.php
+++ b/pandora_console/mobile/operation/alerts.php
@@ -139,7 +139,7 @@ class Alerts {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/events.php b/pandora_console/mobile/operation/events.php
index 8dda4384e2..1e91809614 100644
--- a/pandora_console/mobile/operation/events.php
+++ b/pandora_console/mobile/operation/events.php
@@ -428,7 +428,7 @@ class Events {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
@@ -442,7 +442,7 @@ class Events {
 		$options['dialog_id'] = 'detail_event_dialog_error';
 		$options['title_text'] = __('ERROR: Event detail');
 		$options['content_text'] = '<span style="color: #ff0000;">' .
-			__('Error connecting to DB pandora.') . '</span>';
+			__('Error connecting to DB.') . '</span>';
 			
 		return $options;
 	}
diff --git a/pandora_console/mobile/operation/groups.php b/pandora_console/mobile/operation/groups.php
index 38ccdcb465..da797f7425 100644
--- a/pandora_console/mobile/operation/groups.php
+++ b/pandora_console/mobile/operation/groups.php
@@ -51,7 +51,7 @@ class Groups {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/module_graph.php b/pandora_console/mobile/operation/module_graph.php
index 3af94962be..1f152bc34f 100644
--- a/pandora_console/mobile/operation/module_graph.php
+++ b/pandora_console/mobile/operation/module_graph.php
@@ -268,7 +268,7 @@ class ModuleGraph {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
@@ -361,7 +361,7 @@ class ModuleGraph {
 		
 		if ($this->id_agent) {
 			$ui->createDefaultHeader(
-				sprintf(__("PandoraFMS: %s"), $this->module["nombre"]),
+				sprintf(__("%s: %s"), get_product_name(), $this->module["nombre"]),
 				$ui->createHeaderButton(
 						array('icon' => 'back',
 							'pos' => 'left',
@@ -370,7 +370,7 @@ class ModuleGraph {
 		}
 		else {
 			$ui->createDefaultHeader(
-				sprintf(__("PandoraFMS: %s"), $this->module["nombre"]),
+				sprintf(__("%s: %s"), get_product_name(), $this->module["nombre"]),
 				$ui->createHeaderButton(
 						array('icon' => 'back',
 							'pos' => 'left',
diff --git a/pandora_console/mobile/operation/modules.php b/pandora_console/mobile/operation/modules.php
index 01766f60c2..5dd89b9aec 100644
--- a/pandora_console/mobile/operation/modules.php
+++ b/pandora_console/mobile/operation/modules.php
@@ -171,7 +171,7 @@ class Modules {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/networkmap.php b/pandora_console/mobile/operation/networkmap.php
index c5d5e39006..9595efaa87 100755
--- a/pandora_console/mobile/operation/networkmap.php
+++ b/pandora_console/mobile/operation/networkmap.php
@@ -76,7 +76,7 @@ class Networkmap {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/networkmaps.php b/pandora_console/mobile/operation/networkmaps.php
index d19bcab991..f8f533cc84 100755
--- a/pandora_console/mobile/operation/networkmaps.php
+++ b/pandora_console/mobile/operation/networkmaps.php
@@ -97,7 +97,7 @@ class Networkmaps {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/tactical.php b/pandora_console/mobile/operation/tactical.php
index e1e6118ea4..071865b39b 100755
--- a/pandora_console/mobile/operation/tactical.php
+++ b/pandora_console/mobile/operation/tactical.php
@@ -69,7 +69,7 @@ class Tactical {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/visualmap.php b/pandora_console/mobile/operation/visualmap.php
index 2c77d3c347..da9d36bc23 100644
--- a/pandora_console/mobile/operation/visualmap.php
+++ b/pandora_console/mobile/operation/visualmap.php
@@ -63,7 +63,7 @@ class Visualmap {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/visualmaps.php b/pandora_console/mobile/operation/visualmaps.php
index 464b51fd89..96212dda80 100644
--- a/pandora_console/mobile/operation/visualmaps.php
+++ b/pandora_console/mobile/operation/visualmaps.php
@@ -81,7 +81,7 @@ class Visualmaps {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else

From 29f56df1fde048bec46d63e2c2ec3e8a152e5976 Mon Sep 17 00:00:00 2001
From: Fermin <fermin.hernandez@artica.es>
Date: Fri, 11 May 2018 15:17:53 +0200
Subject: [PATCH 033/146] [Rebranding] Open operation/agents

---
 pandora_console/operation/agentes/group_view.php       |  2 +-
 .../operation/agentes/interface_traffic_graph_win.php  |  4 ++--
 pandora_console/operation/agentes/realtime_win.php     | 10 +---------
 pandora_console/operation/agentes/snapshot_view.php    |  2 +-
 pandora_console/operation/agentes/stat_win.php         |  6 +++---
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index 3397036f42..b177464a59 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -264,7 +264,7 @@ if (!empty($result_groups)) {
 			else {
 				$hint = '';
 				if (enterprise_hook('agents_is_using_secondary_groups')) {
-					$hint = ui_print_help_tip(__("This Pandora installation are using the secondary groups feature. For this reason, an agent can be counted several times."));
+					$hint = ui_print_help_tip(__("This %s installation are using the secondary groups feature. For this reason, an agent can be counted several times.", get_product_name()));
 				}
 				echo $link . $group_name . "</a>" . $hint;
 			}
diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php
index 84f6087663..3b8db2a234 100644
--- a/pandora_console/operation/agentes/interface_traffic_graph_win.php
+++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php
@@ -80,7 +80,7 @@ $interface_traffic_modules = array(
 		}
 ?>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Pandora FMS Graph (<?php echo agents_get_alias($agent_id) . ' - ' . $interface_name; ?>)</title>
+		<title><?php echo __('%s Interface Graph', get_product_name()) . ' (' .agents_get_alias($agent_id) . ' - ' . $interface_name; ?>)</title>
 		<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
 		<link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
 		<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
@@ -228,7 +228,7 @@ $interface_traffic_modules = array(
 		$side_layer_params = array();
 		// TOP TEXT
 
-		$side_layer_params['top_text'] = "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>" . html_print_image('/images/config.disabled.png', true, array('width' => '16px'),false,false,false,true) . ' ' . __('Pandora FMS Graph configuration menu') . "</div>";
+		$side_layer_params['top_text'] = "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>" . html_print_image('/images/config.disabled.png', true, array('width' => '16px'),false,false,false,true) . ' ' . __('Graph configuration menu') . "</div>";
 		$side_layer_params['body_text'] = "<div class='menu_sidebar_outer'>";
 		$side_layer_params['body_text'] .=__('Please, make your changes and apply with the <i>Reload</i> button');
 		
diff --git a/pandora_console/operation/agentes/realtime_win.php b/pandora_console/operation/agentes/realtime_win.php
index 6106583c80..124292e040 100644
--- a/pandora_console/operation/agentes/realtime_win.php
+++ b/pandora_console/operation/agentes/realtime_win.php
@@ -68,7 +68,7 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
 		}
 		?>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Pandora FMS Realtime Module Graph</title>
+		<title><?php echo __("%s Realtime Module Graph", get_product_name());?></title>
 		<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
 		<link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
 		<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
@@ -95,11 +95,3 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
 
 	</body>
 </html>
-
-<?php
-// Echo the script tags of the datepicker and the timepicker
-// Modify the user language cause the ui.datepicker language files use - instead _
-$custom_user_language = str_replace('_', '-', $user_language);
-ui_require_jquery_file("ui.datepicker-" . $custom_user_language, "include/javascript/i18n/", true);
-ui_include_time_picker(true);
-?>
diff --git a/pandora_console/operation/agentes/snapshot_view.php b/pandora_console/operation/agentes/snapshot_view.php
index 5d815b563e..fcc1bc900d 100644
--- a/pandora_console/operation/agentes/snapshot_view.php
+++ b/pandora_console/operation/agentes/snapshot_view.php
@@ -63,7 +63,7 @@ if (empty($last_data)) {
 		}
 		?>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Pandora FMS Snapshot data view for module (<?php echo $label; ?>)</title>
+		<title><?php echo __("%s Snapshot data view for module (%s)", get_product_name(), $label); ?></title>
 		<script type='text/javascript' src='../../include/javascript/jquery-1.7.1.js'></script>
 	</head>
 	<body style='background:#000; color: #ccc;'>
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 6ff4b1483a..0cb77497fe 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -77,7 +77,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		}
 		?>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Pandora FMS Graph (<?php echo $alias . ' - ' . $label; ?>)</title>
+		<title><?php echo __("%s Graph", get_product_name()) . ' (' . $alias . ' - ' . $label; ?>)</title>
 		<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
 		<link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
 		<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
@@ -297,7 +297,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		$params = array();
 		// TOP TEXT
 		//Use the no_meta parameter because this image is only in the base console
-		$params['top_text'] =  "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>" . html_print_image('images/wrench_blanco.png', true, array('width' => '16px'), false, false, true) . ' ' . __('Pandora FMS Graph configuration menu') . ui_print_help_icon ("graphs",true, $config["homeurl"], "images/help_w.png", true) . "</div>";
+		$params['top_text'] =  "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>" . html_print_image('images/wrench_blanco.png', true, array('width' => '16px'), false, false, true) . ' ' . __('Graph configuration menu') . ui_print_help_icon ("graphs",true, $config["homeurl"], "images/help_w.png", true) . "</div>";
 		$params['body_text'] = "<div class='menu_sidebar_outer'>";
 		$params['body_text'] .=__('Please, make your changes and apply with the <i>Reload</i> button');
 		
@@ -385,7 +385,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 			(bool)$draw_events, true, $disabled);
 		if ($disabled) {
 			$data[1] .= ui_print_help_tip(
-				__('Show events is disabled because this Pandora node is set the event replication.'), true);
+				__("'Show events' is disabled because this %s node is set to event replication.", get_product_name()), true);
 		}
 		$table->data[] = $data;
 		$table->rowclass[] = '';

From deb1cebecab9f87f2f98bd3aa51f176289d6f4e4 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Fri, 11 May 2018 16:13:56 +0200
Subject: [PATCH 034/146] Show warning modal window when change snmp or
 satellite module name - #2251

---
 .../godmode/agentes/configurar_agente.php     |  74 +++++++++++++++++-
 .../images/icono-warning-triangulo.png        | Bin 0 -> 2036 bytes
 2 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 pandora_console/images/icono-warning-triangulo.png

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 5cf8e8a03d..186a5e33aa 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1264,7 +1264,6 @@ if ($update_module || $create_module) {
 if ($update_module) {
 	$id_agent_module = (int) get_parameter ('id_agent_module');
 	
-	
 	$values = array (
 		'id_agente_modulo' => $id_agent_module,
 		'descripcion' => $description,
@@ -1895,10 +1894,81 @@ switch ($tab) {
 	var wizard_tab_showed = 0;
 	
 	$(document).ready (function () {
+		
+		$('body').append('<div id="dialog"></div>');
 		// Control the tab and subtab hover. When mouse leave one, 
 		// check if is hover the other before hide the subtab
 		$('.agent_wizard_tab').hover(agent_wizard_tab_show, agent_wizard_tab_hide);
-	
+		
+		$('#module_form').submit(function() {
+			
+			var aget_id_os = '<?php echo agents_get_os(modules_get_agentmodule_agent(get_parameter("id_agent_module"))); ?>';
+			
+			if('<?php echo modules_get_agentmodule_name(get_parameter("id_agent_module")); ?>' != $('#text-name').val() &&
+			 '<?php echo agents_get_os(modules_get_agentmodule_agent(get_parameter("id_agent_module"))); ?>' == 19){
+				
+				event.preventDefault();
+				
+				$("#dialog").dialog({
+					resizable: true,
+					draggable: true,
+					modal: true,
+					height: 220,
+					width: 600,
+					title: 'Changing the module name of a satellite agent',
+					open: function(){
+							$('#dialog').html('<br><img src="images/icono-warning-triangulo.png" style="float:left;margin-left:25px;"><p style="float:right;font-style:nunito;font-size:11pt;margin-right:50px;"><span style="font-weight:bold;font-size:12pt;">Warning</span> <br>The names of the modules of a satellite should not be <br> altered manually. Unless you are absolutely certain of <br> the process, do not alter these names.</p>');
+					},
+					buttons: [{
+							text: "Ok",
+							click: function() {
+								$('#module_form').submit();
+							}
+						},
+						{
+						text: "Cancel",
+						click: function() {
+							$( this ).dialog( "close" );
+							return false;
+						}
+					}]
+				});
+				
+			}				
+			
+			var module_type_snmp =  '<?php echo modules_get_agentmodule_type(get_parameter("id_agent_module")); ?>';
+			
+			if('<?php echo modules_get_agentmodule_name(get_parameter("id_agent_module")); ?>' != $('#text-name').val() && (
+				module_type_snmp == 15 || module_type_snmp == 16 || module_type_snmp == 17 || module_type_snmp == 18)){
+					
+					event.preventDefault();
+					
+					$("#dialog").dialog({
+						resizable: true,
+						draggable: true,
+						modal: true,
+						height: 260,
+						width: 600,
+						title: 'Changing snmp module name',
+						open: function(){
+								$('#dialog').html('<br><img src="images/icono-warning-triangulo.png" style="float:left;margin-left:25px;margin-top:30px;"><p style="float:right;font-style:nunito;font-size:11pt;margin-right:50px;"><span style="font-weight:bold;font-size:12pt;">Warning</span> <br> 					If you change the name of this module, various features <br> associated with this module, such as network maps, <br> interface graphs or other network modules, may  no longer <br>  work. If you are not completely sure of the process, please <br> do not change the name of the module.					</p>');
+						},
+						buttons: [{
+					      text: "Ok",
+					      click: function() {
+					        $('#module_form').submit();
+					      }
+				    	},
+							{
+							text: "Cancel",
+							click: function() {
+								$( this ).dialog( "close" );
+								return false;
+							}
+						}]
+					});
+			}
+    });
 	});
 	
 	// Set the position and width of the subtab
diff --git a/pandora_console/images/icono-warning-triangulo.png b/pandora_console/images/icono-warning-triangulo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e81f83bdade2405e6c58584b93e5e68f71ded1a0
GIT binary patch
literal 2036
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
SGkmoG0000<MNUMnLSTXn2d0Jq

literal 0
HcmV?d00001


From 80aeded9319e38e9ad9540413d2ae40c554fec53 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 14 May 2018 12:58:22 +0200
Subject: [PATCH 035/146] [Rebranding] Central node in network maps

---
 .../include/functions_pandora_networkmap.php    | 13 ++++++++-----
 .../javascript/functions_pandora_networkmap.js  | 17 +++++++++++------
 .../agentes/pandora_networkmap.view.php         |  3 +++
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php
index 09ffd90419..22df6a582b 100644
--- a/pandora_console/include/functions_pandora_networkmap.php
+++ b/pandora_console/include/functions_pandora_networkmap.php
@@ -104,7 +104,7 @@ function networkmap_process_networkmap($id = 0) {
 			// Open Graph
 			$graph = networkmap_open_graph ($layout, $nooverlap, $pure, $zoom,
 				$ranksep, $font_size, null);
-			$graph .= networkmap_create_pandora_node (__('Pandora FMS'), $font_size, $simple);
+			$graph .= networkmap_create_pandora_node (get_product_name(), $font_size, $simple);
 			$graph .= networkmap_close_graph ();
 
 			switch (PHP_OS) {
@@ -211,7 +211,7 @@ function networkmap_process_networkmap($id = 0) {
 		}
 		else {
 			// Generate dot file
-			$graph = networkmap_generate_dot (__('Pandora FMS'),
+			$graph = networkmap_generate_dot (get_product_name(),
 				$id_group,
 				$simple,
 				$font_size,
@@ -1090,8 +1090,9 @@ function networkmap_loadfile($id = 0, $file = '',
 				$data['id_agent'] = 0;
 				$data['id_module'] = 0;
 				$data['type'] = '';
-				if (preg_match('/Pandora FMS/', $line) != 0) {
-					$data['text'] = 'Pandora FMS';
+				$product_name = get_product_name();
+				if (preg_match("/$product_name/", $line) != 0) {
+					$data['text'] = $product_name;
 					$data['id_agent'] = 0;
 				}
 				else {
@@ -1621,7 +1622,9 @@ if (empty($list_networkmaps))
 	$list_networkmaps = array();
 ?>
 
-<div id="open_version_dialog" style="display: none;">In the Open version of PandoraFMS can not be edited nodes or map</div>
+<div id="open_version_dialog" style="display: none;">
+	<?php echo __("In the Open version of %s can not be edited nodes or map", get_product_name()); ?>
+</div>
 
 <div id="dialog_node_edit" style="display: none;" title="<?php echo __('Edit node');?>">
 	<div style="text-align: left; width: 100%;">
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index b5a85ee5c3..8b5d68b711 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -3640,9 +3640,6 @@ function draw_elements_graph() {
 		})
 		.on("contextmenu", function (d) { show_menu("node", d); });
 
-	node_temp.append("title")
-		.text(function (d) { return d.text; });
-
 	var font_size = (node_radius / 1.5);
 
 	node_temp.append("text")
@@ -3657,16 +3654,24 @@ function draw_elements_graph() {
 		})
 		.append("tspan")
 		.attr("style", "font-size: " + font_size + "px !important; font-family:Verdana; text-align:center; text-anchor:middle; fill:#000000")
-		.text(function (d) {
-			return d.text;
-		})
+		.text(function (d) { return get_node_name_ov(d) })
 		.classed('dragable_node', true) //own dragable
 		.on("click", selected_node)
 		.on("contextmenu", function (d) { show_menu("node", d); });
 
+	node_temp.append("title")
+		.text(function (d) { return get_node_name_ov(d) });
+
 	node.exit().remove();
 }
 
+function get_node_name_ov (data) {
+	// Node central name should be the product name
+	return (data.type == 0 && data.id_agent == 0)
+		? $("#hidden-product_name").val()
+		: data.text;
+}
+
 function choose_group_for_show_agents() {
 	if (enterprise_installed) {
 		group = $("#group_for_show_agents option:selected").val();
diff --git a/pandora_console/operation/agentes/pandora_networkmap.view.php b/pandora_console/operation/agentes/pandora_networkmap.view.php
index d2a7830f83..521f7bea88 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.view.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.view.php
@@ -700,6 +700,9 @@ else {
 	$id = (int) get_parameter('id_networkmap', 0);
 }
 
+// Print the product name to handle it in js
+html_print_input_hidden ('product_name', get_product_name());
+
 $dash_mode = 0;
 $map_dash_details = array();
 $networkmap = db_get_row('tmap', 'id', $id);

From fe124bff5fe04c8889752acf397a688fd6cf4324 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 14 May 2018 14:41:11 +0200
Subject: [PATCH 036/146] Fixed rss events due to secondary groups

---
 pandora_console/operation/events/events_rss.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/operation/events/events_rss.php b/pandora_console/operation/events/events_rss.php
index bb81462dbe..9a8bf2af51 100644
--- a/pandora_console/operation/events/events_rss.php
+++ b/pandora_console/operation/events/events_rss.php
@@ -138,7 +138,8 @@ require('events.build_query.php');
 ////////////////////////////////////////////////////////////////////////
 
 $sql = "SELECT *
-	FROM tevento
+	FROM tevento te LEFT JOIN tagent_secondary_group tasg
+		ON te.id_grupo = tasg.id_group
 	WHERE 1=1 " . $sql_post . "
 	ORDER BY utimestamp DESC";
 

From ed18d586762af42c5ad70014a6ed93a8782a8919 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 14 May 2018 15:52:51 +0200
Subject: [PATCH 037/146] [Rebranding] Open operation/*

---
 pandora_console/operation/events/events_marquee.php |  2 +-
 pandora_console/operation/events/events_rss.php     | 10 +++++-----
 pandora_console/operation/netflow/nf_live_view.php  |  4 ++--
 pandora_console/operation/search_helps.php          |  2 +-
 pandora_console/operation/users/user_edit.php       |  7 +++----
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pandora_console/operation/events/events_marquee.php b/pandora_console/operation/events/events_marquee.php
index 9fb662eeed..9ffea8f61d 100644
--- a/pandora_console/operation/events/events_marquee.php
+++ b/pandora_console/operation/events/events_marquee.php
@@ -106,7 +106,7 @@ foreach ($result as $row) {
 
 echo "<html>";
 echo "<head>";
-echo "<title>Pandora FMS - Latest events </title>";
+echo "<title>" . __("%s - Latest events", get_product_name()) . "</title>";
 
 $query = ui_get_full_url();
 echo '<meta http-equiv="refresh" content="' . $MARQUEE_INTERVAL . '; URL=' . $query . '">';
diff --git a/pandora_console/operation/events/events_rss.php b/pandora_console/operation/events/events_rss.php
index bb81462dbe..9fbbbf1585 100644
--- a/pandora_console/operation/events/events_rss.php
+++ b/pandora_console/operation/events/events_rss.php
@@ -60,9 +60,9 @@ function rss_error_handler ($errno, $errstr, $errfile, $errline, $error_human_de
 	$rss_feed .= "\n";
 	$rss_feed .= '<channel>';
 	$rss_feed .= "\n";
-	$rss_feed .= '<title>Pandora RSS Feed</title>';
+	$rss_feed .= '<title>' . get_product_name() . ' RSS Feed</title>';
 	$rss_feed .= "\n";
-	$rss_feed .= '<description>Latest events on Pandora</description>';
+	$rss_feed .= '<description>Latest events on ' . get_product_name() .  '</description>';
 	$rss_feed .= "\n";
 	$rss_feed .= '<lastBuildDate>'.date (DATE_RFC822, 0).'</lastBuildDate>';
 	$rss_feed .= "\n";
@@ -138,7 +138,7 @@ require('events.build_query.php');
 ////////////////////////////////////////////////////////////////////////
 
 $sql = "SELECT *
-	FROM tevento
+	FROM tevento LEFT JOIN tagent_secondary_group on id_grupo = id_group
 	WHERE 1=1 " . $sql_post . "
 	ORDER BY utimestamp DESC";
 
@@ -157,8 +157,8 @@ else {
 $rss_feed = '<?xml version="1.0" encoding="utf-8" ?>' . "\n"; // ' <?php ' -- Fixes highlighters thinking that the closing tag is PHP
 $rss_feed .= '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">' . "\n"; 
 $rss_feed .= '<channel>'. "\n";
-$rss_feed .= '<title>Pandora RSS Feed</title>'. "\n";
-$rss_feed .= '<description>Latest events on Pandora</description>' . "\n";
+$rss_feed .= '<title>' . get_product_name() . ' RSS Feed</title>'. "\n";
+$rss_feed .= '<description>Latest events on ' . get_product_name() . '</description>' . "\n";
 $rss_feed .= '<lastBuildDate>'.date (DATE_RFC822, $lastbuild).'</lastBuildDate>'. "\n"; //Last build date is the last event - that way readers won't mark it as having new posts
 $rss_feed .= '<link>'.$url.'</link>'. "\n"; //Link back to the main Pandora page
 $rss_feed .= '<atom:link href="' . xml_entities(io_safe_input ($selfurl)) . '" rel="self" type="application/rss+xml" />'. "\n";; //Alternative for Atom feeds. It's the same.
diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php
index 6e23dc11b3..13ebfcdd57 100644
--- a/pandora_console/operation/netflow/nf_live_view.php
+++ b/pandora_console/operation/netflow/nf_live_view.php
@@ -237,9 +237,9 @@ echo '<form method="post" action="' . $config['homeurl'] .
 		html_print_input_text ('date', $date, false, 13, 10, true) .
 		html_print_image ("images/calendar_view_day.png", true,
 			array("alt" => "calendar")) .
-		ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
+		ui_print_help_tip(__('Date format is YY/MM/DD'), true) .
 		html_print_input_text ('time', $time, false, 10, 8, true) .
-		ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
+		ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true) .
 		"</td>";
 	
 	echo "<td>" . '<b>'.__('Interval').'</b>' . "</td>";
diff --git a/pandora_console/operation/search_helps.php b/pandora_console/operation/search_helps.php
index 84b08e9960..c53f7f5acf 100644
--- a/pandora_console/operation/search_helps.php
+++ b/pandora_console/operation/search_helps.php
@@ -20,7 +20,7 @@ $totalHelps = check_acl($config["id_user"], 0, "IR");
 
 if ($helps === false || !$searchHelps) {
 	echo "<br><div class='nf'>" . __("Zero results found.") .
-		sprintf(__('You can find more help in the <a style="text-decoration: underline;" href="%s">Pandora\'s wiki</a>'),
+		sprintf(__('You can find more help in the <a style="text-decoration: underline;" href="%s">wiki</a>'),
 			"http://wiki.pandorafms.com/index.php?search=" . $config['search_keywords']) .
 		"</div>\n";
 }
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index f5d1057941..ec8df08265 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -228,7 +228,7 @@ if ($view_mode === false) {
 	}
 	else {
 		$data = array();
-		$data[0] = '<i>'.__('You can not change your password from Pandora FMS under the current authentication scheme').'</i>';
+		$data[0] = '<i>'.__('You cannot change your password under the current authentication scheme').'</i>';
 		$table->rowclass[] = '';
 		$table->rowstyle[] = '';
 		$table->colspan[count($table-data)][0] = 2;
@@ -352,7 +352,7 @@ if (check_acl ($config['id_user'], 0, "ER")){
 else if (license_free()) {
 	$data[1] = __('Newsletter Subscribed') . ':';
 	if ($user_info["middlename"]) {
-		$data[1] .= $jump . '<span style="font-weight:initial;">' . __('Already subscribed to Pandora FMS newsletter') . "</span>";
+		$data[1] .= $jump . '<span style="font-weight:initial;">' . __('Already subscribed to %s newsletter', get_product_name()) . "</span>";
 	}
 	else {
 		$data[1] .= $jump . '<span style="font-weight:initial;"><a style="text-decoration:underline;" href="javascript: force_run_newsletter();">' . __('Subscribe to our newsletter') . "</a></span>";
@@ -474,10 +474,9 @@ echo '<form name="user_mod" method="post" action="'.$url.'&amp;modified=1&amp;id
 
 html_print_table($table);
 
-
 echo '<div style="width:' . $table->width . '; text-align:right;">';
 if (!$config["user_can_update_info"]) {
-	echo '<i>'.__('You can not change your user info from Pandora FMS under the current authentication scheme').'</i>';
+	echo '<i>'.__('You can not change your user info under the current authentication scheme').'</i>';
 }
 else {
 	html_print_submit_button (__('Update'), 'uptbutton', $view_mode, 'class="sub upd"');

From cb11f0333ef76a3b9571c622e80a60e5ac6ee4a4 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 14 May 2018 16:06:32 +0200
Subject: [PATCH 038/146] [Rebranding] Open general/firts_task/incidents.php

---
 pandora_console/general/firts_task/incidents.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pandora_console/general/firts_task/incidents.php b/pandora_console/general/firts_task/incidents.php
index 32924ac626..a694874cb3 100644
--- a/pandora_console/general/firts_task/incidents.php
+++ b/pandora_console/general/firts_task/incidents.php
@@ -33,13 +33,13 @@ if ($incident_w || $incident_m) {
 	</div>
 	<div class="text_task">
 		<h3> <?php echo __('Create Incidents'); ?></h3>
-		<p id="description_task"> <?php echo __("Besides receiving and processing data to monitor systems or applications, 
-			you're also required to monitor possible incidents which might take place on these systems within the system monitoring process.
-			For it, the Pandora FMS team has designed an incident manager within which any user is able to open incidents, 
-			explaining what's happened on the network and to update them with comments and files any time in case there is a need to do so.
-			This system allows the users to work as a team, along with different roles and work-flow systems which allows an incident to be 
-			moved from one group to another, and that members from different groups and different people could work on the same incident, sharing information and files.
-		"); ?></p>
+		<p id="description_task"> <?php echo __("Besides receiving and processing data to monitor systems or applications,
+			you're also required to monitor possible incidents which might take place on these subsystems within the system's monitoring process.
+			For it, the %s team has designed an incident manager from which any user is able to open incidents,
+			that explain what's happened on the network, and update them with comments and files, at any time, in case there is a need to do so.
+			This system allows users to work as a team, along with different roles and work-flow systems which allow an incident to be
+			moved from one group to another, and members from different groups and different people could work on the same incident, sharing information and files.
+		", get_product_name()); ?></p>
 		<form action="index.php?sec=workspace&amp;sec2=operation/incidents/incident_detail&amp;insert_form=1" method="post">
 			<input type="submit" class="button_task" value="<?php echo __('Create Incidents'); ?>" />
 		</form>

From d8f63e99632d6168b8e2e5f881b9bf2bfbfa0dcf Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 14 May 2018 17:51:10 +0200
Subject: [PATCH 039/146] [Rebranding] Some missing string in extension

---
 pandora_console/extensions/dbmanager.php             |  8 +++++++-
 pandora_console/extensions/resource_exportation.php  |  5 +++--
 pandora_console/extensions/resource_registration.php | 11 ++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php
index 114c3bf709..4bcaeac702 100644
--- a/pandora_console/extensions/dbmanager.php
+++ b/pandora_console/extensions/dbmanager.php
@@ -134,7 +134,13 @@ function dbmgr_extension_main () {
 	ui_print_page_header (__('Database interface'), "images/gm_db.png", false, false, true);
 	
 	echo '<div class="notify">';
-	echo "This is an advanced extension to interface with Pandora FMS database directly from WEB console using native SQL sentences. Please note that <b>you can damage</b> your Pandora FMS installation if you don't know </b>exactly</b> what are you are doing, this means that you can severily damage your setup using this extension. This extension is intended to be used <b>only by experienced users</b> with a depth knowledge of Pandora FMS internals.";
+	echo __("This is an advanced extension to interface with %s database directly from WEB console
+		using native SQL sentences. Please note that <b>you can damage</b> your %s installation
+		if you don't know </b>exactly</b> what are you are doing,
+		this means that you can severily damage your setup using this extension.
+		This extension is intended to be used <b>only by experienced users</b>
+		with a depth knowledge of %s internals.",
+		get_product_name(), get_product_name(), get_product_name());
 	echo '</div>';
 	
 	echo "<br />";
diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
index 4bdc7d2046..3e6ba7f540 100755
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@@ -338,8 +338,9 @@ function resource_exportation_extension_main() {
 	ui_print_page_header (__('Resource exportation'), "images/extensions.png", false, "", true, "" );
 	
 	echo "<div class=notify>";
-	echo __("This extension makes exportation of resource template more easy. " .
-		"Here you can export as a resource template in Pandora FMS 3.x format (.ptr). ");
+	echo __("This extension makes exportation of resource template more easy.") .
+		" " .
+		__("You can export resource templates in .ptr format.");
 	echo "</div>";
 	
 	echo "<br /><br />";
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index a4dff69997..61ae26f55b 100755
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -855,11 +855,12 @@ function resource_registration_extension_main() {
 	}
 	
 	echo "<div class=notify>";
-	printf(__("This extension makes registration of resource template more easy. " .
-		"Here you can upload a resource template in Pandora FMS 3.x format (.ptr). " .
-		"Please refer to documentation on how to obtain and use Pandora FMS resources. " .
-		"<br><br>You can get more resurces in our <a href='%s'>Public Resource Library</a>") ,
-		"http://pandorafms.org/index.php?sec=community&sec2=repository&lng=en");
+	echo __("This extension makes registering resource templates easier.") . " " .
+		__("Here you can upload a resource template in .ptr format.") . " " .
+		__("Please refer to our documentation for more information on how to obtain and use Pandora FMS' resources.") . " " .
+		"<br> <br>" .
+		__("You can get more resurces in our <a href='http://pandorafms.org/index.php?sec=community&sec2=repository&lng=en'>Public Resource Library</a>")
+	;
 	echo "</div>";
 	
 	echo "<br /><br />";

From cc26124289affade59e082c3be7ed930cf9180eb Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 17 May 2018 16:12:44 +0200
Subject: [PATCH 040/146] Rebranding open server

---
 pandora_server/bin/pandora_server             | 12 ++++-----
 pandora_server/lib/PandoraFMS/Config.pm       |  6 +++++
 pandora_server/lib/PandoraFMS/Core.pm         | 27 ++++++++-----------
 pandora_server/lib/PandoraFMS/DataServer.pm   |  4 +--
 .../lib/PandoraFMS/NetworkServer.pm           |  6 ++---
 pandora_server/lib/PandoraFMS/PluginServer.pm |  2 +-
 .../lib/PandoraFMS/PredictionServer.pm        |  2 +-
 pandora_server/lib/PandoraFMS/ReconServer.pm  |  6 ++---
 pandora_server/lib/PandoraFMS/SNMPServer.pm   |  2 +-
 pandora_server/lib/PandoraFMS/Tools.pm        |  2 +-
 pandora_server/lib/PandoraFMS/WMIServer.pm    |  6 ++---
 11 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 693058dde8..49d3c97cba 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -55,7 +55,7 @@ my $MainThread = threads->self;
 sub pandora_shutdown () {
 	my $signal = shift;
 
-	logger (\%Config, 'Pandora FMS Server \'' . $Config{'servername'} . '\' Caught SIG' . $signal . ' by thread(' . threads->self()->tid() . ')', 10);
+	logger (\%Config, $Config{'rb_product_name'} . ' Server \'' . $Config{'servername'} . '\' Caught SIG' . $signal . ' by thread(' . threads->self()->tid() . ')', 10);
 
 	if (!threads->self->equal($MainThread)) {
 		# deliver signal to the main thread since no other threads than main thread
@@ -63,7 +63,7 @@ sub pandora_shutdown () {
 		$MainThread->kill($signal);
 		return;
 	}
-	logger (\%Config, 'Pandora FMS Server \'' . $Config{'servername'} . '\' Shutdown by signal ', 1);
+	logger (\%Config, $Config{'rb_product_name'} . ' Server \'' . $Config{'servername'} . '\' Shutdown by signal ', 1);
 	
 	# Stop servers
 	foreach my $server (@Servers) {
@@ -103,7 +103,7 @@ sub pandora_startup () {
 
 	# Update the agent cache.
 	threads->create('enterprise_hook', ('update_agent_cache', [\%Config]))->detach() if ($Config{'node_metaconsole'} == 1);
-	pandora_audit (\%Config, 'Pandora FMS Server Daemon starting', 'SYSTEM', 'System', $DBH);
+	pandora_audit (\%Config, $Config{'rb_product_name'} . ' Server Daemon starting', 'SYSTEM', 'System', $DBH);
 	
 	# Load servers
 	if (!is_metaconsole(\%Config)) {
@@ -197,7 +197,7 @@ sub pandora_crash () {
 		$full_error .= $error_line;
 	}
 	
-	logger (\%Config, 'Pandora FMS Server \'' . $Config{'servername'} . '\' unhandled error.', 1);
+	logger (\%Config, $Config{'rb_product_name'} . ' Server \'' . $Config{'servername'} . '\' unhandled error.', 1);
 	
 	# It's interesting show by console problems, not only in logs. This helps
 	# to solve stupid problems like Database credential problems for example
@@ -634,7 +634,7 @@ sub main() {
 				$server->restartEvent ($@);
 			}
 			
-			logger (\%Config, 'Pandora FMS Server restarting (' . $@ . ') in ' . $Config{'restart_delay'} . ' seconds.', 1);
+			logger (\%Config, $Config{'rb_product_name'} . ' Server restarting (' . $@ . ') in ' . $Config{'restart_delay'} . ' seconds.', 1);
 			pandora_restart ();
 		}
 		elsif (($Config{'auto_restart'} > 0) && (time () - $time_ref > $Config{'auto_restart'})) {
@@ -660,7 +660,7 @@ sub main() {
 					$server->restartEvent ($@);
 				}
 				
-				logger (\%Config, 'Pandora FMS Server restarting (' . $@ . ') in 5 seconds.', 1);
+				logger (\%Config, $Config{'rb_product_name'} . ' Server restarting (' . $@ . ') in 5 seconds.', 1);
 				pandora_load_config (\%Config);
 				pandora_restart (5);
 			}
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index cf59c3e7e0..386739c316 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -178,6 +178,12 @@ sub pandora_get_sharedconfig ($$) {
 		$pa_config->{'include_agents'} = 0;
 	}
 
+	# PandoraFMS product name
+	$pa_config->{'rb_product_name'} = enterprise_hook(
+		'pandora_get_product_name',
+		[$dbh]
+	);
+	$pa_config->{'rb_product_name'} = 'Pandora FMS' unless (defined ($pa_config->{'rb_product_name'}) && $pa_config->{'rb_product_name'} ne '');
 }
 
 ##########################################################################
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 0537628dc2..c3e0bba259 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -605,13 +605,13 @@ sub pandora_process_alert ($$$$$$$$;$) {
 			pandora_event ($pa_config, "Alert ceased (" .
 				safe_output($alert->{'name'}) . ")", 0, 0, $alert->{'priority'}, $id,
 				(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0), 
-				"alert_ceased", 0, $dbh, 'Pandora', '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
+				"alert_ceased", 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
 		}  else {
 			pandora_event ($pa_config, "Alert ceased (" .
 					safe_output($alert->{'name'}) . ")", $agent->{'id_grupo'},
 					$agent->{'id_agente'}, $alert->{'priority'}, $id,
 					(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0),
-					"alert_ceased", 0, $dbh, 'Pandora', '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
+					"alert_ceased", 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
 		}
 		return;
 	}
@@ -844,7 +844,7 @@ sub pandora_execute_alert ($$$$$$$$$;$) {
 
 		pandora_event ($pa_config, "Alert $text (" . safe_output($alert->{'name'}) . ") " . (defined ($module) ? 'assigned to ('. safe_output($module->{'nombre'}) . ")" : ""),
  			(defined ($agent) ? $agent->{'id_grupo'} : 0), (defined ($agent) ? $agent->{'id_agente'} : 0), $severity, (defined ($alert->{'id_template_module'}) ? $alert->{'id_template_module'} : 0),
-			(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0), $event, 0, $dbh, 'Pandora', '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
+			(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0), $event, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
 	}
 }
 
@@ -1395,7 +1395,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		# Field 5 (Ticket name)
 		my $ticket_name = $field5;
 		if ($ticket_name eq "") {
-			$ticket_name = "Pandora FMS alert action created by API";
+			$ticket_name = $pa_config->{'rb_product_name'} . " alert action created by API";
 		}
 		
 		# Field 6 (Ticket group ID)
@@ -1715,8 +1715,6 @@ sub pandora_planned_downtime_disabled_once_start($$) {
 		db_do($dbh, 'UPDATE tplanned_downtime
 			SET executed = 1
 			WHERE id = ?', $downtime->{'id'});
-		
-		print"pandora_planned_downtime_disabled_once_start\n";
 		pandora_event ($pa_config,
 			"(Created by " . $downtime->{'id_user'} . ") Server ".$pa_config->{'servername'}." started planned downtime: ".safe_output($downtime->{'name'}), 0, 0, 1, 0, 0, 'system', 0, $dbh);
 		
@@ -2191,7 +2189,6 @@ sub pandora_planned_downtime_weekly_start($$) {
 			db_do($dbh, 'UPDATE tplanned_downtime
 				SET executed = 1
 				WHERE id = ?', $downtime->{'id'});
-			print"pandora_planned_downtime_weekly_start\n";
 			pandora_event ($pa_config,
 				"Server ".$pa_config->{'servername'}." started planned downtime: ".safe_output($downtime->{'name'}), 0, 0, 1, 0, 0, 'system', 0, $dbh);
 				
@@ -2306,8 +2303,6 @@ sub pandora_planned_downtime_weekly_stop($$) {
 			db_do($dbh, 'UPDATE tplanned_downtime
 				SET executed = 0
 				WHERE id = ?', $downtime->{'id'});
-
-			print"pandora_planned_downtime_weekly_stop\n";
 			pandora_event ($pa_config,
 				"Server ".$pa_config->{'servername'}." stopped planned downtime: ".safe_output($downtime->{'name'}), 0, 0, 1, 0, 0, 'system', 0, $dbh);
 			
@@ -3151,7 +3146,7 @@ sub pandora_event ($$$$$$$$$$;$$$$$$$$$) {
 	
 	
 	# Set default values for optional parameters
-	$source = 'Pandora' unless defined ($source);
+	$source = $pa_config->{'rb_product_name'} unless defined ($source);
 	$comment = '' unless defined ($comment);
 	$id_extra = '' unless defined ($id_extra);
 	$user_name = '' unless defined ($user_name);
@@ -4165,11 +4160,11 @@ sub generate_status_event ($$$$$$$$) {
 	# Generate the event
 	if ($status != 0){
 		pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, 'Pandora', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 	} else { 
 		# Self validate this event if has "normal" status
 		pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 1, $dbh, 'Pandora', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 1, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 	}
 
 }
@@ -4692,7 +4687,7 @@ sub pandora_self_monitoring ($$) {
 
 	my $xml_output = "";
 	
-	$xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='Pandora FMS Server version " . $pa_config->{'version'} . "' agent_name='".$pa_config->{'servername'} . "' agent_alias='".$pa_config->{'servername'} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >";
+	$xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='" . $pa_config->{'rb_product_name'} . " Server version " . $pa_config->{'version'} . "' agent_name='".$pa_config->{'servername'} . "' agent_alias='".$pa_config->{'servername'} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >";
 	$xml_output .=" <module>";
 	$xml_output .=" <name>Status</name>";
 	$xml_output .=" <type>generic_proc</type>";
@@ -4924,7 +4919,7 @@ sub pandora_module_unknown ($$) {
 			# Are unknown events enabled?
 			if ($pa_config->{'unknown_events'} == 1) {
 				pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, 'Pandora', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 			}
 		}
 		# Regular module
@@ -4990,7 +4985,7 @@ sub pandora_module_unknown ($$) {
 		        $description = subst_alert_macros ($description, \%macros, $pa_config, $dbh, $agent, $module);
 		        
 				pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, 'Pandora', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 			}
 		}
 	}
@@ -5444,7 +5439,7 @@ sub pandora_create_integria_ticket ($$$$$$$$$$$) {
 		$integria_user = "admin";
 	}
 	if ($ticket_name eq "") {
-		$ticket_name = "Ticket created by Pandora FMS";
+		$ticket_name = "Ticket created by " . $pa_config->{'rb_product_name'};
 	}
 	if ($group_id eq "") {
 		$group_id = 1;
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 189b8952d8..ef62bab200 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -88,7 +88,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 
-	print_message ($pa_config, " [*] Starting Pandora FMS Data Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " Data Server.", 1);
 	$self->setNumThreads ($pa_config->{'dataserver_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }
@@ -346,7 +346,7 @@ sub process_xml_data ($$$$$) {
 					return;
 				}
 			} else {
-					pandora_event ($pa_config, "Unable to create agent '" . safe_output($agent_name) . "': autocreate_group $group_id does not exist. Edit the pandora_server.conf file and change it.", 0, 0, 0, 0, 0, 'error', 0, $dbh);
+					pandora_event ($pa_config, "Unable to create agent '" . safe_output($agent_name) . "': autocreate_group $group_id does not exist. Edit the server configuration file and change it.", 0, 0, 0, 0, 0, 'error', 0, $dbh);
 					logger($pa_config, "Group id $group_id does not exist (check autocreate_group config token).", 3);
 					return;
 			}
diff --git a/pandora_server/lib/PandoraFMS/NetworkServer.pm b/pandora_server/lib/PandoraFMS/NetworkServer.pm
index f52b6e8a72..ff755ab2de 100644
--- a/pandora_server/lib/PandoraFMS/NetworkServer.pm
+++ b/pandora_server/lib/PandoraFMS/NetworkServer.pm
@@ -55,8 +55,8 @@ sub new ($$$) {
 	return undef unless $config->{'networkserver'} == 1;
 
 	if (! -e $config->{'snmpget'}) {
-		logger ($config, ' [E] ' . $config->{'snmpget'} . " needed by Pandora FMS Network Server not found.", 1);
-		print_message ($config, ' [E] ' . $config->{'snmpget'} . " needed by Pandora FMS Network Server not found.", 1);
+		logger ($config, ' [E] ' . $config->{'snmpget'} . " needed by " . $config->{'rb_product_name'} . " Network Server not found.", 1);
+		print_message ($config, ' [E] ' . $config->{'snmpget'} . " needed by " . $config->{'rb_product_name'} . " Network Server not found.", 1);
 		return undef;
 	}
 
@@ -80,7 +80,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 
-	print_message ($pa_config, " [*] Starting Pandora FMS Network Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " Network Server.", 1);
 	$self->setNumThreads ($pa_config->{'network_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }
diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm
index a3d280f9b2..b94de25598 100644
--- a/pandora_server/lib/PandoraFMS/PluginServer.pm
+++ b/pandora_server/lib/PandoraFMS/PluginServer.pm
@@ -81,7 +81,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 
-	print_message ($pa_config, " [*] Starting Pandora FMS Plugin Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " Plugin Server.", 1);
 	$self->setNumThreads ($pa_config->{'plugin_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }
diff --git a/pandora_server/lib/PandoraFMS/PredictionServer.pm b/pandora_server/lib/PandoraFMS/PredictionServer.pm
index 1862930267..ec7fa7e586 100644
--- a/pandora_server/lib/PandoraFMS/PredictionServer.pm
+++ b/pandora_server/lib/PandoraFMS/PredictionServer.pm
@@ -77,7 +77,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 	
-	print_message ($pa_config, " [*] Starting Pandora FMS Prediction Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " Prediction Server.", 1);
 	$self->setNumThreads ($pa_config->{'prediction_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }
diff --git a/pandora_server/lib/PandoraFMS/ReconServer.pm b/pandora_server/lib/PandoraFMS/ReconServer.pm
index 3261729569..0d00e3c9ca 100644
--- a/pandora_server/lib/PandoraFMS/ReconServer.pm
+++ b/pandora_server/lib/PandoraFMS/ReconServer.pm
@@ -65,8 +65,8 @@ sub new ($$$$$$) {
 	return undef unless $config->{'reconserver'} == 1;
 	
 	if (! -e $config->{'nmap'}) {
-		logger ($config, ' [E] ' . $config->{'nmap'} . " needed by Pandora FMS Recon Server not found.", 1);
-		print_message ($config, ' [E] ' . $config->{'nmap'} . " needed by Pandora FMS Recon Server not found.", 1);
+		logger ($config, ' [E] ' . $config->{'nmap'} . " needed by " . $config->{'rb_product_name'} . " Recon Server not found.", 1);
+		print_message ($config, ' [E] ' . $config->{'nmap'} . " needed by " . $config->{'rb_product_name'} . " Recon Server not found.", 1);
 		return undef;
 	}
 
@@ -98,7 +98,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 	
-	print_message ($pa_config, " [*] Starting Pandora FMS Recon Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " Recon Server.", 1);
 	$self->setNumThreads ($pa_config->{'recon_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }
diff --git a/pandora_server/lib/PandoraFMS/SNMPServer.pm b/pandora_server/lib/PandoraFMS/SNMPServer.pm
index 9cd44427d6..b5dd550581 100644
--- a/pandora_server/lib/PandoraFMS/SNMPServer.pm
+++ b/pandora_server/lib/PandoraFMS/SNMPServer.pm
@@ -115,7 +115,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 
-	print_message ($pa_config, " [*] Starting Pandora FMS SNMP Console.", 2);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " SNMP Console.", 2);
 	
 	# Set the initial date for storm protection.
 	$pa_config->{"__storm_ref__"} = time();
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 3ca50a64ae..a81aa6bfb5 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -445,7 +445,7 @@ sub pandora_sendmail {
 	my %mail = ( To	=> $to_address,
 		Message		=> $message,
 		Subject		=> encode('MIME-Header', $subject),
-		'X-Mailer'	=> "Pandora FMS",
+		'X-Mailer'	=> $pa_config->{"rb_product_name"},
 		Smtp		=> $pa_config->{"mta_address"},
 		Port		=> $pa_config->{"mta_port"},
 		From		=> $pa_config->{"mta_from"},
diff --git a/pandora_server/lib/PandoraFMS/WMIServer.pm b/pandora_server/lib/PandoraFMS/WMIServer.pm
index 74cb4e6ae8..b667de6a91 100644
--- a/pandora_server/lib/PandoraFMS/WMIServer.pm
+++ b/pandora_server/lib/PandoraFMS/WMIServer.pm
@@ -54,8 +54,8 @@ sub new ($$;$) {
 
 	# Check for a WMI client
 	if (system ($config->{'wmi_client'} . " >$DEVNULL 2>&1") >> 8 != 1) {
-		logger ($config, ' [E] ' . $config->{'wmi_client'} . " not found. Pandora FMS WMI Server needs a DCOM/WMI client.", 1);
-		print_message ($config, ' [E] ' . $config->{'wmi_client'} . " not found. Pandora FMS WMI Server needs a DCOM/WMI client.", 1);
+		logger ($config, ' [E] ' . $config->{'wmi_client'} . " not found. " . $config->{'rb_product_name'} . " WMI Server needs a DCOM/WMI client.", 1);
+		print_message ($config, ' [E] ' . $config->{'wmi_client'} . " not found. " . $config->{'rb_product_name'} . " WMI Server needs a DCOM/WMI client.", 1);
 		return undef;
 	}
 
@@ -79,7 +79,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 
-	print_message ($pa_config, " [*] Starting Pandora FMS WMI Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " WMI Server.", 1);
 	$self->setNumThreads ($pa_config->{'wmi_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }

From 477fc9d22a5d848884b591221b678e9d90e93074 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 17 May 2018 18:38:26 +0200
Subject: [PATCH 041/146] [Rebranding] pandora_db

---
 pandora_server/util/pandora_db.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index cbbaccb753..a79bf16c11 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -555,7 +555,7 @@ sub pandora_compactdb ($$) {
 sub pandora_init ($) {
 	my $conf = shift;
 	
-	log_message ('', "\nPandora FMS DB Tool $version Copyright (c) 2004-2015 Artica ST\n");
+	log_message ('', "\nDB Tool $version Copyright (c) 2004-2018 Artica ST\n");
 	log_message ('', "This program is Free Software, licensed under the terms of GPL License v2\n");
 	log_message ('', "You can download latest versions and documentation at http://www.pandorafms.org\n\n");
 	
@@ -677,7 +677,7 @@ sub pandora_load_config ($) {
    	
 	db_disconnect ($dbh);
 
-	log_message ('', "Pandora DB now initialized and running (PURGE=" . $conf->{'_days_purge'} . " days, COMPACT=$conf->{'_days_compact'} days, STEP=" . $conf->{'_step_compact'} . ") . \n\n");
+	log_message ('', "DB Tool now initialized and running (PURGE=" . $conf->{'_days_purge'} . " days, COMPACT=$conf->{'_days_compact'} days, STEP=" . $conf->{'_step_compact'} . ") . \n\n");
 }
 
 
@@ -1045,7 +1045,7 @@ my $history_dbh = ($conf{'_history_db_enabled'} eq '1') ? db_connect ($conf{'dbe
 # Get a lock
 my $lock = db_get_lock ($dbh, 'pandora_db');
 if ($lock == 0 && $conf{'_force'} == 0) { 
-	log_message ('', " [*] Another instance of pandora_db seems to be running.\n\n");
+	log_message ('', " [*] Another instance of DB Tool seems to be running.\n\n");
 	exit 1;
 }
 

From ce946c1093f5276ac59ee3b75aa3597a883d7c95 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 18 May 2018 12:54:00 +0200
Subject: [PATCH 042/146] [Rebranding] en help

---
 .../include/help/en/help_alert_command.php    |  2 +-
 .../include/help/en/help_alert_config.php     |  6 ++--
 .../include/help/en/help_alert_macros.php     |  4 +--
 .../include/help/en/help_alert_recovery.php   |  2 +-
 .../include/help/en/help_alert_type.php       |  8 +++---
 .../include/help/en/help_alerts.php           |  2 +-
 .../include/help/en/help_alerts_config.php    | 28 +++++++++----------
 .../help/en/help_cascade_protection.php       |  4 +--
 .../include/help/en/help_categories.php       |  2 +-
 .../help/en/help_configure_gis_map.php        |  4 +--
 .../help/en/help_context_module_unknow.php    |  8 +++---
 .../en/help_context_pandora_server_email.php  |  8 +++---
 .../include/help/en/help_create_agent.php     |  2 +-
 pandora_console/include/help/en/help_cron.php |  2 +-
 .../include/help/en/help_custom_logo.php      |  2 +-
 .../help/en/help_dynamic_threshold.php        |  2 +-
 .../include/help/en/help_event_alert.php      |  4 +--
 .../include/help/en/help_events_history.php   |  2 +-
 .../include/help/en/help_export_server.php    |  4 +--
 .../include/help/en/help_ff_threshold.php     |  4 +--
 .../include/help/en/help_gis_map_builder.php  |  2 +-
 .../help/en/help_gis_setup_map_connection.php |  4 +--
 .../include/help/en/help_graphs.php           | 10 +++----
 .../include/help/en/help_history_database.php |  6 ++--
 pandora_console/include/help/en/help_ipam.php |  6 ++--
 .../include/help/en/help_local_component.php  |  2 +-
 .../include/help/en/help_main_help.php        |  4 +--
 .../help/en/help_manage_alert_list.php        |  2 +-
 .../include/help/en/help_manage_alerts.php    |  2 +-
 .../include/help/en/help_module_tokens.php    |  6 ++--
 .../help/en/help_network_map_enterprise.php   |  8 +++---
 .../include/help/en/help_performance.php      |  2 +-
 .../include/help/en/help_planned_downtime.php |  2 +-
 .../help/en/help_planned_downtime_time.php    |  2 +-
 .../help/en/help_plugin_definition.php        |  8 +++---
 .../include/help/en/help_plugin_macros.php    |  2 +-
 .../include/help/en/help_plugin_policy.php    |  2 +-
 .../include/help/en/help_profile.php          |  2 +-
 .../include/help/en/help_recontask.php        |  4 +--
 .../help/en/help_reporting_wizard_sla_tab.php |  2 +-
 .../include/help/en/help_response_macros.php  |  2 +-
 .../include/help/en/help_servers.php          |  6 ++--
 .../include/help/en/help_snmp_alert.php       |  2 +-
 .../include/help/en/help_snmpoid.php          |  2 +-
 .../include/help/en/help_snmpwalk.php         |  4 +--
 .../include/help/en/help_tags_config.php      |  2 +-
 .../include/help/en/help_tcp_send.php         |  2 +-
 .../include/help/en/help_timesource.php       |  4 +--
 .../help_visual_console_editor_editor_tab.php |  2 +-
 ...help_visual_console_editor_preview_tab.php |  2 +-
 .../include/help/en/help_web_checks.php       |  4 +--
 .../include/help/en/help_wux_console.php      | 12 ++++----
 52 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/pandora_console/include/help/en/help_alert_command.php b/pandora_console/include/help/en/help_alert_command.php
index ce60378f6c..b464b427bb 100644
--- a/pandora_console/include/help/en/help_alert_command.php
+++ b/pandora_console/include/help/en/help_alert_command.php
@@ -6,4 +6,4 @@
 
 <h1>Alert commands</h1>
 
-<p>Pandora FMS's reaction to a value stating &#34;out of range&#34; can be diverse: it can be recorder on the syslog, an email or SMS alert can be sent, or the execution of any script found on the Pandora FMS device and that can be properly processed.</p>
+<p><?php echo get_product_name();?>'s reaction to a value stating &#34;out of range&#34; can be diverse: it can be recorder on the syslog, an email or SMS alert can be sent, or the execution of any script found on the <?php echo get_product_name();?> device and that can be properly processed.</p>
diff --git a/pandora_console/include/help/en/help_alert_config.php b/pandora_console/include/help/en/help_alert_config.php
index 79c5f47255..b8d02b6282 100644
--- a/pandora_console/include/help/en/help_alert_config.php
+++ b/pandora_console/include/help/en/help_alert_config.php
@@ -8,7 +8,7 @@
 
     <b>Name:</b> Name assigned to the action.<br>
     <b>Group:</b> Group the action belongs to. <br>
-    <b>Command:</b> In this field the command that will be used in case the alert is triggered can be defined. Users can choose from the different commands that are defined on Pandora. Depending on the command chosen a variable group of fields will be shown (specific to each command) <br>
+    <b>Command:</b> In this field the command that will be used in case the alert is triggered can be defined. Users can choose from the different commands that are defined on <?php echo get_product_name();?>. Depending on the command chosen a variable group of fields will be shown (specific to each command) <br>
     <b>Threshold:</b> The action’s execution threshold. <br>
     <b>Command Preview:</b>  In this field, which can’t be edited, the command that will be run on the system will appear automatically. <br>
     <b>Field X:</b> In these fields:<br><br>
@@ -48,7 +48,7 @@ Apart from the defined module macros, the following macros are also available:
   <li>_data_: Module data that caused the alert to fire.</li>
   <li>_email_tag_: Emails associated to the module’s tags.</li>
   <li>_event_cfX_: (Only event alerts) Key of the event custom field that fired the alert. For example, if there is a custom field whose key is IPAM, its value can be obtained using the _event_cfIPAM_ macro.</li>
-  <li>_event_description_: (Only event alerts) The textual description of the Pandora FMS event.</li>
+  <li>_event_description_: (Only event alerts) The textual description of the <?php echo get_product_name();?> event.</li>
   <li>_event_extra_id_ : (Only event alerts) Extra id.</li>
   <li>_event_id_: (Only event alerts) ID of the event that triggered the alert.</li>
   <li>_event_text_severity_: (Only event alerts) Event text severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical).</li>
@@ -71,7 +71,7 @@ Apart from the defined module macros, the following macros are also available:
   <li>_groupcustomid_: Group custom ID.</li>
   <li>_groupother_: Other information about the group. Configured when the group is created.</li>
   <li>_homeurl_ : It is a link of the public URL this must be configured in the general options of the setup.</li>
-  <li>_id_agent_: Agent’s ID, useful for building a direct URL that redirects to a Pandora FMS console webpage.</li>
+  <li>_id_agent_: Agent’s ID, useful for building a direct URL that redirects to a <?php echo get_product_name();?> console webpage.</li>
   <li>_id_alert_: Alert’s numeric ID (unique), used to correlate the alert with third party software.</li>
   <li>_id_group_ : Agent group ID.</li>
   <li>_id_module_: Module ID.</li>
diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php
index cda2daf380..d2afc89053 100644
--- a/pandora_console/include/help/en/help_alert_macros.php
+++ b/pandora_console/include/help/en/help_alert_macros.php
@@ -33,7 +33,7 @@ Besides the defined module macros, the following macros are available:
 <li>_data_: Module data that caused the alert to fire.</li>
 <li>_email_tag_: Emails associated to the module’s tags.</li>
 <li>_event_cfX_: (Only event alerts) Key of the event custom field that fired the alert. For example, if there is a custom field whose key is IPAM, its value can be obtained using the _event_cfIPAM_ macro.</li>
-<li>_event_description_: (Only event alerts) The textual description of the Pandora FMS event.</li>
+<li>_event_description_: (Only event alerts) The textual description of the <?php echo get_product_name();?> event.</li>
 <li>_event_extra_id_: (Only event alerts) Extra id.</li>
 <li>_event_id_: (Only event alerts) ID of the event that triggered the alert.</li>
 <li>_event_text_severity_: (Only event alerts) Event text severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical).</li>
@@ -56,7 +56,7 @@ Besides the defined module macros, the following macros are available:
 <li>_groupcustomid_: Group custom ID.</li>
 <li>_groupother_: Other information about the group. Configured when the group is created.</li>
 <li>_homeurl_ : It is a link of the public URL this must be configured in the general options of the setup.</li>
-<li>_id_agent_: Agent’s ID, useful for building a direct URL that redirects to a Pandora FMS console webpage.</li>
+<li>_id_agent_: Agent’s ID, useful for building a direct URL that redirects to a <?php echo get_product_name();?> console webpage.</li>
 <li>_id_alert_: Alert’s numeric ID (unique), used to correlate the alert with third party software.</li>
 <li>_id_group_ : Agent group ID.</li>
 <li>_id_module_: Module ID.</li>
diff --git a/pandora_console/include/help/en/help_alert_recovery.php b/pandora_console/include/help/en/help_alert_recovery.php
index 4dae2c624a..3bf4747308 100644
--- a/pandora_console/include/help/en/help_alert_recovery.php
+++ b/pandora_console/include/help/en/help_alert_recovery.php
@@ -5,4 +5,4 @@
 ?>
 <h1>Alert recovery</h1>
 
-It defines whether Pandora FMS launches another alert when the alert’s condition is recovered. It has the same “field1”, but adds "[RECOVER]" to “field2” and “field3”. It is disabled by default. 
+It defines whether <?php echo get_product_name();?> launches another alert when the alert’s condition is recovered. It has the same “field1”, but adds "[RECOVER]" to “field2” and “field3”. It is disabled by default. 
diff --git a/pandora_console/include/help/en/help_alert_type.php b/pandora_console/include/help/en/help_alert_type.php
index 2832ab62e6..93325ecb6c 100644
--- a/pandora_console/include/help/en/help_alert_type.php
+++ b/pandora_console/include/help/en/help_alert_type.php
@@ -7,9 +7,9 @@
 
 There are some preset alerts, on which it’s very likely you will have to make adjustments, in case your system does not provide the internal commands needed to execute those alerts. The development team has tested these alerts with Red Hat Enterprise Linux (RHEL), CentOS, Debian and Ubuntu Server.
 <ul>
-	<li><b>eMail</b>: Sends an e-mail from Pandora FMS’ Server. It uses your local sendmail. If you have installed another kind of local mailer or do not have one, you should install and configure sendmail or any equivalent (and check the syntax) to be able to use this service. Pandora FMS relies on system tools to execute almost every alert, it will be necessary to check that those commands work properly on your system.</li>
-	<li><b>Internal audit</b>: This is the only "internal" alert, it writes the incident in Pandora FMS’ internal auditing system. This is stored on Pandora FMS’ Database and can be reviewed from the web console with the Pandora FMS audit viewer.</li>
-	<li><b>Pandora FMS’ Alertlog</b>: Saves information about alerts inside a text file (.log). Use this type of alert to generate log files using the format you need. To do so, you will need to modify the command so that it will use the format and file you want. Note that Pandora FMS does not handle file rotation, and that Pandora FMS’ Server process that executes the alert will need access to the log file in order to write on it.</li>
-	<li><b>Pandora FMS Events</b>: This alert creates an special event on the Pandora FMS event manager.</li> 
+	<li><b>eMail</b>: Sends an e-mail from <?php echo get_product_name();?> Server. It uses your local sendmail. If you have installed another kind of local mailer or do not have one, you should install and configure sendmail or any equivalent (and check the syntax) to be able to use this service. <?php echo get_product_name();?> relies on system tools to execute almost every alert, it will be necessary to check that those commands work properly on your system.</li>
+	<li><b>Internal audit</b>: This is the only "internal" alert, it writes the incident in <?php echo get_product_name();?>'s' internal auditing system. This is stored on <?php echo get_product_name();?>'s Database and can be reviewed from the web console with the <?php echo get_product_name();?> audit viewer.</li>
+	<li><b><?php echo get_product_name();?> Alertlog</b>: Saves information about alerts inside a text file (.log). Use this type of alert to generate log files using the format you need. To do so, you will need to modify the command so that it will use the format and file you want. Note that <?php echo get_product_name();?> does not handle file rotation, and that <?php echo get_product_name();?>'s' Server process that executes the alert will need access to the log file in order to write on it.</li>
+	<li><b><?php echo get_product_name();?> Events</b>: This alert creates an special event on the <?php echo get_product_name();?> event manager.</li> 
 </ul>
 These alerts are predefined and cannot be deleted, however the user can define new ones that can use custom commands, and add them using Alert management.
diff --git a/pandora_console/include/help/en/help_alerts.php b/pandora_console/include/help/en/help_alerts.php
index 34f9d31ce0..85a4c9fcd8 100644
--- a/pandora_console/include/help/en/help_alerts.php
+++ b/pandora_console/include/help/en/help_alerts.php
@@ -14,7 +14,7 @@
 
 	<li><b>Alert type:</b> This can be selected from the previously generated alert list.</li>
 	<li><b>Max. Value:</b> Defines the maximum value for a module. Any value above that threshold will trigger the alert.</li>
-	<li><b>Min. Value:</b> Defines the minimum value for a module. Any value below that will trigger the alert. The ”max." &amp; "min." couple are key values when defining an alert, since they define the range for normal values. Outside that range Pandora FMS will trigger the alert.</li>
+	<li><b>Min. Value:</b> Defines the minimum value for a module. Any value below that will trigger the alert. The ”max." &amp; "min." couple are key values when defining an alert, since they define the range for normal values. Outside that range <?php echo get_product_name();?> will trigger the alert.</li>
 	<li><b>Alert text:</b> In the case of string modules you can define a regular expression or a substring to match the contents of a data module in order to trigger the alert.</li>
 	<li><b>Time from / Time to:</b> This defines a “valid” timespan to trigger alert.</li>
 	<li><b>Description:</b> Describes the function of the alert, and it is useful to identify the alert among the others in the general view of alerts.</li>
diff --git a/pandora_console/include/help/en/help_alerts_config.php b/pandora_console/include/help/en/help_alerts_config.php
index 0348588629..7f772f1c39 100644
--- a/pandora_console/include/help/en/help_alerts_config.php
+++ b/pandora_console/include/help/en/help_alerts_config.php
@@ -3,22 +3,22 @@
  * @package Include/help/es 
  */
 ?> 
-<h1>Pandora FMS’ Quick Guide to Alert Configuration </h1>
+<h1><?php echo get_product_name();?>'s Quick Guide to Alert Configuration </h1>
 <br>
 <b>Introduction to the Current Alert System</b><br>
 <br>
 People usually complain about the complexity of defining alerts on
-Pandora FMS. Before, until version 2.0, alerts were easier to
+<?php echo get_product_name();?>. Before, until version 2.0, alerts were easier to
 configure. For each alert the condition and what it did when the action was not completed was defined for each case. It was a more "intuitive"
 thing (but it also had fields such as the "threshold" alert that caused
 many headaches to more than one person!). It was very simple, but, was
 it worth it ?<br>
 <br>
-One of our “star” users (we mention this because he had A LOT of agents installed, and also knew the inner workings of Pandora FMS quite well) mentioned that creating an alert for 2000 modules was tremendously complicated, especially when it was necessary to modify something for all of them. Due to this, and other issues, we decided to modify the alert system so that it could be modular, so that the alert’s definition and its triggering condition (template) could be separated from the action that has to be executed when the alert is triggered (alert action) and from the command that is run within the action (Alert command). The combination of an alert template with a module triggers the alert itself.<br><br>
+One of our “star” users (we mention this because he had A LOT of agents installed, and also knew the inner workings of <?php echo get_product_name();?> quite well) mentioned that creating an alert for 2000 modules was tremendously complicated, especially when it was necessary to modify something for all of them. Due to this, and other issues, we decided to modify the alert system so that it could be modular, so that the alert’s definition and its triggering condition (template) could be separated from the action that has to be executed when the alert is triggered (alert action) and from the command that is run within the action (Alert command). The combination of an alert template with a module triggers the alert itself.<br><br>
 
 This way, if I have 1000 devices with a module named “Host Alive” and all of them have a related alert template named “Host Down” that when triggered executes an action named “Warn the Operator”, and I wish to change the minimum number of alerts that must be fired before the Operator is warned, I only have to change the definition on the template instead of going one by one over the 1000 alerts to modify that specific condition.<br><br>
 
-Many users only manage a few dozen devices, but there are many users with hundreds—even thousands—of systems monitored with Pandora FMS, and we have to try and make it so that with Pandora FMS all types of environments can be managed.<br>
+Many users only manage a few dozen devices, but there are many users with hundreds—even thousands—of systems monitored with <?php echo get_product_name();?>, and we have to try and make it so that with <?php echo get_product_name();?> all types of environments can be managed.<br>
 <br>
 <br>
 <br>
@@ -118,9 +118,9 @@ html_print_image("images/help/alert07.png", false,
 	array('width' => '550px'));
 ?>
 <br>
-We’ve now made it so that the system can discriminate when something is right (OK status, marked in GREEN) and when something is wrong (CRITICAL status, marked in RED). Now what we have to do is make the system send us an email when the module reaches that status. For this we’ll use Pandora FMS’ alert system.<br>
+We’ve now made it so that the system can discriminate when something is right (OK status, marked in GREEN) and when something is wrong (CRITICAL status, marked in RED). Now what we have to do is make the system send us an email when the module reaches that status. For this we’ll use <?php echo get_product_name();?>'s alert system.<br>
 <br>
-For this we need to make sure there is a command available that can do what we need it to (in this case, send an email). This example is easy because there is a predefined command on Pandora FMS that is meant to automate email sending, meaning this is already done.<br>
+For this we need to make sure there is a command available that can do what we need it to (in this case, send an email). This example is easy because there is a predefined command on <?php echo get_product_name();?> that is meant to automate email sending, meaning this is already done.<br>
 <br>
 <b>Configuring the Alert</b><br>
 <br>
@@ -133,7 +133,7 @@ html_print_image("images/help/alert08.png", false,
 	array('width' => '550px'));
 ?>
 <br>
-This action uses the “send email” command, and is really simple, since only one field from the form needs to be filled out (Field1) leaving the other two empty. This is one of the most confusing parts of the alert system on Pandora FMS: what are field1, field2 and field3?<br>
+This action uses the “send email” command, and is really simple, since only one field from the form needs to be filled out (Field1) leaving the other two empty. This is one of the most confusing parts of the alert system on <?php echo get_product_name();?>: what are field1, field2 and field3?<br>
 <br>
 These fields are the ones used to “pass” the information on from the alert template to the command, and at the same time from that command to the next. This way both the template and the command can provide different information to the command. In this case, the command only establishes field1 and leaves field2 and field3 to be filled by the template, like what is shown next.<br>
 <br>
@@ -163,19 +163,19 @@ The most critical parameters here are the following:<br>
 <br>
 <i>Time threshold:</i> Set to one day by default. If a module is constantly down during, for example, one day and and we have set a value of 5 minutes here, it means that alerts would be sent every 5 minutes.  If we leave it at one day (24hrs.), it’ll only send the alert once, when it goes down. If the module recovers, and drops again, it’ll send another alert, but if it remains down from the second drop, it won’t send more alerts until 24hrs have gone by.<br>
 <br>
-<i>Min. Number of alerts:</i> The minimum number of times that a condition will have to be met (in this case, that the module is in CRITICAL status) before Pandora FMS runs the actions linked to the alert template. It’s a way to avoid false positives “flooding” you with alerts, or so that an erratic behaviour doesn’t lead to multiply alerts going off. If we place a ‘1’ here it means that until this doesn’t happen at least once, it won’t be taken into account. If i set a value of ‘0’ the first time the module returns an error, the alert will go off.<br>
+<i>Min. Number of alerts:</i> The minimum number of times that a condition will have to be met (in this case, that the module is in CRITICAL status) before <?php echo get_product_name();?> runs the actions linked to the alert template. It’s a way to avoid false positives “flooding” you with alerts, or so that an erratic behaviour doesn’t lead to multiply alerts going off. If we place a ‘1’ here it means that until this doesn’t happen at least once, it won’t be taken into account. If i set a value of ‘0’ the first time the module returns an error, the alert will go off.<br>
 <br>
 <i>Max. Number of alerts:</i> A value of 1 means that it’ll only execute the action once. If we have ’10’ set here, it’ll run the action 10 times. This is a way to limit the number of times an alert can go off.<br>
 <br>
 Again, we can see the fields “field1, field2, field3”. Now we can see that field1 is blank, which is precisely the one we’ve defined when configuring the action. Field2 and Field3 are used for the “send mail” action to define the subject and the message’s body, whilst Field1 is used to define the recipient(s) of said message (addresses must be separated by commas). Therefore the template, combined with the use of some macros, is defining the subject and alert message in a way that, in our case, we would receive a message like the following (supposing the agent where the module is placed is named “Farscape”):<br>
 <br>
 <i>To: sancho.lerena@notexist.ocm<br>
-Subject: [PANDORA] Farscape cpu_sys is in CRITICAL status with a value
+Subject: [MONITORING] Farscape cpu_sys is in CRITICAL status with a value
 of 20<br>
 Message body:<br>
 <br>
-This is an automated alert generated by Pandora FMS<br>
-Please contact your Pandora FMS operator for more information. *DO NOT* reply to
+This is an automated alert generated by <?php echo get_product_name();?><br>
+Please contact your <?php echo get_product_name();?> operator for more information. *DO NOT* reply to
 this email.<br>
 </i><br>
 Given that the default action is the one we have defined previously, all
@@ -229,7 +229,7 @@ Alerts in standby are useful because they can be viewed without interfering with
 <br>
 <b>Using Alert Commands other than the “send email” command</b><br>
 <br>
-The email, as a command is internal to Pandora FMS and can’t be configured, this means Field1, Field2 and Field3 are fields that are preset to be used as the recipient, subject and body for the email alert. But, what happens when we want to execute a different, more customised alert?<br>
+The email, as a command is internal to <?php echo get_product_name();?> and can’t be configured, this means Field1, Field2 and Field3 are fields that are preset to be used as the recipient, subject and body for the email alert. But, what happens when we want to execute a different, more customised alert?<br>
 <br>
 We’ll define a new, totally customised command. Imagine that we want to generate a log file with each alert we find. The format for that log file has to be something like:<br>
 <br>
@@ -262,9 +262,9 @@ We can see that the alert was fired at 18:17:10 because of the " farscape"
 agent, in the "cpu_sys" module, with a data value of "23.00" and with the
 description that we chose when we defined the action.<br>
 <br>
-Since the command’s execution, the field order and other affairs can make it so we don’t really understand how it’s executed at the end of the command, the easiest thing to do is to activate the Pandora server debug traces (verbose 10) in the configuration file for the Pandora server ‘/etc/pandora/pandora_server.conf’, and then reset the server
+Since the command’s execution, the field order and other affairs can make it so we don’t really understand how it’s executed at the end of the command, the easiest thing to do is to activate the <?php echo get_product_name();?> server debug traces (verbose 10) in the configuration file for the <?php echo get_product_name();?> server ‘/etc/pandora/pandora_server.conf’, and then reset the server
 (/etc/init.d/pandora_server restart). After, we take a look at the file
 /var/log/pandora/pandora_server.log and look for the exact line with the
-alert command execution that we've defined, to see how the Pandora FMS
+alert command execution that we've defined, to see how the <?php echo get_product_name();?>
 server is launching and executing the command.<br>
 <br>
diff --git a/pandora_console/include/help/en/help_cascade_protection.php b/pandora_console/include/help/en/help_cascade_protection.php
index e534776177..913b4bd7d4 100644
--- a/pandora_console/include/help/en/help_cascade_protection.php
+++ b/pandora_console/include/help/en/help_cascade_protection.php
@@ -8,7 +8,7 @@
 </div>
 <br>
 <p>
-This option should be assigned to avoid an “alert storm” that can come in because a group of agents are unreachable. This type of behaviour occurs when an intermediary device, like for example a router, is down and all devices behind it, therefore, cannot be reached. Probably these devices aren’t down and chances indicate that they’re working with another router in HA mode. But, if nothing is done, it’s likely for Pandora FMS to think that they’re down since they can’t be tested using a Remote ICMP Proc test (a Ping check).
+This option should be assigned to avoid an “alert storm” that can come in because a group of agents are unreachable. This type of behaviour occurs when an intermediary device, like for example a router, is down and all devices behind it, therefore, cannot be reached. Probably these devices aren’t down and chances indicate that they’re working with another router in HA mode. But, if nothing is done, it’s likely for <?php echo get_product_name();?> to think that they’re down since they can’t be tested using a Remote ICMP Proc test (a Ping check).
 <br><br>
 When you enable <i>cascade protection</i> for an agent, this means that if any of its parents has a CRITICAL alert fired, then the agent’s alerts <strong>WILL NOT BE</strong> fired. If the agent's parent has a module in CRITICAL or several alerts with less criticality than CRITICAL, alerts from the agent will be fired as normal if needed. Cascade protection checks parent alerts with CRITICAL priority, including the correlated alerts assigned to the parent.
 <br><br>
@@ -23,7 +23,7 @@ If you want to use an advanced cascade protection system, just use correlation a
 <br>
 </div>
 <p>
-This option should be assigned to avoid an “alert storm” that can come in because a group of agents are unreachable. This type of behaviour occurs when an intermediary device, like for example a router, is down and all devices behind it, therefore, cannot be reached. Probably these devices aren’t down and chances indicate that they’re working with another router in HA mode. But, if nothing is done, it’s likely for Pandora FMS to think that they’re down since they can’t be tested using a Remote ICMP Proc test (a Ping check).
+This option should be assigned to avoid an “alert storm” that can come in because a group of agents are unreachable. This type of behaviour occurs when an intermediary device, like for example a router, is down and all devices behind it, therefore, cannot be reached. Probably these devices aren’t down and chances indicate that they’re working with another router in HA mode. But, if nothing is done, it’s likely for <?php echo get_product_name();?> to think that they’re down since they can’t be tested using a Remote ICMP Proc test (a Ping check).
 <br><br>
 When you enable <i>cascade protection</i> for an module, this means that if this parent agent module has a CRITICAL alert fired, then agent alerts <strong>WILL NOT BE</strong> fired.
 <br><br>
diff --git a/pandora_console/include/help/en/help_categories.php b/pandora_console/include/help/en/help_categories.php
index 57de2bbda0..ee0bf3e83d 100644
--- a/pandora_console/include/help/en/help_categories.php
+++ b/pandora_console/include/help/en/help_categories.php
@@ -3,6 +3,6 @@
  * @package Include/help/en
  */
 ?>
-<h1>Categories in Pandora FMS</h1>
+<h1>Categories in <?php echo get_product_name();?></h1>
 On the system some categories can be created and configured to later be assigned to any module desired. <br>
 The only user that has the permits to create and configure these categories is the administrator and they can be used to apply a “fee” to modules depending on the category the are sorted into.
diff --git a/pandora_console/include/help/en/help_configure_gis_map.php b/pandora_console/include/help/en/help_configure_gis_map.php
index 3aeefe5e1d..87ec1222fb 100644
--- a/pandora_console/include/help/en/help_configure_gis_map.php
+++ b/pandora_console/include/help/en/help_configure_gis_map.php
@@ -10,14 +10,14 @@ This page is the place to configure a GIS Map.
 </p>
 <h2>Map Name</h2>
 <p>
-Each map has a desciptive name used to recognice the map within Pandora FMS.
+Each map has a desciptive name used to recognice the map within <?php echo get_product_name();?>.
 </p>
 <h2>Select Connections</h2>
 <p>
 The first step is to select the main <strong>connection</strong> used in this GIS Map. At least one connection must be selected to configure the GIS Map, but it's possible to add more by pressing the <?php html_print_image("images/add.png", false, array("alt" => "Add")); ?> (Add) icon.
 </p>
 <p>
-When the firs connection is set, Pandora FMS asks if you want to use the default values of the connection for the map, to avoid to write again all the information. Also if the default connection for the map is changed (using the radio button), Pandora FMS will ask again if you want to use the values of the new default connection.
+When the firs connection is set, <?php echo get_product_name();?> asks if you want to use the default values of the connection for the map, to avoid to write again all the information. Also if the default connection for the map is changed (using the radio button), <?php echo get_product_name();?> will ask again if you want to use the values of the new default connection.
 </p>
 <h2>Map Paramteres</h2>
 <p>
diff --git a/pandora_console/include/help/en/help_context_module_unknow.php b/pandora_console/include/help/en/help_context_module_unknow.php
index 891306a655..aa2fda8b4f 100644
--- a/pandora_console/include/help/en/help_context_module_unknow.php
+++ b/pandora_console/include/help/en/help_context_module_unknow.php
@@ -3,7 +3,7 @@
  * @package Include/help/en
  */
 ?>
-<h1>Unknown modules in Pandora</h1>
+<h1>Unknown modules in <?php echo get_product_name();?></h1>
 <p>
 You may have unknown modules for many reasons. Unknown module is a special status for a module/monitor which means “I dont have recent data for this monitor and I should have data”. A monitor goes to unknown status when doesnt receive nothing in at least its interval (for example, 300 seconds) multiplied by two, in this case, if you doesn't receive nothing in ten minutes, monitor goes to unknown.
 </p>
@@ -11,10 +11,10 @@ You may have unknown modules for many reasons. Unknown module is a special statu
 These are a few cases where you can get unknown modules:
 </p>
 <ul style="list-style-type: disc; margin-left: 30px;">
-	<li>Your pandora server is down. Restart it, dont forget to check /var/log/pandora/pandora_server.log to see why was down.</li>
-	<li>Your tentacle server is down, and cannot get data from your Pandora FMS agents installed in your remote servers.</li>
+	<li>Your <?php echo get_product_name();?> server is down. Restart it, dont forget to check /var/log/pandora/pandora_server.log to see why was down.</li>
+	<li>Your tentacle server is down, and cannot get data from your <?php echo get_product_name();?> agents installed in your remote servers.</li>
 	<li>You have a network problem between your agents and your server.</li>
-	<li>Your pandora fms agent is stopped and is not sending information to your server.</li>
+	<li>Your <?php echo get_product_name();?> agent is stopped and is not sending information to your server.</li>
 	<li>Your network is down, or the remote device you are trying to ask is down or changed it's IP address (for example for numerical SNMP remote queries).</li>
 	<li>Your agent is reporting a badly synchronized date. Means reports a timedate in the past and that messup everything.</li>
 	<li>The script / module before works now doesn't, that can be because something is happing in the agent, check it out.</li>
diff --git a/pandora_console/include/help/en/help_context_pandora_server_email.php b/pandora_console/include/help/en/help_context_pandora_server_email.php
index f210cc07d9..73720132c5 100755
--- a/pandora_console/include/help/en/help_context_pandora_server_email.php
+++ b/pandora_console/include/help/en/help_context_pandora_server_email.php
@@ -3,14 +3,14 @@
  * @package Include/help/en
  */
 ?>
-<h1>Config the Pandora Server for email alerts</h1>
-<p>You must to edit the <i>"Pandora Server conf file"</i>, normaly it is in:
+<h1>Config the <?php echo get_product_name();?> for email alerts</h1>
+<p>You must to edit the <i>"<?php echo get_product_name();?> conf file"</i>, normaly it is in:
 <pre>
 	/etc/pandora_server/pandora_server.conf
 </pre>
 And you must set these values:
 <pre>
-# mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
+# mta_address: External Mailer (MTA) IP Address to be used by <?php echo get_product_name();?> internal email capabilities
 
 mta_address localhost
 
@@ -33,6 +33,6 @@ mta_auth LOGIN
 # mta_from Email address that sends the mail, by default is pandora@localhost 
 #           probably you need to change it to avoid problems with your antispam
 
-mta_from Pandora FMS <pandora@mydomain.com>
+mta_from <?php echo get_product_name();?> &lt;monitoring@mydomain.com&gt;
 </pre>
 </p>
\ No newline at end of file
diff --git a/pandora_console/include/help/en/help_create_agent.php b/pandora_console/include/help/en/help_create_agent.php
index d65d9b98ef..e851bcf99c 100644
--- a/pandora_console/include/help/en/help_create_agent.php
+++ b/pandora_console/include/help/en/help_create_agent.php
@@ -12,5 +12,5 @@ To create an Agent, you must fill this form. Please fill all the fields you need
 "Interval" refers to the agent's execution interval. The interval is how often the agent sends data to the server.
 </p>
 <p>
-"Server" refers to the Pandora Server that will read data send by the agent. 
+"Server" refers to the <?php echo get_product_name();?> Server that will read data send by the agent. 
 </p>
diff --git a/pandora_console/include/help/en/help_cron.php b/pandora_console/include/help/en/help_cron.php
index a1e235d06e..07095a6325 100644
--- a/pandora_console/include/help/en/help_cron.php
+++ b/pandora_console/include/help/en/help_cron.php
@@ -9,7 +9,7 @@ Using the configuration parameter sets <b>Cron from</b> and <b>Cron to</b> makes
 it possible for a module to run only for certain periods of time. 
 The way in which it is configured is similar to the syntax of 
 <a style="font-size:14px;" href="https://en.wikipedia.org/wiki/Cron">cron</a>. 
-Just as they appear in the Pandora console, each one of the parameters  
+Just as they appear in the <?php echo get_product_name();?> console, each one of the parameters  
 has three options.
 
 <h4>Cron from: any</h4>
diff --git a/pandora_console/include/help/en/help_custom_logo.php b/pandora_console/include/help/en/help_custom_logo.php
index 96a3feac52..d42383982e 100644
--- a/pandora_console/include/help/en/help_custom_logo.php
+++ b/pandora_console/include/help/en/help_custom_logo.php
@@ -5,7 +5,7 @@
 ?>
 <h1>Custom logo (Branding)</h1>
 
-This option is used to display your own logo in the Pandora FMS header. You can use any kind of graphic in PNG format. There is a fixed width/height for any image displayed here of 206x47 pixels. 
+This option is used to display your own logo in the <?php echo get_product_name();?> header. You can use any kind of graphic in PNG format. There is a fixed width/height for any image displayed here of 206x47 pixels. 
 <br><br>
 Upload your custom branding logo, using the file manager to /images/custom_logo directory.
 
diff --git a/pandora_console/include/help/en/help_dynamic_threshold.php b/pandora_console/include/help/en/help_dynamic_threshold.php
index fb1c3c5c24..85551ebf94 100644
--- a/pandora_console/include/help/en/help_dynamic_threshold.php
+++ b/pandora_console/include/help/en/help_dynamic_threshold.php
@@ -8,7 +8,7 @@
 <h2>Dynamic threshold Interval</h2>
 
 <p>
-	Introduce a time period in the Dynamic Threshold Interval field and the module will return the data obtained during the interval. This allows Pandora to establish minimum thresholds of critical and warning status according to the server configuration.
+	Introduce a time period in the Dynamic Threshold Interval field and the module will return the data obtained during the interval. This allows <?php echo get_product_name();?> to establish minimum thresholds of critical and warning status according to the server configuration.
 	<br><br>
 	The default setting will <b>only</b> give minimums, so if maximum = 0 it will read from the configured minimum to infinite.
 	<br><br>
diff --git a/pandora_console/include/help/en/help_event_alert.php b/pandora_console/include/help/en/help_event_alert.php
index eafc8aefc9..f084fae04c 100644
--- a/pandora_console/include/help/en/help_event_alert.php
+++ b/pandora_console/include/help/en/help_event_alert.php
@@ -6,7 +6,7 @@
 
 <h1>Event Alerts</h1>
 
-From Pandora FMS 4.0 version, it is possible to define alerts on events, that allows to work from a completely new approach much more flexible. This is an Enterprise feature.<br>
+It is possible to define alerts on events, that allows to work from a completely new approach much more flexible. This is an Enterprise feature.<br>
 
 To create the new event alerts, click on the Create button in the Event alerts menu from the Administration menu. <br><br>
 
@@ -61,6 +61,6 @@ For example, we could configure a rule that matches with the events generated by
 <?php html_print_image ("images/help/event04.png", false, array('width' => '550px')); ?>
 
 <br>
-<p>Given the high number of events that the Pandora FMS database could store, the server works on an event window that is defined in the pandora_server.conf configuration file through the parameter event_window. The events that have been generated out of this time window won't be processed by the server, so it doesn't make sense to specify in a rule a time window higher to the one configured in the server </p>
+<p>Given the high number of events that the <?php echo get_product_name();?> database could store, the server works on an event window that is defined in the pandora_server.conf configuration file through the parameter event_window. The events that have been generated out of this time window won't be processed by the server, so it doesn't make sense to specify in a rule a time window higher to the one configured in the server </p>
 
 
diff --git a/pandora_console/include/help/en/help_events_history.php b/pandora_console/include/help/en/help_events_history.php
index 125ca1a8a0..605bebede5 100644
--- a/pandora_console/include/help/en/help_events_history.php
+++ b/pandora_console/include/help/en/help_events_history.php
@@ -3,7 +3,7 @@
 */
 ?>
 
-<p> When the history events are enabled, the purging script (pandora_db.pl) will copy the not validated or in process events (only new ones) to the history table before delete it.
+<p> When the history events are enabled, the purging script (DB Tool) will copy the not validated or in process events (only new ones) to the history table before delete it.
 <br><br>These events can be consulted in the history events view. This view can be accessed in a new tab in the events section.
 </p>
 
diff --git a/pandora_console/include/help/en/help_export_server.php b/pandora_console/include/help/en/help_export_server.php
index eb08c436a6..448a56c708 100644
--- a/pandora_console/include/help/en/help_export_server.php
+++ b/pandora_console/include/help/en/help_export_server.php
@@ -5,10 +5,10 @@
 ?>
 <h1>Export server</h1>
 
-<p>Pandora FMS Enterprise Version implements, through the export server, a data scaling device that allows you to do a virtually distributed implementation able to monitor an unlimited number of information, as long as you design it properly and break it up into different information profiles.</p>
+<p><?php echo get_product_name();?> Enterprise Version implements, through the export server, a data scaling device that allows you to do a virtually distributed implementation able to monitor an unlimited number of information, as long as you design it properly and break it up into different information profiles.</p>
 
 <ul>
-<li type="circle">Name: Pandora FMS server name.</li>
+<li type="circle">Name: <?php echo get_product_name();?> server name.</li>
 <li type="circle">Export server: Combo to choose the server petition of export server that will be used to export the data.</li>
 <li type="circle">Prefix: Prefix that is used to add to the agent name that send the data. For example, when the data of an agent named "Farscape" is resent, and its prefix in the export server is "EU01",the resent agent data will be seen in the destination server with the agent name EUO1-Farscape.</li>
 <li type="circle">Interval: Define the time interval, and how often (in seconds) you want to send the data that is unresolved.</li>
diff --git a/pandora_console/include/help/en/help_ff_threshold.php b/pandora_console/include/help/en/help_ff_threshold.php
index fda1216fba..3641e5edad 100644
--- a/pandora_console/include/help/en/help_ff_threshold.php
+++ b/pandora_console/include/help/en/help_ff_threshold.php
@@ -8,7 +8,7 @@
 <br>
 <br>
 
-The Threshold parameter FF (FF = FlipFlop) is used to "filter" the continuous changes of state in the generation of events / states, so that you can tell Pandora FMS until an element is not at least X times in the same state after changing from an original state, not considered to have changed. 
+The Threshold parameter FF (FF = FlipFlop) is used to "filter" the continuous changes of state in the generation of events / states, so that you can tell <?php echo get_product_name();?> until an element is not at least X times in the same state after changing from an original state, not considered to have changed. 
 <br><br>
 Take a classic example: A ping to a host where there is packet loss. In an environment like this, might give results as:
 <br>
@@ -24,7 +24,7 @@ Take a classic example: A ping to a host where there is packet loss. In an envir
  1 
 </pre>
 <br>
-However, the host is alive in all cases. What we really want is to tell Pandora that until the host does not say you are at least three times down, not marked as such, so that in the previous case and would never be dropped, and only in this case it would be:
+However, the host is alive in all cases. What we really want is to tell <?php echo get_product_name();?> that until the host does not say you are at least three times down, not marked as such, so that in the previous case and would never be dropped, and only in this case it would be:
 <pre>
  1  
  1  
diff --git a/pandora_console/include/help/en/help_gis_map_builder.php b/pandora_console/include/help/en/help_gis_map_builder.php
index a24d349775..363d51fda4 100644
--- a/pandora_console/include/help/en/help_gis_map_builder.php
+++ b/pandora_console/include/help/en/help_gis_map_builder.php
@@ -6,7 +6,7 @@
 <h1>GIS Map builder</h1>
 
 <p>
-This page shows a list of the defined maps, and let you edit, delete or view any of them. Also from this page is where the <strong>default Map</strong> of Pandora FMS is set.
+This page shows a list of the defined maps, and let you edit, delete or view any of them. Also from this page is where the <strong>default Map</strong> of <?php echo get_product_name();?> is set.
 </p>
 To create a map a connection to a map server is needed, the connections are created by the Adminstrator in the <strong>Setup</strong> menu.
 <p>
diff --git a/pandora_console/include/help/en/help_gis_setup_map_connection.php b/pandora_console/include/help/en/help_gis_setup_map_connection.php
index c813b78100..0afe61a8e1 100644
--- a/pandora_console/include/help/en/help_gis_setup_map_connection.php
+++ b/pandora_console/include/help/en/help_gis_setup_map_connection.php
@@ -11,7 +11,7 @@ This page is the place where the admin can configure <strong>a connection to a G
 
 <h2>Connection types</h2>
 <p>
-Currently Pandora FMS support 3 differet kinds of connections: OpenStreetMap, Google Maps and Static Image.
+Currently <?php echo get_product_name();?> support 3 differet kinds of connections: OpenStreetMap, Google Maps and Static Image.
 </p>
 <h3>Open Street Maps</h3>
 <p>
@@ -33,5 +33,5 @@ ABQIAAAAZuJY-VSG4gOH73b6mcUw1hTfSvFQRXGUGjHx8f036YCF-UKjgxT9lUhqOJx7KDHSnFnt46qn
 </pre>
 <h3>Static Image</h3>
 <p>
-It's also possible to use a static image (a PNG for example) as the only source of the map. To use it, the<strong>url</strong>, the <strong>positional information</strong> of the image and the <strong>height</strong> and <strong>width</strong> must be filled.
+It's also possible to use a static image (a PNG for example) as the only source of the map. To use it, the <strong>url</strong>, the <strong>positional information</strong> of the image and the <strong>height</strong> and <strong>width</strong> must be filled.
 </p>
diff --git a/pandora_console/include/help/en/help_graphs.php b/pandora_console/include/help/en/help_graphs.php
index 65d1e9984f..b1f51e0cb0 100644
--- a/pandora_console/include/help/en/help_graphs.php
+++ b/pandora_console/include/help/en/help_graphs.php
@@ -48,11 +48,11 @@ div.img_title {
 </style>
 
 <body class="hlp_graphs">
-<h1>INTERPRETING GRAPHS IN PANDORA FMS</h1>
+<h1>INTERPRETING GRAPHS IN <?php echo get_product_name();?></h1>
 
 
-<p>In Pandora FMS, graphs represent the values a module has had during a given period.</p>
-<p>Due to the large amount of data that Pandora FMS stores, two different types of functionality are offered</p>
+<p>In <?php echo get_product_name();?>, graphs represent the values a module has had during a given period.</p>
+<p>Due to the large amount of data that <?php echo get_product_name();?> stores, two different types of functionality are offered</p>
 
 
 <h2>NORMAL GRAPHS</h2>
@@ -98,7 +98,7 @@ div.img_title {
 <dd>Shows indicator points with triggered alert information at the top.</dd>
 
 <dt>Show percentile</dt>
-<dd>Adds a graph that indicates the percentile line (configurable in general visual options of Pandora).</dd>
+<dd>Adds a graph that indicates the percentile line (configurable in general visual options of <?php echo get_product_name();?>).</dd>
 
 <dt>Time comparison (superimposed)</dt>
 <dd>Displays the same graphic overlay, but in the period before the selected one. For example, if we request a period of one week and activate this option, the week before the chosen one will also be shown superimposed.</dd>
@@ -107,7 +107,7 @@ div.img_title {
 <dd>Displays the same graph, but in the period before the selected one, in a separate area. For example, if we request a period of one week and activate this option, the week before the chosen one will also be shown.</dd>
 
 <dt>Display unknown graphic</dt>
-<dd>It shows boxes in grey shading covering the periods in which Pandora FMS cannot guarantee the module's status, either due to data loss, disconnection of a software agent, etc.</dd>
+<dd>It shows boxes in grey shading covering the periods in which <?php echo get_product_name();?> cannot guarantee the module's status, either due to data loss, disconnection of a software agent, etc.</dd>
 
 <dt>Show Full Scale Graph (TIP)</dt>
 <dd>Switches the creation mode from "normal" to "TIP". In this mode, the graphs will show real data rather than approximations, so the time it will take to generate them will be longer. More detailed information on this type of graphs can be found in the following section.</dd>
diff --git a/pandora_console/include/help/en/help_history_database.php b/pandora_console/include/help/en/help_history_database.php
index bc49d89e48..0859f49f3e 100644
--- a/pandora_console/include/help/en/help_history_database.php
+++ b/pandora_console/include/help/en/help_history_database.php
@@ -5,7 +5,7 @@
 ?>
 <h1>History database</h1>
 
-A history database is a database where old module data is moved to make the main Pandora FMS database more responsive for everyday operations. That data will still be available seamlessly to the Pandora FMS console when viewing reports, module charts etc. 
+A history database is a database where old module data is moved to make the main <?php echo get_product_name();?>  database more responsive for everyday operations. That data will still be available seamlessly to the <?php echo get_product_name();?>  console when viewing reports, module charts etc. 
 <br><br>
 <b>SETTING UP A HISTORY DATABASE</b>
 <br><br>
@@ -14,7 +14,7 @@ To configure a history database follow these simple steps:
 <ol>
 <li>Create the new history database. 
 <br><br>
-<li>Create the necessary tables in the new database. You can use the pandoradb.sql script provided with the Pandora FMS console: 
+<li>Create the necessary tables in the new database. You can use the DB Tool script provided with the <?php echo get_product_name();?>  console: 
 <br><br>
 <i>cat pandoradb.sql | mysql -u user -p -D history_db</i>
 <br><br>
@@ -22,7 +22,7 @@ To configure a history database follow these simple steps:
 <br><br>
 <i>Mysql Example: GRANT ALL PRIVILEGES ON pandora.* TO 'pandora'@'IP' IDENTIFIED BY 'password'</i>
 <br><br>
-<li>In your Pandora FMS console navigate to Setup->History database and enter the host, port, database name, user and password of the new database.
+<li>In your <?php echo get_product_name();?>  console navigate to Setup->History database and enter the host, port, database name, user and password of the new database.
 </ol>
 <br><br>
 <?php html_print_image ("images/help/historyddbb.png", false, array('width' => '550px')); ?>
diff --git a/pandora_console/include/help/en/help_ipam.php b/pandora_console/include/help/en/help_ipam.php
index fafb0e5a0b..f26de991d8 100755
--- a/pandora_console/include/help/en/help_ipam.php
+++ b/pandora_console/include/help/en/help_ipam.php
@@ -5,9 +5,9 @@
 ?>
 <h1>IP Address Management (IPAM)</h1>
 <br>
-Using IPAM extension, we can manage, discover and get event on changes on hosts in a given network. We can know if a given IP address (IPv4 or IPv6) change it's availability (answer to a ping) or hostname (using dns resolution). We also can detect its OS and link a IP address to a current Pandora FMS agent, adding the IP address to their currently assigned addresses. IPAM extension uses the recon server and a recon script on the low level, but you don't need to configure nothing, IPAM extension do everything for you.
+Using IPAM extension, we can manage, discover and get event on changes on hosts in a given network. We can know if a given IP address (IPv4 or IPv6) change it's availability (answer to a ping) or hostname (using dns resolution). We also can detect its OS and link a IP address to a current <?php echo get_product_name();?>  agent, adding the IP address to their currently assigned addresses. IPAM extension uses the recon server and a recon script on the low level, but you don't need to configure nothing, IPAM extension do everything for you.
 <br><br>
-IP Management works in parallel to the monitoring you currently manage with Pandora FMS agents, you can associate a IP address managed with IPAM extension or not, it depends on you. Managed IP addresses can optionally generate event on change.
+IP Management works in parallel to the monitoring you currently manage with <?php echo get_product_name();?>  agents, you can associate a IP address managed with IPAM extension or not, it depends on you. Managed IP addresses can optionally generate event on change.
 
 <h2>IPs Detection</h2>
 We can setup a network (using a bit mask or a prefix), and this network will be automatically sweeped or setup to have a on-request manual execution. This will execute a recon script task, searching for active IP (using nmap for IPv4 and ping for IPv6). You see the progress on network sweep in the status view and also in the recon server view.
@@ -76,7 +76,7 @@ When you click on the main icon, a modal window will be opened showing all the I
 <h3>Edition view</h3>
 If you have enought permission, you will have access to setup view, where IP address are shown as a list. You can filter to show only the IP's you are interested into, make changes and update all at once.<br><br>
 
-Some fields, are automatically filled by the recon script, like hostname, if it have a Pandora FMS agent and the operating system. You can mark that fields as "manual" and edit them.<br><br>
+Some fields, are automatically filled by the recon script, like hostname, if it have a <?php echo get_product_name();?>  agent and the operating system. You can mark that fields as "manual" and edit them.<br><br>
 
 <table width=100%>
 <tr>
diff --git a/pandora_console/include/help/en/help_local_component.php b/pandora_console/include/help/en/help_local_component.php
index 1a2bdbc6aa..30eb475973 100644
--- a/pandora_console/include/help/en/help_local_component.php
+++ b/pandora_console/include/help/en/help_local_component.php
@@ -6,4 +6,4 @@
 
 <h1>Local Component</h1>
 
-<p>Local Components are elements that can be applied to agents like templates. With Pandora FMS Enterprise, this can be applied authomatically and remotely with policies or one by one.</p>
+<p>Local Components are elements that can be applied to agents like templates. With <?php echo get_product_name();?> Enterprise, this can be applied authomatically and remotely with policies or one by one.</p>
diff --git a/pandora_console/include/help/en/help_main_help.php b/pandora_console/include/help/en/help_main_help.php
index 4c63f0e356..31f88c0098 100644
--- a/pandora_console/include/help/en/help_main_help.php
+++ b/pandora_console/include/help/en/help_main_help.php
@@ -3,10 +3,10 @@
  * @package Include/help/en
  */
 ?>
-<h1>Pandora FMS - Help index</h1>
+<h1><?php echo get_product_name();?> - Help index</h1>
 <h3>Introduction</h3>
 <p>
-This is the online help for Pandora FMS console. This help is -in best cases- just a "brief" contextual help, not intented to teach you how to use Pandora FMS. Official documentation of Pandora FMS is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.
+This is the online help for <?php echo get_product_name();?> console. This help is -in best cases- just a "brief" contextual help, not intented to teach you how to use <?php echo get_product_name();?>. Official documentation of <?php echo get_product_name();?> is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.
 
 <br><br>
 <a href="http://pandorafms.com/pandora/doc/"><b>Download the official documentation</b></a>
diff --git a/pandora_console/include/help/en/help_manage_alert_list.php b/pandora_console/include/help/en/help_manage_alert_list.php
index 63f5b0431f..d46ac3abbf 100644
--- a/pandora_console/include/help/en/help_manage_alert_list.php
+++ b/pandora_console/include/help/en/help_manage_alert_list.php
@@ -6,7 +6,7 @@
 <h1>Alerts</h1>
 
 <p>
-Alerts in Pandora FMS react to an "out of range" module value. The alert can consist of sending an e-mail or an SMS to the administrator, sending a SNMP trap, write the incident into the system log or into Pandora FMS log file, etc. Basically, an alert can be anything that can be triggered by a script configured in the Operating System where Pandora FMS Servers run.
+Alerts in <?php echo get_product_name();?> react to an "out of range" module value. The alert can consist of sending an e-mail or an SMS to the administrator, sending a SNMP trap, write the incident into the system log or into <?php echo get_product_name();?> log file, etc. Basically, an alert can be anything that can be triggered by a script configured in the Operating System where <?php echo get_product_name();?> Servers run.
 </p>
 
 <p>
diff --git a/pandora_console/include/help/en/help_manage_alerts.php b/pandora_console/include/help/en/help_manage_alerts.php
index 8c03bd786f..a2f379583c 100644
--- a/pandora_console/include/help/en/help_manage_alerts.php
+++ b/pandora_console/include/help/en/help_manage_alerts.php
@@ -5,7 +5,7 @@
 ?>
 <h1>Alerts</h1>
 
-Alerts in Pandora FMS react to an "out of range" module value. The alert can consist of sending an e-mail or an SMS to the administrator, sending a SNMP trap, write the incident into the system log or into Pandora FMS log file, etc. Basically, an alert can be anything that can be triggered by a script configured in the Operating System where Pandora FMS Servers run.
+Alerts in <?php echo get_product_name();?> react to an "out of range" module value. The alert can consist of sending an e-mail or an SMS to the administrator, sending a SNMP trap, write the incident into the system log or into <?php echo get_product_name();?> log file, etc. Basically, an alert can be anything that can be triggered by a script configured in the Operating System where <?php echo get_product_name();?> Servers run.
 <br /><br />
 The values "_field1_", "_field2_" and "_field3_" of the customized alerts are used to build the command line that will be executed.
 <br /><br />
diff --git a/pandora_console/include/help/en/help_module_tokens.php b/pandora_console/include/help/en/help_module_tokens.php
index 0926562e18..8078c41e8d 100644
--- a/pandora_console/include/help/en/help_module_tokens.php
+++ b/pandora_console/include/help/en/help_module_tokens.php
@@ -96,7 +96,7 @@ The total of seconds, agent will wait for the execution of the module, so if it
 <br><br>
 <b>module_postprocess 'factor'</b>
 <br><br>
-Same as in the definition of post processing of a module that is done from the console, here could be defined a numeric value of floating comma that will send this value to Pandora FMS in order the server will use it to multiply the received (raw) by the agent.
+Same as in the definition of post processing of a module that is done from the console, here could be defined a numeric value of floating comma that will send this value to <?php echo get_product_name();?> in order the server will use it to multiply the received (raw) by the agent.
 <br><br>
 <b>module_save 'variable name'</b>
 <br><br>
@@ -245,7 +245,7 @@ module_end<br>
 <br>
 <b>Processes Watchdog</b>
 <br><br>
-A Watchdog is a system that allows to act immediately when an agent is down, usually picking up the process that is down . The Pandora FMS Windows agent could act as Watchdog when a process is down. This is called watchdog mode for the process: 
+A Watchdog is a system that allows to act immediately when an agent is down, usually picking up the process that is down . The <?php echo get_product_name();?> Windows agent could act as Watchdog when a process is down. This is called watchdog mode for the process: 
 <br><br>
 Executing a process could need some parameters, so there are some additional configuration options for these kind of modules. It is important to say that the watchdog mode only works when the module type is asynchronous. Let's see an example of configuration of a module_proc with watchdog.
 <br><br>
@@ -268,7 +268,7 @@ This is the definition of the additional parameters for module_proc with watchdo
 <br><br>
     <i>module_startdelay:</i> Number of milliseconds the module will wait before starting the process by first time. If the process takes lot of time at starting , then it will be a great idea to order the agent through this parameter that it "wait" until start checking again if the process has got up. In this example wait 3 seconds.
 <br><br>
-    <i>module_retrydelay:</i> Similar to the previous one but for subsequent falls/reattempts, after having detect a fall. When Pandora detects a fall, relaunch the process, wait the nº of milliseconds pointed out in this parameter and check again if the process is already up.  
+    <i>module_retrydelay:</i> Similar to the previous one but for subsequent falls/reattempts, after having detect a fall. When <?php echo get_product_name();?> detects a fall, relaunch the process, wait the nº of milliseconds pointed out in this parameter and check again if the process is already up.  
 <br><br>
 <b>module_cpuproc 'process'</b>
 <br><br>
diff --git a/pandora_console/include/help/en/help_network_map_enterprise.php b/pandora_console/include/help/en/help_network_map_enterprise.php
index 860168630e..2209e03af0 100644
--- a/pandora_console/include/help/en/help_network_map_enterprise.php
+++ b/pandora_console/include/help/en/help_network_map_enterprise.php
@@ -6,7 +6,7 @@
 
 <h1>Networkmap console</h1>
 
-<p>With Pandora FMS Enterprise we have the possibility of create editable network maps that are more interactive comparing with the Open version that is currently on the "See agents" submenu.</p>
+<p>With <?php echo get_product_name();?> Enterprise we have the possibility of create editable network maps that are more interactive comparing with the Open version that is currently on the "See agents" submenu.</p>
 
 <p>On the contrary to the Open version, the Networkmap Enterprise provide us with more features, such as: </p>
 
@@ -38,7 +38,7 @@
 
 <h2>Minimap</h2>
 
-<p>This minimap gives us a global view that shows all the map extension, but in a smaller view, and besides, in contrast with the map view, all the nodes are shown, but without status and without relationships. Except the Pandora fictitious point, that is shown in green. And a red box is also shown of the part of the map that is being shown. </p>
+<p>This minimap gives us a global view that shows all the map extension, but in a smaller view, and besides, in contrast with the map view, all the nodes are shown, but without status and without relationships. Except the <?php echo get_product_name();?> fictitious point, that is shown in green. And a red box is also shown of the part of the map that is being shown. </p>
 
 <p>It's on the upper left corner, and could be hidden pressing on the arrow icon. 
 </p>
@@ -72,7 +72,7 @@
 
 
     <p>It shows a box which rim will be of the same color that the agent status. <br>
-    The agent name is a link to the Pandora agent page. <br>
+    The agent name is a link to the <?php echo get_product_name();?> agent page. <br>
     Inside the box are all the modules that are not in unknown status, which, depending if the module status is green or red. <br>
         It's possible to click on these modules and they shown a tooltip with the module main data.  <br>
     In the box rim are the modules kind SNMP Proc,that use to be for network interfaces when an agent related with network systems is monitored.  <br></p>
@@ -107,7 +107,7 @@
     <li><b>Creating the network map from:</b> option only available in the creation. It's the way to create the network map if we do it from the agents that are in the previously selected group, or on the contrary we want an empty network map. </li>
     <li><b>Size of the network map:</b> where it's possible to define the size of the network map, by default it's of 3000 width and 3000 high. </li>
     <li><b>Method for creating of the network map:</b> the method of distribution of the nodes that will make up the network map, by default it's radial, but there are the following ones: </li>
-        <p>- <i>Radial:</i> In which all the nodes will be placed around the fictitious node that the Pandora represents. <br>
+        <p>- <i>Radial:</i> In which all the nodes will be placed around the fictitious node that the <?php echo get_product_name();?> represents. <br>
         - <i>Circular:</i> In which the nodes will be placed in concentric circles en el cual se dispondrá los nodos en círculos concentricos. <br>
         - <i>Flat:</i> In which the nodes with tree shape will be placed. <br>
         - <i>spring1, spring2:</i> are variations of the Flat.  <br>
diff --git a/pandora_console/include/help/en/help_performance.php b/pandora_console/include/help/en/help_performance.php
index c3e212010c..d2c0a23bca 100644
--- a/pandora_console/include/help/en/help_performance.php
+++ b/pandora_console/include/help/en/help_performance.php
@@ -62,5 +62,5 @@ Agent access graph, renders the number of agent contacts per hour in a graph wit
 <br><br>
 Maximum number of days before delete unknown modules. 
 <br><br>
-<i>**All these parameters are made when running the pandora_db.pl tool</i>
+<i>**All these parameters are made when running the DB Tool</i>
 
diff --git a/pandora_console/include/help/en/help_planned_downtime.php b/pandora_console/include/help/en/help_planned_downtime.php
index 0dd0fa4dac..d1d5bb844f 100644
--- a/pandora_console/include/help/en/help_planned_downtime.php
+++ b/pandora_console/include/help/en/help_planned_downtime.php
@@ -12,5 +12,5 @@ This tool is used to plan non-monitoring periods of time. This is useful if you
 It's very easy to setup, you specify start date/time of a scheduled downtime and an end date/time. After setting the first fields you must save the Scheduled downtime and edit it, to set the agents which are going to be disconnected. You can also edit the rest of the fields once editing the Scheduled downtime entry.
 </p>
 <p>
-When scheduled downtime starts, Pandora FMS automatically disable all agents assigned to this downtime and no alerts or data are processed. When downtime ends, Pandora FMS will be enable all agents assigned to this downtime. You cannot delete or modify a downtime instance when it's fired, you need to wait for ending before doing anything in this downtime instance. Of course you can manually, enable an agent using the agent configuration dialog.
+When scheduled downtime starts, <?php echo get_product_name();?> automatically disable all agents assigned to this downtime and no alerts or data are processed. When downtime ends, <?php echo get_product_name();?> will be enable all agents assigned to this downtime. You cannot delete or modify a downtime instance when it's fired, you need to wait for ending before doing anything in this downtime instance. Of course you can manually, enable an agent using the agent configuration dialog.
 </p>
diff --git a/pandora_console/include/help/en/help_planned_downtime_time.php b/pandora_console/include/help/en/help_planned_downtime_time.php
index 7c151cd8fb..aea7a0afa0 100644
--- a/pandora_console/include/help/en/help_planned_downtime_time.php
+++ b/pandora_console/include/help/en/help_planned_downtime_time.php
@@ -9,7 +9,7 @@
 
 <p>
 	The date format must be year/month/day and the time format must be hour:minute:second.
-	It's possible to create a scheduled downtime with a past date, if that option aren't disabled by the admin of Pandora FMS.
+	It's possible to create a scheduled downtime with a past date, if that option aren't disabled by the admin of <?php echo get_product_name();?>.
 </p>
 
 <h2>Periodically execution</h2>
diff --git a/pandora_console/include/help/en/help_plugin_definition.php b/pandora_console/include/help/en/help_plugin_definition.php
index 7b3b4f4e01..f6aeb4cd29 100644
--- a/pandora_console/include/help/en/help_plugin_definition.php
+++ b/pandora_console/include/help/en/help_plugin_definition.php
@@ -5,9 +5,9 @@
 ?>
 <h1>Plugin registration</h1>
 
-Unlike with the rest of components, in a default way Pandora FMS does not include any pre-configured complement, so first you should create and configure a complement to could after add it to the module of an agent. But Pandora FMS includes plugins in the installation directories, but as have already been said, they are not configured in the database. 
+Unlike with the rest of components, in a default way <?php echo get_product_name();?> does not include any pre-configured complement, so first you should create and configure a complement to could after add it to the module of an agent. But <?php echo get_product_name();?> includes plugins in the installation directories, but as have already been said, they are not configured in the database. 
 <br><br>
-To add a plugin that already exists to Pandora FMS, go to the console administration section, and in it, click on Manage servers. After doing this, click on Manage plugins: 
+To add a plugin that already exists to <?php echo get_product_name();?>, go to the console administration section, and in it, click on Manage servers. After doing this, click on Manage plugins: 
 <br><br>
 Once you are in the screen of the plugin management, click on Create a new plugin, so there will be no one. 
 <br><br>
@@ -18,7 +18,7 @@ Fill in the plugin creation form with the following data:
 Name of the plugin, in this case Nmap.
 <br><br>
 <b>Plugin type </b><br>
-There are two kinds of plugins, the standard ones and the kind Nagios. The standard plugins are scripts that execute actions and accept parameters. The Nagios plugins are, as their name shows, Nagios plugins that could be being used in Pandora FMS.The difference is mainly on that the Nagios plugins return an error level to show if the test has been successful or not.
+There are two kinds of plugins, the standard ones and the kind Nagios. The standard plugins are scripts that execute actions and accept parameters. The Nagios plugins are, as their name shows, Nagios plugins that could be being used in <?php echo get_product_name();?>.The difference is mainly on that the Nagios plugins return an error level to show if the test has been successful or not.
 <br><br>
 If you want to use a plugin kind Nagios and you want to get a data, not an state (good/Bad), then you can use a plugin kind Nagios is the "Standard" mode.
 <br><br>
@@ -38,7 +38,7 @@ Plugin description. Write a short description, as for example:Test # UDP open po
 
 It is the path where the plugin command is. In a default way, if the installation has been an standard one, there will be in the directory /usr/share/pandora_server/util/plugin/. Though it could be any path of the system. For this case, writte /usr/share/pandora_server/util/plugin/udp_nmap_plugin.shin the field.
 <br><br>
-Pandora server will execute this script, so this should have permissions of access and execution on it.
+<?php echo get_product_name();?> server will execute this script, so this should have permissions of access and execution on it.
 <br><br>
 <b>Plug-in parameters</b><br>
 
diff --git a/pandora_console/include/help/en/help_plugin_macros.php b/pandora_console/include/help/en/help_plugin_macros.php
index 3cf8e47b1c..1660c45e13 100644
--- a/pandora_console/include/help/en/help_plugin_macros.php
+++ b/pandora_console/include/help/en/help_plugin_macros.php
@@ -17,7 +17,7 @@ The following macros are available:
 <li>_modulegroup_ : Module group name.</li>
 <li>_moduledescription_ : Description of the module.</li>
 <li>_modulestatus_ : Status of the module.</li>
-<li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.</li>
+<li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a <?php echo get_product_name();?> console webpage.</li>
 <li>_id_group_ : Id of agent group.</li>
 <li>_policy_ : Name of the policy the module belongs to (if applies).</li>
 <li>_interval_ : Execution interval of the module. </li>
diff --git a/pandora_console/include/help/en/help_plugin_policy.php b/pandora_console/include/help/en/help_plugin_policy.php
index 5f17196272..61afa6336d 100644
--- a/pandora_console/include/help/en/help_plugin_policy.php
+++ b/pandora_console/include/help/en/help_plugin_policy.php
@@ -6,7 +6,7 @@
 
 <h1>Agent Plugins</h1>
 
-<p>Since Pandora FMS 5.0, with the plugins editor in policies is possible propagate the agents plugins easily.
+<p>With the plugins editor in policies is possible propagate the agents plugins easily.
 <br><br>
 Is possible to add agent plugins in a policy to be created in each local agent when be applied. 
 <br><br>
diff --git a/pandora_console/include/help/en/help_profile.php b/pandora_console/include/help/en/help_profile.php
index 1222af8668..3e41970fbd 100644
--- a/pandora_console/include/help/en/help_profile.php
+++ b/pandora_console/include/help/en/help_profile.php
@@ -6,7 +6,7 @@
 
 <h1>Profile</h1>
 
-<p>Pandora FMS is a Web management tool that allows multiple users to work with different permissions in multiple defined agent groups. The permissions an user can have are defined in profiles.</p>
+<p><?php echo get_product_name();?> is a Web management tool that allows multiple users to work with different permissions in multiple defined agent groups. The permissions an user can have are defined in profiles.</p>
 
 <p>The following list defines what ACL control allows in each feature at the console:</p>
 
diff --git a/pandora_console/include/help/en/help_recontask.php b/pandora_console/include/help/en/help_recontask.php
index 345badb83e..53424b850d 100644
--- a/pandora_console/include/help/en/help_recontask.php
+++ b/pandora_console/include/help/en/help_recontask.php
@@ -25,7 +25,7 @@ Network where you want to do the recognition. Use the network format/ bits mask.
 
 <b>Interval</b>
 <br>
-Repetition interval of systems search. Do not use intervals very shorts so Recon explores a network sending one Ping to each address. If you use recon networks very larges (for example a class A) combined with very short intervals (6 hours) you will be doing that Pandora FMS will be always bomb the network with pings, overloading it and also Pandora FMS unnecessarily.<br><br>
+Repetition interval of systems search. Do not use intervals very shorts so Recon explores a network sending one Ping to each address. If you use recon networks very larges (for example a class A) combined with very short intervals (6 hours) you will be doing that <?php echo get_product_name();?> will be always bomb the network with pings, overloading it and also <?php echo get_product_name();?> unnecessarily.<br><br>
 
 <b>Module template</b><br>
 
@@ -33,7 +33,7 @@ Plugins template to add to the discovered systems. When it detects a system that
 
 <b>OS</b><br>
 
-Operative system to recognize. If you select one instead of any (Any) it will only be added the systems with this operative system.Consider that in some circumstances Pandora FMS can make a mistake when detecting systems, so this kind of "guess" is done with statistic patterns, that depending on some other factors could fail (networks with filters, security software, modified versions of the systems).To could use this method with security, you should have installed Xprobe2 in your system. <br><br>
+Operative system to recognize. If you select one instead of any (Any) it will only be added the systems with this operative system.Consider that in some circumstances <?php echo get_product_name();?> can make a mistake when detecting systems, so this kind of "guess" is done with statistic patterns, that depending on some other factors could fail (networks with filters, security software, modified versions of the systems).To could use this method with security, you should have installed Xprobe2 in your system. <br><br>
 
 <b>Ports</b><br>
 
diff --git a/pandora_console/include/help/en/help_reporting_wizard_sla_tab.php b/pandora_console/include/help/en/help_reporting_wizard_sla_tab.php
index 9264792823..bed414ce01 100644
--- a/pandora_console/include/help/en/help_reporting_wizard_sla_tab.php
+++ b/pandora_console/include/help/en/help_reporting_wizard_sla_tab.php
@@ -6,4 +6,4 @@
 
 <h1>SLA Wizard</h1>
 
-<p>Allows to measure the service level (Service Level Agreement) of any monitor of Pandora FMS. In this wizard you can create a SLA report of several agents.</p>
+<p>Allows to measure the service level (Service Level Agreement) of any monitor of <?php echo get_product_name();?>. In this wizard you can create a SLA report of several agents.</p>
diff --git a/pandora_console/include/help/en/help_response_macros.php b/pandora_console/include/help/en/help_response_macros.php
index 78098d8c0b..c5fe087ec7 100644
--- a/pandora_console/include/help/en/help_response_macros.php
+++ b/pandora_console/include/help/en/help_response_macros.php
@@ -18,7 +18,7 @@ The accepted macros are:
 <li><b>Event ID:</b> _event_id_</li>
 <li><b>Event instructions:</b> _event_instruction_</li>
 <li><b>Event severity ID:</b> _event_severity_id_</li>
-<li><b>Event severity (translated by Pandora console):</b> _event_severity_text_</li>
+<li><b>Event severity (translated by <?php echo get_product_name();?> console):</b> _event_severity_text_</li>
 <li><b>Event source:</b> _event_source_</li>
 <li><b>Event status (new, validated or event in process):</b> _event_status_</li>
 <li><b>Event tags separated by commas:</b> _event_tags_</li>
diff --git a/pandora_console/include/help/en/help_servers.php b/pandora_console/include/help/en/help_servers.php
index 057489227a..f65b535f67 100644
--- a/pandora_console/include/help/en/help_servers.php
+++ b/pandora_console/include/help/en/help_servers.php
@@ -6,11 +6,11 @@
 
 <h1>Server management</h1>
 
-<p>The Pandora FMS servers are the elements in charge of performing the existing checks. They verify them and change their status depending on the results. They are also in charge of triggering the alerts established to control the status of data.</p>
+<p>The <?php echo get_product_name();?> servers are the elements in charge of performing the existing checks. They verify them and change their status depending on the results. They are also in charge of triggering the alerts established to control the status of data.</p>
 
-<p>Pandora FMS's data server can work in high availability and/or load balancing modes. In a very large architecture, various Pandora FMS servers can be used at the same time, in order to handle large volumes of functionally or geographically distributed information.</p>
+<p><?php echo get_product_name();?>'s data server can work in high availability and/or load balancing modes. In a very large architecture, various <?php echo get_product_name();?> servers can be used at the same time, in order to handle large volumes of functionally or geographically distributed information.</p>
 
-<p>Pandora FMS servers are always on and permanently verify if any element has any problem. If there is any alert linked to the problem, then it'll run the pre-set action such as sending an SMS, an email, or activating a script execution.</p>
+<p><?php echo get_product_name();?> servers are always on and permanently verify if any element has any problem. If there is any alert linked to the problem, then it'll run the pre-set action such as sending an SMS, an email, or activating a script execution.</p>
 
 <ul>
 <li type="circle">Data Server</li>
diff --git a/pandora_console/include/help/en/help_snmp_alert.php b/pandora_console/include/help/en/help_snmp_alert.php
index f315f5697c..d4d40d4ba3 100644
--- a/pandora_console/include/help/en/help_snmp_alert.php
+++ b/pandora_console/include/help/en/help_snmp_alert.php
@@ -6,4 +6,4 @@
 
 <h1>SNMP alert</h1>
 
-<p>It's possible to associate an alert to a trap, so Pandora FMS warns us on arrival of a specific trap. SNMP traps have got nothing to do with the rest of the system alerts, even if both reuse the actions' system.</p>
+<p>It's possible to associate an alert to a trap, so <?php echo get_product_name();?> warns us on arrival of a specific trap. SNMP traps have got nothing to do with the rest of the system alerts, even if both reuse the actions' system.</p>
diff --git a/pandora_console/include/help/en/help_snmpoid.php b/pandora_console/include/help/en/help_snmpoid.php
index e638854d21..10fe9898fd 100644
--- a/pandora_console/include/help/en/help_snmpoid.php
+++ b/pandora_console/include/help/en/help_snmpoid.php
@@ -5,4 +5,4 @@
 ?>
 <h1>SNMP OID</h1>
 
-Module's SNMP OID. If there is a MIB able to resolve the name in Pandora FMS Network Server, then you can use alphanumeric OIDs (i.e. SNMPv2-MIB::sysDescr.0). Numeric OID can always be used (i.e. 3.1.3.1.3.5.12.4.0.1), even if there is no specific MIB. 
+Module's SNMP OID. If there is a MIB able to resolve the name in <?php echo get_product_name();?> Network Server, then you can use alphanumeric OIDs (i.e. SNMPv2-MIB::sysDescr.0). Numeric OID can always be used (i.e. 3.1.3.1.3.5.12.4.0.1), even if there is no specific MIB. 
diff --git a/pandora_console/include/help/en/help_snmpwalk.php b/pandora_console/include/help/en/help_snmpwalk.php
index 8963a448f4..92a7c93556 100644
--- a/pandora_console/include/help/en/help_snmpwalk.php
+++ b/pandora_console/include/help/en/help_snmpwalk.php
@@ -5,6 +5,6 @@
 ?>
 <h1>SNMP walk</h1>
 
-Pandora FMS has also a simple SNMP browser that allows to walk the MIB of a remote device by a SNMP Walk. 
+<?php echo get_product_name();?> has also a simple SNMP browser that allows to walk the MIB of a remote device by a SNMP Walk. 
 <br /><br />
-Walking ("SNMP Walk") over a device will make all MIB variables available, so you can choose one. You can also enter a MIB using numerical OID or human understandable format, if you have the correct MIB installed in your Pandora FMS Network Server. 
+Walking ("SNMP Walk") over a device will make all MIB variables available, so you can choose one. You can also enter a MIB using numerical OID or human understandable format, if you have the correct MIB installed in your <?php echo get_product_name();?> Network Server. 
diff --git a/pandora_console/include/help/en/help_tags_config.php b/pandora_console/include/help/en/help_tags_config.php
index b4c3aecfad..cf2fbe240d 100644
--- a/pandora_console/include/help/en/help_tags_config.php
+++ b/pandora_console/include/help/en/help_tags_config.php
@@ -3,7 +3,7 @@
  * @package Include/help/en
  */
 ?>
-<h1>Tags in Pandora FMS</h1>
+<h1>Tags in <?php echo get_product_name();?></h1>
 
 The access to the modules can be configurated with a Tags system. A tags are configurated on the system, and be assigned to the choosed modules. In this way the access of the user can be limited to the modules with certain tags.
 <br><br>
diff --git a/pandora_console/include/help/en/help_tcp_send.php b/pandora_console/include/help/en/help_tcp_send.php
index ea44e5e276..302deb2f13 100644
--- a/pandora_console/include/help/en/help_tcp_send.php
+++ b/pandora_console/include/help/en/help_tcp_send.php
@@ -38,7 +38,7 @@ If you type something, like "none" and press enter, they reply you the following
 <br /><br />
 Protocol mismatch
 <br /><br />
-So to "code" this conversation in a Pandora FMS TCP module, you need to put in TCP Send:
+So to "code" this conversation in a <?php echo get_product_name();?> TCP module, you need to put in TCP Send:
 <br /><br />
 |none^M
 <br /><br />
diff --git a/pandora_console/include/help/en/help_timesource.php b/pandora_console/include/help/en/help_timesource.php
index cb37708dc5..9acceb5743 100644
--- a/pandora_console/include/help/en/help_timesource.php
+++ b/pandora_console/include/help/en/help_timesource.php
@@ -9,9 +9,9 @@
 What source to use for the time. This can be (for now) either the local system (System) or database (Database).<br />
 </p>
 <p>
-This is useful when your database is not on the same system as your webserver or your Pandora FMS servers. 
+This is useful when your database is not on the same system as your webserver or your <?php echo get_product_name();?> servers. 
 In that case any time difference will miscalculate the time differences and timestamps.
-You should use NTP to sync all your pandora servers and your MySQL server. 
+You should use NTP to sync all your <?php echo get_product_name();?> servers and your MySQL server. 
 By using these preferences you don't have to sync your webserver but it's still recommended.
 </p>
 <p>
diff --git a/pandora_console/include/help/en/help_visual_console_editor_editor_tab.php b/pandora_console/include/help/en/help_visual_console_editor_editor_tab.php
index fcdb43a897..3cc211da66 100644
--- a/pandora_console/include/help/en/help_visual_console_editor_editor_tab.php
+++ b/pandora_console/include/help/en/help_visual_console_editor_editor_tab.php
@@ -17,7 +17,7 @@ defined:
 	<li>the work area (where you will "draw" the visual console)</li>
 	<li>the option palette ( that is not visible in this screen shot)</li>
 </ul>
-In the version Pandora 5.0.1 you can set the label with a rich text.
+You can set the label with a rich text.
 And the item "Simple value" you can use the macros to set inner the text
 with (_VALUE_).
 </p>
diff --git a/pandora_console/include/help/en/help_visual_console_editor_preview_tab.php b/pandora_console/include/help/en/help_visual_console_editor_preview_tab.php
index 790bc1824a..cfe2355c5d 100644
--- a/pandora_console/include/help/en/help_visual_console_editor_preview_tab.php
+++ b/pandora_console/include/help/en/help_visual_console_editor_preview_tab.php
@@ -6,4 +6,4 @@
 
 <h1>Preview</h1>
 
-<p>This tab is useful to see the result of your work in a quick way, avoiding surfing between the Pandora Console menus. The visual console view is an static view, so, if the state of the elements contained there, they will not be drawing again as it happens with the visual console view that hangs on the Visual Console menu.</p>
+<p>This tab is useful to see the result of your work in a quick way, avoiding surfing between the <?php echo get_product_name();?> Console menus. The visual console view is an static view, so, if the state of the elements contained there, they will not be drawing again as it happens with the visual console view that hangs on the Visual Console menu.</p>
diff --git a/pandora_console/include/help/en/help_web_checks.php b/pandora_console/include/help/en/help_web_checks.php
index 3148293e92..fd4b5981c8 100644
--- a/pandora_console/include/help/en/help_web_checks.php
+++ b/pandora_console/include/help/en/help_web_checks.php
@@ -6,7 +6,7 @@
 <h1>WEB Monitoring</h1>
 
 <p>
-Advanced WEB Monitoring is a feature done by the Goliat/WEB Server in Pandora FMS Enterprise version.
+Advanced WEB Monitoring is a feature done by the Goliat/WEB Server in <?php echo get_product_name();?> Enterprise version.
 <br /><br />
 This is a sample of GOLIAT Webcheck module:
 <br />
@@ -43,7 +43,7 @@ The following macros are available:
 <li>_moduledescription_ : Description of the module who fired the alert.</li>
 <li>_modulestatus_ : Status of the module.</li>
 <li>_moduletags_ : Tags associated to the module.</li>
-<li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.</li>
+<li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a <?php echo get_product_name();?> console webpage.</li>
 <li>_policy_ : Name of the policy the module belongs to (if applies).</li>
 <li>_interval_ : Execution interval of the module. </li>
 <li>_target_ip_ : IP address of the target of the module.</li>
diff --git a/pandora_console/include/help/en/help_wux_console.php b/pandora_console/include/help/en/help_wux_console.php
index f6f092d1e4..39ad49d70a 100644
--- a/pandora_console/include/help/en/help_wux_console.php
+++ b/pandora_console/include/help/en/help_wux_console.php
@@ -2,11 +2,11 @@
 <h2>Introducci&oacute;n</h2>
 
 <p>
-    Pandora WUX es un componente interno de Pandora FMS que permite a los usuarios automatizar sus sesiones de navegaci&oacute;n web. Genera en Pandora FMS un informe con los resultados de las ejecuciones, tiempos empleados, y capturas con los posibles errores encontrados. Es capaz de dividir las sesiones de navegaci&oacute;n en fases para simplificar la vista y depurar posibles cuellos de botella.
+	<?php echo get_product_name();?> WUX es un componente interno de <?php echo get_product_name();?> que permite a los usuarios automatizar sus sesiones de navegaci&oacute;n web. Genera en <?php echo get_product_name();?> un informe con los resultados de las ejecuciones, tiempos empleados, y capturas con los posibles errores encontrados. Es capaz de dividir las sesiones de navegaci&oacute;n en fases para simplificar la vista y depurar posibles cuellos de botella.
 </p>
 
 <p>
-    Pandora WUX utiliza el robot de navegaci&oacute;n de Pandora (PWR - Pandora Web Robot) para automatizar las sesiones de navegaci&oacute;n
+	<?php echo get_product_name();?> WUX utiliza el robot de navegaci&oacute;n de <?php echo get_product_name();?> (PWR - <?php echo get_product_name();?> Web Robot) para automatizar las sesiones de navegaci&oacute;n
 </p>
 
 <h2>Grabar una sesi&oacute;n de navegaci&oacute;n web</h2>
@@ -114,13 +114,13 @@
 </p>
 
 <p>
-	Una vez verificada la validez de la secuencia de navegaci&oacute;n, la guardaremos (Archivo -&gt; Save Test Case) para ejecutarla posteriormente con Pandora WUX. El fichero resultante ser&aacute; un documento HTML que Pandora WUX interpretar&aacute;.
+	Una vez verificada la validez de la secuencia de navegaci&oacute;n, la guardaremos (Archivo -&gt; Save Test Case) para ejecutarla posteriormente con <?php echo get_product_name();?> WUX. El fichero resultante ser&aacute; un documento HTML que <?php echo get_product_name();?> WUX interpretar&aacute;.
 </p>
 
-<h4>Grabar una sesi&oacute;n transaccional con Pandora WUX PWR</h4>
+<h4>Grabar una sesi&oacute;n transaccional con <?php echo get_product_name();?> WUX PWR</h4>
 
 <p>
-	Pandora WUX en modo PWR (Pandora Web Robot) permite dividir la monitorizaci&oacute;n de la navegaci&oacute;n de un sitio web en m&uacute;ltiples m&oacute;dulos, que representar&aacute;n cada uno de los pasos realizados.
+	<?php echo get_product_name();?> WUX en modo PWR (<?php echo get_product_name();?> Web Robot) permite dividir la monitorizaci&oacute;n de la navegaci&oacute;n de un sitio web en m&uacute;ltiples m&oacute;dulos, que representar&aacute;n cada uno de los pasos realizados.
 </p>
 
 <p>
@@ -186,7 +186,7 @@
     En esta vista podemos encontrar toda la infomaci&oacute;n que el sistema WUX ha obtenido de la sesi&oacute;n de navegaci&oacute;n configurada: 
 </p>
 <p>
-    <b><u>Nota</u>:</b> Si hemos definido fases en nuestra sesi&oacute;n de navegaci&oacute;n, se mostrar&aacute;n en esta vista de una forma sencilla y clara (ver apartado de grabaci&oacute;n <i>sesi&oacute;n transaccional con Pandora WUX PWR)</i>.
+    <b><u>Nota</u>:</b> Si hemos definido fases en nuestra sesi&oacute;n de navegaci&oacute;n, se mostrar&aacute;n en esta vista de una forma sencilla y clara (ver apartado de grabaci&oacute;n <i>sesi&oacute;n transaccional con <?php echo get_product_name();?> WUX PWR)</i>.
 </p>
 
 <p style="text-align: center">

From 929733598cdafdea0cda1fff99028b03cef631e8 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 18 May 2018 14:06:00 +0200
Subject: [PATCH 043/146] [Rebranding] help es

---
 .../include/help/es/help_alert_command.php    |  2 +-
 .../include/help/es/help_alert_compound.php   |  4 +--
 .../include/help/es/help_alert_config.php     |  6 ++--
 .../help/es/help_alert_fields_description.php |  6 ++--
 .../include/help/es/help_alert_macros.php     |  4 +--
 .../include/help/es/help_alert_recovery.php   |  2 +-
 .../include/help/es/help_alert_type.php       |  8 +++---
 .../include/help/es/help_alert_validation.php |  2 +-
 .../include/help/es/help_alerts.php           |  2 +-
 .../include/help/es/help_alerts_config.php    | 28 +++++++++----------
 .../help/es/help_cascade_protection.php       |  4 +--
 .../include/help/es/help_categories.php       |  4 +--
 .../include/help/es/help_collection_tab.php   |  2 +-
 .../include/help/es/help_collections.php      |  6 ++--
 .../include/help/es/help_component_groups.php |  2 +-
 .../help/es/help_configure_gis_map.php        |  4 +--
 .../include/help/es/help_create_agent.php     |  2 +-
 pandora_console/include/help/es/help_cron.php |  2 +-
 .../include/help/es/help_custom_logo.php      |  2 +-
 .../include/help/es/help_event_alert.php      |  4 +--
 .../include/help/es/help_events_history.php   |  2 +-
 .../include/help/es/help_export_server.php    | 10 +++----
 .../include/help/es/help_ff_threshold.php     |  4 +--
 .../include/help/es/help_gis_map_builder.php  |  4 +--
 .../help/es/help_gis_setup_map_connection.php |  2 +-
 .../include/help/es/help_graph_builder.php    |  4 +--
 .../include/help/es/help_graph_editor.php     |  2 +-
 .../include/help/es/help_graph_view.php       |  2 +-
 .../include/help/es/help_graphs.php           | 10 +++----
 .../include/help/es/help_history_database.php |  8 +++---
 pandora_console/include/help/es/help_ipam.php |  4 +--
 .../include/help/es/help_main_help.php        |  4 +--
 .../help/es/help_manage_alert_list.php        |  2 +-
 .../include/help/es/help_manage_alerts.php    |  2 +-
 .../include/help/es/help_module_tokens.php    |  4 +--
 .../help/es/help_network_map_enterprise.php   |  4 +--
 .../include/help/es/help_performance.php      |  2 +-
 .../include/help/es/help_planned_downtime.php |  2 +-
 .../help/es/help_planned_downtime_time.php    |  2 +-
 .../help/es/help_plugin_definition.php        |  8 +++---
 .../include/help/es/help_plugin_macros.php    |  2 +-
 .../include/help/es/help_plugin_policy.php    |  2 +-
 .../include/help/es/help_profile.php          |  2 +-
 .../include/help/es/help_recontask.php        |  4 +--
 .../help/es/help_reporting_wizard_sla_tab.php |  2 +-
 .../help/es/help_reporting_wizard_tab.php     |  2 +-
 .../include/help/es/help_response_macros.php  |  2 +-
 .../include/help/es/help_servers.php          |  6 ++--
 .../es/help_service_elements_management.php   |  4 +--
 .../help/es/help_services_management.php      |  2 +-
 .../include/help/es/help_snmp_alert.php       |  2 +-
 .../include/help/es/help_snmp_explorer.php    |  2 +-
 .../include/help/es/help_snmpcommunity.php    |  2 +-
 .../include/help/es/help_snmpoid.php          |  2 +-
 .../include/help/es/help_snmpwalk.php         |  4 +--
 .../include/help/es/help_tags_config.php      |  2 +-
 .../include/help/es/help_template_tab.php     |  2 +-
 .../include/help/es/help_timesource.php       |  4 +--
 .../include/help/es/help_web_checks.php       |  2 +-
 .../include/help/es/help_wux_console.php      | 12 ++++----
 60 files changed, 119 insertions(+), 121 deletions(-)

diff --git a/pandora_console/include/help/es/help_alert_command.php b/pandora_console/include/help/es/help_alert_command.php
index 57b1aad847..a2f19dc197 100644
--- a/pandora_console/include/help/es/help_alert_command.php
+++ b/pandora_console/include/help/es/help_alert_command.php
@@ -6,4 +6,4 @@
 
 <h1>Comando de alerta</h1>
 
-<p>La reaccion de Pandora FMS para un valor &#34;fuera de rango&#34; puede ser de diversos tipos: escribir en un syslog, envio de una mail o SMS, o bien la ejecucion de cualquier script que este alojado en la maquina de Pandora FMS y pueda ser procesado.</p>
+<p>La reacci&oacute;n de <?php echo get_product_name();?> para un valor &#34;fuera de rango&#34; puede ser de diversos tipos: escribir en un syslog, env&iacute;o de una mail o SMS, o bien la ejecucion de cualquier script que este alojado en la maquina de <?php echo get_product_name();?> y pueda ser procesado.</p>
diff --git a/pandora_console/include/help/es/help_alert_compound.php b/pandora_console/include/help/es/help_alert_compound.php
index 1f46531855..f1fc0ddc06 100644
--- a/pandora_console/include/help/es/help_alert_compound.php
+++ b/pandora_console/include/help/es/help_alert_compound.php
@@ -4,7 +4,7 @@
 */
 ?>
 
-<h1>Alerta correlacion</h1>
+<h1>Alerta correlaci&oacute;n</h1>
 
-<p>Permite usar mas de un modulo para generar una reaccion en Pandora FMS. Dichos modulos pueden pertenecer a un mismo agente o a varios.</p>
+<p>Permite usar m&aacute;s de un m&oacute;dulo para generar una reacci&oacute;n en <?php echo get_product_name();?>. Dichos m&oacute;dulos pueden pertenecer a un mismo agente o a varios.</p>
 
diff --git a/pandora_console/include/help/es/help_alert_config.php b/pandora_console/include/help/es/help_alert_config.php
index 9e060dc967..312862a10e 100644
--- a/pandora_console/include/help/es/help_alert_config.php
+++ b/pandora_console/include/help/es/help_alert_config.php
@@ -9,7 +9,7 @@ A continuación se detallan los campos que hay que rellenar:<br><br>
 
     <b>Name:</b> El nombre de la acción.<br>
     <b>Group:</b> El grupo de la acción.<br>
-    <b>Command:</b> En este campo se define el comando que se usará en el caso de que se ejecute la alerta. Se puede elegir entre los diferntes Comandos que hay definidos en Pandora. Dependiendo del comando elegido nos aparecerán unos campos a rellenar u otros.<br>
+    <b>Command:</b> En este campo se define el comando que se usará en el caso de que se ejecute la alerta. Se puede elegir entre los diferntes Comandos que hay definidos en  <?php echo get_product_name();?>. Dependiendo del comando elegido nos aparecerán unos campos a rellenar u otros.<br>
     <b>Threshold:</b> El umbral de ejecución de la acción.<br>
     <b>Command Preview:</b> En este campo, no editable, aparecerá automáticamente el comando que se va a ejecutar en el sistema.<br>
     <b>Field X:</b> En estos campos se define el valor de las macros _field1_ a _field10_, que se usarán en el comando, en caso de ser necesario. Estos campos pueden ser un campo de texto o un combo de selección si se configura. Dependiendo del comando seleccionado apareceran un numero de campos a rellenar según sea necesario o no. Por ejemplo:<br><br>
@@ -50,7 +50,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
   <li>_data_: Dato que hizo que la alerta se disparase.</li>
   <li>_email_tag_: Emails asociados a los tags de módulos.</li>
   <li>_event_cfX_: (Solo alertas de evento) Clave del campo personalizado del evento que disparó la alerta. Por ejemplo, si hay un campo personalizado cuya clave es IPAM, se puede obtener su valor usando la macro _event_cfIPAM_.</li>
-  <li>_event_description_ : (Solo alertas de evento) Descripción textual del evento de Pandora FMS.</li>
+  <li>_event_description_ : (Solo alertas de evento) Descripción textual del evento de  <?php echo get_product_name();?>.</li>
   <li>_event_extra_id_ : (Solo alertas de evento) Id extra.</li>
   <li>_event_id_: (Solo alertas de evento) Id del evento que disparó la alerta.</li>
   <li>_event_text_severity_: (Solo alertas de evento) Prioridad en texto de el evento que dispara la alerta (Maintenance, Informational, Normal Minor, Warning, Major, Critical).</li>
@@ -73,7 +73,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
   <li>_groupcustomid_: ID personalizado del grupo.</li>
   <li>_groupother_: Otra información sobre el grupo. Se configura al crear el grupo.</li>
   <li>_homeurl_: Es un enlace de la URL pública que debe configurarse en las opciones generales de la configuración.</li>
-  <li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de Pandora.</li>
+  <li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de  <?php echo get_product_name();?>.</li>
   <li>_id_alert_: ID de la alerta, util para correlar la alerta en herramientas de terceros.</li>
   <li>_id_group_ : ID del grupo de agente.</li>
   <li>_id_module_: ID del módulo.</li>
diff --git a/pandora_console/include/help/es/help_alert_fields_description.php b/pandora_console/include/help/es/help_alert_fields_description.php
index f8614bbfe8..4665b33541 100644
--- a/pandora_console/include/help/es/help_alert_fields_description.php
+++ b/pandora_console/include/help/es/help_alert_fields_description.php
@@ -3,8 +3,8 @@
  * @package Include/help/es
  */
 ?>
-<h1>Descripcion de campos</h1>
+<h1>Descripción de campos</h1>
 
-Es posible configurar una descripcion personalizada a cada campo en la configuracion del comando.
+Es posible configurar una descripcion personalizada a cada campo en la configuración del comando.
 <br><br>
-Esta descripcion aparecera en el formulario de configuracion de la accion junto a la caja de texto del campo cuando se seleccione el comando.
+Esta descripción aparecerá en el formulario de configuración de la acción junto a la caja de texto del campo cuando se seleccione el comando.
diff --git a/pandora_console/include/help/es/help_alert_macros.php b/pandora_console/include/help/es/help_alert_macros.php
index 07d6a20b8a..fec55d7175 100644
--- a/pandora_console/include/help/es/help_alert_macros.php
+++ b/pandora_console/include/help/es/help_alert_macros.php
@@ -33,7 +33,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
   <li>_data_: Dato que hizo que la alerta se disparase.</li>
   <li>_email_tag_: Emails asociados a los tags de módulos.</li>
   <li>_event_cfX_: (Solo alertas de evento) Clave del campo personalizado del evento que disparó la alerta. Por ejemplo, si hay un campo personalizado cuya clave es IPAM, se puede obtener su valor usando la macro _event_cfIPAM_</li>
-  <li>_event_description_ : (Solo alertas de evento) Descripción textual del evento de Pandora FMS.</li>
+  <li>_event_description_ : (Solo alertas de evento) Descripción textual del evento de <?php echo get_product_name();?>.</li>
   <li>_event_extra_id_ : (Solo alertas de evento) Id extra.</li>
   <li>_event_id_: (Solo alertas de evento) Id del evento que disparó la alerta.</li>
   <li>_event_text_severity_:(Solo alertas de evento) Prioridad en texto de el evento que dispara la alerta (Maintenance, Informational, Normal Minor, Warning, Major, Critical).</li>
@@ -56,7 +56,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
   <li>_groupcustomid_: ID personalizado del grupo.</li>
   <li>_groupother_: Otra información sobre el grupo. Se configura al crear el grupo.</li>
   <li>_homeurl_: Es un enlace de la URL pública que debe configurarse en las opciones generales de la configuración.</li>
-  <li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de Pandora.</li>
+  <li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de <?php echo get_product_name();?>.</li>
   <li>_id_alert_: ID de la alerta, util para correlar la alerta en herramientas de terceros.</li>
   <li>_id_group_ : ID del grupo de agente.</li>
   <li>_id_module_: ID del módulo.</li>
diff --git a/pandora_console/include/help/es/help_alert_recovery.php b/pandora_console/include/help/es/help_alert_recovery.php
index 3666c30eb0..9c0addc685 100644
--- a/pandora_console/include/help/es/help_alert_recovery.php
+++ b/pandora_console/include/help/es/help_alert_recovery.php
@@ -5,4 +5,4 @@
 ?>
 <h1>Recuperación de alerta</h1>
 
-Define si Pandora FMS lanza otra alerta cuando la condición de la alerta se recupera. Tiene el mismo «campo1» pero añade «[RECOVER]]» al «campo2» y al «campo3». De forma predeterminada está desactivada.
+Define si <?php echo get_product_name();?> lanza otra alerta cuando la condición de la alerta se recupera. Tiene el mismo «campo1» pero añade «[RECOVER]]» al «campo2» y al «campo3». De forma predeterminada está desactivada.
diff --git a/pandora_console/include/help/es/help_alert_type.php b/pandora_console/include/help/es/help_alert_type.php
index aa98d7f2a3..234531dd44 100644
--- a/pandora_console/include/help/es/help_alert_type.php
+++ b/pandora_console/include/help/es/help_alert_type.php
@@ -7,9 +7,9 @@
 
 Existen algunas alertas predefinidas, las cuales es muy probable que tenga que configurar en caso de que su sistema no proporcione los comandos necesarios para ejecutarlas. El equipo de desarrollo ha probado estas alertas con Red Hat Enterprise Linux (RHEL), CentOS, Debian y Ubuntu Server.
 <ul>
-	<li><b>eMail</b>: Envía un correo-e desde el servidor de Pandora FMS. Usa el sendmail local. Si instaló otro tipo de servidor de correo o no tiene uno, debería instalar y configurar sendmail o cualquiera equivalente (y comprobar la sintaxis) para poder usar este servicio. Pandora FMS depende de las herramientas del sistema para ejecutar prácticamente cada alerta, será necesario comprobar que esos comandos funcionan correctamente en su sistema.</li>
-	<li><b>Internal audit</b>: Es la única alerta &laquo;interna&raquo;, escribe un incidente en el sistema de auditoría interno de Pandora FMS. Ésto se almacena en la base de datos de Pandora FMS y se puede revisar con el visor de auditoría de Pandora FMS desde la consola Web.</li>
-	<li><b>Pandora FMS Alertlog</b>: Guarda información acerca de la alerta en un fichero de texto (.log). Use este tipo de alerta para generar ficheros log usando el formato que necesite. Para ello, deberá modificar el comando para que use el formato y fichero que usted quierd.a Note que Pandora FMS no gestiona rotación de ficheros, y que el proceso del servidor de Pandora FMS que ejecuta la alerta deberá poder acceder al fichero log para escribir en él.</li>
-	<li><b>Pandora FMS Event</b>: Esta alerta crea un evento especial en el gestor de eventos de Pandora FMS.</li> 
+	<li><b>eMail</b>: Envía un correo-e desde el servidor de <?php echo get_product_name();?>. Usa el sendmail local. Si instaló otro tipo de servidor de correo o no tiene uno, debería instalar y configurar sendmail o cualquiera equivalente (y comprobar la sintaxis) para poder usar este servicio. <?php echo get_product_name();?> depende de las herramientas del sistema para ejecutar prácticamente cada alerta, será necesario comprobar que esos comandos funcionan correctamente en su sistema.</li>
+	<li><b>Internal audit</b>: Es la única alerta &laquo;interna&raquo;, escribe un incidente en el sistema de auditoría interno de <?php echo get_product_name();?>. Esto se almacena en la base de datos de <?php echo get_product_name();?> y se puede revisar con el visor de auditoría de <?php echo get_product_name();?> desde la consola Web.</li>
+	<li><b><?php echo get_product_name();?> Alertlog</b>: Guarda información acerca de la alerta en un fichero de texto (.log). Use este tipo de alerta para generar ficheros log usando el formato que necesite. Para ello, deberá modificar el comando para que use el formato y fichero que usted quierd.a Note que <?php echo get_product_name();?> no gestiona rotación de ficheros, y que el proceso del servidor de <?php echo get_product_name();?> que ejecuta la alerta deberá poder acceder al fichero log para escribir en él.</li>
+	<li><b><?php echo get_product_name();?> Event</b>: Esta alerta crea un evento especial en el gestor de eventos de <?php echo get_product_name();?>.</li> 
 </ul>
 Estas alertas son predefinidas y no se pueden borrar, no obstante el usuario puede definir alertas nuevas que usen comandos personalizados y añadirlas al Gestor de alertas.
\ No newline at end of file
diff --git a/pandora_console/include/help/es/help_alert_validation.php b/pandora_console/include/help/es/help_alert_validation.php
index 7e3a349bf1..3aaa0b2c0c 100644
--- a/pandora_console/include/help/es/help_alert_validation.php
+++ b/pandora_console/include/help/es/help_alert_validation.php
@@ -5,5 +5,5 @@
 ?>
 <h1>Validación de alerta</h1>
 <p>
-Validar una alerta sólo cambia su bit de estado y limpia el estado &laquo;disparado&raquo;, de tal forma que si la alerta se dispara de nuevo el proceso continua. Está orientado a alertas con grandes umbrales, por ejemplo, 1 día. Si obtiene una alarma y la revisa y la marca como vista, probablemente quiera establecer su estado a verde y no quiere esperar 1 día a que se vuelva a poner verde.
+Validar una alerta solo cambia su bit de estado y limpia el estado &laquo;disparado&raquo;, de tal forma que si la alerta se dispara de nuevo el proceso continua. Está orientado a alertas con grandes umbrales, por ejemplo, 1 día. Si obtiene una alarma y la revisa y la marca como vista, probablemente quiera establecer su estado a verde y no quiere esperar 1 día a que se vuelva a poner verde.
 </p>
diff --git a/pandora_console/include/help/es/help_alerts.php b/pandora_console/include/help/es/help_alerts.php
index 19ff104483..606d2b89d6 100644
--- a/pandora_console/include/help/es/help_alerts.php
+++ b/pandora_console/include/help/es/help_alerts.php
@@ -14,7 +14,7 @@
 
 	<li><b>Tipo de alerta:</b> Éste puede seleccionarse de la lista de alertas que hayan sido previamente generadas.</li>
 	<li><b>Valor máximo:</b> Define el valor máximo para un módulo. Cualquier valor por encima de este umbral lanzará la alerta.</li>
-	<li><b>Valor mínimo:</b> Define el valor mínimo para un módulo. Cualquier valor por debajo de este umbral disparará la alerta. La pareja de &laquo;maximo&raquo; y &laquo;minimo&raquo; son los valores clave en la definición de una alerta, ya que definen en qué rango de valores se ha de disparar una alerta. Los valores de máximo y mínimo definen «lo aceptable», valores que Pandora FMS considera «válidos», fuera de estos valores, Pandora FMS lo considerará como alerta candidata a ser disparada.</li>
+	<li><b>Valor mínimo:</b> Define el valor mínimo para un módulo. Cualquier valor por debajo de este umbral disparará la alerta. La pareja de &laquo;maximo&raquo; y &laquo;minimo&raquo; son los valores clave en la definición de una alerta, ya que definen en qué rango de valores se ha de disparar una alerta. Los valores de máximo y mínimo definen «lo aceptable», valores que <?php echo get_product_name();?> considera «válidos», fuera de estos valores, <?php echo get_product_name();?> lo considerará como alerta candidata a ser disparada.</li>
 	<li><b>Texto de la alerta:</b> En caso de módulos string, se puede definir una expresión regular o una subcadena para hacer disparar una alerta.</li>
 	<li><b>Hora desde / Hora hasta:</b> Esto define un rango de tiempo &laquo;válido&raquo; para lanzar alertas.</li>
 	<li><b>Descripción:</b> Describe la función de la alerta, y resulta útil para identificar la alerta entre otras en la vista general de alertas.</li>
diff --git a/pandora_console/include/help/es/help_alerts_config.php b/pandora_console/include/help/es/help_alerts_config.php
index d61ea0ae5d..7a98cb2863 100644
--- a/pandora_console/include/help/es/help_alerts_config.php
+++ b/pandora_console/include/help/es/help_alerts_config.php
@@ -3,18 +3,18 @@
  * @package Include/help/es 
  */
 ?> 
- <h1>Guía rápida de configuración de alertas para Pandora FMS</h1>
+ <h1>Guía rápida de configuración de alertas para <?php echo get_product_name();?></h1>
 <br>
 
 <b>Introducción al sistema de alertas actual</b><br><br>
 
-Uno de los problemas más frecuentes y que ocasiona mayor número de quejas por parte de los usuarios es la complejidad de definir alertas en Pandora FMS. Antes, hasta la version 2.0, las alertas eran bastante más sencillas de configurar.Para cada alerta, se definía la condición y lo que hacía cuando la acción no se cumplía, para cada caso. Era más intuitivo (aun así habia campos como el alert "threshold" que daban dolores de cabeza a más de uno). Era sencillo, pero ¿merecía la pena?.<br><br>
+Uno de los problemas más frecuentes y que ocasiona mayor número de quejas por parte de los usuarios es la complejidad de definir alertas en <?php echo get_product_name();?>. Antes, hasta la version 2.0, las alertas eran bastante más sencillas de configurar.Para cada alerta, se definía la condición y lo que hacía cuando la acción no se cumplía, para cada caso. Era más intuitivo (aun así habia campos como el alert "threshold" que daban dolores de cabeza a más de uno). Era sencillo, pero ¿merecía la pena?.<br><br>
 
-Uno de nuestros mejores usuarios (cuando digo mejor, es porque tenía muchísimos agentes instalados, y además conocía muy bien el funcionamiento de Pandora FMS), nos comentó que crear una alerta en 2000 modulos, era enormemente complicado, especialmente cuando habia que modificar algo en todas ellas. Debido principalmente a este y otros problemas, modificamos el sistema de alertas para que fuera modular, para que se pudiera separar la definición de la condición de disparo de la alerta (Alert template), de la acción a ejecutar cuando esta se dispara (Alert action) y del comando que se ejecuta dentro de la acción (Alert comnmand). La combinación de una plantilla de alerta (Alert template) con un módulo desencadena la alerta en sí.<br><br>
+Uno de nuestros mejores usuarios (cuando digo mejor, es porque tenía muchísimos agentes instalados, y además conocía muy bien el funcionamiento de <?php echo get_product_name();?>), nos comentó que crear una alerta en 2000 modulos, era enormemente complicado, especialmente cuando habia que modificar algo en todas ellas. Debido principalmente a este y otros problemas, modificamos el sistema de alertas para que fuera modular, para que se pudiera separar la definición de la condición de disparo de la alerta (Alert template), de la acción a ejecutar cuando esta se dispara (Alert action) y del comando que se ejecuta dentro de la acción (Alert comnmand). La combinación de una plantilla de alerta (Alert template) con un módulo desencadena la alerta en sí.<br><br>
 
 De esta forma, si yo tengo 1000 máquinas con un modulo llamado "Host alive" y todos ellas tienen asociada una plantilla de alerta llamada "Host down" que ejecuta por defecto una acción llamada "Avisar al operador", y quiero cambiar el número mínimo de alertas que se deben disparar antes de avisar al operador, sólo tengo que hacer un cambio en la definicion de la plantilla, no ir una por una, en las 1000 alertas para modificar esa condición.<br><br>
 
-Muchos usuarios sólo gestionan algunas decenas de máquinas, pero existen usuarios con cientos, incluso miles de sistemas monitorizados con Pandora FMS, y tenemos que intentar hacer posible que con Pandora FMS se puedan gestionar todo tipo de entornos.<br><br><br><br>
+Muchos usuarios sólo gestionan algunas decenas de máquinas, pero existen usuarios con cientos, incluso miles de sistemas monitorizados con <?php echo get_product_name();?>, y tenemos que intentar hacer posible que con <?php echo get_product_name();?> se puedan gestionar todo tipo de entornos.<br><br><br><br>
 <b>Estructura de una alerta</b><br><br>
 
 <?php html_print_image ("images/help/alert01.png", false, array('width' => '550px')); ?>
@@ -85,16 +85,16 @@ Aceptamos y grabamos la modificación. Ahora cuando el valor del módulo CPU sea
 
 <?php html_print_image ("images/help/alert07.png", false, array('width' => '550px')); ?>
 <br>
-Ya hemos hecho que el sistema sepa discriminar cuando algo está bien (OK, color VERDE) y cuando está mal (CRITICAL, color rojo). Ahora lo que debemos hacer es que nos envíe un email cuando el modulo se ponga en este estado. Para ello utilizaremos el sistema de alertas de Pandora FMS.<br><br>
+Ya hemos hecho que el sistema sepa discriminar cuando algo está bien (OK, color VERDE) y cuando está mal (CRITICAL, color rojo). Ahora lo que debemos hacer es que nos envíe un email cuando el modulo se ponga en este estado. Para ello utilizaremos el sistema de alertas de <?php echo get_product_name();?>.<br><br>
 
-Para esto, lo primero que debemos hacer es asegurarnos de que existe un comando que hace lo que necesitamos (enviar un email). Este ejemplo es fácil porque existe un comando predefinido en Pandora FMS para enviar mails. Asi que ya lo tenemos.<br><br>
+Para esto, lo primero que debemos hacer es asegurarnos de que existe un comando que hace lo que necesitamos (enviar un email). Este ejemplo es fácil porque existe un comando predefinido en <?php echo get_product_name();?> para enviar mails. Asi que ya lo tenemos.<br><br>
 <b>Configurando la acción</b><br><br>
 
 Ahora tenemos que crear una acción que sea "Enviar un email al operador". Vamos a ello: Vamos al menu de administracion -> Alertas -> Acciones y le damos al botón para crear una nueva acción:<br><br>
 
 <?php html_print_image ("images/help/alert08.png", false, array('width' => '550px')); ?>
 <br>
-Esta acción utiliza el comando "Enviar email", y es realmente sencillo, ya que sólo relleno un campo (Field 1) dejando los otros dos vacíos. Esta es una de las partes más confusas del sistema de alertas de Pandora FMS: ¿Qué son los campos field1, field2, y field3?.<br><br>
+Esta acción utiliza el comando "Enviar email", y es realmente sencillo, ya que sólo relleno un campo (Field 1) dejando los otros dos vacíos. Esta es una de las partes más confusas del sistema de alertas de <?php echo get_product_name();?>: ¿Qué son los campos field1, field2, y field3?.<br><br>
 
 Esos campos son los que se usan para "pasar" la información de la plantilla de alerta al comando, y a su vez, de éste al comando. De forma que tanto Plantilla como Comando, puedan aportar diferente información al comando. En este caso el comando sólo establece el campo 1, y dejaremos el campo 2 y el campo 3 a la plantilla, como veremos a continuación.<br><br>
 
@@ -120,18 +120,18 @@ Los parámetros más críticos aquí son los siguientes:<br><br>
 
     <i>Time threshold:</i> Por defecto es un día. Si un módulo permanece todo el rato caído, durante, por ejemplo un día, y tenemos aquí un valor de 5 minutos, significa que nos estaría mandando alertas cada 5 minutos. Si lo dejamos en un día (24 horas), sólo nos enviará la alerta una vez, cuando se caiga. Si el modulo se recupera, y luego se vuelve a caer, nos enviará una alerta de nuevo, pero si sigue caída desde la 2º caida, no enviará mas alertas hasta dentro de 24 horas. <br><br>
 
-    <i>Min. Número de alertas:</i> El nº mínimo de veces que se tendrá que dar la condición (en este caso, que el modulo esté en estado CRITICAL) antes de que Pandora FMS me ejecute las acciones asociadas a la plantilla de alerta. Es una forma de evitar que falsos positivos me "inunden" a alertas, o que un comportamiento errático (ahora bien, ahora mal) haga que se disparen muchas alertas. Si ponemos aquí 1, significa que hasta que no ocurra al menos una vez, no lo tendré en cuenta. Si pongo 0, la primera vez que el modulo esté mal, disparará la alerta. <br><br>
+    <i>Min. Número de alertas:</i> El nº mínimo de veces que se tendrá que dar la condición (en este caso, que el modulo esté en estado CRITICAL) antes de que <?php echo get_product_name();?> me ejecute las acciones asociadas a la plantilla de alerta. Es una forma de evitar que falsos positivos me "inunden" a alertas, o que un comportamiento errático (ahora bien, ahora mal) haga que se disparen muchas alertas. Si ponemos aquí 1, significa que hasta que no ocurra al menos una vez, no lo tendré en cuenta. Si pongo 0, la primera vez que el modulo esté mal, disparará la alerta. <br><br>
 
     <i>Max. Numero de alertas:</i> 1 significa que sólo ejecutará la acción una vez. Si tenemos aquí 10, ejecutará 10 veces la acción. Es una forma de limitar el número de veces que una alerta se puede ejecutar. <br><br>
 
 De nuevo volvemos a ver los campos: "campo1, campo2 y campo3". Ahora podemos ver que el campo1 está en blanco, que es justamente el que hemos definido al configurar la acción. El campo2 y el campo3 se usan en la acción de enviar un mail para definir el subject y el texto del mensaje, mientras que el campo1 se usa para definir el o los destinatarios (separados por comas). Asi que la plantilla, usando algunas macros, está definiendo el subject y el mensaje de alerta de forma que en nuestro caso nos llegaría un mensaje como el que sigue (suponiendo que el agente donde está el modulo se llama "Farscape":<br><br>
 
 <i>To: sancho.lerena@notexist.ocm<br>
-Subject: [PANDORA] Farscape cpu_sys is in CRITICAL status with value 20<br>
+Subject: [MONITORING] Farscape cpu_sys is in CRITICAL status with value 20<br>
 Texto email:<br><br>
 
-This is an automated alert generated by Pandora FMS<br>
-Please contact your Pandora FMS for more information. *DO NOT* reply this email.<br></i><br>
+This is an automated alert generated by <?php echo get_product_name();?><br>
+Please contact your <?php echo get_product_name();?> for more information. *DO NOT* reply this email.<br></i><br>
 
 Dado que la acción por defecto es la que he definido previamente, todas las alertas que usen esta plantilla, usarán esa acción predeterminada por defecto, a no ser que la modifique.<br><br>
 
@@ -169,7 +169,7 @@ Las alertas pueden estar activadas, desactivadas o en standby. La diferencia ent
 Las alertas en standby son útiles para poder visualizarlas sin que molesten en otros aspectos.<br><br>
 <b>Utilizando comandos de alertas distintos del email</b><br><br>
 
-El email, como comando es interno a Pandora FMS y no se puede configurar, es decir, field1, field2 y field3 son campos que están definidos que se usan como destinatario, subject y texto del mensaje. Pero, ¿que ocurre si yo quiero ejecutar una acción diferente, definida por mi?.<br><br>
+El email, como comando es interno a <?php echo get_product_name();?> y no se puede configurar, es decir, field1, field2 y field3 son campos que están definidos que se usan como destinatario, subject y texto del mensaje. Pero, ¿que ocurre si yo quiero ejecutar una acción diferente, definida por mi?.<br><br>
 
 Vamos a definir un nuevo comando, algo totalmente definido por nosotros. Imaginemos que queremos generar un fichero log con cada alerta que encontremos. El formato de ese fichero log tiene que ser algo como:<br><br>
 
@@ -189,8 +189,8 @@ Si vemos el fichero de log que hemos creado:<br><br>
 
 <i>2010-05-25 18:17:10 - farscape - cpu_sys - 23.00 - Custom alert for LOG#1</i><br><br>
 
-La alerta se disparó a las 18:17:10 en el agente "farscape", en el modulo "cpu_sys" con un dato de "23.00" y con la descripcion que pusimos al definir la acción.<br><br>
+La alerta se disparó a las 18:17:10 en el agente "farscape", en el modulo "cpu_sys" con un dato de "23.00" y con la descripción que pusimos al definir la acción.<br><br>
 
-Dado que la ejecución del comando, el orden de los campos y otros asuntos pueden hacer que no entendamos bien cómo se ejecuta al final el comando, lo más sencillo es activar las trazas de debug del servidor de pandora (verbose 10) en el fichero de configuracion de pandora server en /etc/pandora/pandora_server.conf, reiniciemos el servidor (/etc/init.d/pandora_server restart) y que miremos el fichero /var/log/pandora/pandora_server.log buscando la línea exacta con la ejecución del comando de la alerta que hemos definido, para ver como el servidor de Pandora FMS está lanzando el comando. <br><br>
+Dado que la ejecución del comando, el orden de los campos y otros asuntos pueden hacer que no entendamos bien cómo se ejecuta al final el comando, lo más sencillo es activar las trazas de debug del servidor de <?php echo get_product_name();?> (verbose 10) en el fichero de configuración de <?php echo get_product_name();?> server en /etc/pandora/pandora_server.conf, reiniciemos el servidor (/etc/init.d/pandora_server restart) y que miremos el fichero /var/log/pandora/pandora_server.log buscando la línea exacta con la ejecución del comando de la alerta que hemos definido, para ver como el servidor de <?php echo get_product_name();?> está lanzando el comando. <br><br>
 
 
diff --git a/pandora_console/include/help/es/help_cascade_protection.php b/pandora_console/include/help/es/help_cascade_protection.php
index fd28217a69..56b4b06955 100644
--- a/pandora_console/include/help/es/help_cascade_protection.php
+++ b/pandora_console/include/help/es/help_cascade_protection.php
@@ -8,7 +8,7 @@
 </div>
 <br>
 <p>
-Esta opción se designa para evitar una "tormenta" de alertas que entren porque un grupo de agentes son inalcanzables. Este tipo de comportamiento ocurre cuando un dispositivo intermedio, como por ejemplo un router, está caido, y todos los dispositivos que están tras él no se pueden alcanzar. Probablemente estos dispositivos no estén caídos e incluso estos dispositivos estén trabajando junto con otro router, en modo HA. Pero si no hace nada, probablemente Pandora FMS piense que estén caídos porque no los pueden testar con un Remote ICMP Proc Test (un ping).
+Esta opción se designa para evitar una "tormenta" de alertas que entren porque un grupo de agentes son inalcanzables. Este tipo de comportamiento ocurre cuando un dispositivo intermedio, como por ejemplo un router, está caido, y todos los dispositivos que están tras él no se pueden alcanzar. Probablemente estos dispositivos no estén caídos e incluso estos dispositivos estén trabajando junto con otro router, en modo HA. Pero si no hace nada, probablemente <?php echo get_product_name();?> piense que estén caídos porque no los pueden testar con un Remote ICMP Proc Test (un ping).
 <br><br>
 Cuando habilite  <i>cascade protection</i> en un agente, esto significa que si cualquiera de sus padres tiene una alerta CRÍTICA disparada, entonces las alertas del agente <strong>NO SERÁN</strong> disparadas. Si el padre del agente tiene un módulo en CRITICAL o varias alertas con menor criticidad que CRITICAL, las alertas del agente serán disparadas si deben hacerlo. La protección en cascada comprueba las alertas padre con criticidad CRITICAL, incluyendo las alertas de correlación asignadas al padre.
 <br><br>
@@ -23,7 +23,7 @@ Si quiere usar un sistema avanzado de protección en cascada, sólo tiene que us
 </div>
 <br>
 <p>
-Esta opción se designa para evitar una "tormenta" de alertas que entren porque un grupo de agentes son inalcanzables. Este tipo de comportamiento ocurre cuando un dispositivo intermedio, como por ejemplo un router, está caido, y todos los dispositivos que están tras él no se pueden alcanzar. Probablemente estos dispositivos no estén caídos e incluso estos dispositivos estén trabajando junto con otro router, en modo HA. Pero si no hace nada, probablemente Pandora FMS piense que estén caídos porque no los pueden testar con un Remote ICMP Proc Test (un ping).
+Esta opción se designa para evitar una "tormenta" de alertas que entren porque un grupo de agentes son inalcanzables. Este tipo de comportamiento ocurre cuando un dispositivo intermedio, como por ejemplo un router, está caido, y todos los dispositivos que están tras él no se pueden alcanzar. Probablemente estos dispositivos no estén caídos e incluso estos dispositivos estén trabajando junto con otro router, en modo HA. Pero si no hace nada, probablemente <?php echo get_product_name();?> piense que estén caídos porque no los pueden testar con un Remote ICMP Proc Test (un ping).
 <br><br>
 Cuando habilite  <i>cascade protection</i> en un módulo de un agente, esto significa que si este módulo del agente padre tiene una alerta CRÍTICA disparada, entonces las alertas del agente <strong>NO SERÁN</strong> disparadas.
 <br><br>
diff --git a/pandora_console/include/help/es/help_categories.php b/pandora_console/include/help/es/help_categories.php
index 9a79bac481..1fbccc8961 100644
--- a/pandora_console/include/help/es/help_categories.php
+++ b/pandora_console/include/help/es/help_categories.php
@@ -3,8 +3,8 @@
  * @package Include/help/es
  */
 ?>
-<h1>Categorias en Pandora FMS</h1>
+<h1>Categorías en <?php echo get_product_name();?></h1>
 
 Se pueden configurar unas categorias en el sistema, se asignan a los módulos que se quiera. <br>
-El único usuario que tiene permisos para realizar la creación y configuración de categorias es el administrador y se pueden utilizar para la tarificación de modulos dependiendo de la categoria a la que pertenezcan.
+El único usuario que tiene permisos para realizar la creación y configuración de categorias es el administrador y se pueden utilizar para la tarificación de modulos dependiendo de la categoría a la que pertenezcan.
 
diff --git a/pandora_console/include/help/es/help_collection_tab.php b/pandora_console/include/help/es/help_collection_tab.php
index 13a777fd0a..927840f8f9 100644
--- a/pandora_console/include/help/es/help_collection_tab.php
+++ b/pandora_console/include/help/es/help_collection_tab.php
@@ -5,5 +5,5 @@
 
 <h1>Colecciones del agente</h1>
 
-<p>Una coleccion es un grupo de ficheros (ejecutables o scripts) que son copiados a la maquina del agente en un diretorio especifico. Con esto se puede transferir remotamente software a la maquina del agente de una manera sencilla.</p>
+<p>Una colección es un grupo de ficheros (ejecutables o scripts) que son copiados a la maquina del agente en un diretorio específico. Con esto se puede transferir remotamente software a la máquina del agente de una manera sencilla.</p>
 
diff --git a/pandora_console/include/help/es/help_collections.php b/pandora_console/include/help/es/help_collections.php
index 3e92887370..1972edecc3 100644
--- a/pandora_console/include/help/es/help_collections.php
+++ b/pandora_console/include/help/es/help_collections.php
@@ -3,9 +3,7 @@
 */
 ?>
 
-<h3>Collections</h3>
+<h1>Colecciones del agente</h1>
 
-<p>
-A collection is group of files (executables or scripts) that are copied to a specific agent directory. With this you can transfer remotely software to agent's machine in a easy way.
-</p>
+<p>Una colección es un grupo de ficheros (ejecutables o scripts) que son copiados a la maquina del agente en un diretorio específico. Con esto se puede transferir remotamente software a la máquina del agente de una manera sencilla.</p>
 
diff --git a/pandora_console/include/help/es/help_component_groups.php b/pandora_console/include/help/es/help_component_groups.php
index a2df1528f7..ea513907a4 100644
--- a/pandora_console/include/help/es/help_component_groups.php
+++ b/pandora_console/include/help/es/help_component_groups.php
@@ -6,5 +6,5 @@
 
 <h1>Grupos de componentes</h1>
 
-<p>Un componente es un modulo generico que puede aplicarse a agentes de forma repetida como si fuera una plantilla. Con esta vista puedes crear grupos para estos componentes.</p>
+<p>Un componente es un módulo genérico que puede aplicarse a agentes de forma repetida como si fuera una plantilla. Con esta vista puedes crear grupos para estos componentes.</p>
 
diff --git a/pandora_console/include/help/es/help_configure_gis_map.php b/pandora_console/include/help/es/help_configure_gis_map.php
index 0cb1e2558a..3b7bca232d 100644
--- a/pandora_console/include/help/es/help_configure_gis_map.php
+++ b/pandora_console/include/help/es/help_configure_gis_map.php
@@ -10,7 +10,7 @@ Esta página es el lugar para configurar un Mapa GIS.
 </p>
 <h2>Nombre del Mapa</h2>
 <p>
-Cada mapa tiene un nombre descriptivo que se utiliza para reconocer el mapa dentro de Pandora FMS.
+Cada mapa tiene un nombre descriptivo que se utiliza para reconocer el mapa dentro de <?php echo get_product_name();?>.
 
 </p>
 <h2>Seleccionar Conexiones</h2>
@@ -19,7 +19,7 @@ El primer paso es seleccionar la principal <strong>conexión </strong> empleada
 
 </p>
 <p>
-Cuando se configura la primera conexión, Pandora FMS te pregunta si quiere utilizar los valores por defecto de la conexión para el mapa, para evitar tener que escribir de nuevo toda la información. También, si la conexión por defecto del mapa se ha cambiado (utilizando el radio button), Pandora FMS te preguntará de nuevo si quiere usar los valores de la nueva conexión por defecto.
+Cuando se configura la primera conexión, <?php echo get_product_name();?> te pregunta si quiere utilizar los valores por defecto de la conexión para el mapa, para evitar tener que escribir de nuevo toda la información. También, si la conexión por defecto del mapa se ha cambiado (utilizando el radio button), <?php echo get_product_name();?> te preguntará de nuevo si quiere usar los valores de la nueva conexión por defecto.
 
 </p>
 <h2>Parámetros del Mapa</h2>
diff --git a/pandora_console/include/help/es/help_create_agent.php b/pandora_console/include/help/es/help_create_agent.php
index ec61c2f816..affd3d884a 100644
--- a/pandora_console/include/help/es/help_create_agent.php
+++ b/pandora_console/include/help/es/help_create_agent.php
@@ -12,5 +12,5 @@ Para crear un Agente, debes rellenar este formulario. Por favor rellena todos lo
 "Interval" se refiere al intervalo de ejecución del agente. El intervalo es cada cuanto el agente envía datos al servidor.
 </p>
 <p>
-"Server" se refiere al Servidor de Pandora que leerá los datos enviados por el agente.
+"Server" se refiere al Servidor de <?php echo get_product_name();?> que leerá los datos enviados por el agente.
 </p>
diff --git a/pandora_console/include/help/es/help_cron.php b/pandora_console/include/help/es/help_cron.php
index 2902c81928..5f911a8348 100644
--- a/pandora_console/include/help/es/help_cron.php
+++ b/pandora_console/include/help/es/help_cron.php
@@ -9,7 +9,7 @@ Mediante los grupos de parámetros de configuración <b>Cron desde</b> y <b>Cron
 puede hacer que un módulo solo se ejecute durante ciertos periodos de tiempo. El 
 modo en el que se configura es parecido a la sintaxis de 
 <a style="font-size:14px;" href="https://es.wikipedia.org/wiki/Cron_(Unix)">cron</a>. 
-Tal y como aparecen en la consola de Pandora, cada uno de los parámetros 
+Tal y como aparecen en la consola de <?php echo get_product_name();?>, cada uno de los parámetros 
 tiene tres opciones.
 
 <h4>Cron desde: cualquiera</h4>
diff --git a/pandora_console/include/help/es/help_custom_logo.php b/pandora_console/include/help/es/help_custom_logo.php
index 02edf9c72f..a1b26d4eed 100644
--- a/pandora_console/include/help/es/help_custom_logo.php
+++ b/pandora_console/include/help/es/help_custom_logo.php
@@ -5,7 +5,7 @@
 ?>
 <h1> Logo de Cliente (Marca comunitaria de empresa)</h1>
 
-Esta opción se utiliza para poder desplegar su propio logo en la cabecera de Pandora FMS. Puede utilizar cualquier tipo de gráfica en formato PNG. Hay una ancho/alto para cualquier imagen desplegada aquí de 206x47 píxeles.
+Esta opción se utiliza para poder desplegar su propio logo en la cabecera de <?php echo get_product_name();?>. Puede utilizar cualquier tipo de gráfica en formato PNG. Hay una ancho/alto para cualquier imagen desplegada aquí de 206x47 píxeles.
 
 <br><br>
 
diff --git a/pandora_console/include/help/es/help_event_alert.php b/pandora_console/include/help/es/help_event_alert.php
index ba15a109bb..537deb47c7 100644
--- a/pandora_console/include/help/es/help_event_alert.php
+++ b/pandora_console/include/help/es/help_event_alert.php
@@ -6,7 +6,7 @@
 
 <h1>Alerta de evento</h1>
 
-Desde la versión 4.0 de Pandora FMS se pueden definir alertas sobre los eventos, lo que permite trabajar desde una perspectiva completamente nueva y mucho más flexible. Esta es una característica Enterprise.<br><br>
+Desde la versión 4.0 de <?php echo get_product_name();?> se pueden definir alertas sobre los eventos, lo que permite trabajar desde una perspectiva completamente nueva y mucho más flexible. Esta es una característica Enterprise.<br><br>
 
 Las Alertas de evento nuevas se crean pinchando en el botón Create en el menú Event alerts en el menú de Administración.
 <br><br>
@@ -59,6 +59,6 @@ Por ejemplo, podríamos configurar una regla que case con los eventos generados
 <?php html_print_image ("images/help/event04.png", false, array('width' => '550px')); ?>
 
 <br>
-<p>Dado el elevado número de eventos que puede llegar a albergar la base de datos de Pandora FMS, el servidor trabaja sobre una ventana de eventos que se define en el fichero de configuración pandora_server.conf mediante el parámetro event_window. Los eventos que se hayan generado fuera de esta ventana de tiempo no serán procesados por el servidor, de modo que no tiene sentido especificar en una regla una ventana de tiempo superior a la configurada en el servidor </p>
+<p>Dado el elevado número de eventos que puede llegar a albergar la base de datos de <?php echo get_product_name();?>, el servidor trabaja sobre una ventana de eventos que se define en el fichero de configuración pandora_server.conf mediante el parámetro event_window. Los eventos que se hayan generado fuera de esta ventana de tiempo no serán procesados por el servidor, de modo que no tiene sentido especificar en una regla una ventana de tiempo superior a la configurada en el servidor </p>
 
 
diff --git a/pandora_console/include/help/es/help_events_history.php b/pandora_console/include/help/es/help_events_history.php
index 4fcf418698..261e4c1622 100644
--- a/pandora_console/include/help/es/help_events_history.php
+++ b/pandora_console/include/help/es/help_events_history.php
@@ -3,7 +3,7 @@
 */
 ?>
 
-<p> Cuando el histórico de eventos está activado, el script de purgado (pandora_db.pl) copiará los eventos no validados o en proceso (solo los nuevos) a la tabla de histórico antes de eliminarlos.
+<p> Cuando el histórico de eventos está activado, el script de purgado (DB Tool) copiará los eventos no validados o en proceso (solo los nuevos) a la tabla de histórico antes de eliminarlos.
 <br><br>Estos eventos pueden ser consultados en la vista de eventos históricos. Esta vista es accesible desde una nueva pestaña en la sección de eventos.
 </p>
 
diff --git a/pandora_console/include/help/es/help_export_server.php b/pandora_console/include/help/es/help_export_server.php
index 48307a77ef..041d8d926c 100644
--- a/pandora_console/include/help/es/help_export_server.php
+++ b/pandora_console/include/help/es/help_export_server.php
@@ -3,17 +3,17 @@
  * @package Include/help/es
  */
 ?>
-<h1>Servidor de exportacion</h1>
+<h1>Servidor de exportación</h1>
 
-<p>La version Enterprise de Pandora FMS implementa, mediante el export server, un mecanismo de escalado de datos que permite virtualmente una implantacion distribuida capaz de monitorizar un numero ilimitado de informacion, siempre que se diseñe adecuadamente y se disgregue en diferentes perfiles de informacion.</p>
+<p>La versión Enterprise de <?php echo get_product_name();?> implementa, mediante el export server, un mecanismo de escalado de datos que permite virtualmente una implantación distribuida capaz de monitorizar un número ilimitado de información, siempre que se diseñe adecuadamente y se disgregue en diferentes perfiles de información.</p>
 
 <ul>
-<li type="circle">Nombre: El nombre del servidor de Pandora FMS.</li>
+<li type="circle">Nombre: El nombre del servidor de <?php echo get_product_name();?>.</li>
 <li type="circle">Servidor de exportacion: Combo donde se elige la instancia del servidor de export server que se usara para exporta los datos.</li>
-<li type="circle">Prefijo: Prefijo que se usa para a&ntilde;adir al nombre del agente que envia los datos. Cuando se reenvian datos de un agente llamado &#34;Farscape&#34;, por ejemplo y su prefijo en el servidor de exportacion es &#34;EU01&#34;, los datos del agente reenviado seran vistos en el servidor de destino con el nombre de agente EU01-Farscape.</li>
+<li type="circle">Prefijo: Prefijo que se usa para a&ntilde;adir al nombre del agente que envía los datos. Cuando se reenvían datos de un agente llamado &#34;Farscape&#34;, por ejemplo y su prefijo en el servidor de exportación es &#34;EU01&#34;, los datos del agente reenviado seran vistos en el servidor de destino con el nombre de agente EU01-Farscape.</li>
 <li type="circle">Interval: Se define el intervalo de tiempo cada cuantos segundos se quieren enviar los datos que haya pendientes.</li> 
 <li type="circle">Directorio destino: Sera el directorio de destino (usado para SSH o FTP unicamente) donde dejara los datos remotamente.</li>
-<li type="circle">Direccion: Dirección del servidor de datos que va a recibir los datos.</li>
+<li type="circle">Dirección: Dirección del servidor de datos que va a recibir los datos.</li>
 <li type="circle">Modo de transferencia: Modo de transferencia. Puedes elegir entre: Local, SSH, FTP y Tentacle.</li>
 <li type="circle">Usuario: Usuario de FTP.</li>
 <li type="circle">Password: Password  de usuario FTP.</li>
diff --git a/pandora_console/include/help/es/help_ff_threshold.php b/pandora_console/include/help/es/help_ff_threshold.php
index 7bea60ade0..abf00b7e28 100644
--- a/pandora_console/include/help/es/help_ff_threshold.php
+++ b/pandora_console/include/help/es/help_ff_threshold.php
@@ -8,7 +8,7 @@
 <br> 
 <br>
 
-El umbral del parámetro FF (FF=FlipFLoP) se utiliza para "filtrar" los continuos cambios de estado en la creación de eventos/estados, para que pueda indicar a Pandora FMS que hasta que un elemento no esté al menos x veces en el mismo estado después de cambiar desde su estado original, no considere que haya cambiado.
+El umbral del parámetro FF (FF=FlipFLoP) se utiliza para "filtrar" los continuos cambios de estado en la creación de eventos/estados, para que pueda indicar a <?php echo get_product_name();?> que hasta que un elemento no esté al menos x veces en el mismo estado después de cambiar desde su estado original, no considere que haya cambiado.
 
 <br><br>
 
@@ -27,7 +27,7 @@ Tomemos como ejemplo clásico: un ping para un host donde hay pérdida de paquet
 </pre>
 <br>
 
-Sin embargo, el host está vivo en todos los casos. Lo que queremos realmente es decirle a Pandora que hasta que es host no lo diga usted está al menos tres veces caído, no lo marque así, con lo que en el caso anterior no estaría caído, y sólo en este caso sería:
+Sin embargo, el host está vivo en todos los casos. Lo que queremos realmente es decirle a <?php echo get_product_name();?> que hasta que es host no lo diga usted está al menos tres veces caído, no lo marque así, con lo que en el caso anterior no estaría caído, y sólo en este caso sería:
 
 <pre>
  1  
diff --git a/pandora_console/include/help/es/help_gis_map_builder.php b/pandora_console/include/help/es/help_gis_map_builder.php
index 7b9156109c..3e303be97a 100644
--- a/pandora_console/include/help/es/help_gis_map_builder.php
+++ b/pandora_console/include/help/es/help_gis_map_builder.php
@@ -7,11 +7,11 @@
 
 <p>
 
-Esta página muestra una lista de los mapas definidos, y le permite editar, borrar o ver cualquiera de ellos. También está instalado en está página el <strong>mapa por defecto</strong> de Pandora FMS.
+Esta página muestra una lista de los mapas definidos, y le permite editar, borrar o ver cualquiera de ellos. También está instalado en está página el <strong>mapa por defecto</strong> de <?php echo get_product_name();?>.
 
 </p>
 
-Para crear una conexión de mapa se necesita una conexión a un servidor de mapas. Las conexiones las crea el Administrador en el menú<strong>Setup</strong>
+Para crear una conexión de mapa se necesita una conexión a un servidor de mapas. Las conexiones las crea el Administrador en el menú <strong>Setup</strong>
 
 <p>
 </p>
diff --git a/pandora_console/include/help/es/help_gis_setup_map_connection.php b/pandora_console/include/help/es/help_gis_setup_map_connection.php
index 1fb89be501..b7813269d9 100644
--- a/pandora_console/include/help/es/help_gis_setup_map_connection.php
+++ b/pandora_console/include/help/es/help_gis_setup_map_connection.php
@@ -11,7 +11,7 @@ En esta sección, es donde el administrador puede configurar <strong>una conexi
 
 <h2>Tipos de conexión</h2>
 <p>
-Ahora mismo, Pandora FMS soporta tres tipos de conexiones:
+Ahora mismo, <?php echo get_product_name();?> soporta tres tipos de conexiones:
 OpenStreetMap, Google Maps e imágenes estáticas.
 </p>
 <h3>Open Street Maps</h3>
diff --git a/pandora_console/include/help/es/help_graph_builder.php b/pandora_console/include/help/es/help_graph_builder.php
index 02c0b31154..659e564ff5 100644
--- a/pandora_console/include/help/es/help_graph_builder.php
+++ b/pandora_console/include/help/es/help_graph_builder.php
@@ -4,7 +4,7 @@
 */
 ?>
 
-<h1>Editor graficos</h1>
+<h1>Editor gráficos</h1>
 
-<p>Permite crear nuevas graficas y editar los antiguos. En esta vista se pueden configurar los parametros generales de las graficas.</p>
+<p>Permite crear nuevas gráficas y editar los antiguos. En esta vista se pueden configurar los parametros generales de las gráficas.</p>
 
diff --git a/pandora_console/include/help/es/help_graph_editor.php b/pandora_console/include/help/es/help_graph_editor.php
index 73c4595504..68773cd925 100644
--- a/pandora_console/include/help/es/help_graph_editor.php
+++ b/pandora_console/include/help/es/help_graph_editor.php
@@ -6,5 +6,5 @@
 
 <h1>Editor de items</h1>
 
-<p>Esta vista permite a&ntile;ade modulos a graficos. Puedes a&ntilde;adir mas de un modulo para crear graficos combinados. Los graficos combinados permiten definir el peso de las variables, tendran valores de diferentes modulos que seran de uno a mas agentes. De esta forma se puede comparar visualmente informacion que venga de diferentes fuentes.</p>
+<p>Esta vista permite a&ntile;ade módulos a gráficos. Puedes a&ntilde;adir más de un módulo para crear gráficos combinados. Los gráficos combinados permiten definir el peso de las variables, tendrán valores de diferentes módulos que serán de uno a mas agentes. De esta forma se puede comparar visualmente información que venga de diferentes fuentes.</p>
 
diff --git a/pandora_console/include/help/es/help_graph_view.php b/pandora_console/include/help/es/help_graph_view.php
index 731ef82f5c..abfe0b705d 100644
--- a/pandora_console/include/help/es/help_graph_view.php
+++ b/pandora_console/include/help/es/help_graph_view.php
@@ -6,4 +6,4 @@
 
 <h1>Vista de graficas</h1>
 
-<p>En esta vista se muestra la visualizacion de graficas. Se puede filtrar por fecha, periodo y el factor de zoom.</p>
+<p>En esta vista se muestra la visualizacion de gráficas. Se puede filtrar por fecha, periodo y el factor de zoom.</p>
diff --git a/pandora_console/include/help/es/help_graphs.php b/pandora_console/include/help/es/help_graphs.php
index 2f98d43ccf..af3f7ed9e9 100644
--- a/pandora_console/include/help/es/help_graphs.php
+++ b/pandora_console/include/help/es/help_graphs.php
@@ -48,11 +48,11 @@ div.img_title {
 </style>
 
 <body class="hlp_graphs">
-<h1>Interpretar las gr&aacute;ficas en Pandora FMS</h1>
+<h1>Interpretar las gr&aacute;ficas en <?php echo get_product_name();?></h1>
 
 
-<p>Las gr&aacute;ficas en Pandora representan los valores que un m&oacute;dulo ha tenido a lo largo de un período.</p>
-<p>Debido a la gran cantidad de datos que Pandora FMS almacena, se ofrecen dos tipos diferentes de funcionalidad:</p>
+<p>Las gr&aacute;ficas en <?php echo get_product_name();?> representan los valores que un m&oacute;dulo ha tenido a lo largo de un período.</p>
+<p>Debido a la gran cantidad de datos que <?php echo get_product_name();?> almacena, se ofrecen dos tipos diferentes de funcionalidad:</p>
 
 
 <h2>Gr&aacute;ficas Normales</h2>
@@ -98,7 +98,7 @@ div.img_title {
 <dd>Muestra puntos indicadores con la informaci&oacute;n de alertas disparadas en la parte superior.</dd>
 
 <dt>Mostrar percentil</dt>
-<dd>Agrega una gr&aacute;fica que indica la l&iacute;nea del percentil (configurable en opciones visuales generales de Pandora).</dd>
+<dd>Agrega una gr&aacute;fica que indica la l&iacute;nea del percentil (configurable en opciones visuales generales de <?php echo get_product_name();?>).</dd>
 
 <dt>Comparaci&oacute;n de tiempo (superpuesto)</dt>
 <dd>Muestra superpuesta la misma gr&aacute;fica, pero en el per&iacute;odo anterior al seleccionado. Por ejemplo, si solicitamos un per&iacute;odo de una semana y activamos esta opci&oacute;n, la semana anterior a la elegida tambi&eacute;n se mostrar&aacute; superpuesta.</dd>
@@ -107,7 +107,7 @@ div.img_title {
 <dd>Muestra la misma gr&aacute;fica, pero en el per&iacute;odo anterior al seleccionado, en un area independiente. Por ejemplo, si solicitamos un per&iacute;odo de una semana y activamos esta opci&oacute;n, la semana anterior a la elegida tambi&eacute;n se mostrar&aacute;.</dd>
 
 <dt>Mostrar gr&aacute;fica de desconocidos</dt>
-<dd>Muestra cajas en sombreado gris cubriendo los per&iacute;odos en que Pandora FMS no puede garantizar el estado del m&oacute;dulo, ya sea por p&eacute;rdida de datos, desconexi&oacute;n de un agente software, etc.</dd>
+<dd>Muestra cajas en sombreado gris cubriendo los per&iacute;odos en que <?php echo get_product_name();?> no puede garantizar el estado del m&oacute;dulo, ya sea por p&eacute;rdida de datos, desconexi&oacute;n de un agente software, etc.</dd>
 
 <dt>Mostrar gr&aacute;fica de escala completa (TIP)</dt>
 <dd>Cambia el modo de pintado de "normal" a "TIP". En este modo, las gr&aacute;ficas mostrar&aacute;n datos reales en vez de aproximaciones, por lo que el tiempo que emplear&aacute;n para su generaci&oacute;n ser&aacute; mayor. Podr&aacute; encontrar informaci&oacute;n m&aacute;s detallada de este tipo de gr&aacute;ficas en el siguiente apartado.</dd>
diff --git a/pandora_console/include/help/es/help_history_database.php b/pandora_console/include/help/es/help_history_database.php
index 4a4448282c..6741a9e3a1 100644
--- a/pandora_console/include/help/es/help_history_database.php
+++ b/pandora_console/include/help/es/help_history_database.php
@@ -5,7 +5,7 @@
 ?>
 <h1>Base de datos de histórico</h1>
 
-Una base de datos de histórico es una base de datos a la que se mueven datos antiguos de módulos para mejorar la respuesta de la base de datos principal de Pandora FMS. Estos datos seguirán estando disponibles para la consola de Pandora FMS de forma transparente al ver informes, gráficas de módulos etc. 
+Una base de datos de histórico es una base de datos a la que se mueven datos antiguos de módulos para mejorar la respuesta de la base de datos principal de <?php echo get_product_name();?>. Estos datos seguirán estando disponibles para la consola de <?php echo get_product_name();?> de forma transparente al ver informes, gráficas de módulos etc. 
 <br><br>
 <b>CONFIGURANDO UNA BASE DE DATOS DE HISTÓRICO</b>
 <br><br>
@@ -14,15 +14,15 @@ Para configurar una base de datos de histórico siga los siguientes pasos:
 <ol>
 <li>Cree la nueva base de datos de histórico.  
 <br><br>
-<li>Cree las tablas necesarias en la nueva base de datos. Puede utilizar el script pandoradb.sql incluido en la consola de Pandora FMS:  
+<li>Cree las tablas necesarias en la nueva base de datos. Puede utilizar el script DB Tool incluido en la consola de <?php echo get_product_name();?>:  
 <br><br>
 <i>cat pandoradb.sql | mysql -u user -p -D history_db</i>
 <br><br>
-<li>Dar los permisos necesarios para que el usuario de pandora tenga acceso a la base de datos de histórico
+<li>Dar los permisos necesarios para que el usuario de <?php echo get_product_name();?> tenga acceso a la base de datos de histórico
 <br><br>
 <i>Mysql Example: GRANT ALL PRIVILEGES ON pandora.* TO 'pandora'@'IP' IDENTIFIED BY 'password'</i>
 <br><br>
-<li>En la consola de Pandora FMS vaya a Setup->History database y configure el host, port, database name, user y password de la nueva base de datos.
+<li>En la consola de <?php echo get_product_name();?> vaya a Setup->History database y configure el host, port, database name, user y password de la nueva base de datos.
 </ol>
 <br><br>
 <?php html_print_image ("images/help/historyddbb.png", false, array('width' => '550px')); ?>
diff --git a/pandora_console/include/help/es/help_ipam.php b/pandora_console/include/help/es/help_ipam.php
index 2cfca4a2c1..afe1647d39 100755
--- a/pandora_console/include/help/es/help_ipam.php
+++ b/pandora_console/include/help/es/help_ipam.php
@@ -73,13 +73,13 @@ Cada dirección tendrá un icono grande que nos aportará información:<br><br>
 Cada dirección tendrá en la parte inferior derecha un enlace para editarla, si disponemos de privilegios suficientes. Así mismo, en la parte inferior izquierda, tendrá un pequeño icono indicando el sistema operativo asociado. 
 En el caso de las direcciones desactivadas, el icono del sistema operativo se verá sustituido por el siguiente icono:<br><br><img src="../images/delete.png" style="width:18px;"><br><br>
 Si hacemos click en el icono principal, se abrirá una ventana modal con toda la información de la IP, incluyendo agente y sistema operativo asociados, configuración y el seguimiento de cuando se creó, editó por el usuario o fue chequeado por el servidor por última vez. En esta vista también se podrá hacer un ping a dicha dirección*.<br><br>
-<b>* El ping se realiza desde la máquina donde esté instalada la consola de Pandora FMS.</b>
+<b>* El ping se realiza desde la máquina donde esté instalada la consola de <?php echo get_product_name();?>.</b>
 
 <h3>Vista de edición</h3>
 Si se tienen los permisos suficientes se podrá acceder a la vista de edición, donde las IPs aparecerán mostradas en forma de lista. Se podrá filtrar para mostrar las direcciones deseadas, hacer cambios 
 en ellas y actualizar todas a la vez.<br><br>
 
-Algunos campos, se rellenan automáticamente por el script de reconocimiento, como el nombre de host, el agente de Pandora FMS asociado y el sistema operativo. Podemos definir estos campos como manuales* y editarlos.<br><br>
+Algunos campos, se rellenan automáticamente por el script de reconocimiento, como el nombre de host, el agente de <?php echo get_product_name();?> asociado y el sistema operativo. Podemos definir estos campos como manuales* y editarlos.<br><br>
 
 <table width=100%>
 <tr>
diff --git a/pandora_console/include/help/es/help_main_help.php b/pandora_console/include/help/es/help_main_help.php
index 29b3fffe65..dfb00e176c 100644
--- a/pandora_console/include/help/es/help_main_help.php
+++ b/pandora_console/include/help/es/help_main_help.php
@@ -3,10 +3,10 @@
  * @package Include/help/en
  */
 ?>
-<h1>Pandora FMS - Índice de la ayuda</h1>
+<h1><?php echo get_product_name();?> - Índice de la ayuda</h1>
 <h3>Introdución</h3>
 <p>
-Esta es la ayuda online para la consola de Pandora FMS. Esta ayuda es -en el mejor de los casos-, simplemente una ayuda contextual breve, no pretende enseñar en detalle como usar Pandora FMS. La documentación oficial de Pandora FMS son 1000 páginas, y probablemente no es necesario leerla entera, pero en cualquier caso, es importante echarle un buen vistazo.
+Esta es la ayuda online para la consola de <?php echo get_product_name();?>. Esta ayuda es -en el mejor de los casos-, simplemente una ayuda contextual breve, no pretende enseñar en detalle como usar <?php echo get_product_name();?>. La documentación oficial de <?php echo get_product_name();?> son 1000 páginas, y probablemente no es necesario leerla entera, pero en cualquier caso, es importante echarle un buen vistazo.
 
 <br><br>
 <a href="http://pandorafms.com/pandora/doc/"><b>Descargue la documentación oficial</b></a>
diff --git a/pandora_console/include/help/es/help_manage_alert_list.php b/pandora_console/include/help/es/help_manage_alert_list.php
index f3b307f3e3..a3071d9408 100644
--- a/pandora_console/include/help/es/help_manage_alert_list.php
+++ b/pandora_console/include/help/es/help_manage_alert_list.php
@@ -6,7 +6,7 @@
 <h1>Alerts</h1>
 
 <p>
-Las Alertas en Pandora FMS reacionan a un valor "fuera de rango" de un módulo. La alerta consiste en enviar un e-mail o un SMS al administrador, enviando un trap SNMP, escribir el indcidenete en el log del sistema en el fichero de log de Pandora FMS, etc. Basicamente, una alerta puede ser cualquier cosa que pueda ser disparada por un script configurado en el Sistema Operativo donde los servidores de Pandora FMS se ejecutan.
+Las Alertas en <?php echo get_product_name();?> reacionan a un valor "fuera de rango" de un módulo. La alerta consiste en enviar un e-mail o un SMS al administrador, enviando un trap SNMP, escribir el indcidenete en el log del sistema en el fichero de log de <?php echo get_product_name();?>, etc. Basicamente, una alerta puede ser cualquier cosa que pueda ser disparada por un script configurado en el Sistema Operativo donde los servidores de <?php echo get_product_name();?> se ejecutan.
 </p>
 
 <p>
diff --git a/pandora_console/include/help/es/help_manage_alerts.php b/pandora_console/include/help/es/help_manage_alerts.php
index f0334cede1..58cebfeff4 100644
--- a/pandora_console/include/help/es/help_manage_alerts.php
+++ b/pandora_console/include/help/es/help_manage_alerts.php
@@ -5,7 +5,7 @@
 ?>
 <h1>Alertas</h1>
 
-Las alertas en Pandora FMS reaccionan ante un valor &laquo;fuera de rango&raquo;. La alerta puede consistir del envío de un correo-e o un SMS al administrador, enviar un trap SNMP, escribir un incidente en el fichero <i>log</i> del sistema o en el <i>log</i> de Pandora FMS, etc. Básicamente, una alerta puede ser cualquier cosa que se pueda dispoarar desde un <i>script</i> configurado en el Sistema Operativo donde Pandora FMS se ejecuta.
+Las alertas en <?php echo get_product_name();?> reaccionan ante un valor &laquo;fuera de rango&raquo;. La alerta puede consistir del envío de un correo-e o un SMS al administrador, enviar un trap SNMP, escribir un incidente en el fichero <i>log</i> del sistema o en el <i>log</i> de <?php echo get_product_name();?>, etc. Básicamente, una alerta puede ser cualquier cosa que se pueda dispoarar desde un <i>script</i> configurado en el Sistema Operativo donde <?php echo get_product_name();?> se ejecuta.
 <br /><br />
 Los valores &laquo;_field1_&raquo;, &laquo;_field2_&raquo; y &laquo;_field3_&raquo; de las alertas personalizadsa se usan para construir el comando de línea que se ejecutará.
 <br /><br />
diff --git a/pandora_console/include/help/es/help_module_tokens.php b/pandora_console/include/help/es/help_module_tokens.php
index 160e48a4c2..e48292734c 100644
--- a/pandora_console/include/help/es/help_module_tokens.php
+++ b/pandora_console/include/help/es/help_module_tokens.php
@@ -241,7 +241,7 @@ module_end<br>
 <br>
 <b>Watchdog de procesos</b>
 <br><br>
-Un Watchdog es un sistema que permite actuar inmediatamente ante la caída de un proceso, generalmente, levantando el proceso que se ha caído. El agente de Windows de Pandora FMS, puede actuar como Watchdog ante la caída de un proceso, a esto le llamamos modo watchdog para procesos:
+Un Watchdog es un sistema que permite actuar inmediatamente ante la caída de un proceso, generalmente, levantando el proceso que se ha caído. El agente de Windows de <?php echo get_product_name();?>, puede actuar como Watchdog ante la caída de un proceso, a esto le llamamos modo watchdog para procesos:
 <br><br>
 Dado que ejecutar un proceso puede requerir algunos parámetros, hay algunas opciones adicionales de configuración para este tipo de módulos. Es importante destacar que el modo watchdog solo funciona cuando el tipo de módulo es asíncrono. Veamos un ejemplo de configuración de un module_proc con watchdog:
 <br><br>
@@ -264,7 +264,7 @@ Esta es la definición de los parámetros adicionales para module_proc con watch
 <br><br>
     <i>module_startdelay:</i> Número de milisegundos que el módulo esperará antes de lanzar el proceso por primera vez. Si el proceso tarda mucho en arrancar, es bueno decirle al agente por medio de este parámetro que "espere" antes de empezar a comprobar de nuevo si el proceso se ha levantado. En este ejemplo espera 3 segundos. 
 <br><br>
-    <i>module_retrydelay:</i> Similar al anterior pero para caídas/reintentos posteriores, después de detectar una caída. Cuando Pandora detecta una caída, relanza el proceso, espera el nº de milisegundos indicados en este parámetro y vuelve a comprobar si el proceso ya esta levantado. 
+    <i>module_retrydelay:</i> Similar al anterior pero para caídas/reintentos posteriores, después de detectar una caída. Cuando <?php echo get_product_name();?> detecta una caída, relanza el proceso, espera el nº de milisegundos indicados en este parámetro y vuelve a comprobar si el proceso ya esta levantado. 
 <br><br>
 <b>module_cpuproc 'process'</b>
 <br><br>
diff --git a/pandora_console/include/help/es/help_network_map_enterprise.php b/pandora_console/include/help/es/help_network_map_enterprise.php
index 70d19af16f..06142c36b2 100644
--- a/pandora_console/include/help/es/help_network_map_enterprise.php
+++ b/pandora_console/include/help/es/help_network_map_enterprise.php
@@ -35,7 +35,7 @@
 
 <h2>Minimapa</h2>
 
-<p>El minimapa nos provee de una vista global que muestra toda la extensión del mapa, pero en una vista mucho mas pequeña, además que frente a la vista del mapa se muestra completamente todos los nodos pero sin estado y sin las relaciones. Excepto el punto ficticio de Pandora que se muestra en verde. Y además se muestra un recuadro rojo de la parte del mapa que se esta mostrando.</p>
+<p>El minimapa nos provee de una vista global que muestra toda la extensión del mapa, pero en una vista mucho mas pequeña, además que frente a la vista del mapa se muestra completamente todos los nodos pero sin estado y sin las relaciones. Excepto el punto ficticio de <?php echo get_product_name();?> que se muestra en verde. Y además se muestra un recuadro rojo de la parte del mapa que se esta mostrando.</p>
 
 <p>Se encuentra en la esquina superior izquierda, y se puede ocultar pulsando en el icono de la flecha.
 </p>
@@ -98,7 +98,7 @@
     <li><b>Tarea de reconocimiento de origen:</b> Nos permite seleccionar la tarea de reconocimiento para generar el mapa.</li>
     <li><b>IP:</b> Nos permite seleccionar la IP generar el mapa (solo generación por máscara ip).</li>
     <li><b>Método de generación del mapa de red:</b> el método de distribución de los nodos que formarán el mapa de red, por defecto es spring2, pero existen los siguientes:</li>
-        <p>- <i>Radial:</i> en el cual todos los nodos se dispondrán alrededor del nodo ficticio que simboliza el Pandora.<br>
+        <p>- <i>Radial:</i> en el cual todos los nodos se dispondrán alrededor del nodo ficticio que simboliza el <?php echo get_product_name();?>.<br>
         - <i>Circular:</i> en el cual se dispondrá los nodos en círculos concentricos.<br>
         - <i>Flat:</i> en el cual se dispondrá los nodos de forma arborescente.<br>
         - <i>spring1, spring2:</i> son variaciones del Flat. <br>
diff --git a/pandora_console/include/help/es/help_performance.php b/pandora_console/include/help/es/help_performance.php
index 7dd0c3977c..c442ed60f5 100644
--- a/pandora_console/include/help/es/help_performance.php
+++ b/pandora_console/include/help/es/help_performance.php
@@ -62,5 +62,5 @@ El gráfico de accesos del agente, renderiza el número de contactos por hora en
 <br><br>
 Campo donde se define el número máximo de días antes de borrar los módulos desconocidos. 
 <br><br>
-<i>**Con todos estos parámetros trabaja la herramienta pandora_db.pl. </i>
+<i>**Con todos estos parámetros trabaja la herramienta DB Tool. </i>
 
diff --git a/pandora_console/include/help/es/help_planned_downtime.php b/pandora_console/include/help/es/help_planned_downtime.php
index 6ab7308ede..dd1d65a5d8 100644
--- a/pandora_console/include/help/es/help_planned_downtime.php
+++ b/pandora_console/include/help/es/help_planned_downtime.php
@@ -12,5 +12,5 @@ Esta herramienta se usa para planear periodos de desconexión de la monitorizaci
 Es muy fácil de configurar, especifique la fecha y hora de inicio de la desconexión programada y la fecha hora del final. Después de rellenar los primeros campos, debe guardar la Desconexión programada y editarla, para establecer los agentes que se van a desconectar. También pued eeditar el resto de campos al editar la Desconexión programada.
 </p>
 <p>
-Cuando una desconexión programada se inicia, Pandora FMS automáticamente desactiva todos los agentes asignados a esa desconexión y no se procesa ningún dato ni alerta. Cuando la desconexión finaliza, Pandora FMS activará todos los agentes asignados a la desconexión.No puede borrar o modificar una instancia de desconexión cuando está activada, debe esperar a que finalice anes de hacer cualquier otra cosa en esa instancia. Por supuesto puede activar manualmente cualquier agente usando el diálogo de configuración del agente.
+Cuando una desconexión programada se inicia, <?php echo get_product_name();?> automáticamente desactiva todos los agentes asignados a esa desconexión y no se procesa ningún dato ni alerta. Cuando la desconexión finaliza, <?php echo get_product_name();?> activará todos los agentes asignados a la desconexión.No puede borrar o modificar una instancia de desconexión cuando está activada, debe esperar a que finalice anes de hacer cualquier otra cosa en esa instancia. Por supuesto puede activar manualmente cualquier agente usando el diálogo de configuración del agente.
 </p>
diff --git a/pandora_console/include/help/es/help_planned_downtime_time.php b/pandora_console/include/help/es/help_planned_downtime_time.php
index cb4af40bfc..c44a49c7ce 100644
--- a/pandora_console/include/help/es/help_planned_downtime_time.php
+++ b/pandora_console/include/help/es/help_planned_downtime_time.php
@@ -9,7 +9,7 @@
 
 <p>
 	El formato de la fecha debe ser año/mes/día y el del tiempo hora:minuto:segundo.
-	Se pueden crear paradas planificadas en fechas pasadas, siempre que el administrador de Pandora FMS no haya deshabilitado esa opción.
+	Se pueden crear paradas planificadas en fechas pasadas, siempre que el administrador de <?php echo get_product_name();?> no haya deshabilitado esa opción.
 </p>
 
 <h2>Ejecución periódica</h2>
diff --git a/pandora_console/include/help/es/help_plugin_definition.php b/pandora_console/include/help/es/help_plugin_definition.php
index 83dde32601..78203ab89b 100644
--- a/pandora_console/include/help/es/help_plugin_definition.php
+++ b/pandora_console/include/help/es/help_plugin_definition.php
@@ -5,9 +5,9 @@
 ?>
 <h1>Registro de complementos</h1>
 
-A diferencia del resto de componentes, de forma predeterminada Pandora FMS no incluye ningún complemento pre-configurado, por lo tanto primero se deberá crear y configurar un complemento, para después añadírselo al módulo de un agente. No obstante Pandora FMS sí incluye complementos en los directorios de instalación, pero como ya se ha dicho no están configurados en la base de datos. 
+A diferencia del resto de componentes, de forma predeterminada <?php echo get_product_name();?> no incluye ningún complemento pre-configurado, por lo tanto primero se deberá crear y configurar un complemento, para después añadírselo al módulo de un agente. No obstante <?php echo get_product_name();?> sí incluye complementos en los directorios de instalación, pero como ya se ha dicho no están configurados en la base de datos. 
 <br><br>
-Para añadir un complemento existente a Pandora FMS, ir a la sección de administración de la consola, y en ella, pulsar sobre Manage servers; después pulsar Manage plugins: 
+Para añadir un complemento existente a <?php echo get_product_name();?>, ir a la sección de administración de la consola, y en ella, pulsar sobre Manage servers; después pulsar Manage plugins: 
 <br><br>
 Una vez en la pantalla de gestión de los complementos, pulsar el botón Create para crear un nuevo complemento, ya que no habrá ninguno.  
 <br><br>
@@ -19,7 +19,7 @@ Rellenar el formulario de creación de complementos con los siguientes datos:
 Nombre del plugin, en este caso Nmap.
 <br><br>
 <b>Plugin type </b><br>
-Hay dos tipos de complementos, los estándar (standard) y los de tipo Nagios. Los complementos estándar son scripts que ejecutan acciones y admiten parámetros. Los complementos de Nagios son, como su nombre indica, complementos de Nagios que se pueden usar en Pandora FMS. La diferencia estriba principalmente en que los plugins de nagios devuelven un error level para indicar si la prueba ha tenido éxito o no.
+Hay dos tipos de complementos, los estándar (standard) y los de tipo Nagios. Los complementos estándar son scripts que ejecutan acciones y admiten parámetros. Los complementos de Nagios son, como su nombre indica, complementos de Nagios que se pueden usar en <?php echo get_product_name();?>. La diferencia estriba principalmente en que los plugins de nagios devuelven un error level para indicar si la prueba ha tenido éxito o no.
 <br><br>
 Si quiere usar un plugin de tipo nagios y quiere obtener un dato, no un estado (Bien/Mal), puede utilizar un plugin de tipo nagios en el modo "Standard". 
 <br><br>
@@ -39,7 +39,7 @@ Descripción del complemento. Escribir una breve descripción, como por ejemplo:
 
 Es la ruta a donde está el comando del complemento. De forma predeterminada, si la instalación ha sido estándar, estarán en el directorio /usr/share/pandora_server/util/plugin/. Aunque puede ser cualquier ruta del sistema. Para este caso, escribir /usr/share/pandora_server/util/plugin/udp_nmap_plugin.sh en el campo.
 <br><br>
-El servidor de pandora ejecutará ese script, por lo que éste debe tener permisos de acceso y de ejecución sobre él. 
+El servidor de <?php echo get_product_name();?> ejecutará ese script, por lo que éste debe tener permisos de acceso y de ejecución sobre él. 
 <br><br>
 <b>Plug-in parameters</b><br>
 
diff --git a/pandora_console/include/help/es/help_plugin_macros.php b/pandora_console/include/help/es/help_plugin_macros.php
index ca6d462d32..701d15f35e 100644
--- a/pandora_console/include/help/es/help_plugin_macros.php
+++ b/pandora_console/include/help/es/help_plugin_macros.php
@@ -17,7 +17,7 @@ Las siguientes macros están disponibles:
 <li>_modulegroup_ : Nombre del grupo del módulo.</li>
 <li>_moduledescription_: Descripcion del modulo.</li>
 <li>_modulestatus_ : Estado del módulo.</li>
-<li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de Pandora.</li>
+<li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de <?php echo get_product_name();?>.</li>
 <li>_policy_: Nombre de la política a la que pertenece el módulo (si aplica).</li>
 <li>_interval_ : Intervalo de la ejecución del módulo. </li>
 
diff --git a/pandora_console/include/help/es/help_plugin_policy.php b/pandora_console/include/help/es/help_plugin_policy.php
index c68cbcdc88..a4e190f7fe 100644
--- a/pandora_console/include/help/es/help_plugin_policy.php
+++ b/pandora_console/include/help/es/help_plugin_policy.php
@@ -6,7 +6,7 @@
 
 <h1>Plugins de agente</h1>
 
-<p>A partir de Pandora FMS 5.0, con el editor de plugins en políticas se pueden propagar los plugins de agentes con facilidad.
+<p>Con el editor de plugins en políticas se pueden propagar los plugins de agentes con facilidad.
 <br><br>
 Se pueden añadir plugins de agente en una política para que se creen en cada agente local al ser aplicada. 
 <br><br>
diff --git a/pandora_console/include/help/es/help_profile.php b/pandora_console/include/help/es/help_profile.php
index 88d035914c..015d1b1157 100644
--- a/pandora_console/include/help/es/help_profile.php
+++ b/pandora_console/include/help/es/help_profile.php
@@ -6,7 +6,7 @@
 
 <h1>Perfil</h1>
 
-<p>Pandora FMS es una herramienta de gestión Web que permite que trabajen múltiples usuarios con diferentes permisos en múltiples grupos de agentes que hay definidos. En los perfiles se definen los permisos que puede tener un usuario.</p>
+<p><?php echo get_product_name();?> es una herramienta de gestión Web que permite que trabajen múltiples usuarios con diferentes permisos en múltiples grupos de agentes que hay definidos. En los perfiles se definen los permisos que puede tener un usuario.</p>
 
 
 <p>Esta lista define qué habilita cada perfil:</p>
diff --git a/pandora_console/include/help/es/help_recontask.php b/pandora_console/include/help/es/help_recontask.php
index 9c93de1a55..d0dc85d823 100644
--- a/pandora_console/include/help/es/help_recontask.php
+++ b/pandora_console/include/help/es/help_recontask.php
@@ -25,7 +25,7 @@ Red sobre la que realizar la exploración. Utiliza el formato de red / mascara d
 
 <b>Intervalo</b>
 <br>
-Intervalo de repetición de la búsqueda de equipos. No utilice intervalos muy cortos ya que recon explora una red enviando un Ping a cada dirección, si utiliza redes de exploracion muy amplias (por ejemplo una clase A) combinado con intervalos muy cortos (6 horas) estará provocando que Pandora FMS esté constantemente bombardeando la red con pings, cargandola e innecesariamente sobre cargando Pandora FMS.<br><br>
+Intervalo de repetición de la búsqueda de equipos. No utilice intervalos muy cortos ya que recon explora una red enviando un Ping a cada dirección, si utiliza redes de exploracion muy amplias (por ejemplo una clase A) combinado con intervalos muy cortos (6 horas) estará provocando que <?php echo get_product_name();?> esté constantemente bombardeando la red con pings, cargandola e innecesariamente sobre cargando <?php echo get_product_name();?>.<br><br>
 
 <b>Plantilla de módulos</b><br>
 
@@ -33,7 +33,7 @@ Plantilla de componentes que añadir a los equipos descubiertos. Cuando detecte
 
 <b>SO</b><br>
 
-Sistema operativo para reconocer. Si se selecciona uno en lugar de cualquiera (Any) sólo se añadirán los equipos con ese sistema operativo. Piense que en determiandas situaciones Pandora FMS puede equivocarse a la hora de detectar sistemas, ya que este tipo de "adivinación" se realiza con patrones estadísticos que en función de algunos factores ajenos pueden fallar (redes con filtrados, software de seguridad, versiones modificadas de los sistemas). Para poder utilizar con seguridad este método debe tener instalado Xprobe2 en su sistema.<br><br>
+Sistema operativo para reconocer. Si se selecciona uno en lugar de cualquiera (Any) sólo se añadirán los equipos con ese sistema operativo. Piense que en determiandas situaciones <?php echo get_product_name();?> puede equivocarse a la hora de detectar sistemas, ya que este tipo de "adivinación" se realiza con patrones estadísticos que en función de algunos factores ajenos pueden fallar (redes con filtrados, software de seguridad, versiones modificadas de los sistemas). Para poder utilizar con seguridad este método debe tener instalado Xprobe2 en su sistema.<br><br>
 
 <b>Puertos</b><br>
 
diff --git a/pandora_console/include/help/es/help_reporting_wizard_sla_tab.php b/pandora_console/include/help/es/help_reporting_wizard_sla_tab.php
index 96a0c586da..9e80d42a3e 100644
--- a/pandora_console/include/help/es/help_reporting_wizard_sla_tab.php
+++ b/pandora_console/include/help/es/help_reporting_wizard_sla_tab.php
@@ -6,5 +6,5 @@
 
 <h1>Wizard SLA</h1>
 
-<p>Permite medir el nivel del servicio (Service Level Agreement) de todos los moduloes de Pandora FMS. En es este wizard puedes crear un informe SLA de muchas agentes.</p>
+<p>Permite medir el nivel del servicio (Service Level Agreement) de todos los moduloes de <?php echo get_product_name();?>. En es este wizard puedes crear un informe SLA de muchas agentes.</p>
 
diff --git a/pandora_console/include/help/es/help_reporting_wizard_tab.php b/pandora_console/include/help/es/help_reporting_wizard_tab.php
index b5a07a02e9..e49bc84b27 100644
--- a/pandora_console/include/help/es/help_reporting_wizard_tab.php
+++ b/pandora_console/include/help/es/help_reporting_wizard_tab.php
@@ -6,4 +6,4 @@
 
 <h1>Wizard</h1>
 
-<p>Esta pestaña pertenece a la versión Enterprise de Pandora, esta pestaña nos permite realizar de una forma automática con unos pocos click, y de una vez multitud de items para un informe, con configuraciones comunes pero aplicadas a multitud de agentes y o módulos.</p>
+<p>Esta pestaña pertenece a la versión Enterprise de <?php echo get_product_name();?>. Esta pestaña nos permite realizar de una forma automática con unos pocos click, y de una vez multitud de items para un informe, con configuraciones comunes pero aplicadas a multitud de agentes y o módulos.</p>
diff --git a/pandora_console/include/help/es/help_response_macros.php b/pandora_console/include/help/es/help_response_macros.php
index a32f99c8e1..8f88dca7f7 100644
--- a/pandora_console/include/help/es/help_response_macros.php
+++ b/pandora_console/include/help/es/help_response_macros.php
@@ -19,7 +19,7 @@ Las macros aceptadas son las siguientes:
 <li><b>Id del evento:</b> _event_id_</li>
 <li><b>Instrucciones del evento:</b> _event_instruction_</li>
 <li><b>Id de la criticidad del evento:</b> _event_severity_id_</li>
-<li><b>Gravedad del evento (traducido por la consola de Pandora):</b> _event_severity_text_</li>
+<li><b>Gravedad del evento (traducido por la consola de <?php echo get_product_name();?>):</b> _event_severity_text_</li>
 <li><b>Procedencia del evento:</b> _event_source_</li>
 <li><b>Estado del evento (Nuevo, validado o evento en proceso):</b> _event_status_</li>
 <li><b>Etiquetas del evento separadas por comas:</b> _event_tags_</li>
diff --git a/pandora_console/include/help/es/help_servers.php b/pandora_console/include/help/es/help_servers.php
index 6e262f13b3..c5ce08c1a3 100644
--- a/pandora_console/include/help/es/help_servers.php
+++ b/pandora_console/include/help/es/help_servers.php
@@ -6,11 +6,11 @@
 
 <h1>Gestion de servidores</h1>
 
-<p>Los servidores de Pandora FMS son los elementos encargados de realizar las comprobaciones existentes. Ellos las verifican y cambian el estado de las mismas en funcion de los resultados obtenidos. Tambien son los encargados de disparar las alertas que se establezcan para controlar el estado de los datos.</p>
+<p>Los servidores de <?php echo get_product_name();?> son los elementos encargados de realizar las comprobaciones existentes. Ellos las verifican y cambian el estado de las mismas en funcion de los resultados obtenidos. Tambien son los encargados de disparar las alertas que se establezcan para controlar el estado de los datos.</p>
 
-<p>El servidor de datos de Pandora FMS puede trabajar con alta disponibilidad y/o balanceo de carga. En una arquitectura muy grande, se pueden usar varios servidores de Pandora FMS a la vez, para poder manejar grandes volumenes de informacion distribuida por zonas geograficas o funcionales.</p>
+<p>El servidor de datos de <?php echo get_product_name();?> puede trabajar con alta disponibilidad y/o balanceo de carga. En una arquitectura muy grande, se pueden usar varios servidores de <?php echo get_product_name();?> a la vez, para poder manejar grandes volumenes de informacion distribuida por zonas geograficas o funcionales.</p>
 
-<p>Los servidores de Pandora FMS están siempre en funcionamiento y verifican permanentemente si algún elemento tiene algún problema. Si existe alguna alerta asociada al problema, esta ejecuta la acción definida, como por ejemplo enviar un SMS, un correo electrónico, o activar la ejecución de un script.</p>
+<p>Los servidores de <?php echo get_product_name();?> están siempre en funcionamiento y verifican permanentemente si algún elemento tiene algún problema. Si existe alguna alerta asociada al problema, esta ejecuta la acción definida, como por ejemplo enviar un SMS, un correo electrónico, o activar la ejecución de un script.</p>
 <ul>
 <li type="circle">Servidor datos</li>
 <li type="circle">Servidor de red</li>
diff --git a/pandora_console/include/help/es/help_service_elements_management.php b/pandora_console/include/help/es/help_service_elements_management.php
index 9f3d6c1f33..7602e1a145 100644
--- a/pandora_console/include/help/es/help_service_elements_management.php
+++ b/pandora_console/include/help/es/help_service_elements_management.php
@@ -3,7 +3,7 @@
  * @package Include/help/es
  */
 ?>
-<h1>Gestion de elementos de servicio</h1>
+<h1>Gestión de elementos de servicio</h1>
 
-<p>Esta vista muestra los modulos dentro del servicio actual.</p>
+<p>Esta vista muestra los módulos dentro del servicio actual.</p>
 
diff --git a/pandora_console/include/help/es/help_services_management.php b/pandora_console/include/help/es/help_services_management.php
index d0edb2ffc7..74947bf0d6 100644
--- a/pandora_console/include/help/es/help_services_management.php
+++ b/pandora_console/include/help/es/help_services_management.php
@@ -5,5 +5,5 @@
 ?>
 <h1>Gestion de servicios</h1>
 
-<p>Esta vista muestra todos los servicios disponibles para ser administrados. Tambien muestra los valores de estado critico, aviso, grupo, etc. de los servicios.</p>
+<p>Esta vista muestra todos los servicios disponibles para ser administrados. También muestra los valores de estado critico, aviso, grupo, etc. de los servicios.</p>
 
diff --git a/pandora_console/include/help/es/help_snmp_alert.php b/pandora_console/include/help/es/help_snmp_alert.php
index b545f0ad3d..9276a12896 100644
--- a/pandora_console/include/help/es/help_snmp_alert.php
+++ b/pandora_console/include/help/es/help_snmp_alert.php
@@ -6,5 +6,5 @@
 
 <h1>Alertas SNMP</h1>
 
-<p>Es posible asociar una alerta a un trap, asi Pandora FMS puede avisarnos de la llegada de un trap expecifico. Los traps SNMP no tienen relacion con el resto de sistema de alertas, aunque reulticen el sistema de alertas.</p>
+<p>Es posible asociar una alerta a un trap, asi P<?php echo get_product_name();?> puede avisarnos de la llegada de un trap expecifico. Los traps SNMP no tienen relacion con el resto de sistema de alertas, aunque reulticen el sistema de alertas.</p>
 
diff --git a/pandora_console/include/help/es/help_snmp_explorer.php b/pandora_console/include/help/es/help_snmp_explorer.php
index 14682b63a4..2f51f58a57 100644
--- a/pandora_console/include/help/es/help_snmp_explorer.php
+++ b/pandora_console/include/help/es/help_snmp_explorer.php
@@ -6,7 +6,7 @@
 <h1>SNMP Explorer</h1>
 
 <p>
-SNMP explorer es una extension que permite de una forma facil usar el comando SNMP Walk a los usuarios. SNMP Walk realiza una serie de comandos <i>getnexts</i> para poder recuperar informacion de la maquina objetivo de manera automatica.
+SNMP explorer es una extensión que permite de una forma fácil usar el comando SNMP Walk a los usuarios. SNMP Walk realiza una serie de comandos <i>getnexts</i> para poder recuperar información de la máquina objetivo de manera automatica.
 </p>
 
 
diff --git a/pandora_console/include/help/es/help_snmpcommunity.php b/pandora_console/include/help/es/help_snmpcommunity.php
index def2ff985e..79657daaa5 100644
--- a/pandora_console/include/help/es/help_snmpcommunity.php
+++ b/pandora_console/include/help/es/help_snmpcommunity.php
@@ -5,4 +5,4 @@
 ?>
 <h1>Comunidad SNMP</h1>
 
-Comunidad necesaria parra monitorizar un OID SNMP. 
+Comunidad necesaria para monitorizar un OID SNMP.
diff --git a/pandora_console/include/help/es/help_snmpoid.php b/pandora_console/include/help/es/help_snmpoid.php
index afd43da1b2..fb095bb10d 100644
--- a/pandora_console/include/help/es/help_snmpoid.php
+++ b/pandora_console/include/help/es/help_snmpoid.php
@@ -5,4 +5,4 @@
 ?>
 <h1>OID SNMP</h1>
 
-La OID SNMP del módulo. Si existe una MIB capaz de resolver el nombre en el servidor de red de Pandora FMS, entonces puede usar OID alfanumércias (ej. SNMPv2-MIB::sysDescr.0). Siempre se pueden usar OID numéricas (ej. 3.1.3.1.3.5.12.4.0.1), incluso si no hay una MIB específica.
\ No newline at end of file
+La OID SNMP del módulo. Si existe una MIB capaz de resolver el nombre en el servidor de red de <?php echo get_product_name();?>, entonces puede usar OID alfanumércias (ej. SNMPv2-MIB::sysDescr.0). Siempre se pueden usar OID numéricas (ej. 3.1.3.1.3.5.12.4.0.1), incluso si no hay una MIB específica.
\ No newline at end of file
diff --git a/pandora_console/include/help/es/help_snmpwalk.php b/pandora_console/include/help/es/help_snmpwalk.php
index de07ceef69..6e77a6807f 100644
--- a/pandora_console/include/help/es/help_snmpwalk.php
+++ b/pandora_console/include/help/es/help_snmpwalk.php
@@ -5,6 +5,6 @@
 ?>
 <h1>SNMP walk</h1>
 
-Pandora FMS también tiene un examinador SNMP simple que permite hacer un &laquo;walk&raquo; de un dispositivo remoto a través de un <i>SNMP walk</i>.
+<?php echo get_product_name();?> también tiene un examinador SNMP simple que permite hacer un &laquo;walk&raquo; de un dispositivo remoto a través de un <i>SNMP walk</i>.
 <br /><br />
-Hacer un &laquo;walk&raquo; (&laquo;SNMP Walk&raquo;) sobre un dispositivo hará que todas sus variables MIB estén disponibles, para que pueda elegir una. También puede introducir una MIB usando un OID numérico o un formato comprensible por humanos, si tiene la MIB correcta instalada en su servidor de red de Pandora FMS.
+Hacer un &laquo;walk&raquo; (&laquo;SNMP Walk&raquo;) sobre un dispositivo hará que todas sus variables MIB estén disponibles, para que pueda elegir una. También puede introducir una MIB usando un OID numérico o un formato comprensible por humanos, si tiene la MIB correcta instalada en su servidor de red de <?php echo get_product_name();?>.
diff --git a/pandora_console/include/help/es/help_tags_config.php b/pandora_console/include/help/es/help_tags_config.php
index 46a12a47db..72006b2743 100644
--- a/pandora_console/include/help/es/help_tags_config.php
+++ b/pandora_console/include/help/es/help_tags_config.php
@@ -3,7 +3,7 @@
  * @package Include/help/es
  */
 ?>
-<h1>Tags en Pandora FMS</h1>
+<h1>Tags en <?php echo get_product_name();?></h1>
 
 El acceso a los módulos se puede configurar con un sistema de Etiquetas o Tags. Se configuran unos tags en el sistema, se asignan a los módulos que se quiera. De esta forma se puede limitar el acceso a un usuario a los módulos con determinados tags.
 <br><br>
diff --git a/pandora_console/include/help/es/help_template_tab.php b/pandora_console/include/help/es/help_template_tab.php
index 0c3da0830b..957e5d02bd 100644
--- a/pandora_console/include/help/es/help_template_tab.php
+++ b/pandora_console/include/help/es/help_template_tab.php
@@ -4,5 +4,5 @@
 ?>
 
 <p>
-Las plantillas de modulos son agrupaciones de modulos de comprobaciones de red. Las plantillas pueden aplicarse directamente a los agentes, evitando tener que añrlos  uno a uno.
+Las plantillas de módulos son agrupaciones de módulos de comprobaciones de red. Las plantillas pueden aplicarse directamente a los agentes, evitando tener que añadirlos uno a uno.
 </p>
diff --git a/pandora_console/include/help/es/help_timesource.php b/pandora_console/include/help/es/help_timesource.php
index d75997227d..db2ea3a8e5 100644
--- a/pandora_console/include/help/es/help_timesource.php
+++ b/pandora_console/include/help/es/help_timesource.php
@@ -9,9 +9,9 @@
 Qué origen de tiempo usar. Esto puede ser (por el momento) el sistema local (&laquo;Sistema&raquo;) o la base de datos (&laquo;Base de datos&raquo;).
 </p>
 <p>
-Esto es útil cuando su base de datos no está en el mismo sistema que su servidor Web o los servidores de su Pandora FMS.
+Esto es útil cuando su base de datos no está en el mismo sistema que su servidor Web o los servidores de su <?php echo get_product_name();?>.
 En ese caso cualquier diferencia de tiempo calculará de forma errónea las diferencias de tiempo y marcas de tiempo.
-Debería usar NTP para sincronizar todos sus servidores de Pandora FMS y su servidor de MySQL.
+Debería usar NTP para sincronizar todos sus servidores de <?php echo get_product_name();?> y su servidor de MySQL.
 Usando estas preferencias no tendrá que sincronizar su servidor web, aún así se recomienda.
 </p>
 <p>
diff --git a/pandora_console/include/help/es/help_web_checks.php b/pandora_console/include/help/es/help_web_checks.php
index 051a16166f..ddb113ae63 100644
--- a/pandora_console/include/help/es/help_web_checks.php
+++ b/pandora_console/include/help/es/help_web_checks.php
@@ -6,7 +6,7 @@
 <h1>Monitorización WEB </h1>
 
 <p>
-La monitorización WEB avanzada es una funcionalidad que realiza el Servidor WEB de Goliat en la versión Enterprise de Pandora FMS.
+La monitorización WEB avanzada es una funcionalidad que realiza el Servidor WEB de Goliat en la versión Enterprise de <?php echo get_product_name();?>.
 
 <br><br>
 Este es un ejemplo del modulo Webcheck de GOLIAT:
diff --git a/pandora_console/include/help/es/help_wux_console.php b/pandora_console/include/help/es/help_wux_console.php
index f6f092d1e4..39ad49d70a 100644
--- a/pandora_console/include/help/es/help_wux_console.php
+++ b/pandora_console/include/help/es/help_wux_console.php
@@ -2,11 +2,11 @@
 <h2>Introducci&oacute;n</h2>
 
 <p>
-    Pandora WUX es un componente interno de Pandora FMS que permite a los usuarios automatizar sus sesiones de navegaci&oacute;n web. Genera en Pandora FMS un informe con los resultados de las ejecuciones, tiempos empleados, y capturas con los posibles errores encontrados. Es capaz de dividir las sesiones de navegaci&oacute;n en fases para simplificar la vista y depurar posibles cuellos de botella.
+	<?php echo get_product_name();?> WUX es un componente interno de <?php echo get_product_name();?> que permite a los usuarios automatizar sus sesiones de navegaci&oacute;n web. Genera en <?php echo get_product_name();?> un informe con los resultados de las ejecuciones, tiempos empleados, y capturas con los posibles errores encontrados. Es capaz de dividir las sesiones de navegaci&oacute;n en fases para simplificar la vista y depurar posibles cuellos de botella.
 </p>
 
 <p>
-    Pandora WUX utiliza el robot de navegaci&oacute;n de Pandora (PWR - Pandora Web Robot) para automatizar las sesiones de navegaci&oacute;n
+	<?php echo get_product_name();?> WUX utiliza el robot de navegaci&oacute;n de <?php echo get_product_name();?> (PWR - <?php echo get_product_name();?> Web Robot) para automatizar las sesiones de navegaci&oacute;n
 </p>
 
 <h2>Grabar una sesi&oacute;n de navegaci&oacute;n web</h2>
@@ -114,13 +114,13 @@
 </p>
 
 <p>
-	Una vez verificada la validez de la secuencia de navegaci&oacute;n, la guardaremos (Archivo -&gt; Save Test Case) para ejecutarla posteriormente con Pandora WUX. El fichero resultante ser&aacute; un documento HTML que Pandora WUX interpretar&aacute;.
+	Una vez verificada la validez de la secuencia de navegaci&oacute;n, la guardaremos (Archivo -&gt; Save Test Case) para ejecutarla posteriormente con <?php echo get_product_name();?> WUX. El fichero resultante ser&aacute; un documento HTML que <?php echo get_product_name();?> WUX interpretar&aacute;.
 </p>
 
-<h4>Grabar una sesi&oacute;n transaccional con Pandora WUX PWR</h4>
+<h4>Grabar una sesi&oacute;n transaccional con <?php echo get_product_name();?> WUX PWR</h4>
 
 <p>
-	Pandora WUX en modo PWR (Pandora Web Robot) permite dividir la monitorizaci&oacute;n de la navegaci&oacute;n de un sitio web en m&uacute;ltiples m&oacute;dulos, que representar&aacute;n cada uno de los pasos realizados.
+	<?php echo get_product_name();?> WUX en modo PWR (<?php echo get_product_name();?> Web Robot) permite dividir la monitorizaci&oacute;n de la navegaci&oacute;n de un sitio web en m&uacute;ltiples m&oacute;dulos, que representar&aacute;n cada uno de los pasos realizados.
 </p>
 
 <p>
@@ -186,7 +186,7 @@
     En esta vista podemos encontrar toda la infomaci&oacute;n que el sistema WUX ha obtenido de la sesi&oacute;n de navegaci&oacute;n configurada: 
 </p>
 <p>
-    <b><u>Nota</u>:</b> Si hemos definido fases en nuestra sesi&oacute;n de navegaci&oacute;n, se mostrar&aacute;n en esta vista de una forma sencilla y clara (ver apartado de grabaci&oacute;n <i>sesi&oacute;n transaccional con Pandora WUX PWR)</i>.
+    <b><u>Nota</u>:</b> Si hemos definido fases en nuestra sesi&oacute;n de navegaci&oacute;n, se mostrar&aacute;n en esta vista de una forma sencilla y clara (ver apartado de grabaci&oacute;n <i>sesi&oacute;n transaccional con <?php echo get_product_name();?> WUX PWR)</i>.
 </p>
 
 <p style="text-align: center">

From 79354a0ebfa04f78dc0096462d52f3344c5b8e45 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 18 May 2018 14:22:39 +0200
Subject: [PATCH 044/146] fixed graphs

---
 pandora_console/include/functions.php         |  46 +-
 .../include/functions_custom_graphs.php       |   6 +-
 pandora_console/include/functions_graph.php   | 632 ++++++++----------
 .../include/functions_reporting.php           |  71 +-
 pandora_console/include/graphs/fgraph.php     |   1 -
 .../include/graphs/flot/pandora.flot.js       |  44 +-
 .../operation/agentes/stat_win.php            |   2 +-
 7 files changed, 377 insertions(+), 425 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index edcb7c9034..479d15f132 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3004,7 +3004,7 @@ function legend_graph_array(
 	global $legend;
 	$unit = $format_graph['unit'];
 
-	if (isset($show_elements_graph['labels']) && is_array($show_elements_graph['labels'])){
+	if (isset($show_elements_graph['labels']) && is_array($show_elements_graph['labels']) && (count($show_elements_graph['labels']) > 0)){
 		$legend['sum'.$series_suffix] = $show_elements_graph['labels'][$data_module_graph['module_id']] . ' ' ;
 	}
 	else{
@@ -3066,22 +3066,36 @@ function legend_graph_array(
 	return $legend;
 }
 
-function series_type_graph_array( $series_suffix, $data_module_graph){
+function series_type_graph_array($data){
 	global $config;
-	global $series_type;
-
-	$series_type['event'.$series_suffix] = 'points';
-	$series_type['alert'.$series_suffix] = 'points';
-	$series_type['unknown'.$series_suffix] = 'unknown';
-	switch ($data_module_graph['id_module_type']) {
-		case 21: case 2: case 6:
-		case 18: case 9: case 31:
-			$series_type['sum'.$series_suffix] = 'boolean';
-			break;
-		default:
-			$series_type['sum'.$series_suffix] = 'area';
-			break;
+	foreach ($data as $key => $value) {
+		if(strpos($key, 'sum') !== false){
+			switch ($value['id_module_type']) {
+				case 21: case 2: case 6:
+				case 18: case 9: case 31:
+					$series_type[$key] = 'boolean';
+					break;
+				default:
+					$series_type[$key] = 'area';
+					break;
+			}
+		}
+		elseif(strpos($key, 'event') !== false){
+			$series_type[$key] = 'points';
+		}
+		elseif(strpos($key, 'alert') !== false){
+			$series_type[$key] = 'points';
+		}
+		elseif(strpos($key, 'unknown') !== false){
+			$series_type[$key] = 'unknown';
+		}
+		elseif(strpos($key, 'percentil') !== false){
+			$series_type[$key] = 'percentil';
+		}
+		else{
+			$series_type[$key] = 'area';
+		}
 	}
-	$series_type['percentil' . $series_suffix] = 'percentil';
+	return $series_type;
 }
 ?>
diff --git a/pandora_console/include/functions_custom_graphs.php b/pandora_console/include/functions_custom_graphs.php
index 83ffb6e290..9ca67f5ca2 100644
--- a/pandora_console/include/functions_custom_graphs.php
+++ b/pandora_console/include/functions_custom_graphs.php
@@ -238,7 +238,8 @@ function custom_graphs_print($id_graph, $height, $width, $period,
 		$homeurl = ui_get_full_url(false, false, false, false);
 	}
 
-	$output = graphic_combined_module($modules,
+	$output = graphic_combined_module(
+		$modules,
 		$weights,
 		$period,
 		$width,
@@ -271,7 +272,8 @@ function custom_graphs_print($id_graph, $height, $width, $period,
 		$fullscale,
 		$summatory,
 		$average,
-		$modules_series);
+		$modules_series
+	);
 
 	if ($return)
 		return $output;
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index fdafb3afab..5333a1801f 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -331,6 +331,8 @@ function grafico_modulo_sparse_data_chart (
 	$array_data["sum" . $series_suffix]['max'] = $max_value;
 	$array_data["sum" . $series_suffix]['avg'] = $sum_data/$count_data;
 
+	$array_data["sum" . $series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
+
 	if (!is_null($show_elements_graph['percentil']) &&
 		$show_elements_graph['percentil'] &&
 		!$show_elements_graph['flag_overlapped']) {
@@ -354,11 +356,10 @@ function grafico_modulo_sparse_data(
 	$series_suffix, $str_series_suffix) {
 
 	global $config;
-	global $array_data;
+	//global $array_data;
 	global $caption;
 	global $color;
 	global $legend;
-	global $series_type;
 	global $array_events_alerts;
 
 	if($show_elements_graph['fullscale']){
@@ -465,23 +466,6 @@ function grafico_modulo_sparse_data(
 			}
 		}
 
-//XXXX que hacer con baseline
-		/*
-		// Get baseline data
-		$baseline_data = array();
-		if ($baseline) {
-			$baseline_data = array ();
-			if ($baseline == 1) {
-				$baseline_data = enterprise_hook(
-					'reporting_enterprise_get_baseline',
-					array ($agent_module_id, $period, $width, $height , $title, $unit_name, $date));
-				if ($baseline_data === ENTERPRISE_NOT_HOOK) {
-					$baseline_data = array ();
-				}
-			}
-		}
-		*/
-
 		if ($show_elements_graph['show_events']  ||
 			$show_elements_graph['show_alerts'] ) {
 
@@ -603,13 +587,9 @@ function grafico_modulo_sparse_data(
 		$data_module_graph
 	);
 
-	series_type_graph_array(
-		$series_suffix,
-		$data_module_graph
-	);
-
 	$array_events_alerts[$series_suffix] = $events;
 
+	return $array_data;
 }
 
 function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
@@ -621,22 +601,23 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	$menu = true, $backgroundColor = 'white', $percentil = null,
 	$dashboard = false, $vconsole = false, $type_graph = 'area', $fullscale = false,
 	$id_widget_dashboard = false,$force_interval = 0,$time_interval = 300,
-	$max_only = 0, $min_only = 0) {
+	$max_only = 0, $min_only = 0, $array_data_create = 0) {
 
 	global $config;
+
+
 	global $graphic_type;
-	global $array_data;
+	//global $array_data;
 	global $caption;
 	global $color;
 	global $legend;
-	global $series_type;
 	global $array_events_alerts;
 
+
 	$array_data   = array();
 	$caption      = array();
 	$color        = array();
 	$legend       = array();
-	$series_type  = array();
 
 	$array_events_alerts = array();
 
@@ -735,58 +716,66 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 
 	$type_graph = $config['type_module_charts'];
 
-	if ($show_elements_graph['compare'] !== false) {
-		$series_suffix = 2;
-		$series_suffix_str = ' (' . __('Previous') . ')';
+	if(!$array_data_create){
+		if ($show_elements_graph['compare'] !== false) {
+			$series_suffix = 2;
+			$series_suffix_str = ' (' . __('Previous') . ')';
 
-		$date_array_prev['final_date'] = $date_array['start_date'];
-		$date_array_prev['start_date'] = $date_array['start_date'] - $date_array['period'];
-		$date_array_prev['period']     = $date_array['period'];
+			$date_array_prev['final_date'] = $date_array['start_date'];
+			$date_array_prev['start_date'] = $date_array['start_date'] - $date_array['period'];
+			$date_array_prev['period']     = $date_array['period'];
 
-		if ($show_elements_graph['compare'] === 'overlapped') {
-			$show_elements_graph['flag_overlapped'] = 1;
-		}
-		else{
-			$show_elements_graph['flag_overlapped'] = 0;
+			if ($show_elements_graph['compare'] === 'overlapped') {
+				$show_elements_graph['flag_overlapped'] = 1;
+			}
+			else{
+				$show_elements_graph['flag_overlapped'] = 0;
+			}
+
+			$array_data = grafico_modulo_sparse_data(
+				$agent_module_id, $date_array_prev,
+				$data_module_graph, $show_elements_graph,
+				$format_graph, $exception_interval_graph,
+				$series_suffix, $series_suffix_str
+			);
+
+			switch ($show_elements_graph['compare']) {
+				case 'separated':
+				case 'overlapped':
+					// Store the chart calculated
+					$array_data_prev  = $array_data;
+					$legend_prev      = $legend;
+					$color_prev       = $color;
+					$caption_prev     = $caption;
+					break;
+			}
 		}
 
-		grafico_modulo_sparse_data(
-			$agent_module_id, $date_array_prev,
+		$series_suffix = 1;
+		$series_suffix_str = '';
+		$show_elements_graph['flag_overlapped'] = 0;
+
+		$array_data = grafico_modulo_sparse_data(
+			$agent_module_id, $date_array,
 			$data_module_graph, $show_elements_graph,
 			$format_graph, $exception_interval_graph,
-			$series_suffix, $series_suffix_str
+			$series_suffix, $str_series_suffix
 		);
 
-		switch ($show_elements_graph['compare']) {
-			case 'separated':
-			case 'overlapped':
-				// Store the chart calculated
-				$array_data_prev  = $array_data;
-				$legend_prev      = $legend;
-				$series_type_prev = $series_type;
-				$color_prev       = $color;
-				$caption_prev     = $caption;
-				break;
+		if($show_elements_graph['compare']){
+			if ($show_elements_graph['compare'] === 'overlapped') {
+				$array_data = array_merge($array_data, $array_data_prev);
+				$legend     = array_merge($legend, $legend_prev);
+				$color      = array_merge($color, $color_prev);
+			}
 		}
 	}
+	else{
+		$array_data = $array_data_create;
+	}
 
-	$series_suffix = 1;
-	$series_suffix_str = '';
-	$show_elements_graph['flag_overlapped'] = 0;
-
-	grafico_modulo_sparse_data(
-		$agent_module_id, $date_array,
-		$data_module_graph, $show_elements_graph,
-		$format_graph, $exception_interval_graph,
-		$series_suffix, $str_series_suffix
-	);
-
-	if($show_elements_graph['compare']){
-		if ($show_elements_graph['compare'] === 'overlapped') {
-			$array_data = array_merge($array_data, $array_data_prev);
-			$legend     = array_merge($legend, $legend_prev);
-			$color      = array_merge($color, $color_prev);
-		}
+	if($show_elements_graph['return_data']){
+		return $array_data;
 	}
 
 	//XXX
@@ -801,6 +790,10 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 		)
 	);
 
+	$series_type = series_type_graph_array(
+		$array_data
+	);
+
 	//esto la sparse
 	//setup_watermark($water_mark, $water_mark_file, $water_mark_url);
 
@@ -829,6 +822,11 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 		}
 		$return .= '<br>';
 		if (!empty($array_data_prev)) {
+
+			$series_type = series_type_graph_array(
+				$array_data_prev
+			);
+
 			$return .= area_graph(
 				$agent_module_id,
 				$array_data_prev,
@@ -871,176 +869,6 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	}
 
 return $return;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//de aki al final eliminar;
-
-	enterprise_include_once("include/functions_reporting.php");
-
-	global $chart;
-	global $color;
-	global $color_prev;
-	global $legend;
-	global $long_index;
-	global $series_type;
-	global $chart_extra_data;
-	global $warning_min;
-	global $critical_min;
-	
-	$series_suffix_str = '';
-	if ($compare !== false) {
-		$series_suffix = '2';
-		$series_suffix_str = ' (' . __('Previous') . ')';
-		// Build the data of the previous period
-
-		grafico_modulo_sparse_data ($agent_module_id, $period,
-			$show_events, $width, $height, $title, $unit_name,
-			$show_alerts, $avg_only, $date-$period, $unit, $baseline,
-			$return_data, $show_title, $projection, $adapt_key,
-			$compare, $series_suffix, $series_suffix_str,
-			$show_unknown, $percentil, $dashboard, $vconsole,$type_graph, 
-			$fullscale, $flash_chart,$force_interval,$time_interval,$max_only,$min_only);
-		
-		switch ($compare) {
-			case 'separated':
-				// Store the chart calculated
-				$chart_prev = $chart;
-				$legend_prev = $legend;
-				$long_index_prev = $long_index;
-				$series_type_prev = $series_type;
-				$color_prev = $color;
-				break;
-			case 'overlapped':
-				// Store the chart calculated deleting index,
-				// because will be over the current period
-				$chart_prev = $chart;
-				$legend_prev = $legend;
-				$series_type_prev = $series_type;
-				$color_prev = $color;
-				foreach($color_prev as $k => $col) {
-					$color_prev[$k]['color'] = '#' .
-						get_complementary_rgb($color_prev[$k]['color']);
-				}
-				break;
-		}
-	}
-	
-	// Build the data of the current period
-	$data_returned = grafico_modulo_sparse_data ($agent_module_id,
-		$period, $show_events,
-		$width, $height , $title, $unit_name,
-		$show_alerts, $avg_only,
-		$date, $unit, $baseline, $return_data, $show_title,
-		$projection, $adapt_key, $compare, '', '', $show_unknown,
-		$percentil, $dashboard, $vconsole, $type_graph, $fullscale,$flash_chart,
-		$force_interval,$time_interval,$max_only,$min_only);
-
-	if ($return_data) {
-		return $data_returned;
-	}
-	if ($compare === 'overlapped') {
-		/*
-		$i = 0;
-		foreach ($chart as $k=>$v) {
-			if (!isset($chart_prev[$i])) {
-				continue;
-			}
-			$chart[$k] = array_merge($v,$chart_prev[$i]);
-			$i++;
-		}
-		*/
-		foreach ($chart_prev as $k => $v) {
-			$chart[$k+$period]['sum2'] = $v['sum2'];
-			//unset($chart[$k]);
-		}
-		
-		/*
-		$chart["1517834070"]["sum2"] = "5";
-		$chart["1517834075"]["sum2"] = "6";
-		$chart["1517834080"]["sum2"] = "7";
-		$chart["1517834085"]["sum2"] = "8";
-		
-		$chart["1517834088"]["sum2"] = "3";
-		*/
-		ksort($chart);
-
-		$legend = array_merge($legend, $legend_prev);
-		$color = array_merge($color, $color_prev);
-	}
-
-	if ($only_image) {
-		$flash_chart = false;
-	}
-	if($config["fixed_graph"] == false){
-		$water_mark = array('file' =>
-			$config['homedir'] . "/images/logo_vertical_water.png",
-			'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
-	}
-
-	if ($type_graph === 'area') {
-		if ($compare === 'separated') {
-			return
-				area_graph($flash_chart, $chart, $width, $height/2, $color,
-					$legend, $long_index,
-					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-					$title, $unit, $homeurl, $water_mark, $config['fontpath'],
-					$config['font_size'], $unit, $ttl, $series_type,
-					$chart_extra_data, $warning_min, $critical_min,
-					$adapt_key, false, $series_suffix_str, $menu,
-					$backgroundColor).
-				'<br>'.
-				area_graph($flash_chart, $chart_prev, $width, $height/2,
-					$color_prev, $legend_prev, $long_index_prev,
-					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-					$title, $unit, $homeurl, $water_mark, $config['fontpath'],
-					$config['font_size'], $unit, $ttl, $series_type_prev,
-					$chart_extra_data, $warning_min, $critical_min,
-					$adapt_key, false, $series_suffix_str, $menu,
-					$backgroundColor);
-		}
-		else {
-			// Color commented not to restrict serie colors
-			if($id_widget_dashboard){
-				$opcion = unserialize(db_get_value_filter('options','twidget_dashboard',array('id' => $id_widget_dashboard)));
-				$color['min']['color'] = $opcion['min'];
-				$color['sum']['color'] = $opcion['avg'];
-				$color['max']['color'] = $opcion['max'];
-			}
-
-			return
-				area_graph($flash_chart, $chart, $width, $height, $color,
-					$legend, $long_index,
-					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-					$title, $unit, $homeurl, $water_mark, $config['fontpath'],
-					$config['font_size'], $unit, $ttl, $series_type,
-					$chart_extra_data, $warning_min, $critical_min,
-					$adapt_key, false, $series_suffix_str, $menu,
-					$backgroundColor, $dashboard, $vconsole, $agent_module_id);
-		}
-	}
-	elseif ($type_graph === 'line') {
-
-	}
 }
 
 function graph_get_formatted_date($timestamp, $format1, $format2) {
@@ -1124,7 +952,6 @@ function graphic_combined_module (
 	global $config;
 	global $graphic_type;
 	global $legend;
-	global $series_type;
 
 	$legend        = array();
 	$caption       = array();
@@ -1149,11 +976,11 @@ function graphic_combined_module (
 	$average
 	$modules_series
 */
-
+/*
 html_debug_print($name_list);
 html_debug_print($unit_list);
 html_debug_print($from_interface);
-
+*/
 	$date_array = array();
 	$date_array["period"]     = $period;
 	$date_array["final_date"] = $date;
@@ -1182,14 +1009,14 @@ html_debug_print($from_interface);
 	$show_elements_graph['pure']         = $pure;
 	$show_elements_graph['baseline']     = false; //dont use
 	$show_elements_graph['only_image']   = $only_image;
-	$show_elements_graph['return_data']  = true; //dont use
+	$show_elements_graph['return_data']  = false; //dont use
 	$show_elements_graph['id_widget']    = $id_widget_dashboard;
 	$show_elements_graph['labels']       = $labels;
 	$show_elements_graph['stacked']      = $stacked;
 
 	$format_graph = array();
-	$format_graph['width']      = $width . "px";
-	$format_graph['height']     = $height;
+	$format_graph['width']      = "90%";
+	$format_graph['height']     = "450";
 	$format_graph['type_graph'] = ''; //dont use
 	$format_graph['unit_name']  = $unit_name;
 	$format_graph['unit']       = ''; //dont use
@@ -1292,11 +1119,6 @@ html_debug_print($from_interface);
 			$data_module_graph
 		);
 
-		series_type_graph_array(
-			$series_suffix,
-			$data_module_graph
-		);
-
 		if($config["fixed_graph"] == false){
 			$water_mark = array(
 				'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
@@ -1310,6 +1132,10 @@ html_debug_print($from_interface);
 		$i++;
 	}
 
+	$series_type = series_type_graph_array(
+		$array_data
+	);
+
 	if ($flash_charts === false && $stacked == CUSTOM_GRAPH_GAUGE)
 		$stacked = CUSTOM_GRAPH_BULLET_CHART;
 
@@ -1644,10 +1470,6 @@ html_debug_print($from_interface);
 		$module_name_list  = array();
 		$collector         = 0;
 
-
-
-
-
 				// Added to support projection graphs
 				if ($projection != false and $i != 0) {
 					$projection_data = array();
@@ -1677,6 +1499,9 @@ html_debug_print($from_interface);
 	//	$temp = array();
 
 
+	$graph_values = $temp;
+
+
 
 	//Set graph color
 	$threshold_data = array();
@@ -1791,129 +1616,100 @@ html_debug_print($from_interface);
 
 	//summatory and average series
 	if($stacked == CUSTOM_GRAPH_AREA  || $stacked == CUSTOM_GRAPH_LINE) {
-		//Fix pdf label
-		$static_pdf = strpos($module_name_list[0], '<span style');
+		if($summatory || $average) {
+			if(isset($array_data) && is_array($array_data)){
+				foreach ($array_data as $key => $value) {
+					if(strpos($key, 'sum') !== false){
+						$data_array_reverse[$key] = array_reverse($value['data']);
+						if(!$modules_series) {
+							unset($array_data[$key]);
+							unset($legend[$key]);
+							unset($series_type[$key]);
+						}
+					}
+				}
 
-		if($summatory && $average) {
-			foreach ($graph_values as $key => $value) {
-				$cont = count($value);
-				$summ = array_sum($value);
-				array_push($value,$summ);
-				array_push($value,$summ/$cont);
-				$graph_values[$key] = $value;
-				if(!$modules_series) {
-					array_splice($graph_values[$key],0,count($graph_values[$key])-2);
+				if(isset($data_array_reverse) && is_array($data_array_reverse)){
+					$array_sum_reverse = array();
+					$data_array_prev = false;
+					$data_array_pop = array();
+					$count = 0;
+
+					while(count($data_array_reverse['sum0']) > 0){
+						foreach ($data_array_reverse as $key_reverse => $value_reverse) {
+							if(is_array($value_reverse) && count($value_reverse) > 0){
+								$data_array_pop[$key_reverse] = array_pop($data_array_reverse[$key_reverse]);
+							}
+						}
+
+						if(isset($data_array_pop) && is_array($data_array_pop)){
+							$acum_data = 0;
+							$acum_array = array();
+							$sum_data = 0;
+							$count_pop = 0;
+							foreach ($data_array_pop as $key_pop => $value_pop) {
+								if( $value_pop[0] > $acum_data ){
+									if($acum_data != 0){
+										$sum_data = $sum_data + $data_array_prev[$key_pop][1];
+										$data_array_reverse[$key_pop][] = $value_pop;
+										$data_array_prev[$acum_key] = $acum_array;
+									}
+									else{
+										if($data_array_prev[$key_pop] == false){
+											$data_array_prev[$key_pop] = $value_pop;
+										}
+										$acum_key   = $key_pop;
+										$acum_data  = $value_pop[0];
+										$acum_array = $value_pop;
+										$sum_data   = $value_pop[1];
+									}
+								}
+								elseif($value_pop[0] < $acum_data){
+									$sum_data = $sum_data + $data_array_prev[$key_pop][1];
+									$data_array_reverse[$acum_key][] = $acum_array;
+									$data_array_prev[$key_pop] = $value_pop;
+									$acum_key   = $key_pop;
+									$acum_data  = $value_pop[0];
+									$acum_array = $value_pop;
+								}
+								elseif($value_pop[0] == $acum_data){
+									$data_array_prev[$key_pop] = $value_pop;
+									$sum_data += $value_pop[1];
+								}
+								$count_pop++;
+							}
+							if($summatory){
+								$array_sum_reverse[$count][0] = $acum_data;
+								$array_sum_reverse[$count][1] = $sum_data;
+							}
+							if($average){
+								$array_avg_reverse[$count][0] = $acum_data;
+								$array_avg_reverse[$count][1] = $sum_data / $count_pop;
+							}
+						}
+						$count++;
+					}
 				}
 			}
 
-			if(!$modules_series) {
-				if(empty($percentil)) {
-					array_splice($module_name_list,0,count($module_name_list));
-				} else {
-					array_splice($module_name_list,0,count($module_name_list)-(count($module_name_list)/2));
-				}
-				if($static_pdf === 0) {
-					array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
-					array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
-				} else {
-					array_unshift($module_name_list, __('summatory'));
-					array_unshift($module_name_list, __('average'));
-				}
-
-			} else {
-				if(empty($percentil)) {
-					if($static_pdf === 0) {
-						array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
-						array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
-					} else {
-						array_push($module_name_list, __('summatory'));
-						array_push($module_name_list, __('average'));
-					}
-				} else {
-					if($static_pdf === 0) {
-						array_splice($module_name_list,(count($module_name_list)/2),0,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
-						array_splice($module_name_list,(count($module_name_list)/2),0,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
-					} else {
-						array_splice($module_name_list,(count($module_name_list)/2),0, __('average'));
-						array_splice($module_name_list,(count($module_name_list)/2),0,__('summatory'));
-					}
-				}
-			}
-		} elseif($summatory) {
-			foreach ($graph_values as $key => $value) {
-				array_push($value,array_sum($value));
-				$graph_values[$key] = $value;
-				if(!$modules_series){
-					array_splice($graph_values[$key],0,count($graph_values[$key])-1);
-				}
+//XXXXX color,type,title, opacity
+			if(isset($array_sum_reverse) && is_array($array_sum_reverse)){
+				$array_data['sumatory']['data']  = $array_sum_reverse;
+				$array_data['sumatory']['color'] = 'purple';
+				$legend['sumatory']              = __('Summatory');
+				$series_type['sumatory']         = 'area';
 			}
 
-			if(!$modules_series) {
-				if(empty($percentil)) {
-					array_splice($module_name_list,0,count($module_name_list));
-				} else {
-					array_splice($module_name_list,0,count($module_name_list)-(count($module_name_list)/2));
-				}
-				if($static_pdf === 0) {
-					array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
-				} else {
-					array_unshift($module_name_list, __('summatory'));
-				}
-			} else {
-				if(empty($percentil)) {
-					if($static_pdf === 0) {
-						array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
-					} else {
-						array_push($module_name_list,__('summatory'));
-					}
-				} else {
-					if($static_pdf === 0) {
-						array_splice($module_name_list,(count($module_name_list)/2),0,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
-					} else {
-						array_splice($module_name_list,(count($module_name_list)/2),0,__('summatory'));
-					}
-				}
-			}
-		} elseif($average) {
-			foreach ($graph_values as $key => $value) {
-				$summ = array_sum($value) / count($value);
-				array_push($value,$summ);
-				$graph_values[$key] = $value;
-				if(!$modules_series){
-					array_splice($graph_values[$key],0,count($graph_values[$key])-1);
-				}
-			}
-			if(!$modules_series) {
-				if(empty($percentil)) {
-					array_splice($module_name_list,0,count($module_name_list));
-				} else {
-					array_splice($module_name_list,0,count($module_name_list)-(count($module_name_list)/2));
-				}
-				if($static_pdf === 0) {
-					array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
-				} else {
-					array_unshift($module_name_list,__('average'));
-				}
-			} else {
-				if(empty($percentil)) {
-					if($static_pdf === 0) {
-						array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
-					} else {
-						array_push($module_name_list,__('average'));
-					}
-				} else {
-					if($static_pdf === 0) {
-						array_splice($module_name_list,(count($module_name_list)/2),0,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
-					} else {
-						array_splice($module_name_list,(count($module_name_list)/2),0,__('average'));
-					}
-				}
+			if(isset($array_avg_reverse) && is_array($array_avg_reverse)){
+				$array_data['sum_avg']['data']  = $array_avg_reverse;
+				$array_data['sum_avg']['color'] = 'orange';
+				$legend['sum_avg']              = __('AVG');
+				$series_type['sum_avg']         = 'area';
 			}
+
 		}
 	}
 
-	$graph_values = $temp;
-
 	switch ($stacked) {
 		default:
 		case CUSTOM_GRAPH_STACKED_LINE:
@@ -1963,6 +1759,108 @@ html_debug_print($from_interface);
 	}
 }
 
+function combined_graph_summatory_average ($array_data){
+	if(isset($array_data) && is_array($array_data)){
+		foreach ($array_data as $key => $value) {
+			if(strpos($key, 'sum') !== false){
+				$data_array_reverse[$key] = array_reverse($value['data']);
+				/*
+				if(!$modules_series) {
+					unset($array_data[$key]);
+					unset($legend[$key]);
+					unset($series_type[$key]);
+				}
+				*/
+			}
+		}
+
+		if(isset($data_array_reverse) && is_array($data_array_reverse)){
+			$array_sum_reverse = array();
+			$array_avg_reverse = array();
+			$data_array_prev = false;
+			$data_array_pop = array();
+			$count = 0;
+
+			while(count($data_array_reverse['sum0']) > 0){
+				foreach ($data_array_reverse as $key_reverse => $value_reverse) {
+					if(is_array($value_reverse) && count($value_reverse) > 0){
+						$data_array_pop[$key_reverse] = array_pop($data_array_reverse[$key_reverse]);
+					}
+				}
+
+				if(isset($data_array_pop) && is_array($data_array_pop)){
+					$acum_data  = 0;
+					$acum_array = array();
+					$sum_data   = 0;
+					$count_pop  = 0;
+					foreach ($data_array_pop as $key_pop => $value_pop) {
+						if( $value_pop[0] > $acum_data ){
+							if($acum_data != 0){
+								$sum_data = $sum_data + $data_array_prev[$key_pop][1];
+								$data_array_reverse[$key_pop][] = $value_pop;
+								$data_array_prev[$acum_key] = $acum_array;
+							}
+							else{
+								if($data_array_prev[$key_pop] == false){
+									$data_array_prev[$key_pop] = $value_pop;
+								}
+								$acum_key   = $key_pop;
+								$acum_data  = $value_pop[0];
+								$acum_array = $value_pop;
+								$sum_data   = $value_pop[1];
+							}
+						}
+						elseif($value_pop[0] < $acum_data){
+							$sum_data = $sum_data + $data_array_prev[$key_pop][1];
+							$data_array_reverse[$acum_key][] = $acum_array;
+							$data_array_prev[$key_pop] = $value_pop;
+							$acum_key   = $key_pop;
+							$acum_data  = $value_pop[0];
+							$acum_array = $value_pop;
+						}
+						elseif($value_pop[0] == $acum_data){
+							$data_array_prev[$key_pop] = $value_pop;
+							$sum_data += $value_pop[1];
+						}
+						$count_pop++;
+					}
+				//	if($summatory){
+					//	$array_sum_reverse[$count][0] = $acum_data;
+					//	$array_sum_reverse[$count][1] = $sum_data;
+				//	}
+				//	if($average){
+						$array_avg_reverse[$count][0] = $acum_data;
+						$array_avg_reverse[$count][1] = $sum_data / $count_pop;
+				//	}
+				}
+				$count++;
+			}
+		}
+		return $array_avg_reverse;
+	}
+	else{
+		return false;
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /**
  * Print a graph with access data of agents
  *
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 2a3fc52101..f3a6766835 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -3479,75 +3479,108 @@ function reporting_simple_baseline_graph($report, $content,
 	$force_height_chart = null) {
 
 	global $config;
-	
+
 	if ($config['metaconsole']) {
 		$id_meta = metaconsole_get_id_server($content["server_name"]);
-		
-		
 		$server = metaconsole_get_connection_by_id ($id_meta);
 		metaconsole_connect($server);
 	}
-	
+
 	$return['type'] = 'simple_baseline_graph';
-	
+
 	if (empty($content['name'])) {
 		$content['name'] = __('Simple baseline graph');
 	}
-	
+
 	$module_name = io_safe_output(
 		modules_get_agentmodule_name($content['id_agent_module']));
 	$agent_name = io_safe_output(
 		modules_get_agentmodule_agent_alias ($content['id_agent_module']));
-	
+
 	$return['title'] = $content['name'];
 	$return['subtitle'] = $agent_name . " - " . $module_name;
 	$return["description"] = $content["description"];
 	$return["date"] = reporting_get_date_text($report, $content);
 	$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
-	
+
 	// Get chart
 	reporting_set_conf_charts($width, $height, $only_image, $type,
 		$content, $ttl);
-	
+
 	if (!empty($force_width_chart)) {
 		$width = $force_width_chart;
 	}
-	
+
 	if (!empty($force_height_chart)) {
 		$height = $force_height_chart;
 	}
-	
+
+//XXXXXXXX
+	$width  = '90%';
+	$height = 300;
+
+	$baseline_data = enterprise_hook(
+		'reporting_enterprise_get_baseline',
+		array (
+			$content['id_agent_module'],
+			$content['period'],
+			$report["datetime"]
+		)
+	);
+
+	if ($baseline_data === ENTERPRISE_NOT_HOOK) {
+		$baseline_data = array ();
+	}
+
 	switch ($type) {
 		case 'dinamic':
 		case 'static':
-			$return['chart'] = grafico_modulo_sparse(
+			$return['chart'] = grafico_modulo_sparse (
 				$content['id_agent_module'],
 				$content['period'],
 				false,
 				$width,
 				$height,
 				'',
-				'',
+				null,
+				false,
+				0,
 				false,
-				true,
-				true,
 				$report["datetime"],
 				'',
-				true,
+				0,
 				0,
 				true,
 				$only_image,
 				ui_get_full_url(false, false, false, false),
-				$ttl);
+				$ttl,
+				false,
+				'',
+				false,
+				false,
+				true,
+				'white',
+				null,
+				false,
+				false,
+				'area',
+				false,
+				false,
+				0,
+				300,
+				0,
+				0,
+				$baseline_data
+			);
 			break;
 		case 'data':
 			break;
 	}
-	
+
 	if ($config['metaconsole']) {
 		metaconsole_restore_db();
 	}
-	
+
 	return reporting_check_structure_content($return);
 }
 
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index a708a29263..425dda50c1 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -230,7 +230,6 @@ function area_graph(
 	global $config;
 
 	include_once('functions_flot.php');
-
 	if ($config['flash_charts']) {
 		return flot_area_graph(
 			$agent_module_id,
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 88df07cd3b..af44d4907a 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1558,28 +1558,33 @@ function pandoraFlotArea(
 					break;
 			}
 
-			data_base.push({
-				id: 'serie_' + i,
-				data: value.data,
-				label: index + series_suffix_str,
-				color: value.color,
-				lines: {
-					show: line_show,
-					fill: filled,
-					lineWidth: lineWidth,
-					steps: steps_chart
-				},
-				points: {
-					show: points_show,
-					radius: 3,
-					fillColor: fill_points
-				}
-			});
-
-			i++;
+			//in graph stacked unset percentil
+			if(	! ( (type == 1) && ( /percentil/.test(index) ) == true ) &&
+				! ( (type == 3) && ( /percentil/.test(index) ) == true )   ){
+				data_base.push({
+					id: 'serie_' + i,
+					data: value.data,
+					label: index + series_suffix_str,
+					color: value.color,
+					lines: {
+						show: line_show,
+						fill: filled,
+						lineWidth: lineWidth,
+						steps: steps_chart
+					},
+					points: {
+						show: points_show,
+						radius: 3,
+						fillColor: fill_points
+					}
+				});
+			}
 		}
+		i++;
 	});
 
+	console.log(data_base);
+
 	// The first execution, the graph data is the base data
 	datas = data_base;
 	font_size = 8;
@@ -2120,6 +2125,7 @@ function pandoraFlotArea(
 		}
 
 		// Get only two decimals
+		//XXXXXXXXXX
 		formatted = round_with_decimals(formatted, 100)
 		return '<div class='+font+' style="font-size:'+font_size+'pt;">'+formatted+'</div>';
 	}
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index a2c92376ed..6d4527aedf 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -505,4 +505,4 @@ ui_include_time_picker(true);
 	$(window).resize(function() {
 		$("#field_list").css('height', ($(window).height() - 160) + 'px');
 	});
-</script>
\ No newline at end of file
+</script>

From 4a8972a5d5eb0a1cbbc770d5fb1a7a88215b8cfe Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 18 May 2018 14:30:51 +0200
Subject: [PATCH 045/146] [Rebranding] help ja

---
 .../include/help/ja/help_alert_command.php    |  2 +-
 .../include/help/ja/help_alert_compound.php   |  2 +-
 .../include/help/ja/help_alert_config.php     |  4 +--
 .../include/help/ja/help_alert_macros.php     |  2 +-
 .../include/help/ja/help_alert_recovery.php   |  2 +-
 .../include/help/ja/help_alerts_config.php    | 26 +++++++++----------
 .../help/ja/help_cascade_protection.php       |  4 +--
 .../include/help/ja/help_categories.php       |  2 +-
 .../help/ja/help_configure_gis_map.php        |  6 ++---
 .../ja/help_context_pandora_server_email.php  |  8 +++---
 .../include/help/ja/help_create_agent.php     |  2 +-
 pandora_console/include/help/ja/help_cron.php |  2 +-
 .../include/help/ja/help_custom_logo.php      |  2 +-
 .../include/help/ja/help_event_alert.php      |  4 +--
 .../include/help/ja/help_events_history.php   |  2 +-
 .../include/help/ja/help_export_server.php    |  4 +--
 .../include/help/ja/help_ff_threshold.php     |  2 +-
 .../include/help/ja/help_gis_map_builder.php  |  2 +-
 .../help/ja/help_gis_setup_map_connection.php |  2 +-
 .../include/help/ja/help_graphs.php           | 10 +++----
 .../include/help/ja/help_history_database.php |  6 ++---
 pandora_console/include/help/ja/help_ipam.php |  6 ++---
 .../include/help/ja/help_local_component.php  |  2 +-
 .../include/help/ja/help_main_help.php        |  4 +--
 .../help/ja/help_manage_alert_list.php        |  4 +--
 .../include/help/ja/help_manage_alerts.php    |  2 +-
 .../help/ja/help_network_map_enterprise.php   |  4 +--
 .../include/help/ja/help_performance.php      |  2 +-
 .../include/help/ja/help_planned_downtime.php |  2 +-
 .../help/ja/help_plugin_definition.php        |  8 +++---
 .../include/help/ja/help_plugin_policy.php    |  2 +-
 .../include/help/ja/help_recontask.php        |  4 +--
 .../help/ja/help_reporting_wizard_sla_tab.php |  2 +-
 .../include/help/ja/help_response_macros.php  |  2 +-
 .../include/help/ja/help_servers.php          |  6 ++---
 .../include/help/ja/help_snmp_alert.php       |  2 +-
 .../include/help/ja/help_snmpoid.php          |  2 +-
 .../include/help/ja/help_snmpwalk.php         |  4 +--
 .../include/help/ja/help_tags_config.php      |  2 +-
 .../include/help/ja/help_timesource.php       |  4 +--
 .../help_visual_console_editor_editor_tab.php |  2 +-
 ...help_visual_console_editor_preview_tab.php |  2 +-
 .../include/help/ja/help_web_checks.php       |  2 +-
 43 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/pandora_console/include/help/ja/help_alert_command.php b/pandora_console/include/help/ja/help_alert_command.php
index 3790ba9ccd..b8eeeedee5 100644
--- a/pandora_console/include/help/ja/help_alert_command.php
+++ b/pandora_console/include/help/ja/help_alert_command.php
@@ -6,4 +6,4 @@
 
 <h1>アラートコマンド</h1>
 
-<p>&#34;しきい値を越えた場合&#34;の Pandora FMS の動作には、syslog への記録、e-mail、SMS 送信や、Pandora FMS が動作するマシンでの任意のスクリプトの実行など、さまざまな種類があります。</p>
+<p>&#34;しきい値を越えた場合&#34;の <?php echo get_product_name();?> の動作には、syslog への記録、e-mail、SMS 送信や、<?php echo get_product_name();?> が動作するマシンでの任意のスクリプトの実行など、さまざまな種類があります。</p>
diff --git a/pandora_console/include/help/ja/help_alert_compound.php b/pandora_console/include/help/ja/help_alert_compound.php
index c2115d1134..691a5853ca 100644
--- a/pandora_console/include/help/ja/help_alert_compound.php
+++ b/pandora_console/include/help/ja/help_alert_compound.php
@@ -6,4 +6,4 @@
 
 <h1>関連付けアラート</h1>
 
-<p>一つ以上のモジュールを使って Pandora FMS の動作をさせることができます。これらのモジュールは、同一エージェントや異なるエージェントからのどちらでも可能です。</p>
+<p>一つ以上のモジュールを使って <?php echo get_product_name();?> の動作をさせることができます。これらのモジュールは、同一エージェントや異なるエージェントからのどちらでも可能です。</p>
diff --git a/pandora_console/include/help/ja/help_alert_config.php b/pandora_console/include/help/ja/help_alert_config.php
index a59f445b4b..870591f83a 100644
--- a/pandora_console/include/help/ja/help_alert_config.php
+++ b/pandora_console/include/help/ja/help_alert_config.php
@@ -9,7 +9,7 @@
 
     <b>名前(Name):</b> アクションの名前。<br>
     <b>グループ(Group):</b> アクションのグループ。<br>
-    <br>コマンド(Command):</b> アラートが実行された時に利用されるコマンドの定義です。Pandora で定義されたコマンドを選択することができます。選択するコマンドによって、入力が必要なフィールドが異なります。<br>
+    <br>コマンド(Command):</b> アラートが実行された時に利用されるコマンドの定義です。<?php echo get_product_name();?> で定義されたコマンドを選択することができます。選択するコマンドによって、入力が必要なフィールドが異なります。<br>
     <b>閾値(Threshold):</b> アクション実行の閾値。<br>
     <b>コマンドプレビュー(Command Preview):</b> このフィールドには、システムが実行するコマンドが表示されます。編集はできません。<br>
     <b>フィールドX(Field X):</b> このフィールドでは、マクロ _field1_ から _field10_ までのマクロの値を定義します。これらは、必要に応じてコマンドで利用されます。これらのフィールドは、設定によりテキスト入力または選択となります。選択したコマンドに応じて、表示されるフィールドの数が変化します。以下に例を示します。<br><br>
@@ -49,7 +49,7 @@ email アクションを設定するには、_field1_ (送信先アドレス)、
     <li>_data_ : アラート発生時のモジュールのデータ(値)</li>
     <li>_email_tag_ : モジュールタグに関連付けられた Email。</li>
     <li>_event_cfX_ : (イベントアラートのみ) アラートを発報したイベントのカスタムフィールドのキー。 For example, if there is a custom field whose key is IPAM, its value can be obtained using the _event_cfIPAM_ macro.</li>
-    <li>_event_description_ :  (イベントアラートのみ) Pandora FMS イベントの説明 です</li>
+    <li>_event_description_ :  (イベントアラートのみ) <?php echo get_product_name();?> イベントの説明 です</li>
     <li>_event_extra_id_: (Only event alerts) Extra id.</li>
     <li>_event_id_ : (イベントアラートのみ) アラート発生元のイベントID</li>
     <li>_event_text_severity_ : (イベントアラートのみ) イベント(アラートの発生元)のテキストでの重要度 (Maintenance, Informational, Normal Minor, Warning, Major, Critical)</li>
diff --git a/pandora_console/include/help/ja/help_alert_macros.php b/pandora_console/include/help/ja/help_alert_macros.php
index 0c4b296ad7..85b1de7c46 100644
--- a/pandora_console/include/help/ja/help_alert_macros.php
+++ b/pandora_console/include/help/ja/help_alert_macros.php
@@ -33,7 +33,7 @@
     <li>_data_ : アラート発生時のモジュールのデータ(値)</li>
     <li>_email_tag_ : モジュールタグに関連付けられた Email。</li>
     <li>_event_cfX_ : (イベントアラートのみ) アラートを発報したイベントのカスタムフィールドのキー。 For example, if there is a custom field whose key is IPAM, its value can be obtained using the _event_cfIPAM_ macro.</li>
-    <li>_event_description_ :  (イベントアラートのみ) Pandora FMS イベントの説明 です</li>
+    <li>_event_description_ :  (イベントアラートのみ) <?php echo get_product_name();?> イベントの説明 です</li>
     <li>_event_extra_id_: (Only event alerts) Extra id.</li>
     <li>_event_id_ : (イベントアラートのみ) アラート発生元のイベントID</li>
     <li>_event_text_severity_ : (イベントアラートのみ) イベント(アラートの発生元)のテキストでの重要度 (Maintenance, Informational, Normal Minor, Warning, Major, Critical)</li>
diff --git a/pandora_console/include/help/ja/help_alert_recovery.php b/pandora_console/include/help/ja/help_alert_recovery.php
index d4cf9b5d41..b603045937 100644
--- a/pandora_console/include/help/ja/help_alert_recovery.php
+++ b/pandora_console/include/help/ja/help_alert_recovery.php
@@ -5,5 +5,5 @@
 ?>
 <h1>アラートリカバリ</h1>
 
-アラート状態がリカバーした時に、Pandora FMS が別のアラートを上げるかどうかを定義します。フィールド 1 は同じで、フィールド 2 とフィールド 3 に "[RECOVER]" が追加されます。
+アラート状態がリカバーした時に、<?php echo get_product_name();?> が別のアラートを上げるかどうかを定義します。フィールド 1 は同じで、フィールド 2 とフィールド 3 に "[RECOVER]" が追加されます。
 デフォルトでは無効に設定されています。
diff --git a/pandora_console/include/help/ja/help_alerts_config.php b/pandora_console/include/help/ja/help_alerts_config.php
index 93e008ff6e..36f2e51ff4 100644
--- a/pandora_console/include/help/ja/help_alerts_config.php
+++ b/pandora_console/include/help/ja/help_alerts_config.php
@@ -3,18 +3,18 @@
  * @package Include/help/ja
  */
 ?> 
- <h1>Pandora FMS アラート設定クイックガイド</h1>
+ <h1><?php echo get_product_name();?> アラート設定クイックガイド</h1>
 <br>
 
 <b>アラートシステムの概要</b><br><br>
 
-Pandora FMS のアラート定義は複雑だと良く言われます。バージョン 2.0 以前は、アラートの設定は簡単でした。個々のアラートで状態を定義し、それぞれの場合においてアクションが実施されなかった時に何をするかを定義していました。これは "直感的" です (しかし、それぞれが閾値の設定を持っており、多くの人の頭痛の種になっていました)。シンプルではありますが、良くは無いのではないでしょうか。<br><br>
+<?php echo get_product_name();?> のアラート定義は複雑だと良く言われます。バージョン 2.0 以前は、アラートの設定は簡単でした。個々のアラートで状態を定義し、それぞれの場合においてアクションが実施されなかった時に何をするかを定義していました。これは "直感的" です (しかし、それぞれが閾値の設定を持っており、多くの人の頭痛の種になっていました)。シンプルではありますが、良くは無いのではないでしょうか。<br><br>
 
-一人のユーザ (たくさんのエージェントをインストールし、Pandora FMS を良く利用していました) が、2000 のモジュール全てに対して、アラートを 設定 しなくてはいけないという点でとても大変であるということを言及しました。この点とその他問題のために、我々はアラートシステムをモジュール化し、アラートが発生したときに実行するアクション (アラートアクション) および、アクションによって実行されるコマンド (アラートコマンド) から、アラートを発生させる定義 (アラートテンプレート) を分割するよう改変を行いました。モジュールとアラートテンプレートの組み合わせにより、アラートが発生します。<br><br>
+一人のユーザ (たくさんのエージェントをインストールし、<?php echo get_product_name();?> を良く利用していました) が、2000 のモジュール全てに対して、アラートを 設定 しなくてはいけないという点でとても大変であるということを言及しました。この点とその他問題のために、我々はアラートシステムをモジュール化し、アラートが発生したときに実行するアクション (アラートアクション) および、アクションによって実行されるコマンド (アラートコマンド) から、アラートを発生させる定義 (アラートテンプレート) を分割するよう改変を行いました。モジュールとアラートテンプレートの組み合わせにより、アラートが発生します。<br><br>
 
 この方法で、"Host alive" というモジュールを持ち、"Host down" というアラートテンプレートが関連付けられた 1000 のシステムがあったとします。このとき、"Call to the operator" というアラートがデフォルトで実行されます。そして、オペレータへ通知する前に何回のアラート検知までを許容するか(何回目まではオペレータへ通知しないか)を変更したいと考えたとき、テンプレートの定義を変更するだけで実現できます。1000個のアラート設定を一つ一つ設定変更する必要はありません。<br><br>
 
-Pandora FMS で、何人かのユーザは、数十のマシンのみを管理していますが、数百を管理しているユーザもいます。また、数千ものシステムをモニタしているユーザもいます。我々は、Pandora FMS で、すべての種類の環境の管理を可能にしなければいけません。<br><br><br><br>
+<?php echo get_product_name();?> で、何人かのユーザは、数十のマシンのみを管理していますが、数百を管理しているユーザもいます。また、数千ものシステムをモニタしているユーザもいます。我々は、<?php echo get_product_name();?> で、すべての種類の環境の管理を可能にしなければいけません。<br><br><br><br>
 <b>アラートの仕組み</b><br><br>
 
 <?php html_print_image ("images/help/alert01.png", false, array('width' => '550px')); ?>
@@ -84,9 +84,9 @@ Pandora FMS で、何人かのユーザは、数十のマシンのみを管理
 
 <?php html_print_image ("images/help/alert07.png", false, array('width' => '550px')); ?>
 
-以上で、どのような時が正常 (正常で緑表示) で、どのような時が異常 (障害で赤表示) かをシステムが認識するようになりました。次のすべきは、モジュールが障害状態になったときにメール通知する設定です。そのためには、Pandora FMS アラートシステムを利用します。<br><br>
+以上で、どのような時が正常 (正常で緑表示) で、どのような時が異常 (障害で赤表示) かをシステムが認識するようになりました。次のすべきは、モジュールが障害状態になったときにメール通知する設定です。そのためには、<?php echo get_product_name();?> アラートシステムを利用します。<br><br>
 
-この設定をするには、まずは、必要なコマンド (メールを送る) が一つあるということを認識する必要があります。この例では、Pandora FMS にあらかじめ定義されているメール送信コマンドを利用するので簡単です。 <br><br>
+この設定をするには、まずは、必要なコマンド (メールを送る) が一つあるということを認識する必要があります。この例では、<?php echo get_product_name();?> にあらかじめ定義されているメール送信コマンドを利用するので簡単です。 <br><br>
 
 <b>アラートの設定</b><br><br>
 
@@ -94,7 +94,7 @@ Pandora FMS で、何人かのユーザは、数十のマシンのみを管理
 
 <?php html_print_image ("images/help/alert08.png", false, array('width' => '550px')); ?>
 
-このアクションでは、eMail というメールを送信するコマンドを使います。これはとても簡単で、一つのフィールド (フィールド 1) だけ設定すれば良く、他の 2つの設定は不要です。フィールド1、2、3 は何かというのは、Pandora FMS のアラートシステムの中で最もわかりにくい部分の一つです。<br><br>
+このアクションでは、eMail というメールを送信するコマンドを使います。これはとても簡単で、一つのフィールド (フィールド 1) だけ設定すれば良く、他の 2つの設定は不要です。フィールド1、2、3 は何かというのは、<?php echo get_product_name();?> のアラートシステムの中で最もわかりにくい部分の一つです。<br><br>
 
 これらのフィールドは、アラートテンプレートの情報をコマンド設定へ "渡す" ために利用されます。また、そこから、実際に実行されるコマンドに渡されます。つまり、テンプレートとコマンド設定の両方から、異なる情報を実行されるコマンドに与えることができます。この場合、コマンドに対してフィールド 1のみを指定し、フィールド 2 と 3 は設定していません。<br><br>
 
@@ -121,18 +121,18 @@ Pandora FMS で、何人かのユーザは、数十のマシンのみを管理
 
     <i>再通知間隔(Time threshhold):</i> デフォルトでは 1日です。例では 1日ですが、5分に設定すると、モジュールが常にダウン状態の場合、5分間隔でアラート通知されます。もし、1日 (24時間) に設定すると、ダウンしたときに、まず一度アラート通知します。モジュールが復旧し、再びダウンすると、再びアラート通知します。しかし、二度目のダウンからダウン状態が続いても、24時間以内であればアラートを通知しません。<br><br>
 
-    <i>最小アラート数(Min. Number of alerts):</i> Pandora FMS がアラートテンプレートで定義したアクションを実行する状態変化 (この例では、モジュールの障害状態) の回数です。この設定により、正常状態と障害状態を繰り返す大量のアラートが発生を避けることができます。ここに 1を設定すると、モジュールの一度の障害状態は無視します。0 を設定すると、モジュールの初回の障害状態でアラート通知がされます。<br><br>
+    <i>最小アラート数(Min. Number of alerts):</i> <?php echo get_product_name();?> がアラートテンプレートで定義したアクションを実行する状態変化 (この例では、モジュールの障害状態) の回数です。この設定により、正常状態と障害状態を繰り返す大量のアラートが発生を避けることができます。ここに 1を設定すると、モジュールの一度の障害状態は無視します。0 を設定すると、モジュールの初回の障害状態でアラート通知がされます。<br><br>
 
     <i>最大アラート数(Max. Number of alerts):</i> 1 は、アクションを一度だけ実行することを意味します。もし、ここに 10 を設定すると、アクションを 10回実行します。この設定により、アラートの実行回数を制限することができます。<br><br>
 
 再び、"フィールド1(field1)"、"フィールド2(field2)"、"フィールド3(field3)" があります。フィールド1(field1)には何も書かれていませんが、これによりアクションを設定したときに定義したものが使われます。フィールド2(field2)およびフィールド3(field3)は、メール送信のアクションで件名と本文として使われます。ここで、フィールド1(field1)は、受信アドレス (カンマ区切りで複数書けます) の定義をすることもできます。テンプレートは、マクロを使って件名と本文を定義します。この例では、次のようなメールが送信されます。("Farscape" というエージェントのモジュールを想定)<br><br>
 
 <i>To: sancho.lerena@notexist.ocm<br>
-Subject: [PANDORA] Farscape cpu_sys is in CRITICAL status with value 20<br>
+Subject: [MONITORING] Farscape cpu_sys is in CRITICAL status with value 20<br>
 Texto email:<br><br>
 
-This is an automated alert generated by Pandora FMS<br>
-Please contact your Pandora FMS for more information. *DO NOT* reply this email.<br></i><br>
+This is an automated alert generated by <?php echo get_product_name();?><br>
+Please contact your <?php echo get_product_name();?> for more information. *DO NOT* reply this email.<br></i><br>
 
 下に、前もって定義したデフォルトのアクションが表示されます。このテンプレートを利用する全てのアラートは、設定を変更しなければデフォルトでこの定義済アクションを利用します。<br><br>
 
@@ -173,7 +173,7 @@ Please contact your Pandora FMS for more information. *DO NOT* reply this email.
 
 <b>メール送信以外のアラートコマンドの利用</b><br><br>
 
-メール送信は、Pandora FMS の内部コマンドであり、フィールド1、フィールド2、フィールド3 はそれぞれメール送信先、件名、本文として使うように定義されており変更することはできません。では、別のアクションを自分で定義したい時はどうすれば良いでしょうか。<br><br>
+メール送信は、<?php echo get_product_name();?> の内部コマンドであり、フィールド1、フィールド2、フィールド3 はそれぞれメール送信先、件名、本文として使うように定義されており変更することはできません。では、別のアクションを自分で定義したい時はどうすれば良いでしょうか。<br><br>
 
 この場合は、新たなコマンドの定義画面へ行き、自分で定義を行います。検知したアラートそれぞれのログファイルを作成したいとします。ログファイルのフォーマットは次のようなものを想定します。<br><br>
 
@@ -196,4 +196,4 @@ Please contact your Pandora FMS for more information. *DO NOT* reply this email.
 
 アラートは、"farscape" エージェントの "cpu_sys" モジュールで、18:17:10 に発生したこと、また、現在のデータは "23.00" であり、アクションで設定した説明が含まれていることがわかります。<br><br>
 
-コマンド実行時に、フィールドやその他がどのように引き渡されて実行されたかは簡単にはわかりません。それを確認する簡単な方法は、pandora サーバの設定ファイル /etc/pandora/pandora_server.conf にて、デバッグトレースを有効にする (verbose 10) ことです。 そして、Pandora FMS サーバがどのようにコマンドを実行しているか確認するには、サーバを再起動し (/etc/init.d/pandora_server restart)、/var/log/pandora/pandora_server.log に出力されている定義されたアラートの実行ログを探します。<br><br>
+コマンド実行時に、フィールドやその他がどのように引き渡されて実行されたかは簡単にはわかりません。それを確認する簡単な方法は、pandora サーバの設定ファイル /etc/pandora/pandora_server.conf にて、デバッグトレースを有効にする (verbose 10) ことです。 そして、<?php echo get_product_name();?> サーバがどのようにコマンドを実行しているか確認するには、サーバを再起動し (/etc/init.d/pandora_server restart)、/var/log/pandora/pandora_server.log に出力されている定義されたアラートの実行ログを探します。<br><br>
diff --git a/pandora_console/include/help/ja/help_cascade_protection.php b/pandora_console/include/help/ja/help_cascade_protection.php
index 3dfcb88c9d..f8d28a6fc6 100644
--- a/pandora_console/include/help/ja/help_cascade_protection.php
+++ b/pandora_console/include/help/ja/help_cascade_protection.php
@@ -10,7 +10,7 @@
 <p>
 このオプションは、あるエージェントの障害により他のエージェントの状態が確認できなくなった時に、大量のアラートが上がるのを避けるために利用します。
 たとえば、途中のルータがダウンしたことにより、その先の機器が実際には正常稼働していたとしても疎通が取れなくなったような場合です。
-何も設定を行わないと、Pandora FMS は ICMP(ping)疎通確認を実施し、疎通が取れなくなった全てのエージェントをダウン状態と認識します。
+何も設定を行わないと、<?php echo get_product_name();?> は ICMP(ping)疎通確認を実施し、疎通が取れなくなった全てのエージェントをダウン状態と認識します。
 <br><br>
 エージェントで<i>関連障害検知抑制</i>を有効にすると、いずれかの親のエージェントで「障害」アラートが上がった場合は、その配下のエージェントではアラートは上がらなくなります。
 親エージェントが「障害」状態よりレベルの低いアラート状態の場合は、配下のエージェントのアラートも上がります。
@@ -29,7 +29,7 @@
 <p>
 このオプションは、あるエージェントの障害により他のエージェントの状態が確認できなくなった時に、大量のアラートが上がるのを避けるために利用します。
 たとえば、途中のルータがダウンしたことにより、その先の機器が実際には正常稼働していたとしても疎通が取れなくなったような場合です。
-何も設定を行わないと、Pandora FMS は ICMP(ping)疎通確認を実施し、疎通が取れなくなった全てのエージェントをダウン状態と認識します。
+何も設定を行わないと、<?php echo get_product_name();?> は ICMP(ping)疎通確認を実施し、疎通が取れなくなった全てのエージェントをダウン状態と認識します。
 <br><br>
 モジュールで<i>関連障害検知抑制</i>を有効にすると、いずれかの親のエージェントのモジュールで「障害」アラートが上がった場合は、その配下のエージェントではアラートは上がらなくなります。
 <br><br>
diff --git a/pandora_console/include/help/ja/help_categories.php b/pandora_console/include/help/ja/help_categories.php
index 22d9fdd54d..678f9f72a1 100644
--- a/pandora_console/include/help/ja/help_categories.php
+++ b/pandora_console/include/help/ja/help_categories.php
@@ -3,7 +3,7 @@
  * @package Include/help/ja
  */
 ?>
-<h1>Pandora FMS におけるカテゴリ</h1>
+<h1><?php echo get_product_name();?> におけるカテゴリ</h1>
 
 カテゴリはシステム上で設定され、選択されたモジュールに割り当てられます。<br>
 管理者のみが、カテゴリを作成したり編集したりできます。属するカテゴリに応じてモジュールを操作するのに利用できます。
diff --git a/pandora_console/include/help/ja/help_configure_gis_map.php b/pandora_console/include/help/ja/help_configure_gis_map.php
index 9f132e4e3a..93d5ec1e43 100644
--- a/pandora_console/include/help/ja/help_configure_gis_map.php
+++ b/pandora_console/include/help/ja/help_configure_gis_map.php
@@ -10,7 +10,7 @@
 </p>
 <h2>マップ名</h2>
 <p>
-それぞれのマップには Pandora FMS 内で区別するための名前を定義します。
+それぞれのマップには <?php echo get_product_name();?> 内で区別するための名前を定義します。
 </p>
 <h2>利用マップの選択</h2>
 <p>
@@ -19,8 +19,8 @@ GIS マップを設定するためには、少なくとも一つ選択されて
 <?php html_print_image("images/add.png", false, array("alt" => "Add")); ?>(追加)アイコンをクリックして、追加することも可能です。
 </p>
 <p>
-意図しない設定情報の再入力を防ぐために、利用マップが設定されると、それを Pandora FMS はデフォルトのマップとして利用するかどうか尋ねます。
-(ラジオボタンによって)デフォルトの利用マップが変更された場合は、それで良いか Pandora FMS は再度尋ねます。
+意図しない設定情報の再入力を防ぐために、利用マップが設定されると、それを <?php echo get_product_name();?> はデフォルトのマップとして利用するかどうか尋ねます。
+(ラジオボタンによって)デフォルトの利用マップが変更された場合は、それで良いか <?php echo get_product_name();?> は再度尋ねます。
 </p>
 <h2>マップパラメータ</h2>
 <p>
diff --git a/pandora_console/include/help/ja/help_context_pandora_server_email.php b/pandora_console/include/help/ja/help_context_pandora_server_email.php
index c811ea88b0..4acd60e574 100755
--- a/pandora_console/include/help/ja/help_context_pandora_server_email.php
+++ b/pandora_console/include/help/ja/help_context_pandora_server_email.php
@@ -3,14 +3,14 @@
  * @package Include/help/ja
  */
 ?>
-<h1>email アラートのための Pandora サーバ設定</h1>
-<p><i>"Pandora サーバ設定ファイル"</i>を編集する必要があります。通常は以下にあります。
+<h1>email アラートのための <?php echo get_product_name();?> サーバ設定</h1>
+<p><i>"<?php echo get_product_name();?> サーバ設定ファイル"</i>を編集する必要があります。通常は以下にあります。
 <pre>
 	/etc/pandora_server/pandora_server.conf
 </pre>
 次の値を設定します。
 <pre>
-# mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
+# mta_address: External Mailer (MTA) IP Address to be used by <?php echo get_product_name();?> internal email capabilities
 
 mta_address localhost
 
@@ -33,6 +33,6 @@ mta_auth LOGIN
 # mta_from Email address that sends the mail, by default is pandora@localhost 
 #           probably you need to change it to avoid problems with your antispam
 
-mta_from Pandora FMS <pandora@mydomain.com>
+mta_from <?php echo get_product_name();?> &lt;monitoring@mydomain.com&gt;
 </pre>
 </p>
diff --git a/pandora_console/include/help/ja/help_create_agent.php b/pandora_console/include/help/ja/help_create_agent.php
index 0d432d00f0..0d8ac45555 100644
--- a/pandora_console/include/help/ja/help_create_agent.php
+++ b/pandora_console/include/help/ja/help_create_agent.php
@@ -12,5 +12,5 @@
 "間隔" は、エージェントの実行間隔です。どの程度の頻度でエージェントがサーバにデータを送るかです。
 </p>
 <p>
-"サーバ" は、Pandora サーバで、エージェントから送られるデータを受け取ります。
+"サーバ" は、<?php echo get_product_name();?> サーバで、エージェントから送られるデータを受け取ります。
 </p>
diff --git a/pandora_console/include/help/ja/help_cron.php b/pandora_console/include/help/ja/help_cron.php
index 6608ae60cf..b5208694c0 100644
--- a/pandora_console/include/help/ja/help_cron.php
+++ b/pandora_console/include/help/ja/help_cron.php
@@ -9,7 +9,7 @@ Using the configuration parameter sets <b>Cron from</b> and <b>Cron to</b> makes
 it possible for a module to run only for certain periods of time. 
 The way in which it is configured is similar to the syntax of 
 <a style="font-size:14px;" href="https://en.wikipedia.org/wiki/Cron">cron</a>. 
-Just as they appear in the Pandora console, each one of the parameters  
+Just as they appear in the <?php echo get_product_name();?> console, each one of the parameters  
 has three options.
 
 <h4>Cron from: any</h4>
diff --git a/pandora_console/include/help/ja/help_custom_logo.php b/pandora_console/include/help/ja/help_custom_logo.php
index daa5704532..1fca279a7a 100644
--- a/pandora_console/include/help/ja/help_custom_logo.php
+++ b/pandora_console/include/help/ja/help_custom_logo.php
@@ -5,7 +5,7 @@
 ?>
 <h1>カスタムロゴ</h1>
 
-ここに指定した画像ファイルを、オリジナルロゴとして Pandora FMS のヘッダーに表示することができます。
+ここに指定した画像ファイルを、オリジナルロゴとして <?php echo get_product_name();?> のヘッダーに表示することができます。
 表示可能な画像ファイルは PNG 形式です。
 画像サイズは、206x47ピクセルに修正されます。
 <br><br>
diff --git a/pandora_console/include/help/ja/help_event_alert.php b/pandora_console/include/help/ja/help_event_alert.php
index 62171b90d5..ea34c43d5c 100644
--- a/pandora_console/include/help/ja/help_event_alert.php
+++ b/pandora_console/include/help/ja/help_event_alert.php
@@ -6,7 +6,7 @@
 
 <h1>イベントアラート、イベント相関</h1>
 
-Pandora FMS バージョン 4.0 から、イベントにアラートを定義できるようになりました。より柔軟な完全に新たなアプローチです。これはエンタープライズ版の機能です。
+<?php echo get_product_name();?> バージョン 4.0 から、イベントにアラートを定義できるようになりました。より柔軟な完全に新たなアプローチです。これはエンタープライズ版の機能です。
 
 新たなイベントアラートを作成するには、システム管理メニューのイベントアラートメニューで作成ボタンをクリックします。 <br><br>
 
@@ -61,6 +61,6 @@ Pandora FMS バージョン 4.0 から、イベントにアラートを定義で
 <?php html_print_image ("images/help/event04.png", false, array('width' => '550px')); ?>
 
 
-<p>* Pandora FMS データベースに保存できるイベント数に関しては、pandora_server.conf ファイルの event_window パラメータにて定義します。この時間範囲を越えるイベントが発生した場合は、サーバは処理を行いません。そのため、サーバの設定よりも大きな時間間隔を設定しても意味がありません。 </p>
+<p>* <?php echo get_product_name();?> データベースに保存できるイベント数に関しては、pandora_server.conf ファイルの event_window パラメータにて定義します。この時間範囲を越えるイベントが発生した場合は、サーバは処理を行いません。そのため、サーバの設定よりも大きな時間間隔を設定しても意味がありません。 </p>
 
 
diff --git a/pandora_console/include/help/ja/help_events_history.php b/pandora_console/include/help/ja/help_events_history.php
index 68d7f1d29e..eed3001724 100644
--- a/pandora_console/include/help/ja/help_events_history.php
+++ b/pandora_console/include/help/ja/help_events_history.php
@@ -3,7 +3,7 @@
 */
 ?>
 
-<p> ヒストリイベントが有効の場合、削除スクリプト(pandora_db.pl)は、未承諾もしくは処理中(新しいもののみ)のイベントを削除する前にヒストリテーブルへコピーします。
+<p> ヒストリイベントが有効の場合、削除スクリプト(DB Tool)は、未承諾もしくは処理中(新しいもののみ)のイベントを削除する前にヒストリテーブルへコピーします。
 <br><br>これらのイベントは、ヒストリイベントビューで扱うことができます。このビューは、イベント画面の新しいタブからアクセスできます。
 </p>
 
diff --git a/pandora_console/include/help/ja/help_export_server.php b/pandora_console/include/help/ja/help_export_server.php
index d6f130c18c..1f98e92ec5 100644
--- a/pandora_console/include/help/ja/help_export_server.php
+++ b/pandora_console/include/help/ja/help_export_server.php
@@ -5,10 +5,10 @@
 ?>
 <h1>エクスポートサーバ</h1>
 
-<p>Pandora FMS エンタープライズ版の実装では、さまざまな情報をプロファイルに分割するように設計すれば、データスケーリング機能のエクスポートサーバで仮想的に無限のモニタリング情報を配布することができます。</p>
+<p><?php echo get_product_name();?> エンタープライズ版の実装では、さまざまな情報をプロファイルに分割するように設計すれば、データスケーリング機能のエクスポートサーバで仮想的に無限のモニタリング情報を配布することができます。</p>
 
 <ul>
-<li type="circle">名前: Pandora FMS サーバ名。</li>
+<li type="circle">名前: <?php echo get_product_name();?> サーバ名。</li>
 <li type="circle">エクスポートサーバ: データをエクスポートするのに使うエクスポートサーバを選択します。</li>
 <li type="circle">プレフィックス: 送信するデータのエージェント名に追加するプレフィックスです。例えば、"Farscape" という名前のエージェントがあり、エクスポートサーバのプレフィックスが "EU04" であれば、送信先のサーバでのエージェント名は、EU01-Farscape となります。</li>
 <li type="circle">間隔: 時間間隔および未解決のデータを送信する頻度(秒)を定義します。</li>
diff --git a/pandora_console/include/help/ja/help_ff_threshold.php b/pandora_console/include/help/ja/help_ff_threshold.php
index 3e25b90c37..ab8c881fe6 100644
--- a/pandora_console/include/help/ja/help_ff_threshold.php
+++ b/pandora_console/include/help/ja/help_ff_threshold.php
@@ -9,7 +9,7 @@
 <br>
 
 連続抑制回数は、状態変化を繰り返すようなデータを扱う場合に利用します。
-これを設定することにより、Pandora FMS にオリジナルの状態から連続何回データが変化した状態にあるかの判断をさせることができます。
+これを設定することにより、<?php echo get_product_name();?> にオリジナルの状態から連続何回データが変化した状態にあるかの判断をさせることができます。
 <br><br>
 例えば、あるホストへの ping でパケットロスがあったとします。
 このような場合、つぎのようなモニタ結果となります。
diff --git a/pandora_console/include/help/ja/help_gis_map_builder.php b/pandora_console/include/help/ja/help_gis_map_builder.php
index b96bf062f8..9274d12f15 100644
--- a/pandora_console/include/help/ja/help_gis_map_builder.php
+++ b/pandora_console/include/help/ja/help_gis_map_builder.php
@@ -8,7 +8,7 @@
 <p>
 このページでは定義済のマップ一覧を表示しています。
 それらの編集や削除、参照ができます。
-また、このページで、Pandora FMS の<strong>デフォルトマップ</strong>が定義されています。
+また、このページで、<?php echo get_product_name();?> の<strong>デフォルトマップ</strong>が定義されています。
 </p>
 マップを作成するためには、利用マップの設定が必要です。
 利用マップの設定は、<strong>設定</strong>メニューで管理者権限にて実施してください。
diff --git a/pandora_console/include/help/ja/help_gis_setup_map_connection.php b/pandora_console/include/help/ja/help_gis_setup_map_connection.php
index 05854f7c5e..eb42b7a2a8 100644
--- a/pandora_console/include/help/ja/help_gis_setup_map_connection.php
+++ b/pandora_console/include/help/ja/help_gis_setup_map_connection.php
@@ -11,7 +11,7 @@
 
 <h2>マップの種類</h2>
 <p>
-現在、Pandora FMS は、OpenStreetマップ、Google マップ、静的画像の 3種類のマップをサポートしています。
+現在、<?php echo get_product_name();?> は、OpenStreetマップ、Google マップ、静的画像の 3種類のマップをサポートしています。
 </p>
 <h3>Open Street マップ</h3>
 <p>
diff --git a/pandora_console/include/help/ja/help_graphs.php b/pandora_console/include/help/ja/help_graphs.php
index 0fc35349a9..7e5136af91 100644
--- a/pandora_console/include/help/ja/help_graphs.php
+++ b/pandora_console/include/help/ja/help_graphs.php
@@ -48,11 +48,11 @@ div.img_title {
 </style>
 
 <body class="hlp_graphs">
-<h1>INTERPRETING GHRAPHS IN PANDORA FMS</h1>
+<h1>INTERPRETING GHRAPHS IN <?php echo get_product_name();?></h1>
 
 
-<p>In Pandora FMS, graphs represent the values a module has had during a given period.</p>
-<p>Due to the large amount of data that Pandora FMS stores, two different types of functionality are offered</p>
+<p>In <?php echo get_product_name();?>, graphs represent the values a module has had during a given period.</p>
+<p>Due to the large amount of data that <?php echo get_product_name();?> stores, two different types of functionality are offered</p>
 
 
 <h2>NORMAL GRAPHS</h2>
@@ -98,7 +98,7 @@ div.img_title {
 <dd>Shows indicator points with triggered alert information at the top.</dd>
 
 <dt>Show percentile</dt>
-<dd>Adds a graph that indicates the percentile line (configurable in general visual options of Pandora).</dd>
+<dd>Adds a graph that indicates the percentile line (configurable in general visual options of <?php echo get_product_name();?>).</dd>
 
 <dt>Time comparison (superimposed)</dt>
 <dd>Displays the same graphic overlay, but in the period before the selected one. For example, if we request a period of one week and activate this option, the week before the chosen one will also be shown superimposed.</dd>
@@ -107,7 +107,7 @@ div.img_title {
 <dd>Displays the same graph, but in the period before the selected one, in a separate area. For example, if we request a period of one week and activate this option, the week before the chosen one will also be shown.</dd>
 
 <dt>Display unknown graphic</dt>
-<dd>It shows boxes in grey shading covering the periods in which Pandora FMS cannot guarantee the module's status, either due to data loss, disconnection of a software agent, etc.</dd>
+<dd>It shows boxes in grey shading covering the periods in which <?php echo get_product_name();?> cannot guarantee the module's status, either due to data loss, disconnection of a software agent, etc.</dd>
 
 <dt>Show Full Scale Graph (TIP)</dt>
 <dd>Switches the creation mode from "normal" to "TIP". In this mode, the graphs will show real data rather than approximations, so the time it will take to generate them will be longer. More detailed information on this type of graphs can be found in the following section.</dd>
diff --git a/pandora_console/include/help/ja/help_history_database.php b/pandora_console/include/help/ja/help_history_database.php
index e2c2bad982..9ece6b5070 100644
--- a/pandora_console/include/help/ja/help_history_database.php
+++ b/pandora_console/include/help/ja/help_history_database.php
@@ -5,7 +5,7 @@
 ?>
 <h1>ヒストリデータベース</h1>
 
-ヒストリデータベースは、メインの Pandora FMS データベースの応答速度を確保するために、古いモジュールデータを毎日移動させるためのデータベースです。データは、Pandora FMS コンソールでレポートやグラフを表示するときにシームレスに参照できます。
+ヒストリデータベースは、メインの <?php echo get_product_name();?> データベースの応答速度を確保するために、古いモジュールデータを毎日移動させるためのデータベースです。データは、<?php echo get_product_name();?> コンソールでレポートやグラフを表示するときにシームレスに参照できます。
 <br><br>
 <b>ヒストリデータベースの設定</b>
 <br><br>
@@ -14,7 +14,7 @@
 <ol>
 <li>新たなヒストリデータベースの作成
 <br><br>
-<li>新たなデータベースに必要なテーブルを作成します。Pandora FMS コンソールと共に提供されている pandoradb.sql スクリプトが利用できます。
+<li>新たなデータベースに必要なテーブルを作成します。<?php echo get_product_name();?> コンソールと共に提供されている DB Tool スクリプトが利用できます。
 <br><br>
 <i>cat pandoradb.sql | mysql -u user -p -D history_db</i>
 <br><br>
@@ -22,7 +22,7 @@
 <br><br>
 <i>Mysql Example: GRANT ALL PRIVILEGES ON pandora.* TO 'pandora'@'IP' IDENTIFIED BY 'password'</i>
 <br><br>
-<li>Pandora FMS コンソールの 設定(Setup) -> ヒストリデータベース(History database) のメニューへ行き、ホスト名、ポート番号、データベース名および、新たなデータベースのユーザ名とパスワードを入力します。
+<li><?php echo get_product_name();?> コンソールの 設定(Setup) -> ヒストリデータベース(History database) のメニューへ行き、ホスト名、ポート番号、データベース名および、新たなデータベースのユーザ名とパスワードを入力します。
 </ol>
 <br><br>
 <?php html_print_image ("images/help/historyddbb.png", false, array('width' => '550px')); ?>
diff --git a/pandora_console/include/help/ja/help_ipam.php b/pandora_console/include/help/ja/help_ipam.php
index 18198e410b..e06a6654ae 100644
--- a/pandora_console/include/help/ja/help_ipam.php
+++ b/pandora_console/include/help/ja/help_ipam.php
@@ -5,9 +5,9 @@
 ?>
 <h1>IP アドレス管理 (IPAM)</h1>
 <br>
-IPAM 拡張を利用して、指定したネットワークのホストの管理、検出、変更イベントの検出をすることができます。IP アドレス(IPv4 または IPv6)が変更された場合、ホスト(ping応答)やホスト名(DNS名前解決の利用)が存在するかどうかを知ることができます。また、OS の検出および、現在割り当てられている IP アドレスを追加することにより、現在の Pandora FMS エージェントに IP アドレスをリンクすることができます。IPAM 拡張は、ベースに自動検出サーバおよび自動検出スクリプトを利用します。ただし、何の設定も要りません。IPAM 拡張は全てを自動実行します。
+IPAM 拡張を利用して、指定したネットワークのホストの管理、検出、変更イベントの検出をすることができます。IP アドレス(IPv4 または IPv6)が変更された場合、ホスト(ping応答)やホスト名(DNS名前解決の利用)が存在するかどうかを知ることができます。また、OS の検出および、現在割り当てられている IP アドレスを追加することにより、現在の <?php echo get_product_name();?> エージェントに IP アドレスをリンクすることができます。IPAM 拡張は、ベースに自動検出サーバおよび自動検出スクリプトを利用します。ただし、何の設定も要りません。IPAM 拡張は全てを自動実行します。
 <br><br>
-IP 管理は、Pandora FMS エージェントで設定している監視と並行して動作します。IP アドレス管理を IPAM 拡張と関連づけることも、そうしないことも、好きにできます。管理された IP アドレスは、変化時にオプションでイベントを生成することができます。
+IP 管理は、<?php echo get_product_name();?> エージェントで設定している監視と並行して動作します。IP アドレス管理を IPAM 拡張と関連づけることも、そうしないことも、好きにできます。管理された IP アドレスは、変化時にオプションでイベントを生成することができます。
 
 <h2>IP 検出</h2>
 ネットワークを設定する(ネットマスクまたはプレフィックスを利用)ことができ、ネットワークは、自動的に検出するかまたは、手動実行する設定ができます。これは、自動検出タスクを実行し、(IPv4 では nmap、IPv6 では ping を利用し)応答のある IP を検索します。ネットワーク検出の進捗、はステータス画面および自動検出サーバ画面でも見ることができます。
@@ -77,7 +77,7 @@ IP 管理は、Pandora FMS エージェントで設定している監視と並
 <h3>編集画面</h3>
 権限があれば、編集画面にアクセスできます。ここでは、IP アドレスが一覧で表示されます。必要な IP のみを表示するようにフィルタすることができます。すべて一度に変更および更新ができます。<br><br>
 
-Pandora FMS エージェントおよび OS がある場合、ホスト名などいくつかのフィールドは、自動検出スクリプトによって自動的に入力されています。これらのフィールドは "手動" に設定して編集することができます。<br><br>
+<?php echo get_product_name();?> エージェントおよび OS がある場合、ホスト名などいくつかのフィールドは、自動検出スクリプトによって自動的に入力されています。これらのフィールドは "手動" に設定して編集することができます。<br><br>
 
 <table width=100%>
 <tr>
diff --git a/pandora_console/include/help/ja/help_local_component.php b/pandora_console/include/help/ja/help_local_component.php
index 146d68015a..0b4621c626 100644
--- a/pandora_console/include/help/ja/help_local_component.php
+++ b/pandora_console/include/help/ja/help_local_component.php
@@ -6,4 +6,4 @@
 
 <h1>ローカルコンポーネント</h1>
 
-<p>ローカルコンポーネントは、テンプレートのようにエージェントに適用できる要素です。Pandora FMS エンタープライズ版では、これはポリシーを使ってリモートから自動的に適用できます。</p>
+<p>ローカルコンポーネントは、テンプレートのようにエージェントに適用できる要素です。<?php echo get_product_name();?> エンタープライズ版では、これはポリシーを使ってリモートから自動的に適用できます。</p>
diff --git a/pandora_console/include/help/ja/help_main_help.php b/pandora_console/include/help/ja/help_main_help.php
index 5f9edf46fa..54e64a3d81 100644
--- a/pandora_console/include/help/ja/help_main_help.php
+++ b/pandora_console/include/help/ja/help_main_help.php
@@ -3,10 +3,10 @@
  * @package Include/help/ja
  */
 ?>
-<h1>Pandora FMS - ヘルプ</h1>
+<h1><?php echo get_product_name();?> - ヘルプ</h1>
 <h3>概要</h3>
 <p>
-これは、Pandora FMS コンソールのオンラインヘルプです。このヘルプは簡単に説明することを目的としたもので、Pandora FMS の使い方を教えることを意図しているわけではありません。Pandora FMS の公式ドキュメントは約 900ページにも及びます。全体を読む必要はありませんが、参照できるようにダウンロードしておくことをお勧めします。
+これは、<?php echo get_product_name();?> コンソールのオンラインヘルプです。このヘルプは簡単に説明することを目的としたもので、<?php echo get_product_name();?> の使い方を教えることを意図しているわけではありません。<?php echo get_product_name();?> の公式ドキュメントは約 900ページにも及びます。全体を読む必要はありませんが、参照できるようにダウンロードしておくことをお勧めします。
 
 <br><br>
 <a href="http://pandorafms.com/pandora/doc/"><b>公式ドキュメントのダウンロード</b></a>
diff --git a/pandora_console/include/help/ja/help_manage_alert_list.php b/pandora_console/include/help/ja/help_manage_alert_list.php
index cef03ca9e1..254094f552 100644
--- a/pandora_console/include/help/ja/help_manage_alert_list.php
+++ b/pandora_console/include/help/ja/help_manage_alert_list.php
@@ -6,9 +6,9 @@
 <h1>アラート</h1>
 
 <p>
-Pandora FMS のアラートは、モジュールの値がしきい値を超えると動作します。アラート
+<?php echo get_product_name();?> のアラートは、モジュールの値がしきい値を超えると動作します。アラート
 では、管理者への e-mail や SMS 送信、SNMP トラップ送信、インシデント登録や Pando
-ra FMS ログファイルへの記録等ができます。基本的に、Pandora FMS サーバを実行して
+ra FMS ログファイルへの記録等ができます。基本的に、<?php echo get_product_name();?> サーバを実行して
 いる OS 上で実行できるスクリプトは何でも実行することができます。
 </p>
 
diff --git a/pandora_console/include/help/ja/help_manage_alerts.php b/pandora_console/include/help/ja/help_manage_alerts.php
index 72971a935d..c667e2bd2d 100644
--- a/pandora_console/include/help/ja/help_manage_alerts.php
+++ b/pandora_console/include/help/ja/help_manage_alerts.php
@@ -5,7 +5,7 @@
 ?>
 <h1>アラート</h1>
 
-Pandora FMS のアラートは、モジュールの値がしきい値を超えると動作します。アラートでは、管理者への e-mail や SMS 送信、SNMP トラップ送信、インシデント登録や Pandora FMS ログファイルへの記録等ができます。基本的に、Pandora FMS サーバを実行している OS 上で実行できるスクリプトは何でも実行することができます。
+<?php echo get_product_name();?> のアラートは、モジュールの値がしきい値を超えると動作します。アラートでは、管理者への e-mail や SMS 送信、SNMP トラップ送信、インシデント登録や <?php echo get_product_name();?> ログファイルへの記録等ができます。基本的に、<?php echo get_product_name();?> サーバを実行している OS 上で実行できるスクリプトは何でも実行することができます。
 <br /><br />
 実行するコマンドを作成する場合、"_field1_", "_field2_", "_field3_" という値を利用できます。
 <br /><br />
diff --git a/pandora_console/include/help/ja/help_network_map_enterprise.php b/pandora_console/include/help/ja/help_network_map_enterprise.php
index 4424172578..e035bb8bc8 100644
--- a/pandora_console/include/help/ja/help_network_map_enterprise.php
+++ b/pandora_console/include/help/ja/help_network_map_enterprise.php
@@ -6,7 +6,7 @@
 
 <h1>ネットワークマップコンソール</h1>
 
-<p>Pandora FMS Enterprise では、編集可能なネットワークマップを作成することができます。ネットワーク参照メニューにあるオープンソース版のものと比べるとより対話形式になっています。</p>
+<p><?php echo get_product_name();?> Enterprise では、編集可能なネットワークマップを作成することができます。ネットワーク参照メニューにあるオープンソース版のものと比べるとより対話形式になっています。</p>
 
 <p>オープンソース版に対して Enterprise 版のネットワークマップでは、次のような機能があります。</p>
 
@@ -71,7 +71,7 @@
 
 
     <p>エージェントの状態と同じ色の枠で表示されます。<br>
-    エージェント名は、Pandora のエージェントのページへのリンクになっています。<br>
+    エージェント名は、<?php echo get_product_name();?> のエージェントのページへのリンクになっています。<br>
     ウインドウ内には、不明状態ではないすべてのモジュールが、緑や赤といったモジュールの状態に応じて表示されます。<br>
         モジュールをクリックすると、モジュールのメインデータと共に簡単な説明が表示されます。<br>
     枠の中には、SNMP Proc のモジュールがあります。ネットワーク機器関連のエージェントで、ネットワークインタフェースの監視に使われます。<br></p>
diff --git a/pandora_console/include/help/ja/help_performance.php b/pandora_console/include/help/ja/help_performance.php
index 2bd7e4299f..c043c808cc 100644
--- a/pandora_console/include/help/ja/help_performance.php
+++ b/pandora_console/include/help/ja/help_performance.php
@@ -62,4 +62,4 @@ GIS データを削除せずに保持する日数。
 <br><br>
 不明モジュールを削除せずに保持する日数。
 <br><br>
-<i>**これらの全てのパラメータは、pandora_db.pl というツールを実行したときに利用されます。</i>
+<i>**これらの全てのパラメータは、DB Tool というツールを実行したときに利用されます。</i>
diff --git a/pandora_console/include/help/ja/help_planned_downtime.php b/pandora_console/include/help/ja/help_planned_downtime.php
index 7399a5977f..22eb78b6d9 100644
--- a/pandora_console/include/help/ja/help_planned_downtime.php
+++ b/pandora_console/include/help/ja/help_planned_downtime.php
@@ -14,7 +14,7 @@
 説明には任意の文章を入力できます。
 </p>
 <p>
-計画停止時間が来ると、Pandora FMS は自動的に該当するすべてのエージェントのアラートやデータ収集を停止します。
+計画停止時間が来ると、<?php echo get_product_name();?> は自動的に該当するすべてのエージェントのアラートやデータ収集を停止します。
 その時間が終了すると、該当する全てのエージェントを有効に戻します。
 計画停止時間になると、該当する設定は削除や編集ができなくなります。
 削除・編集には、計画停止時間の終了を待つ必要があります。
diff --git a/pandora_console/include/help/ja/help_plugin_definition.php b/pandora_console/include/help/ja/help_plugin_definition.php
index f1dbeeee09..6e536c32c8 100644
--- a/pandora_console/include/help/ja/help_plugin_definition.php
+++ b/pandora_console/include/help/ja/help_plugin_definition.php
@@ -5,9 +5,9 @@
 ?>
 <h1>プラグイン登録</h1>
 
-他のコンポーネントとは異なり、デフォルトでは Pandora FMS にあらかじめ設定されたコンポーネントが存在しません。そのため、エージェントのモジュールに追加できるよ、作成する必要があります。Pandora FMS のインストールディレクトリにはいくつかのプラグインが含まれていますが、前述の通りデータベースに設定はされていません。
+他のコンポーネントとは異なり、デフォルトでは <?php echo get_product_name();?> にあらかじめ設定されたコンポーネントが存在しません。そのため、エージェントのモジュールに追加できるよ、作成する必要があります。<?php echo get_product_name();?> のインストールディレクトリにはいくつかのプラグインが含まれていますが、前述の通りデータベースに設定はされていません。
 <br><br>
-Pandora FMS にすでに存在するプラグインを追加するには、コンソールの管理メニューで、サーバ管理をクリックします。その後、プラグイン管理をクリックします。
+<?php echo get_product_name();?> にすでに存在するプラグインを追加するには、コンソールの管理メニューで、サーバ管理をクリックします。その後、プラグイン管理をクリックします。
 <br><br>
 プラグイン管理画面に行ったら、追加ボタンをクリックします。それ以外のメニューはありません。
 <br><br>
@@ -18,7 +18,7 @@ Pandora FMS にすでに存在するプラグインを追加するには、コ
 プラグイン名です。ここでは、Nmap です。
 <br><br>
 <b>プラグインタイプ(Plugin type)</b><br>
-プラグインは、標準と Nagios の 2種類があります。標準プラグインは、処理を実行し値を取得するものです。Nagios プラグインは、その名の通り Pandora FMS で Nagios プラグインを利用できるようにするものです。Nagios プラグインの主な違いは、実行結果の成功・失敗を戻値で返すことです。
+プラグインは、標準と Nagios の 2種類があります。標準プラグインは、処理を実行し値を取得するものです。Nagios プラグインは、その名の通り <?php echo get_product_name();?> で Nagios プラグインを利用できるようにするものです。Nagios プラグインの主な違いは、実行結果の成功・失敗を戻値で返すことです。
 <br><br>
 Nagios プラグインを利用して正常・異常の状態ではなくデータを取得したい場合は、Nagios プラグインを "標準" モードで利用します。
 <br><br>
@@ -38,7 +38,7 @@ Nagios プラグインを利用して正常・異常の状態ではなくデー
 
 プラグインコマンドのパスを設定します。デフォルトのディレクトリは、標準のインストールをした場合、/usr/share/pandora_server/util/plugin/ です。システム上の任意のパスを指定することができます。この例では、/usr/share/pandora_server/util/plugin/udp_nmap_plugin.shin を設定しています。
 <br><br>
-Pandora サーバは、このスクリプトを実行します。このファイルは、アクセスし実行できるパーミッションになっている必要があります。
+<?php echo get_product_name();?> サーバは、このスクリプトを実行します。このファイルは、アクセスし実行できるパーミッションになっている必要があります。
 <br><br>
 <b>プラグインパラメータ(Plug-in parameters)</b><br>
 
diff --git a/pandora_console/include/help/ja/help_plugin_policy.php b/pandora_console/include/help/ja/help_plugin_policy.php
index 9468447249..0fb9333395 100644
--- a/pandora_console/include/help/ja/help_plugin_policy.php
+++ b/pandora_console/include/help/ja/help_plugin_policy.php
@@ -6,7 +6,7 @@
 
 <h1>エージェントプラグイン</h1>
 
-<p>Pandora FMS 5.0 から、ポリシーのプラグインエディタで、エージェントのプラグインを簡単に展開することができます。
+<p>ポリシーのプラグインエディタで、エージェントのプラグインを簡単に展開することができます。
 <br><br>
 ポリシーを適用したときに、ローカルエージェントにエージェントプラグイン作成するようポリシーに追加することができます。
 <br><br>
diff --git a/pandora_console/include/help/ja/help_recontask.php b/pandora_console/include/help/ja/help_recontask.php
index d64a5bb200..f70113674a 100644
--- a/pandora_console/include/help/ja/help_recontask.php
+++ b/pandora_console/include/help/ja/help_recontask.php
@@ -26,7 +26,7 @@
 
 <b>間隔(Interval)</b>
 <br>
-検出処理の間隔です。自動検出処理では、ネットワーク上にそれぞれの IP アドレスに対して ping を送信するため、短い間隔は設定しないでください。自動検出対象ネットワークが非常に大きく(例えばクラスAのネットワーク)、間隔が短い(6時間)と、Pandora FMS はネットワークに大量の ping を投げ続け、ネットワークおよび Pandora FMS が高負荷になります。<br><br>
+検出処理の間隔です。自動検出処理では、ネットワーク上にそれぞれの IP アドレスに対して ping を送信するため、短い間隔は設定しないでください。自動検出対象ネットワークが非常に大きく(例えばクラスAのネットワーク)、間隔が短い(6時間)と、<?php echo get_product_name();?> はネットワークに大量の ping を投げ続け、ネットワークおよび <?php echo get_product_name();?> が高負荷になります。<br><br>
 
 <b>モジュールテンプレート(Module template)</b><br>
 
@@ -34,7 +34,7 @@
 
 <b>OS</b><br>
 
-認識するオペレーティングシステムです。任意(Any)の OS ではなく特定の OS を選択した場合、該当の OS のシステムのみ追加されます。静的なパラメータを元に実施されるため、(ネットワークがフィルタリングされている、セキュリティソフトウエアが導入されている、システムのバージョンが編集されているなど)特定の条件下では、システム検出時に Pandora FMS が誤認識する可能性があることに注意してください。この機能を利用するには、Xprobe2 がインストールされている必要があります。<br><br>
+認識するオペレーティングシステムです。任意(Any)の OS ではなく特定の OS を選択した場合、該当の OS のシステムのみ追加されます。静的なパラメータを元に実施されるため、(ネットワークがフィルタリングされている、セキュリティソフトウエアが導入されている、システムのバージョンが編集されているなど)特定の条件下では、システム検出時に <?php echo get_product_name();?> が誤認識する可能性があることに注意してください。この機能を利用するには、Xprobe2 がインストールされている必要があります。<br><br>
 
 <b>ポート(Ports)</b><br>
 
diff --git a/pandora_console/include/help/ja/help_reporting_wizard_sla_tab.php b/pandora_console/include/help/ja/help_reporting_wizard_sla_tab.php
index 7c16f20626..f3c11069d0 100644
--- a/pandora_console/include/help/ja/help_reporting_wizard_sla_tab.php
+++ b/pandora_console/include/help/ja/help_reporting_wizard_sla_tab.php
@@ -6,4 +6,4 @@
 
 <h1>SLA ウィザード</h1>
 
-<p>Pandora FMS でモニタリングしているサービスレベル (Service Level Agreement) を計測できます。このウィザードでは、複数のエージェントの SLA レポートを作成することができます。</p>
+<p><?php echo get_product_name();?> でモニタリングしているサービスレベル (Service Level Agreement) を計測できます。このウィザードでは、複数のエージェントの SLA レポートを作成することができます。</p>
diff --git a/pandora_console/include/help/ja/help_response_macros.php b/pandora_console/include/help/ja/help_response_macros.php
index 68603876e9..f5ae7ee4e1 100644
--- a/pandora_console/include/help/ja/help_response_macros.php
+++ b/pandora_console/include/help/ja/help_response_macros.php
@@ -18,7 +18,7 @@
 <li><b>イベントID:</b> _event_id_</li>
 <li><b>Event instructions:</b> _event_instruction_</li>
 <li><b>Event severity ID:</b> _event_severity_id_</li>
-<li><b>Event severity (translated by Pandora console):</b> _event_severity_text_</li>
+<li><b>Event severity (translated by <?php echo get_product_name();?> console):</b> _event_severity_text_</li>
 <li><b>Event source:</b> _event_source_</li>
 <li><b>Event status (new, validated or event in process):</b> _event_status_</li>
 <li><b>Event tags separated by commas:</b> _event_tags_</li>
diff --git a/pandora_console/include/help/ja/help_servers.php b/pandora_console/include/help/ja/help_servers.php
index 30a8dfa9e6..6bd01880a1 100644
--- a/pandora_console/include/help/ja/help_servers.php
+++ b/pandora_console/include/help/ja/help_servers.php
@@ -6,11 +6,11 @@
 
 <h1>サーバ管理</h1>
 
-<p>Pandora FMS サーバは、定義された監視を実行する要素です。監視をし結果に応じて状態を変更します。また、データの状態に応じてアラートを生成します。</p>
+<p><?php echo get_product_name();?> サーバは、定義された監視を実行する要素です。監視をし結果に応じて状態を変更します。また、データの状態に応じてアラートを生成します。</p>
 
-<p>Pandora FMS のデータサーバは、冗長化および負荷分散が可能です。大きなシステムでは、大量の機能を扱ったり物理的に分散した情報を扱うために、さまざまな Pandora FMS サーバを同時に利用可能です。</p>
+<p><?php echo get_product_name();?> のデータサーバは、冗長化および負荷分散が可能です。大きなシステムでは、大量の機能を扱ったり物理的に分散した情報を扱うために、さまざまな Pandora FMS サーバを同時に利用可能です。</p>
 
-<p>Pandora FMS サーバは、各要素に問題が無いか、また、アラートが定義されているかを常に確認します。何かあると、アラームに定義された SMS 送信、e-mail 送信、スクリプトの実行など、アクションを実行します。l</p>
+<p><?php echo get_product_name();?> サーバは、各要素に問題が無いか、また、アラートが定義されているかを常に確認します。何かあると、アラームに定義された SMS 送信、e-mail 送信、スクリプトの実行など、アクションを実行します。l</p>
 
 <ul>
 <li type="circle">データサーバ(Data Server)</li>
diff --git a/pandora_console/include/help/ja/help_snmp_alert.php b/pandora_console/include/help/ja/help_snmp_alert.php
index 9133117128..0d93311d22 100644
--- a/pandora_console/include/help/ja/help_snmp_alert.php
+++ b/pandora_console/include/help/ja/help_snmp_alert.php
@@ -6,4 +6,4 @@
 
 <h1>SNMPアラート</h1>
 
-<p>アラートとトラップを関連付けることができます。それにより、Pandora FMS は、特定のトラップ受信で警告を上げることができます。SNMPトラップは、アクションで再利用したとしても、システムアラートとは関係がありません。</p>
+<p>アラートとトラップを関連付けることができます。それにより、<?php echo get_product_name();?> は、特定のトラップ受信で警告を上げることができます。SNMPトラップは、アクションで再利用したとしても、システムアラートとは関係がありません。</p>
diff --git a/pandora_console/include/help/ja/help_snmpoid.php b/pandora_console/include/help/ja/help_snmpoid.php
index e05be3b733..f09c620a8c 100644
--- a/pandora_console/include/help/ja/help_snmpoid.php
+++ b/pandora_console/include/help/ja/help_snmpoid.php
@@ -5,5 +5,5 @@
 ?>
 <h1>SNMP OID</h1>
 
-Pandora FMS ネットワークサーバにて MIB の名前解決が可能の場合は、その名前で表示されます。(例: SNMPv2-MIB::sysDescr.0)
+<?php echo get_product_name();?> ネットワークサーバにて MIB の名前解決が可能の場合は、その名前で表示されます。(例: SNMPv2-MIB::sysDescr.0)
 MIB が無ければ、数字で表示されます。(例:3.1.3.1.3.5.12.4.0.1)
diff --git a/pandora_console/include/help/ja/help_snmpwalk.php b/pandora_console/include/help/ja/help_snmpwalk.php
index c0641b5e7c..fe9c6344f5 100644
--- a/pandora_console/include/help/ja/help_snmpwalk.php
+++ b/pandora_console/include/help/ja/help_snmpwalk.php
@@ -5,7 +5,7 @@
 ?>
 <h1>snmpwalk</h1>
 
-Pandora FMS は、簡易 SNMP ブラウザがあり、リモートノードに対して snmpwalk を実行することができます。
+<?php echo get_product_name();?> は、簡易 SNMP ブラウザがあり、リモートノードに対して snmpwalk を実行することができます。
 <br /><br />
 snmpwalk は全 MIB データを取得しますが、その中から一つを選択できます。
-また、OID を数値で入力したり、Pandora FMS ネットワークサーバに MIB がインストールされていれば、名称で入力することも可能です。
+また、OID を数値で入力したり、<?php echo get_product_name();?> ネットワークサーバに MIB がインストールされていれば、名称で入力することも可能です。
diff --git a/pandora_console/include/help/ja/help_tags_config.php b/pandora_console/include/help/ja/help_tags_config.php
index 6cc3a50134..f7845c394b 100644
--- a/pandora_console/include/help/ja/help_tags_config.php
+++ b/pandora_console/include/help/ja/help_tags_config.php
@@ -3,7 +3,7 @@
  * @package Include/help/ja
  */
 ?>
-<h1>Pandora FMS におけるタグ</h1>
+<h1><?php echo get_product_name();?> におけるタグ</h1>
 
 モジュールへのアクセス権をタグシステムにより設定することができます。タグはシステムで設定し、選択したモジュールに割り当てられます。これにより、ユーザのアクセスを特定のタグがついたモジュールに限定することができます。
 <br><br>
diff --git a/pandora_console/include/help/ja/help_timesource.php b/pandora_console/include/help/ja/help_timesource.php
index e5967f1625..90c858d781 100644
--- a/pandora_console/include/help/ja/help_timesource.php
+++ b/pandora_console/include/help/ja/help_timesource.php
@@ -9,8 +9,8 @@
 日時データソースに、システムの日時データかデータベースに記録されているデータかどちらをを利用するかを定義します。<br /><br />
 </p>
 <p>
-これは、データベースがウェブサーバや Pandora FMS サーバと異なるサーバで動作している場合で、時刻にずれが生じている場合に便利です。
-すべての Pandora サーバと MySQL サーバの時刻は NTP により同期すべきですが、この設定を利用することにより、必ずしもそうする必要がなくなります。
+これは、データベースがウェブサーバや <?php echo get_product_name();?> サーバと異なるサーバで動作している場合で、時刻にずれが生じている場合に便利です。
+すべての <?php echo get_product_name();?> サーバと MySQL サーバの時刻は NTP により同期すべきですが、この設定を利用することにより、必ずしもそうする必要がなくなります。
 </p>
 <p>
 注: データベースではクエリがキャッシュされますが、内部関数が呼ばれるかどうかに関わらずその時点のシステムタイムが返されますので、日時データは若干異なる場合があります。
diff --git a/pandora_console/include/help/ja/help_visual_console_editor_editor_tab.php b/pandora_console/include/help/ja/help_visual_console_editor_editor_tab.php
index 28526dca2c..9397ddaf48 100644
--- a/pandora_console/include/help/ja/help_visual_console_editor_editor_tab.php
+++ b/pandora_console/include/help/ja/help_visual_console_editor_editor_tab.php
@@ -12,5 +12,5 @@
         <li>ワークエリア (ここで、ビジュアルコンソールを作成します)</li>
         <li>オプションパレット (画面ショットでは表示されていません)</li>
 </ul>
-Pandora FMS バージョン 5.0.1 では、テキストのラベルを設定できます。また、テキスト内に (_VALUE_) マクロを使って値を定義することができます。
+<?php echo get_product_name();?> バージョン 5.0.1 では、テキストのラベルを設定できます。また、テキスト内に (_VALUE_) マクロを使って値を定義することができます。
 </p>
diff --git a/pandora_console/include/help/ja/help_visual_console_editor_preview_tab.php b/pandora_console/include/help/ja/help_visual_console_editor_preview_tab.php
index fcd9844c3c..46983fcd4d 100644
--- a/pandora_console/include/help/ja/help_visual_console_editor_preview_tab.php
+++ b/pandora_console/include/help/ja/help_visual_console_editor_preview_tab.php
@@ -6,4 +6,4 @@
 
 <h1>プレビュー</h1>
 
-<p>このタブは、Pandora コンソールのメニューをたどらずに作業結果を確認するのに便利です。ビジュアルコンソールビューは静的な表示です。そのため、要素に状態を含んでいたとしても、ビジュアルコンソールメニューから表示されるのと違い、それらは表示されません。</p>
+<p>このタブは、<?php echo get_product_name();?> コンソールのメニューをたどらずに作業結果を確認するのに便利です。ビジュアルコンソールビューは静的な表示です。そのため、要素に状態を含んでいたとしても、ビジュアルコンソールメニューから表示されるのと違い、それらは表示されません。</p>
diff --git a/pandora_console/include/help/ja/help_web_checks.php b/pandora_console/include/help/ja/help_web_checks.php
index 9c297a382b..ade3608367 100644
--- a/pandora_console/include/help/ja/help_web_checks.php
+++ b/pandora_console/include/help/ja/help_web_checks.php
@@ -6,7 +6,7 @@
 <h1>ウェブモニタリング</h1>
 
 <p>
-拡張ウェブモニタリングは、Pandora FMS エンタープライズ版の Goliat で動作する機能です。
+拡張ウェブモニタリングは、<?php echo get_product_name();?> エンタープライズ版の Goliat で動作する機能です。
 <br><br>
 以下に、GOLIAT ウェブチェックモジュールのサンプルを示します。
 <br>

From 52ec66d939de0364aa526c8f2804e267b812d7de Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 18 May 2018 14:47:15 +0200
Subject: [PATCH 046/146] [Rebranding] help ja dynamic_threshold

---
 pandora_console/include/help/ja/help_dynamic_threshold.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/help/ja/help_dynamic_threshold.php b/pandora_console/include/help/ja/help_dynamic_threshold.php
index f1a7ab5b87..2d6638b3bd 100644
--- a/pandora_console/include/help/ja/help_dynamic_threshold.php
+++ b/pandora_console/include/help/ja/help_dynamic_threshold.php
@@ -8,7 +8,7 @@
 <h2>動的しきい値の間隔</h2>
 
 <p>
-	動的しきい値の間隔フィールドには時間間隔を設定します。モジュールは、その期間中に取得したデータを返します。これにより、Pandora はサーバの設定に従って障害および警告状態しきい値の最小値を設定します。
+	動的しきい値の間隔フィールドには時間間隔を設定します。モジュールは、その期間中に取得したデータを返します。これにより、<?php echo get_product_name();?> はサーバの設定に従って障害および警告状態しきい値の最小値を設定します。
 	<br><br>
         デフォルトの設定では最小値<b>のみ</b>を設定します。最大値が 0 の場合は、設定された最小値から無限大の範囲を意味します。
 	<br><br>

From 2fa1fb5ea3b45dcc6188f2c4a157d15e08c15bed Mon Sep 17 00:00:00 2001
From: Fermin <fermin.hernandez@artica.es>
Date: Mon, 21 May 2018 09:49:44 +0200
Subject: [PATCH 047/146] [Rebranding] Fixed double safe input in product name
 and copyright notice

---
 pandora_console/include/functions_config.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 7a54b60679..fd27a72723 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -247,9 +247,9 @@ function config_update_config () {
 							$error_update[] = __('Metaconsole agent cache');
 						if (!config_update_value ('log_collector', (bool)get_parameter('log_collector')))
 							$error_update[] = __('Activate Log Collector');
-						if (!config_update_value ('rb_product_name', (string)get_parameter('rb_product_name')))
+						if (!config_update_value ('rb_product_name', get_parameter('rb_product_name')))
 							$error_update[] = __('Product name');
-						if (!config_update_value ('rb_copyright_notice', (string)get_parameter('rb_copyright_notice')))
+						if (!config_update_value ('rb_copyright_notice', get_parameter('rb_copyright_notice')))
 							$error_update[] = __('Copyright notice');
 
 						$inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array());
@@ -1051,6 +1051,14 @@ function config_process_config () {
 		config_update_value ('log_collector', 0);
 	}
 
+	if (!isset ($config['rb_product_name'])) {
+		config_update_value('rb_product_name', get_product_name());
+	}
+
+	if (!isset ($config['rb_copyright_notice'])) {
+		config_update_value('rb_copyright_notice', get_copyright_notice());
+	}
+
 	if (!isset ($config["reset_pass_option"])) {
 		config_update_value ('reset_pass_option', 0);
 	}

From ef07eff769c6a765cd7d3f5c130e8f8afcb95732 Mon Sep 17 00:00:00 2001
From: Fermin <fermin.hernandez@artica.es>
Date: Mon, 21 May 2018 11:07:39 +0200
Subject: [PATCH 048/146] [Rebranding] Added enable update manager option

---
 pandora_console/godmode/menu.php             | 2 +-
 pandora_console/include/functions_config.php | 6 ++++++
 pandora_console/include/functions_db.php     | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 11f510349a..2735619b16 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -435,7 +435,7 @@ foreach ($rows as $row) {
 $menu_godmode["links"]["sub"] = $sub;
 
 // Update Manager
-if (check_acl ($config['id_user'], 0, "PM")) {
+if (check_acl ($config['id_user'], 0, "PM") && $config['enable_update_manager']) {
 	$menu_godmode["messages"]["text"] = __('Update manager');
 	$menu_godmode["messages"]["sec2"] = "";
 	$menu_godmode["messages"]["id"] = "god-um_messages";
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index fd27a72723..317e41e087 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -251,6 +251,8 @@ function config_update_config () {
 							$error_update[] = __('Product name');
 						if (!config_update_value ('rb_copyright_notice', get_parameter('rb_copyright_notice')))
 							$error_update[] = __('Copyright notice');
+						if (!config_update_value ('enable_update_manager', get_parameter('enable_update_manager')))
+							$error_update[] = __('Enable Update Manager');
 
 						$inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array());
 						if (!config_update_value ('inventory_changes_blacklist', implode(',',$inventory_changes_blacklist)))
@@ -1059,6 +1061,10 @@ function config_process_config () {
 		config_update_value('rb_copyright_notice', get_copyright_notice());
 	}
 
+	if (!isset ($config["enable_update_manager"])) {
+		config_update_value ('enable_update_manager', 1);
+	}
+
 	if (!isset ($config["reset_pass_option"])) {
 		config_update_value ('reset_pass_option', 0);
 	}
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 9acd28b98e..b069b4d993 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -1744,6 +1744,8 @@ function db_process_file ($path, $handle_error = true) {
  */
 function db_check_minor_relase_available () {
 	global $config;
+
+	if (!$config['enable_update_manager']) return false;
 	
 	$dir = $config["homedir"]."/extras/mr";
 	
@@ -1788,6 +1790,8 @@ function db_check_minor_relase_available () {
 function db_check_minor_relase_available_to_um ($package, $ent, $offline) {
 	global $config;
 	
+	if (!$config['enable_update_manager']) return false;
+
 	if (!$ent) {
 		$dir = $config['attachment_store'] . "/downloads/pandora_console/extras/mr";
 	}

From 9d1872b2d1c4a81ff70ad8235e32eda9509600b0 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 21 May 2018 11:10:05 +0200
Subject: [PATCH 049/146] Minor fix in plugintools api_methods

---
 pandora_server/lib/PandoraFMS/PluginTools.pm | 24 ++++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 0a70f075c6..7dd997484e 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -1433,10 +1433,10 @@ sub api_available {
 	 	($api_url, $api_pass, $api_user, $api_user_pass) = @{$apidata};
 	}
 
-	$api_url       = $conf->{'api_url'}       unless empty($api_url);
-	$api_pass      = $conf->{'api_pass'}      unless empty($api_pass);
-	$api_user      = $conf->{'api_user'}      unless empty($api_user);
-	$api_user_pass = $conf->{'api_user_pass'} unless empty($api_user_pass);
+	$api_url       = $conf->{'api_url'}       if empty($api_url);
+	$api_pass      = $conf->{'api_pass'}      if empty($api_pass);
+	$api_user      = $conf->{'api_user'}      if empty($api_user);
+	$api_user_pass = $conf->{'api_user_pass'} if empty($api_user_pass);
 
 	my $op = "get";
 	my $op2 = "test";
@@ -1473,10 +1473,10 @@ sub api_create_custom_field {
 	 	($api_url, $api_pass, $api_user, $api_user_pass) = @{$apidata};
 	}
 
-	$api_url       = $conf->{'api_url'}       unless empty($api_url);
-	$api_pass      = $conf->{'api_pass'}      unless empty($api_pass);
-	$api_user      = $conf->{'api_user'}      unless empty($api_user);
-	$api_user_pass = $conf->{'api_user_pass'} unless empty($api_user_pass);
+	$api_url       = $conf->{'api_url'}       if empty($api_url);
+	$api_pass      = $conf->{'api_pass'}      if empty($api_pass);
+	$api_user      = $conf->{'api_user'}      if empty($api_user);
+	$api_user_pass = $conf->{'api_user_pass'} if empty($api_user_pass);
 
 
 
@@ -1572,10 +1572,10 @@ sub api_create_tag {
 	 	($api_url, $api_pass, $api_user, $api_user_pass) = @{$apidata};
 	}
 
-	$api_url       = $conf->{'api_url'}       unless empty($api_url);
-	$api_pass      = $conf->{'api_pass'}      unless empty($api_pass);
-	$api_user      = $conf->{'api_user'}      unless empty($api_user);
-	$api_user_pass = $conf->{'api_user_pass'} unless empty($api_user_pass);
+	$api_url       = $conf->{'api_url'}       if empty($api_url);
+	$api_pass      = $conf->{'api_pass'}      if empty($api_pass);
+	$api_user      = $conf->{'api_user'}      if empty($api_user);
+	$api_user_pass = $conf->{'api_user_pass'} if empty($api_user_pass);
 
 	my $op = "set";
 	my $op2 = "create_tag";

From 3497132517de5d287d20dd641aea763b1bae9c55 Mon Sep 17 00:00:00 2001
From: Fermin <fermin.hernandez@artica.es>
Date: Mon, 21 May 2018 11:56:16 +0200
Subject: [PATCH 050/146] [Rebranding] Moved rebranding to visual styles
 section

---
 .../godmode/setup/setup_visuals.php           | 14 +++++++++-
 pandora_console/include/functions_config.php  | 28 +++++++++----------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 3e7eda10f1..d647bc89b1 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -258,7 +258,19 @@ if(enterprise_installed()) {
 	$table_styles->data[$row][0] = __('Support URL (login)');
 	$table_styles->data[$row][1] = html_print_input_text ('custom_support_url', $config["custom_support_url"], '', 50, 50, true);
 	$row++;
-}	
+}
+
+if(enterprise_installed()) {
+	$table_styles->data[$row][0] = __('Product name');
+	$table_styles->data[$row][1] = html_print_input_text('rb_product_name', get_product_name(), '', 30, 255, true);
+	$row++;
+}
+
+if(enterprise_installed()) {
+	$table_styles->data[$row][0] = __('Copyright notice');
+	$table_styles->data[$row][1] = html_print_input_text('rb_copyright_notice', get_copyright_notice(), '', 30, 255, true);
+	$row++;
+}
 
 $table_styles->data[$row][0] = __('Disable logo in graphs');
 $table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 317e41e087..b2460b39d3 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -247,10 +247,6 @@ function config_update_config () {
 							$error_update[] = __('Metaconsole agent cache');
 						if (!config_update_value ('log_collector', (bool)get_parameter('log_collector')))
 							$error_update[] = __('Activate Log Collector');
-						if (!config_update_value ('rb_product_name', get_parameter('rb_product_name')))
-							$error_update[] = __('Product name');
-						if (!config_update_value ('rb_copyright_notice', get_parameter('rb_copyright_notice')))
-							$error_update[] = __('Copyright notice');
 						if (!config_update_value ('enable_update_manager', get_parameter('enable_update_manager')))
 							$error_update[] = __('Enable Update Manager');
 
@@ -521,8 +517,12 @@ function config_update_config () {
 						$error_update[] = __('Custom Docs url');
 					if (!config_update_value ('custom_support_url', (string) get_parameter ('custom_support_url')))
 						$error_update[] = __('Custom support url');
-
-					if (!config_update_value ('meta_custom_logo', (string) get_parameter ('meta_custom_logo')))
+					if (!config_update_value ('rb_product_name', (string) get_parameter ('rb_product_name')))
+						$error_update[] = __('Product name');
+					if (!config_update_value ('rb_copyright_notice', (string) get_parameter ('rb_copyright_notice')))
+						$error_update[] = __('Copyright notice');
+					
+						if (!config_update_value ('meta_custom_logo', (string) get_parameter ('meta_custom_logo')))
 						$error_update[] = __('Custom logo metaconsole');
 					if (!config_update_value ('meta_custom_logo_login', (string) get_parameter ('meta_custom_logo_login')))
 						$error_update[] = __('Custom logo login metaconsole');
@@ -1053,14 +1053,6 @@ function config_process_config () {
 		config_update_value ('log_collector', 0);
 	}
 
-	if (!isset ($config['rb_product_name'])) {
-		config_update_value('rb_product_name', get_product_name());
-	}
-
-	if (!isset ($config['rb_copyright_notice'])) {
-		config_update_value('rb_copyright_notice', get_copyright_notice());
-	}
-
 	if (!isset ($config["enable_update_manager"])) {
 		config_update_value ('enable_update_manager', 1);
 	}
@@ -1219,6 +1211,14 @@ function config_process_config () {
 	if (!isset ($config["custom_support_url"])) {
 		config_update_value ('custom_support_url', 'https://support.artica.es');
 	}
+
+	if (!isset ($config['rb_product_name'])) {
+		config_update_value('rb_product_name', get_product_name());
+	}
+
+	if (!isset ($config['rb_copyright_notice'])) {
+		config_update_value('rb_copyright_notice', get_copyright_notice());
+	}
 	
 	if (!isset ($config["meta_custom_docs_url"])) {
 		config_update_value ('meta_custom_docs_url', 'http://wiki.pandorafms.com/index.php?title=Main_Page');

From 8f2302630c9ed9ff3163697beca92c74865fdda3 Mon Sep 17 00:00:00 2001
From: Fermin <fermin.hernandez@artica.es>
Date: Mon, 21 May 2018 14:29:11 +0200
Subject: [PATCH 051/146] [Rebranding] Docs and Support login icons are
 configurables

---
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |   2 +
 pandora_console/general/login_page.php        |  24 ++--
 .../godmode/setup/setup_visuals.php           | 128 ++++++++++++++++++
 pandora_console/include/functions_config.php  |  12 ++
 pandora_console/include/functions_ui.php      |  37 +++++
 pandora_console/include/styles/pandora.css    |   8 ++
 pandora_console/pandoradb_data.sql            |   5 +-
 7 files changed, 206 insertions(+), 10 deletions(-)

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 e3572edb04..b8f41cedf4 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
@@ -1160,6 +1160,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 13);
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
 UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
 DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '720');
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index f34d11e8d0..8387d62366 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -86,6 +86,9 @@ if (!empty($config['login_background'])) {
 	$background_url = "images/backgrounds/" . $config['login_background'];
 	$login_body_style = "style=\"background-image: url('$background_url');\"";
 }
+// Get the custom icons
+$docs_logo = ui_get_docs_logo();
+$support_logo = ui_get_support_logo();
 echo '<div id="login_body" ' . $login_body_style . '>';
 echo '<div id="header_login">';
 	echo '<div id="icon_custom_pandora">';
@@ -102,15 +105,20 @@ echo '<div id="header_login">';
 			echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="pandora_console">';	
 		}
 	echo '</div>';
-		echo '<div id="list_icon_docs_support"><ul>';
-			echo '<li><a href="'.$config['custom_docs_url'].'" target="_blank"><img src="images/icono_docs.png" alt="docs pandora"></a></li>';
-			echo '<li>' . __('Docs') . '</li>';
-			if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
-				echo '<li id="li_margin_left"><a href="'.$config['custom_support_url'].'" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
-			} else {
-				echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
+		echo '<div id="list_icon_docs_support"><ul style="line-height: 36px;">';
+			if ($docs_logo !== false) {
+				echo '<li><a href="'.$config['custom_docs_url'].'" target="_blank"><img src="' . $docs_logo . '" alt="docs"></a></li>';
+			}
+			echo '<li><a style="color: white; font-size:inherit;" href="'.$config['custom_docs_url'].'" target="_blank">' . __('Docs') . '</li>';
+			if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
+				if ($support_logo !== false) {
+					echo '<li id="li_margin_left"><a href="'.$config['custom_support_url'].'" target="_blank"><img src="' . $support_logo .'" alt="support"></a></li>';
+				}
+				echo '<li><a style="color: white; font-size:inherit;" href="'.$config['custom_support_url'].'" target="_blank">' . __('Support') . '</li>';
+			} else {
+				echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="' . $support_logo .'" alt="support"></a></li>';
+				echo '<li>' . __('Support') . '</li>';
 			}
-			echo '<li>' . __('Support') . '</li>';
 		echo '</ul></div>';
 	
 		
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index d647bc89b1..72efbbf138 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -234,6 +234,52 @@ if(enterprise_installed()) {
 	$row++;
 }
 
+if(enterprise_installed()){
+	// Custom docs icon
+	$table_styles->data[$row][0] = __('Custom documentation logo');
+	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
+	
+	$files = list_files('enterprise/images/custom_general_logos', "png", 1, 0);
+	$table_styles->data[$row][1] = html_print_select(
+		$files,
+		'custom_docs_logo',
+		$config["custom_docs_logo"],
+		'',
+		__('None'),
+		'',
+		true,
+		false,
+		true,
+		'',
+		false,
+		'width:240px'
+	);
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_docs_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$row++;
+
+	// Custom support icon
+	$table_styles->data[$row][0] = __('Custom support logo');
+	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
+	
+	$files = list_files('enterprise/images/custom_general_logos', "png", 1, 0);
+	$table_styles->data[$row][1] = html_print_select(
+		$files,
+		'custom_support_logo',
+		$config["custom_support_logo"],
+		'',
+		__('None'),
+		'',
+		true,
+		false,
+		true,
+		'',
+		false,
+		'width:240px'
+	);
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_support_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$row++;
+}
+
 //login title1
 if(enterprise_installed()) {
 	$table_styles->data[$row][0] = __('Title 1 (login)');
@@ -1190,6 +1236,88 @@ $("#button-custom_splash_login_preview").click (function (e) {
 	}
 });
 
+$("#button-custom_docs_logo_preview").click (function (e) {
+	var icon_name = $("select#custom_docs_logo option:selected").val();
+	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+
+	if (icon_name == "")
+		return;
+
+	$dialog = $("<div></div>");
+	$image = $("<img src=\"" + icon_path + "\">");
+	$image
+		.css('max-width', '500px')
+		.css('max-height', '500px');
+
+	try {
+		$dialog
+			.hide()
+			.html($image)
+			.dialog({
+				title: "<?php echo __('Logo preview'); ?>",
+				resizable: true,
+				draggable: true,
+				modal: true,
+				overlay: {
+					opacity: 0.5,
+					background: "black"
+				},
+				dialogClass: 'dialog-grayed',
+				minHeight: 1,
+				width: $image.width,
+				close: function () {
+					$dialog
+						.empty()
+						.remove();
+				}
+			}).show();
+	}
+	catch (err) {
+		// console.log(err);
+	}
+});
+
+
+$("#button-custom_support_logo_preview").click (function (e) {
+	var icon_name = $("select#custom_support_logo option:selected").val();
+	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+
+	if (icon_name == "")
+		return;
+
+	$dialog = $("<div></div>");
+	$image = $("<img src=\"" + icon_path + "\">");
+	$image
+		.css('max-width', '500px')
+		.css('max-height', '500px');
+
+	try {
+		$dialog
+			.hide()
+			.html($image)
+			.dialog({
+				title: "<?php echo __('Logo preview'); ?>",
+				resizable: true,
+				draggable: true,
+				modal: true,
+				overlay: {
+					opacity: 0.5,
+					background: "black"
+				},
+				dialogClass: 'dialog-grayed',
+				minHeight: 1,
+				width: $image.width,
+				close: function () {
+					$dialog
+						.empty()
+						.remove();
+				}
+			}).show();
+	}
+	catch (err) {
+		// console.log(err);
+	}
+});
 
 $("#button-login_background_preview").click (function (e) {
 	var icon_name = $("select#login_background option:selected").val();
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index b2460b39d3..f572ebd148 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -506,6 +506,10 @@ function config_update_config () {
 						$error_update[] = __('Custom logo login');
 					if (!config_update_value ('custom_splash_login', (string) get_parameter ('custom_splash_login')))
 						$error_update[] = __('Custom splash login');
+					if (!config_update_value ('custom_docs_logo', (string) get_parameter ('custom_docs_logo')))
+						$error_update[] = __('Custom documentation logo');
+					if (!config_update_value ('custom_support_logo', (string) get_parameter ('custom_support_logo')))
+						$error_update[] = __('Custom support logo');
 					if (!config_update_value ('custom_title1_login', (string) get_parameter ('custom_title1_login')))
 						$error_update[] = __('Custom title1 login');
 					if (!config_update_value ('custom_title2_login', (string) get_parameter ('custom_title2_login')))
@@ -1195,6 +1199,14 @@ function config_process_config () {
 	if (!isset ($config["custom_splash_login"])) {
 		config_update_value ('custom_splash_login', 'splash_image_default.png');
 	}
+
+	if (!isset ($config["custom_docs_logo"])) {
+		config_update_value ('custom_docs_logo', '');
+	}
+
+	if (!isset ($config["custom_support_logo"])) {
+		config_update_value ('custom_support_logo', '');
+	}
 	
 	if (!isset ($config["custom_title1_login"])) {
 		config_update_value ('custom_title1_login', __('WELCOME TO PANDORA FMS'));
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 4fc40ba611..bfcd3ed44f 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3919,4 +3919,41 @@ function ui_get_snapshot_link($params, $only_params = false) {
 	// Return the function call to inline js execution
 	return "winopeng_var('" . implode("', '", $link_parts) . "')";
 }
+
+/**
+ * Get the custom docs logo
+ *
+ * @return string with the path to logo. False if it should not be displayed
+ *
+ */
+function ui_get_docs_logo () {
+	global $config;
+
+	// Default logo to open version (enterprise_installed function only works in login status)
+	if (!file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
+		return "images/icono_docs.png";
+	}
+
+	if (empty($config['custom_docs_logo'])) return false;
+	return 'enterprise/images/custom_general_logos/' . $config['custom_docs_logo'];
+}
+
+/**
+ * Get the custom support logo
+ *
+ * @return string with the path to logo. False if it should not be displayed
+ *
+ */
+function ui_get_support_logo () {
+	global $config;
+
+	// Default logo to open version (enterprise_installed function only works in login status)
+	if (!file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
+		return "images/icono_support.png";
+	}
+
+	if (empty($config['custom_support_logo'])) return false;
+	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
+}
+
 ?>
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 293045208f..c06cdbfed6 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4653,4 +4653,12 @@ form ul.form_flex li ul li{
 
 .pandora_upper {
 	text-transform: uppercase;
+}
+
+.dialog-grayed {
+	background: #373737 !important;
+}
+
+.dialog-grayed .ui-dialog-buttonpane {
+	background: #373737 !important;
 }
\ No newline at end of file
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 85b0c84439..fb1de26061 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -113,8 +113,9 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
 ('current_package_enterprise', '722'),
-('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.0009765625":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
+('custom_docs_logo', 'default_docs.png'),
+('custom_support_logo', 'default_support.png');
 UNLOCK TABLES;
 
 --

From 2ab45d28b8472e4da69f1593c07d9eb4166885eb Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 21 May 2018 14:42:27 +0200
Subject: [PATCH 052/146] Added api_get_agent_id (API) updated plugintools

---
 pandora_console/include/functions_api.php    | 34 +++++++++
 pandora_server/lib/PandoraFMS/PluginTools.pm | 74 ++++++++++++++++++++
 2 files changed, 108 insertions(+)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index a4a737b280..00aaf421f5 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -8821,6 +8821,40 @@ function api_get_agent_name($id_agent, $trash1, $trash2, $returnType) {
 	returnData($returnType, $data);
 }
 
+/**
+ *  Return the ID or an hash of IDs of the detected given agents
+ * 
+ *  @param array or value $data
+ * 
+ * 
+**/
+function api_get_agent_id($trash1, $trash2, $data, $returnType) {
+	$response;
+
+	if (is_metaconsole()) {
+		return;
+	}
+	if (empty($returnType)) {
+		$returnType = "json";
+	}
+
+	$response = array();
+
+	if ($data["type"] == "array") {
+		$response["type"] = "array";
+		$response["data"] = array();
+
+		foreach ($data["data"] as $name) {
+			$response["data"][$name] = agents_get_agent_id($name, 1);
+		}
+	} else {
+		$response["type"] = "string";
+		$response["data"] = agents_get_agent_id($data["data"], 1);
+	}
+
+	returnData($returnType, $response);
+}
+
 /**
  * Agent alias for a given id
  * 
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 7dd997484e..fe175e8db4 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -40,6 +40,7 @@ our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
 
 our @EXPORT = qw(
 	api_available
+	api_call
 	api_create_custom_field
 	api_create_tag
 	api_create_group
@@ -1460,7 +1461,80 @@ sub api_available {
 			id => (empty($rs)?undef:trim($rs))
 		}
 	}
+}
 
+#########################################################################################
+# Pandora API call
+# apidata->{other} = [field1,field2,...,fieldi,...,fieldn]
+#########################################################################################
+sub api_call {
+	my ($conf, $apidata) = @_;
+	my ($api_url, $api_pass, $api_user, $api_user_pass,
+	 	 $op, $op2, $other_mode, $other, $return_type);
+	my $separator;
+
+	if (ref $apidata eq "ARRAY") {
+	 	($api_url, $api_pass, $api_user, $api_user_pass,
+	 	 $op, $op2, $return_type, $other_mode, $other) = @{$apidata};
+	}
+	if (ref $apidata eq "HASH") {
+		$api_url       = $apidata->{'api_url'};
+		$api_pass      = $apidata->{'api_pass'};
+		$api_user      = $apidata->{'api_user'};
+		$api_user_pass = $apidata->{'api_user_pass'};
+		$op            = $apidata->{'op'};
+		$op2           = $apidata->{'op2'};
+		$return_type   = $apidata->{'return_type'};
+		$other_mode    = "url_encode_separator_" . $apidata->{'url_encode_separator'} unless empty($apidata->{'url_encode_separator'});
+		$other_mode    = "url_encode_separator_|" if empty($other_mode);
+		($separator)   = $other_mode =~ /url_encode_separator_(.*)/;
+	}
+
+	$api_url       = $conf->{'api_url'}       if empty($api_url);
+	$api_pass      = $conf->{'api_pass'}      if empty($api_pass);
+	$api_user      = $conf->{'api_user'}      if empty($api_user);
+	$api_user_pass = $conf->{'api_user_pass'} if empty($api_user_pass);
+	$op            = $conf->{'op'}            if empty($op);
+	$op2           = $conf->{'op2'}           if empty($op2);
+	$return_type   = $conf->{'return_type'}   if empty($return_type);
+	$return_type   = 'json'                   if empty($return_type);
+	if (ref ($apidata->{'other'}) eq "ARRAY") {
+		$other_mode  = "url_encode_separator_|" if empty($other_mode);
+		($separator) = $other_mode =~ /url_encode_separator_(.*)/;
+
+		if (empty($separator)) {
+			$separator  = "|";
+			$other_mode = "url_encode_separator_|";
+		}
+
+		$other = join $separator, @{$apidata->{'other'}};
+	}
+
+	my $call;
+
+	$call = $api_url . '?';
+	$call .= 'op=' . $op . '&op2=' . $op2;
+	$call .= '&other_mode=url_encode_separator_' . $separator;
+	$call .= '&other=' . $other;
+	$call .= '&apipass=' . $api_pass . '&user=' . $api_user . '&pass=' . $api_user_pass;
+	$call .= '&return_type=' . $return_type;
+
+	my $rs = call_url($conf, "$call");
+
+	if (ref($rs) ne "HASH") {
+		return {
+			rs => (empty($rs)?1:0),
+			error => (empty($rs)?"Empty response.":undef),
+			id => (empty($rs)?undef:trim($rs)),
+			response => (empty($rs)?undef:$rs),
+		}
+	}
+	else {
+		return {
+			rs => 1,
+			error => $rs->{'error'},
+		}
+	}
 }
 
 #########################################################################################

From 8bda3751df170950c2ec53cabc9bf0364f720e2f Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Mon, 21 May 2018 15:03:54 +0200
Subject: [PATCH 053/146] Improvements to the Pandora FMS Recon Server.

- Ignore virtual interfaces.
- Improved scan of ARP caches.
---
 pandora_server/lib/PandoraFMS/Recon/Base.pm | 109 +++++++++++++++++---
 1 file changed, 92 insertions(+), 17 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Recon/Base.pm b/pandora_server/lib/PandoraFMS/Recon/Base.pm
index 1236054528..e0d6ae8fe1 100644
--- a/pandora_server/lib/PandoraFMS/Recon/Base.pm
+++ b/pandora_server/lib/PandoraFMS/Recon/Base.pm
@@ -19,6 +19,7 @@ use Socket qw/inet_aton/;
 my $DEVNULL = ($^O eq 'MSWin32') ? '/Nul' : '/dev/null';
 
 # Some useful OIDs.
+our $ATPHYSADDRESS = ".1.3.6.1.2.1.3.1.1.2";
 our $DOT1DBASEBRIDGEADDRESS = ".1.3.6.1.2.1.17.1.1.0";
 our $DOT1DBASEPORTIFINDEX = ".1.3.6.1.2.1.17.1.4.1.2";
 our $DOT1DTPFDBADDRESS = ".1.3.6.1.2.1.17.4.3.1.1";
@@ -30,11 +31,12 @@ our $IFINDEX = ".1.3.6.1.2.1.2.2.1.1";
 our $IFINOCTECTS = ".1.3.6.1.2.1.2.2.1.10";
 our $IFOPERSTATUS = ".1.3.6.1.2.1.2.2.1.8";
 our $IFOUTOCTECTS = ".1.3.6.1.2.1.2.2.1.16";
+our $IFTYPE = ".1.3.6.1.2.1.2.2.1.3";
 our $IPENTADDR = ".1.3.6.1.2.1.4.20.1.1";
 our $IFNAME = ".1.3.6.1.2.1.31.1.1.1.1";
 our $IFPHYSADDRESS = ".1.3.6.1.2.1.2.2.1.6";
-our $IPNETTOMEDIAPHYSADDRESS = ".1.3.6.1.2.1.4.22.1.2";
 our $IPADENTIFINDEX = ".1.3.6.1.2.1.4.20.1.2";
+our $IPNETTOMEDIAPHYSADDRESS = ".1.3.6.1.2.1.4.22.1.2";
 our $IPROUTEIFINDEX = ".1.3.6.1.2.1.4.21.1.2";
 our $IPROUTENEXTHOP = ".1.3.6.1.2.1.4.21.1.7";
 our $IPROUTETYPE = ".1.3.6.1.2.1.4.21.1.8";
@@ -88,6 +90,9 @@ sub new {
 		# Keep our own ARP cache to connect hosts to switches/routers.
 		arp_cache => {},
 
+		# Found children.
+		children => {},
+
 		# Working SNMP community for each device.
 		community_cache => {},
 
@@ -289,20 +294,9 @@ sub snmp_discovery($$) {
 			
 			# Find interfaces for the device.
 			$self->find_ifaces($device);
-	
-			# Try to learn more MAC addresses from the device's ARP cache.
-			my @output = $self->snmp_get($device, $IPNETTOMEDIAPHYSADDRESS);
-			foreach my $line (@output) {
-				next unless ($line =~ /^$IPNETTOMEDIAPHYSADDRESS.\d+.(\S+)\s+=\s+\S+:\s+(.*)$/);
-				my ($ip_addr, $mac_addr) = ($1, $2);
-	
-				# Skip broadcast, net and local addresses.
-				next if ($ip_addr =~ m/\.255$|\.0$|127\.0\.0\.1$/);
-	
-				$mac_addr = parse_mac($mac_addr);
-				$self->add_mac($mac_addr, $ip_addr);
-				$self->call('message', "Found MAC $mac_addr for host $ip_addr in the ARP cache of host $device.", 5);
-			}
+
+			# Check remote ARP caches.
+			$self->remote_arp($device);
 		}
 	}
 
@@ -411,6 +405,9 @@ sub find_ifaces($$) {
 
 		next unless ($if_index =~ /^[0-9]+$/);
 
+		# Ignore virtual interfaces.
+		next if ($self->get_if_type($device, $if_index) eq '53');
+
 		# Get the MAC.
 		my $mac = $self->get_if_mac($device, $if_index);
 		next unless (defined($mac) && $mac ne '');
@@ -636,7 +633,7 @@ sub get_if_ip($$$) {
 	my @output = $self->snmp_get($device, $IPADENTIFINDEX);
 	foreach my $line (@output) {
 		chomp ($line);
-		return $1 if ($line =~ m/^IPADENTIFINDEX.(\S+)\s+=\s+\S+:\s+$if_index$/);
+		return $1 if ($line =~ m/^$IPADENTIFINDEX.(\S+)\s+=\s+\S+:\s+$if_index$/);
 	}
 	
 	return '';
@@ -657,6 +654,18 @@ sub get_if_mac($$$) {
 	return $mac;
 }
 
+########################################################################################
+# Returns the type of the given interface (by index).
+########################################################################################
+sub get_if_type($$$) {
+	my ($self, $device, $if_index) = @_;
+	
+	my $type = $self->snmp_get_value($device, "$IFTYPE.$if_index");
+	return '' unless defined($type);
+
+	return $type;
+}
+
 ########################################################################################
 # Get an IP address from the ARP cache given the MAC address.
 ########################################################################################
@@ -858,6 +867,20 @@ sub guess_device_type($$) {
 	$self->set_device_type($device, $device_type);
 }
 
+########################################################################################
+# Return 1 if the given device has children.
+########################################################################################
+sub has_children($$) {
+	my ($self, $device) = @_;
+
+	# Check for aliases!
+	$device = $self->{'aliases'}->{$device} if defined($self->{'aliases'}->{$device});
+
+	return 1 if (defined($self->{'children'}->{$device}));
+
+	return 0;
+}
+
 ########################################################################################
 # Return 1 if the given device has a parent.
 ########################################################################################
@@ -949,6 +972,7 @@ sub mark_connected($$;$$$) {
 		# A parent-child relationship is always created to help complete the map with
 		# layer 3 information.
 		$self->{'parents'}->{$child} = $parent;
+		$self->{'children'}->{$parent} = $child;
 		$self->call('set_parent', $child, $parent);
 	}
 }
@@ -999,6 +1023,54 @@ sub snmp_responds($$) {
 	return 0;
 }
 
+##############################################################################
+# Parse the local ARP cache.
+##############################################################################
+sub local_arp($) {
+	my ($self) = @_;
+
+	my @output = `arp -an 2>/dev/null`;
+	foreach my $line (@output) {
+		next unless ($line =~ m/\((\S+)\) at ([0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+)/);
+		$self->add_mac(parse_mac($2), $1);
+	}
+}
+
+##############################################################################
+# Parse remote SNMP ARP caches.
+##############################################################################
+sub remote_arp($$) {
+	my ($self, $device) = @_;
+
+	# Try to learn more MAC addresses from the device's ARP cache.
+	my @output = $self->snmp_get($device, $IPNETTOMEDIAPHYSADDRESS);
+	foreach my $line (@output) {
+		next unless ($line =~ /^$IPNETTOMEDIAPHYSADDRESS\.\d+\.(\S+)\s+=\s+\S+:\s+(.*)$/);
+		my ($ip_addr, $mac_addr) = ($1, $2);
+
+		# Skip broadcast, net and local addresses.
+		next if ($ip_addr =~ m/\.255$|\.0$|127\.0\.0\.1$/);
+
+		$mac_addr = parse_mac($mac_addr);
+		$self->add_mac($mac_addr, $ip_addr);
+		$self->call('message', "Found MAC $mac_addr for host $ip_addr in the ARP cache of host $device.", 5);
+	}
+
+	# Look in atPhysAddress for MAC addresses too.
+	@output = $self->snmp_get($device, $ATPHYSADDRESS);
+	foreach my $line (@output) {
+		next unless ($line =~ m/^$ATPHYSADDRESS\.\d+\.\d+\.(\S+)\s+=\s+\S+:\s+(.*)$/);
+		my ($ip_addr, $mac_addr) = ($1, $2);
+
+		# Skip broadcast, net and local addresses.
+		next if ($ip_addr =~ m/\.255$|\.0$|127\.0\.0\.1$/);
+
+		$mac_addr = parse_mac($mac_addr);
+		$self->add_mac($mac_addr, $ip_addr);
+		$self->call('message', "Found MAC $mac_addr for host $ip_addr in the ARP cache (atPhysAddress) of host $device.", 5);
+	}
+}
+
 ##############################################################################
 # Ping the given host. Returns 1 if the host is alive, 0 otherwise.
 ##############################################################################
@@ -1152,6 +1224,9 @@ sub scan($) {
 	$self->call('message', "[1/5] Scanning the network...", 3);
 	$self->scan_subnet();
 
+	# Read the local ARP cache.
+	$self->local_arp();
+
 	# Get a list of found hosts.
 	my @hosts = @{$self->get_hosts()};
 	if (scalar(@hosts) > 0 && $self->{'parent_detection'} == 1) {
@@ -1173,7 +1248,7 @@ sub scan($) {
 		foreach my $host (@hosts) {
 			$self->call('update_progress', $progress);
 			$progress += $step;
-			next if ($self->has_parent($host));
+			next if ($self->has_parent($host) || $self->has_children($host));
 			$self->traceroute_connectivity($host);
 		}
 	

From b323d524d6194c9db825ca7dc121a6c7701a1f92 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 21 May 2018 17:25:09 +0200
Subject: [PATCH 054/146] fixed errors in graph update version

---
 pandora_console/include/functions.php         | 169 ++++++------
 pandora_console/include/functions_graph.php   | 261 +++++-------------
 pandora_console/include/graphs/fgraph.php     |   3 +-
 .../flot/jquery.flot.exportdata.pandora.js    |  38 ++-
 .../include/graphs/flot/pandora.flot.js       |  13 +-
 .../include/graphs/functions_flot.php         |  49 +++-
 .../agentes/interface_traffic_graph_win.php   | 101 +++----
 7 files changed, 270 insertions(+), 364 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 479d15f132..1b19be2b5f 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2991,111 +2991,110 @@ function color_graph_array($series_suffix, $compare = false){
 	return $color;
 }
 
-function legend_graph_array(
-	$max, $min, $avg,
-	$series_suffix,
-	$series_suffix_str,
-	$format_graph,
-	$show_elements_graph,
-	$percentil_value,
-	$data_module_graph){
-
-	global $config;
-	global $legend;
-	$unit = $format_graph['unit'];
-
-	if (isset($show_elements_graph['labels']) && is_array($show_elements_graph['labels']) && (count($show_elements_graph['labels']) > 0)){
-		$legend['sum'.$series_suffix] = $show_elements_graph['labels'][$data_module_graph['module_id']] . ' ' ;
-	}
-	else{
-		$legend['sum'.$series_suffix] = $data_module_graph['agent_name']  . ' / ' .
-										$data_module_graph['module_name'] . ': ';
-	}
-
-	$legend['sum'.$series_suffix] .=
-		__('Min:') . remove_right_zeros(
-			number_format(
-				$min,
-				$config['graph_precision']
-			)
-		)  . ' ' .
-		__('Max:') . remove_right_zeros(
-			number_format(
-				$max,
-				$config['graph_precision']
-			)
-		) . ' ' .
-		_('Avg:') . remove_right_zeros(
-			number_format(
-				$max,
-				$config['graph_precision']
-			)
-		) . ' ' . $series_suffix_str;
-
-	if($show_elements_graph['show_unknown']){
-		$legend['unknown'.$series_suffix]   = __('Unknown') . ' ' . $series_suffix_str;
-	}
-	if($show_elements_graph['show_events']){
-		$legend['event'.$series_suffix]     = __('Events') . ' ' . $series_suffix_str;
-	}
-	if($show_elements_graph['show_alerts']){
-		$legend['alert'.$series_suffix]     = __('Alert') . ' ' . $series_suffix_str;
-	}
-	if($show_elements_graph['percentil']){
-		$legend['percentil'.$series_suffix] =
-							__('Percentil') . ' ' .
-							$config['percentil']  .
-							'º ' . __('of module') . ' ';
-
-		if (isset($show_elements_graph['labels']) && is_array($show_elements_graph['labels'])){
-			$legend['percentil'.$series_suffix] .= $show_elements_graph['labels'][$data_module_graph['module_id']] . ' ' ;
-		}
-		else{
-			$legend['percentil'.$series_suffix] .= $data_module_graph['agent_name']  . ' / ' .
-													$data_module_graph['module_name'] . ': ' . ' Value: ';
-		}
-
-		$legend['percentil'.$series_suffix] .= remove_right_zeros(
-													number_format(
-														$percentil_value,
-														$config['graph_precision']
-													)
-												) . ' ' . $series_suffix_str;
-	}
-
-	return $legend;
-}
-
-function series_type_graph_array($data){
+function series_type_graph_array($data, $show_elements_graph){
 	global $config;
 	foreach ($data as $key => $value) {
-		if(strpos($key, 'sum') !== false){
+		if(strpos($key, 'summatory') !== false){
+			$data_return['series_type'][$key] = 'area';
+			$data_return['legend'][$key] = __('Summatory series') . ' ' . $series_suffix_str;
+		}
+		elseif(strpos($key, 'average') !== false){
+			$data_return['series_type'][$key] = 'area';
+			$data_return['legend'][$key] = __('Average series') . ' ' . $series_suffix_str;
+		}
+		elseif(strpos($key, 'sum') !== false || strpos($key, 'baseline') !== false){
 			switch ($value['id_module_type']) {
 				case 21: case 2: case 6:
 				case 18: case 9: case 31:
-					$series_type[$key] = 'boolean';
+					$data_return['series_type'][$key] = 'boolean';
 					break;
 				default:
-					$series_type[$key] = 'area';
+					$data_return['series_type'][$key] = 'area';
 					break;
 			}
+
+			if (isset($show_elements_graph['labels']) &&
+				is_array($show_elements_graph['labels']) &&
+				(count($show_elements_graph['labels']) > 0)){
+				$data_return['legend'][$key] = $show_elements_graph['labels'][$value['id_module_type']] . ' ' ;
+			}
+			else{
+				if(strpos($key, 'baseline') !== false){
+					$data_return['legend'][$key] = $value['agent_name']  . ' / ' .
+												$value['module_name'] . ' Baseline ';
+				}
+				else{
+					$data_return['legend'][$key] = $value['agent_name']  . ' / ' .
+												$value['module_name'] . ': ';
+				}
+			}
+
+			if(strpos($key, 'baseline') === false){
+				$data_return['legend'][$key] .=
+					__('Min:') . remove_right_zeros(
+						number_format(
+							$value['min'],
+							$config['graph_precision']
+						)
+					)  . ' ' .
+					__('Max:') . remove_right_zeros(
+						number_format(
+							$value['max'],
+							$config['graph_precision']
+						)
+					) . ' ' .
+					_('Avg:') . remove_right_zeros(
+						number_format(
+							$value['avg'],
+							$config['graph_precision']
+						)
+					) . ' ' . $series_suffix_str;
+			}
 		}
 		elseif(strpos($key, 'event') !== false){
-			$series_type[$key] = 'points';
+			$data_return['series_type'][$key] = 'points';
+			if($show_elements_graph['show_events']){
+				$data_return['legend'][$key] = __('Events') . ' ' . $series_suffix_str;
+			}
 		}
 		elseif(strpos($key, 'alert') !== false){
-			$series_type[$key] = 'points';
+			$data_return['series_type'][$key] = 'points';
+			if($show_elements_graph['show_alerts']){
+				$data_return['legend'][$key] = __('Alert') . ' ' . $series_suffix_str;
+			}
 		}
 		elseif(strpos($key, 'unknown') !== false){
-			$series_type[$key] = 'unknown';
+			$data_return['series_type'][$key] = 'unknown';
+			if($show_elements_graph['show_unknown']){
+				$data_return['legend'][$key] = __('Unknown') . ' ' . $series_suffix_str;
+			}
 		}
 		elseif(strpos($key, 'percentil') !== false){
-			$series_type[$key] = 'percentil';
+			$data_return['series_type'][$key] = 'percentil';
+			if($show_elements_graph['percentil']){
+				$data_return['legend'][$key] =
+					__('Percentil') . ' ' .
+					$config['percentil']  .
+					'º ' . __('of module') . ' ';
+				if (isset($show_elements_graph['labels']) && is_array($show_elements_graph['labels'])){
+					$data_return['legend'][$key] .= $show_elements_graph['labels'][$value['id_module_type']] . ' ' ;
+				}
+				else{
+					$data_return['legend'][$key] .= $value['agent_name']  . ' / ' .
+											$value['module_name'] . ': ' . ' Value: ';
+				}
+				$data_return['legend'][$key] .= remove_right_zeros(
+												number_format(
+													$value['data'][0][1],
+													$config['graph_precision']
+												)
+											) . ' ' . $series_suffix_str;
+			}
 		}
 		else{
-			$series_type[$key] = 'area';
+			$data_return['series_type'][$key] = 'area';
 		}
 	}
-	return $series_type;
+	return $data_return;
 }
 ?>
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 5333a1801f..c64f8ce20d 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -327,11 +327,12 @@ function grafico_modulo_sparse_data_chart (
 		}
 	}
 
-	$array_data["sum" . $series_suffix]['min'] = $min_value;
-	$array_data["sum" . $series_suffix]['max'] = $max_value;
-	$array_data["sum" . $series_suffix]['avg'] = $sum_data/$count_data;
-
-	$array_data["sum" . $series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
+	$array_data["sum" . $series_suffix]['min']           = $min_value;
+	$array_data["sum" . $series_suffix]['max']           = $max_value;
+	$array_data["sum" . $series_suffix]['avg']           = $sum_data/$count_data;
+	$array_data["sum" . $series_suffix]['id_module_type']= $data_module_graph['id_module_type'];
+	$array_data["sum" . $series_suffix]['agent_name']    = $data_module_graph['agent_name'];
+	$array_data["sum" . $series_suffix]['module_name']   = $data_module_graph['module_name'];
 
 	if (!is_null($show_elements_graph['percentil']) &&
 		$show_elements_graph['percentil'] &&
@@ -356,10 +357,6 @@ function grafico_modulo_sparse_data(
 	$series_suffix, $str_series_suffix) {
 
 	global $config;
-	//global $array_data;
-	global $caption;
-	global $color;
-	global $legend;
 	global $array_events_alerts;
 
 	if($show_elements_graph['fullscale']){
@@ -553,19 +550,6 @@ function grafico_modulo_sparse_data(
 		return $array_data;
 	}
 
-	// Only show caption if graph is not small
-	if ($width > MIN_WIDTH_CAPTION && $height > MIN_HEIGHT){
-		//Flash chart
-		$caption =
-			__('Max. Value')   . $series_suffix_str . ': ' . $max . '    ' .
-			__('Avg. Value')   . $series_suffix_str . ': ' . $avg . '    ' .
-			__('Min. Value')   . $series_suffix_str . ': ' . $min . '    ' .
-			__('Units. Value') . $series_suffix_str . ': ' . $format_graph['unit'];
-	}
-	else{
-		$caption = array();
-	}
-
 	$color = color_graph_array(
 		$series_suffix,
 		$show_elements_graph['flag_overlapped']
@@ -577,16 +561,6 @@ function grafico_modulo_sparse_data(
 		}
 	}
 
-	legend_graph_array(
-		$max, $min, $avg,
-		$series_suffix,
-		$str_series_suffix,
-		$format_graph,
-		$show_elements_graph,
-		$percentil_value,
-		$data_module_graph
-	);
-
 	$array_events_alerts[$series_suffix] = $events;
 
 	return $array_data;
@@ -605,20 +579,12 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 
 	global $config;
 
-
 	global $graphic_type;
-	//global $array_data;
-	global $caption;
-	global $color;
-	global $legend;
 	global $array_events_alerts;
 
 
 	$array_data   = array();
-	$caption      = array();
-	$color        = array();
 	$legend       = array();
-
 	$array_events_alerts = array();
 
 	//date start final period
@@ -743,10 +709,8 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 				case 'separated':
 				case 'overlapped':
 					// Store the chart calculated
-					$array_data_prev  = $array_data;
-					$legend_prev      = $legend;
-					$color_prev       = $color;
-					$caption_prev     = $caption;
+					$array_data_prev = $array_data;
+					$legend_prev     = $legend;
 					break;
 			}
 		}
@@ -766,7 +730,6 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 			if ($show_elements_graph['compare'] === 'overlapped') {
 				$array_data = array_merge($array_data, $array_data_prev);
 				$legend     = array_merge($legend, $legend_prev);
-				$color      = array_merge($color, $color_prev);
 			}
 		}
 	}
@@ -790,10 +753,14 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 		)
 	);
 
-	$series_type = series_type_graph_array(
-		$array_data
+	$series_type_array = series_type_graph_array(
+		$array_data,
+		$show_elements_graph
 	);
 
+	$series_type = $series_type_array['series_type'];
+	$legend = $series_type_array['legend'];
+
 	//esto la sparse
 	//setup_watermark($water_mark, $water_mark_file, $water_mark_url);
 
@@ -805,7 +772,6 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 			$return = area_graph(
 				$agent_module_id,
 				$array_data,
-				$color,
 				$legend,
 				$series_type,
 				$date_array,
@@ -823,14 +789,17 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 		$return .= '<br>';
 		if (!empty($array_data_prev)) {
 
-			$series_type = series_type_graph_array(
-				$array_data_prev
+			$series_type_array = series_type_graph_array(
+				$array_data_prev,
+				$show_elements_graph
 			);
 
+			$series_type = $series_type_array['series_type'];
+			$legend = $series_type_array['legend'];
+
 			$return .= area_graph(
 				$agent_module_id,
 				$array_data_prev,
-				$color,
 				$legend,
 				$series_type,
 				$date_array,
@@ -851,7 +820,6 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 			$return = area_graph(
 				$agent_module_id,
 				$array_data,
-				$color,
 				$legend,
 				$series_type,
 				$date_array,
@@ -951,10 +919,8 @@ function graphic_combined_module (
 
 	global $config;
 	global $graphic_type;
-	global $legend;
 
 	$legend        = array();
-	$caption       = array();
 	$series_type   = array();
 
 	//date start final period
@@ -971,16 +937,8 @@ function graphic_combined_module (
 	$show_max
 	$show_min
 	$show_avg
-	$from_interface
-	$summatory
-	$average
-	$modules_series
-*/
-/*
-html_debug_print($name_list);
-html_debug_print($unit_list);
-html_debug_print($from_interface);
 */
+
 	$date_array = array();
 	$date_array["period"]     = $period;
 	$date_array["final_date"] = $date;
@@ -1013,6 +971,8 @@ html_debug_print($from_interface);
 	$show_elements_graph['id_widget']    = $id_widget_dashboard;
 	$show_elements_graph['labels']       = $labels;
 	$show_elements_graph['stacked']      = $stacked;
+	$show_elements_graph['combined']     = true;
+	$show_elements_graph['from_interface'] = $from_interface;
 
 	$format_graph = array();
 	$format_graph['width']      = "90%";
@@ -1109,16 +1069,6 @@ html_debug_print($from_interface);
 			}
 		}
 
-		legend_graph_array(
-			$max, $min, $avg,
-			$series_suffix,
-			$str_series_suffix,
-			$format_graph,
-			$show_elements_graph,
-			$percentil_value,
-			$data_module_graph
-		);
-
 		if($config["fixed_graph"] == false){
 			$water_mark = array(
 				'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
@@ -1132,10 +1082,21 @@ html_debug_print($from_interface);
 		$i++;
 	}
 
-	$series_type = series_type_graph_array(
-		$array_data
+	//summatory and average series
+	if($stacked == CUSTOM_GRAPH_AREA  || $stacked == CUSTOM_GRAPH_LINE) {
+		if($summatory || $average) {
+			$array_data = combined_graph_summatory_average ($array_data, $average, $summatory, $modules_series);
+		}
+	}
+
+	$series_type_array = series_type_graph_array(
+		$array_data,
+		$show_elements_graph
 	);
 
+	$series_type = $series_type_array['series_type'];
+	$legend      = $series_type_array['legend'];
+
 	if ($flash_charts === false && $stacked == CUSTOM_GRAPH_GAUGE)
 		$stacked = CUSTOM_GRAPH_BULLET_CHART;
 
@@ -1496,14 +1457,10 @@ html_debug_print($from_interface);
 				$module_name_list[$i] .= " (x". format_numeric ($weight_list[$i], 1).")";
 			}
 */
-	//	$temp = array();
 
 
 	$graph_values = $temp;
 
-
-
-	//Set graph color
 	$threshold_data = array();
 
 	if ($from_interface) {
@@ -1527,9 +1484,10 @@ html_debug_print($from_interface);
 
 		$do_it_warning_inverse = true;
 		$do_it_critical_inverse = true;
+
 		foreach ($module_list as $index => $id_module) {
 			// Get module warning_min and critical_min
-			$warning_min = db_get_value('min_warning','tagente_modulo','id_agente_modulo',$id_module);
+			$warning_min  = db_get_value('min_warning','tagente_modulo','id_agente_modulo',$id_module);
 			$critical_min = db_get_value('min_critical','tagente_modulo','id_agente_modulo',$id_module);
 
 			if ($index == 0) {
@@ -1553,7 +1511,7 @@ html_debug_print($from_interface);
 
 		if ($do_it_warning_min || $do_it_critical_min) {
 			foreach ($module_list as $index => $id_module) {
-				$warning_max = db_get_value('max_warning','tagente_modulo','id_agente_modulo',$id_module);
+				$warning_max  = db_get_value('max_warning','tagente_modulo','id_agente_modulo',$id_module);
 				$critical_max = db_get_value('max_critical','tagente_modulo','id_agente_modulo',$id_module);
 
 				if ($index == 0) {
@@ -1578,7 +1536,7 @@ html_debug_print($from_interface);
 
 		if ($do_it_warning_min || $do_it_critical_min) {
 			foreach ($module_list as $index => $id_module) {
-				$warning_inverse = db_get_value('warning_inverse','tagente_modulo','id_agente_modulo',$id_module);
+				$warning_inverse  = db_get_value('warning_inverse','tagente_modulo','id_agente_modulo',$id_module);
 				$critical_inverse = db_get_value('critical_inverse','tagente_modulo','id_agente_modulo',$id_module);
 
 				if ($index == 0) {
@@ -1603,111 +1561,17 @@ html_debug_print($from_interface);
 
 		if ($do_it_warning_min && $do_it_warning_max && $do_it_warning_inverse) {
 			$yellow_threshold = $compare_warning;
-			$threshold_data['yellow_up'] = $yellow_up;
+			$threshold_data['yellow_up']      = $yellow_up;
 			$threshold_data['yellow_inverse'] = (bool)$yellow_inverse;
 		}
 
 		if ($do_it_critical_min && $do_it_critical_max && $do_it_critical_inverse) {
 			$red_threshold = $compare_critical;
-			$threshold_data['red_up'] = $red_up;
+			$threshold_data['red_up']      = $red_up;
 			$threshold_data['red_inverse'] = (bool)$red_inverse;
 		}
-	}
 
-	//summatory and average series
-	if($stacked == CUSTOM_GRAPH_AREA  || $stacked == CUSTOM_GRAPH_LINE) {
-		if($summatory || $average) {
-			if(isset($array_data) && is_array($array_data)){
-				foreach ($array_data as $key => $value) {
-					if(strpos($key, 'sum') !== false){
-						$data_array_reverse[$key] = array_reverse($value['data']);
-						if(!$modules_series) {
-							unset($array_data[$key]);
-							unset($legend[$key]);
-							unset($series_type[$key]);
-						}
-					}
-				}
-
-				if(isset($data_array_reverse) && is_array($data_array_reverse)){
-					$array_sum_reverse = array();
-					$data_array_prev = false;
-					$data_array_pop = array();
-					$count = 0;
-
-					while(count($data_array_reverse['sum0']) > 0){
-						foreach ($data_array_reverse as $key_reverse => $value_reverse) {
-							if(is_array($value_reverse) && count($value_reverse) > 0){
-								$data_array_pop[$key_reverse] = array_pop($data_array_reverse[$key_reverse]);
-							}
-						}
-
-						if(isset($data_array_pop) && is_array($data_array_pop)){
-							$acum_data = 0;
-							$acum_array = array();
-							$sum_data = 0;
-							$count_pop = 0;
-							foreach ($data_array_pop as $key_pop => $value_pop) {
-								if( $value_pop[0] > $acum_data ){
-									if($acum_data != 0){
-										$sum_data = $sum_data + $data_array_prev[$key_pop][1];
-										$data_array_reverse[$key_pop][] = $value_pop;
-										$data_array_prev[$acum_key] = $acum_array;
-									}
-									else{
-										if($data_array_prev[$key_pop] == false){
-											$data_array_prev[$key_pop] = $value_pop;
-										}
-										$acum_key   = $key_pop;
-										$acum_data  = $value_pop[0];
-										$acum_array = $value_pop;
-										$sum_data   = $value_pop[1];
-									}
-								}
-								elseif($value_pop[0] < $acum_data){
-									$sum_data = $sum_data + $data_array_prev[$key_pop][1];
-									$data_array_reverse[$acum_key][] = $acum_array;
-									$data_array_prev[$key_pop] = $value_pop;
-									$acum_key   = $key_pop;
-									$acum_data  = $value_pop[0];
-									$acum_array = $value_pop;
-								}
-								elseif($value_pop[0] == $acum_data){
-									$data_array_prev[$key_pop] = $value_pop;
-									$sum_data += $value_pop[1];
-								}
-								$count_pop++;
-							}
-							if($summatory){
-								$array_sum_reverse[$count][0] = $acum_data;
-								$array_sum_reverse[$count][1] = $sum_data;
-							}
-							if($average){
-								$array_avg_reverse[$count][0] = $acum_data;
-								$array_avg_reverse[$count][1] = $sum_data / $count_pop;
-							}
-						}
-						$count++;
-					}
-				}
-			}
-
-//XXXXX color,type,title, opacity
-			if(isset($array_sum_reverse) && is_array($array_sum_reverse)){
-				$array_data['sumatory']['data']  = $array_sum_reverse;
-				$array_data['sumatory']['color'] = 'purple';
-				$legend['sumatory']              = __('Summatory');
-				$series_type['sumatory']         = 'area';
-			}
-
-			if(isset($array_avg_reverse) && is_array($array_avg_reverse)){
-				$array_data['sum_avg']['data']  = $array_avg_reverse;
-				$array_data['sum_avg']['color'] = 'orange';
-				$legend['sum_avg']              = __('AVG');
-				$series_type['sum_avg']         = 'area';
-			}
-
-		}
+		$show_elements_graph['threshold_data'] = $threshold_data;
 	}
 
 	switch ($stacked) {
@@ -1716,7 +1580,7 @@ html_debug_print($from_interface);
 		case CUSTOM_GRAPH_STACKED_AREA:
 		case CUSTOM_GRAPH_AREA:
 		case CUSTOM_GRAPH_LINE:
-			return area_graph($agent_module_id, $array_data, $color,
+			return area_graph($agent_module_id, $array_data,
 				$legend, $series_type, $date_array,
 				$data_module_graph, $show_elements_graph,
 				$format_graph, $water_mark, $series_suffix_str,
@@ -1759,18 +1623,14 @@ html_debug_print($from_interface);
 	}
 }
 
-function combined_graph_summatory_average ($array_data){
+function combined_graph_summatory_average ($array_data, $average = false, $summatory = false, $modules_series = false, $baseline = false){
 	if(isset($array_data) && is_array($array_data)){
 		foreach ($array_data as $key => $value) {
 			if(strpos($key, 'sum') !== false){
 				$data_array_reverse[$key] = array_reverse($value['data']);
-				/*
 				if(!$modules_series) {
 					unset($array_data[$key]);
-					unset($legend[$key]);
-					unset($series_type[$key]);
 				}
-				*/
 			}
 		}
 
@@ -1824,19 +1684,36 @@ function combined_graph_summatory_average ($array_data){
 						}
 						$count_pop++;
 					}
-				//	if($summatory){
-					//	$array_sum_reverse[$count][0] = $acum_data;
-					//	$array_sum_reverse[$count][1] = $sum_data;
-				//	}
-				//	if($average){
+					if($summatory){
+						$array_sum_reverse[$count][0] = $acum_data;
+						$array_sum_reverse[$count][1] = $sum_data;
+					}
+					if($average){
 						$array_avg_reverse[$count][0] = $acum_data;
 						$array_avg_reverse[$count][1] = $sum_data / $count_pop;
-				//	}
+					}
 				}
 				$count++;
 			}
+
+			if($summatory && isset($array_sum_reverse) && is_array($array_sum_reverse) && count($array_sum_reverse) > 0){
+				$array_data['summatory']['data']  = $array_sum_reverse;
+				$array_data['summatory']['color'] = 'purple';
+			}
+
+			if($average && isset($array_avg_reverse) && is_array($array_avg_reverse) && count($array_avg_reverse) > 0){
+				if($baseline){
+					$array_data['baseline']['data']  = $array_avg_reverse;
+					$array_data['baseline']['color'] = 'green';
+				}
+				else{
+					$array_data['average']['data']  = $array_avg_reverse;
+					$array_data['average']['color'] = 'orange';
+				}
+			}
+
 		}
-		return $array_avg_reverse;
+		return $array_data;
 	}
 	else{
 		return false;
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 425dda50c1..e2a4d310fc 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -221,7 +221,7 @@ function vbar_graph(
 }
 
 function area_graph(
-	$agent_module_id, $array_data, $color,
+	$agent_module_id, $array_data,
 	$legend, $series_type, $date_array,
 	$data_module_graph, $show_elements_graph,
 	$format_graph, $water_mark, $series_suffix_str,
@@ -234,7 +234,6 @@ function area_graph(
 		return flot_area_graph(
 			$agent_module_id,
 			$array_data,
-			$color,
 			$legend,
 			$series_type,
 			$date_array,
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 8cd548285c..8b72dbced9 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
@@ -24,7 +24,6 @@
 			// Throw errors
 			var retrieveDataOject = function (dataObjects, custom) {
 				var result;
-
 				if (typeof dataObjects === 'undefined')
 					throw new Error('Empty parameter');
 
@@ -76,25 +75,36 @@
 				 * }
 				 */
 				if (type === 'csv') {
-
 					result = {
-						head: ['date', 'value','label'],
+						head: ['timestap', 'date', 'value', 'label'],
 						data: []
 					};
 
 					dataObject.data.forEach(function (item, index) {
-						var date = '', value = item[1];
+						var timestap = item[0];
 
-						// 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];
+						var d = new Date(item[0]);
+						var monthNames = [
+							"Jan", "Feb", "Mar",
+							"Apr", "May", "Jun",
+							"Jul", "Aug", "Sep",
+							"Oct", "Nov", "Dec"
+						];
 
-						var clean_label = dataObject.label;
-						clean_label = clean_label.replace( new RegExp("<.*?>", "g"), "");
-						clean_label = clean_label.replace( new RegExp(";", "g"), "");
-						result.data.push([date, value, clean_label]);
+						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 value = item[1];
+
+						var clean_label = plot.getOptions().export.labels_long[dataObject.label];
+						result.data.push([timestap, date, value, clean_label]);
 					});
 				}
 				/* [
@@ -251,7 +261,7 @@
 			// Throw errors
 			var processDataObject = function (dataObject) {
 				var result;
-
+console.log(dataObject);
 				if (typeof dataObject === 'undefined')
 					throw new Error('Empty parameter');
 
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index af44d4907a..a51e3a0760 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1576,15 +1576,14 @@ function pandoraFlotArea(
 						show: points_show,
 						radius: 3,
 						fillColor: fill_points
-					}
+					},
+					legend: legend.index
 				});
 			}
 		}
 		i++;
 	});
-
-	console.log(data_base);
-
+console.log(legend);
 	// The first execution, the graph data is the base data
 	datas = data_base;
 	font_size = 8;
@@ -1608,7 +1607,7 @@ function pandoraFlotArea(
 			},
 			export: {
 				export_data: true,
-				labels_long: labels_long,
+				labels_long: legend,
 				homeurl: homeurl
 			},
 			grid: {
@@ -1701,7 +1700,7 @@ function pandoraFlotArea(
 			},
 			export: {
 				export_data: true,
-				labels_long: labels_long,
+				labels_long: legend,
 				homeurl: homeurl
 			},
 			grid: {
@@ -2126,7 +2125,7 @@ function pandoraFlotArea(
 
 		// Get only two decimals
 		//XXXXXXXXXX
-		formatted = round_with_decimals(formatted, 100)
+		formatted = round_with_decimals(formatted, 100);
 		return '<div class='+font+' style="font-size:'+font_size+'pt;">'+formatted+'</div>';
 	}
 
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index cf2892d6c5..ca5e6b375c 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -101,7 +101,7 @@ function include_javascript_dependencies_flot_graph($return = false) {
 ////////// AREA GRAPHS ////////
 ///////////////////////////////
 function flot_area_graph (
-	$agent_module_id, $array_data, $color,
+	$agent_module_id, $array_data,
 	$legend, $series_type, $date_array,
 	$data_module_graph, $show_elements_graph,
 	$format_graph, $water_mark, $series_suffix_str,
@@ -133,20 +133,41 @@ function flot_area_graph (
 	$return = "<div class='parent_graph' style='width: " . ($format_graph['width']) . "; " . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
 	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:" . $format_graph['font_size'] ."pt !important;'></p>";
-
-	$yellow_threshold = $data_module_graph['w_min'];
-	$red_threshold = $data_module_graph['c_min'];
-	// Get other required module datas to draw warning and critical
-	if ($agent_module_id == 0) {
-		$yellow_up = 0;
-		$red_up = 0;
+	if(!isset($show_elements_graph['combined']) || !$show_elements_graph['combined']){
+		$yellow_threshold = $data_module_graph['w_min'];
+		$red_threshold    = $data_module_graph['c_min'];
+		// Get other required module datas to draw warning and critical
+		if ($agent_module_id == 0) {
+			$yellow_up      = 0;
+			$red_up         = 0;
+			$yellow_inverse = false;
+			$red_inverse    = false;
+		} else {
+			$yellow_up      = $data_module_graph['w_max'];
+			$red_up         = $data_module_graph['c_max'];
+			$yellow_inverse = !($data_module_graph['w_inv'] == 0);
+			$red_inverse    = !($data_module_graph['c_inv'] == 0);
+		}
+	}
+	elseif(isset($show_elements_graph['from_interface']) && $show_elements_graph['from_interface']){
+		if(	isset($show_elements_graph['threshold_data']) && is_array($show_elements_graph['threshold_data'])){
+			$yellow_up      = $show_elements_graph['threshold_data']['yellow_up'];
+			$red_up         = $show_elements_graph['threshold_data']['red_up'];
+			$yellow_inverse = $show_elements_graph['threshold_data']['yellow_inverse'];
+			$red_inverse    = $show_elements_graph['threshold_data']['red_inverse'];
+		}
+		else{
+			$yellow_up      = 0;
+			$red_up         = 0;
+			$yellow_inverse = false;
+			$red_inverse    = false;
+		}
+	}
+	else{
+		$yellow_up      = 0;
+		$red_up         = 0;
 		$yellow_inverse = false;
-		$red_inverse = false;
-	} else {
-		$yellow_up = $data_module_graph['w_max'];
-		$red_up = $data_module_graph['c_max'];
-		$yellow_inverse = !($data_module_graph['w_inv'] == 0);
-		$red_inverse = !($data_module_graph['c_inv'] == 0);
+		$red_inverse    = false;
 	}
 
 	if ($show_elements_graph['menu']) {
diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php
index 84f6087663..12884870f6 100644
--- a/pandora_console/operation/agentes/interface_traffic_graph_win.php
+++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php
@@ -75,7 +75,7 @@ $interface_traffic_modules = array(
 		$refresh = (int) get_parameter('refresh', SECONDS_5MINUTES);
 		if ($refresh > 0) {
 			$query = ui_get_url_refresh(false);
-			
+
 			echo '<meta http-equiv="refresh" content="'.$refresh.'; URL='.$query.'" />';
 		}
 ?>
@@ -99,10 +99,10 @@ $interface_traffic_modules = array(
 			window.onload = function() {
 				// Hack to repeat the init process to period select
 				var periodSelectId = $('[name="period"]').attr('class');
-				
+
 				period_select_init(periodSelectId);
 			};
-			
+
 			function show_others() {
 				if (!$("#checkbox-avg_only").attr('checked')) {
 					$("#hidden-show_other").val(1);
@@ -116,20 +116,18 @@ $interface_traffic_modules = array(
 	</head>
 	<body bgcolor="#ffffff" style='background:#ffffff;'>
 <?php
-		
 		// ACL
 		$permission = false;
 		$agent_group = (int) agents_get_agent_group($agent_id);
 		$strict_user = (bool) db_get_value("strict_acl", "tusuario", "id_user", $config['id_user']);
-		
+
 		// The traffic modules should belong to the agent id
 		$in_agent_id = (int) db_get_value("id_agente", "tagente_modulo", "id_agente_modulo", $params['traffic_module_in']);
 		$out_agent_id = (int) db_get_value("id_agente", "tagente_modulo", "id_agente_modulo", $params['traffic_module_out']);
 		$traffic_modules_belong_to_agent = $agent_id == $in_agent_id && $agent_id == $out_agent_id;
-		
+
 		if (!empty($agent_group) && !empty($params['traffic_module_in'])
 				&& !empty($params['traffic_module_out']) && $traffic_modules_belong_to_agent) {
-			
 			if ($strict_user) {
 				if (tags_check_acl_by_module($params['traffic_module_in'], $config['id_user'], 'RR') === true
 						&& tags_check_acl_by_module($params['traffic_module_out'], $config['id_user'], 'RR') === true)
@@ -139,12 +137,12 @@ $interface_traffic_modules = array(
 				$permission = check_acl($config['id_user'], $agent_group, "RR");
 			}
 		}
-		
+
 		if (!$permission) {
 			require ($config['homedir'] . "/general/noaccess.php");
 			exit;
 		}
-		
+
 		// Get input parameters
 		$period = get_parameter ("period", SECONDS_1DAY);
 		$width = (int) get_parameter("width", 555);
@@ -155,10 +153,10 @@ $interface_traffic_modules = array(
 		$baseline = get_parameter ("baseline", 0);
 		$show_percentil = get_parameter ("show_percentil", 0);
 		$fullscale = get_parameter("fullscale");
-		
+
 		if(!isset($_GET["fullscale_sent"]) ){
-			if(!isset($config['full_scale_option']) || 
-				$config['full_scale_option'] == 0   || 
+			if(!isset($config['full_scale_option']) ||
+				$config['full_scale_option'] == 0   ||
 				$config['full_scale_option'] == 2 ){
 				$fullscale = 0;
 			}
@@ -170,12 +168,11 @@ $interface_traffic_modules = array(
 		if ($zoom > 1) {
 			$height = $height * ($zoom / 2.1);
 			$width = $width * ($zoom / 1.4);
-			
 			echo "<script type='text/javascript'>window.resizeTo($width + 120, $height + 320);</script>";
 		}
-		
+
 		/*$current = date("Y-m-d");
-		
+
 		if ($start_date != $current)
 			$date = strtotime($start_date);
 		else
@@ -183,19 +180,23 @@ $interface_traffic_modules = array(
 		*/
 		$date = strtotime("$start_date $start_time");
 		$now = time();
-		
+
 		if ($date > $now){
 			$date = $now;
 		}
-		
+
 		$urlImage = ui_get_full_url(false);
-		
+
 		if ($config['flash_charts'] == 1)
 			echo '<div style="margin-left: 70px; padding-top: 10px;">';
 		else
 			echo '<div style="margin-left: 50px; padding-top: 10px;">';
-		
-		custom_graphs_print(0,
+
+		$height = 400;
+		$width  = '90%';
+
+		custom_graphs_print(
+			0,
 			$height,
 			$width,
 			$period,
@@ -218,10 +219,11 @@ $interface_traffic_modules = array(
 			(($show_percentil)? $config['percentil'] : null),
 			true,
 			false,
-			$fullscale);
-		
+			$fullscale
+		);
+
 		echo '</div>';
-		
+
 		///////////////////////////
 		// SIDE MENU
 		///////////////////////////
@@ -231,13 +233,12 @@ $interface_traffic_modules = array(
 		$side_layer_params['top_text'] = "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>" . html_print_image('/images/config.disabled.png', true, array('width' => '16px'),false,false,false,true) . ' ' . __('Pandora FMS Graph configuration menu') . "</div>";
 		$side_layer_params['body_text'] = "<div class='menu_sidebar_outer'>";
 		$side_layer_params['body_text'] .=__('Please, make your changes and apply with the <i>Reload</i> button');
-		
+
 		// MENU
 		$side_layer_params['body_text'] .= '<form method="get" action="interface_traffic_graph_win.php">';
 		$side_layer_params['body_text'] .= html_print_input_hidden("params", base64_encode($params_json), true);
-		
+
 		// FORM TABLE
-		
 		$table = html_get_predefined_table('transparent', 2);
 		$table->width = '98%';
 		$table->id = 'stat_win_form_div';
@@ -245,32 +246,32 @@ $interface_traffic_modules = array(
 		$table->style[1] = 'text-align:left;';
 		$table->styleTable = 'border-spacing: 4px;';
 		$table->class = 'alternate';
-		
+
 		$data = array();
 		$data[0] = __('Refresh time');
 		$data[1] = html_print_extended_select_for_time("refresh", $refresh, '', '', 0, 7, true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = __('Begin date');
 		$data[1] = html_print_input_text ("start_date", substr ($start_date, 0, 10),'', 15, 255, true);
 		$data[1] .= html_print_image ("/images/calendar_view_day.png", true, array ("onclick" => "scwShow(scwID('text-start_date'),this);", "style" => 'vertical-align: bottom;'),false,false,false,true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = __('Begin time');
 		$data[1] = html_print_input_text ("start_time", $start_time,'', 10, 10, true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = __('Time range');
 		$data[1] = html_print_extended_select_for_time('period', $period, '', '', 0, 7, true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = __('Show percentil');
 		$data[1] = html_print_checkbox ("show_percentil", 1, (bool) $show_percentil, true);
@@ -288,7 +289,7 @@ $interface_traffic_modules = array(
 		$data[1] = html_print_checkbox ("fullscale", 1, (bool) $fullscale, true);
 		$table->data[] = $data;
 		$table->rowclass[] ='';
-		
+
 		$data = array();
 		$data[0] = __('Zoom factor');
 		$options = array();
@@ -300,47 +301,47 @@ $interface_traffic_modules = array(
 		$data[1] = html_print_select($options, "zoom", $zoom, '', '', 0, true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$form_table = html_print_table($table, true);
-		
+
 		unset($table);
-		
+
 		$table->id = 'stat_win_form';
 		$table->width = '100%';
 		$table->cellspacing = 2;
 		$table->cellpadding = 2;
 		$table->class = 'databox';
-		
+
 		$data = array();
 		$data[0] = html_print_div(array('content' => $form_table, 'style' => 'overflow: auto; height: 220px'), true);
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$data = array();
 		$data[0] = '<div style="width:100%; text-align:right;">' . html_print_submit_button (__('Reload'), "submit", false, 'class="sub upd"', true) . "</div>";
 		$table->data[] = $data;
 		$table->rowclass[] = '';
-		
+
 		$side_layer_params['body_text'] .= html_print_table($table, true);
 		$side_layer_params['body_text'] .= '</form>';
 		$side_layer_params['body_text'] .= '</div>'; // outer
-		
+
 		// ICONS
 		$side_layer_params['icon_closed'] = '/images/graphmenu_arrow_hide.png';
 		$side_layer_params['icon_open'] = '/images/graphmenu_arrow.png';
-		
+
 		// SIZE
 		$side_layer_params['width'] = 500;
-		
+
 		// POSITION
 		$side_layer_params['position'] = 'left';
-		
+
 		html_print_side_layer($side_layer_params);
-		
+
 		// Hidden div to forced title
 		html_print_div(array('id' => 'forced_title_layer', 'class' => 'forced_title_layer', 'hidden' => true));
 ?>
-		
+
 	</body>
 </html>
 <?php
@@ -351,7 +352,7 @@ ui_require_jquery_file("ui.datepicker-" . $custom_user_language, "include/javasc
 ui_include_time_picker(true);
 ?>
 <script>
-	
+
 <?php
 	//Resize window when show the overview graph.
 	if ($config['flash_charts']) {
@@ -363,7 +364,7 @@ ui_include_time_picker(true);
 			height_window = $(window).height();
 			width_window = $(window).width();
 		});
-		
+
 		$("*").filter(function() {
 			if (typeof(this.id) == "string")
 				return this.id.match(/menu_overview_graph.*/);
@@ -375,12 +376,12 @@ ui_include_time_picker(true);
 <?php
 	}
 ?>
-	
+
 	// Add datepicker and timepicker
 	$("#text-start_date").datepicker({
 		dateFormat: "<?php echo DATE_FORMAT_JS; ?>"
 	});
-	
+
 	$("#text-start_time").timepicker({
 		showSecond: true,
 		timeFormat: '<?php echo TIME_FORMAT_JS; ?>',
@@ -392,8 +393,8 @@ ui_include_time_picker(true);
 		currentText: '<?php echo __('Now');?>',
 		closeText: '<?php echo __('Close');?>'
 	});
-	
+
 	$.datepicker.setDefaults($.datepicker.regional["<?php echo $custom_user_language; ?>"]);
-	
+
 	forced_title_callback();
 </script>

From a82299f1cf9fb97b5b889ba45156e84e5832abf4 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 21 May 2018 18:08:36 +0200
Subject: [PATCH 055/146] PluginTools minor changes API cluster minor changes

---
 pandora_console/include/functions_api.php    | 6 +++---
 pandora_server/lib/PandoraFMS/PluginTools.pm | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 00aaf421f5..d4f07fe250 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -10250,7 +10250,7 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
 			db_pandora_audit("Report management", "Fail try to create agent");
 		
 		returnData('string',
-			array('type' => 'string', 'data' => (int)((bool)$id_cluster)));
+			array('type' => 'string', 'data' => (int)$id_cluster));
 		}
 	}
 	
@@ -10299,7 +10299,7 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
 			// 	
 				if($element["type"] == "AA"){
 			// 								
-						$tcluster_module = db_process_sql_insert('tcluster_item',array('name'=>$element["name"],'id_cluster'=>$element["id_cluster"],'critical_limit'=>$element["critical_limit"],'warning_limit'=>$element["warning_limit"]));
+						$tcluster_module = db_process_sql_insert('tcluster_item',array('name'=>io_safe_input($element["name"]),'id_cluster'=>$element["id_cluster"],'critical_limit'=>$element["critical_limit"],'warning_limit'=>$element["warning_limit"]));
 						
 						$id_agent = db_process_sql('select id_agent from tcluster where id = '.$element["id_cluster"]);
 						
@@ -10318,7 +10318,7 @@ function api_set_new_cluster($thrash1, $thrash2, $other, $thrash3) {
 						$get_module_interval_value = $get_module_type[0]['module_interval'];
 						
 						$values_module = array(
-							'nombre' => $element["name"],
+							'nombre' => io_safe_input($element["name"]),
 							'id_modulo' => 0,
 							'prediction_module' => 6,
 							'id_agente' => $id_agent[0]['id_agent'],
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index fe175e8db4..2fe297936d 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -1509,6 +1509,9 @@ sub api_call {
 
 		$other = join $separator, @{$apidata->{'other'}};
 	}
+	else {
+		$other = $apidata->{'other'};
+	}
 
 	my $call;
 

From 0e3db1eb80e96e03f0babe0672a25fcd09f523d7 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 21 May 2018 18:26:28 +0200
Subject: [PATCH 056/146] [Rebranding] Added custom logo to network maps
 central node

---
 .../godmode/setup/setup_visuals.php           | 69 +++++++++++++++++--
 pandora_console/include/functions_config.php  |  8 ++-
 .../include/functions_networkmap.php          | 28 +++++++-
 .../functions_pandora_networkmap.js           | 10 ++-
 .../agentes/pandora_networkmap.view.php       |  3 +-
 5 files changed, 106 insertions(+), 12 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 72efbbf138..1a57c376b8 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -235,11 +235,13 @@ if(enterprise_installed()) {
 }
 
 if(enterprise_installed()){
+	// Get all the custom logos
+	$files = list_files('enterprise/images/custom_general_logos', "png", 1, 0);
+
 	// Custom docs icon
 	$table_styles->data[$row][0] = __('Custom documentation logo');
 	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
-	
-	$files = list_files('enterprise/images/custom_general_logos', "png", 1, 0);
+
 	$table_styles->data[$row][1] = html_print_select(
 		$files,
 		'custom_docs_logo',
@@ -260,8 +262,6 @@ if(enterprise_installed()){
 	// Custom support icon
 	$table_styles->data[$row][0] = __('Custom support logo');
 	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
-	
-	$files = list_files('enterprise/images/custom_general_logos', "png", 1, 0);
 	$table_styles->data[$row][1] = html_print_select(
 		$files,
 		'custom_support_logo',
@@ -278,6 +278,26 @@ if(enterprise_installed()){
 	);
 	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_support_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
 	$row++;
+
+	// Custom center networkmap icon
+	$table_styles->data[$row][0] = __('Custom networkmap center logo');
+	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
+	$table_styles->data[$row][1] = html_print_select(
+		$files,
+		'custom_network_center_logo',
+		$config["custom_network_center_logo"],
+		'',
+		__('Default'),
+		'',
+		true,
+		false,
+		true,
+		'',
+		false,
+		'width:240px'
+	);
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_network_center_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$row++;
 }
 
 //login title1
@@ -1277,7 +1297,6 @@ $("#button-custom_docs_logo_preview").click (function (e) {
 	}
 });
 
-
 $("#button-custom_support_logo_preview").click (function (e) {
 	var icon_name = $("select#custom_support_logo option:selected").val();
 	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
@@ -1319,6 +1338,46 @@ $("#button-custom_support_logo_preview").click (function (e) {
 	}
 });
 
+$("#button-custom_network_center_logo_preview").click (function (e) {
+	var icon_name = $("select#custom_network_center_logo option:selected").val();
+	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+
+	if (icon_name == "")
+		return;
+
+	$dialog = $("<div></div>");
+	$image = $("<img src=\"" + icon_path + "\">");
+	$image
+		.css('max-width', '500px')
+		.css('max-height', '500px');
+
+	try {
+		$dialog
+			.hide()
+			.html($image)
+			.dialog({
+				title: "<?php echo __('Logo preview'); ?>",
+				resizable: true,
+				draggable: true,
+				modal: true,
+				overlay: {
+					opacity: 0.5,
+					background: "black"
+				},
+				minHeight: 1,
+				width: $image.width,
+				close: function () {
+					$dialog
+						.empty()
+						.remove();
+				}
+			}).show();
+	}
+	catch (err) {
+		// console.log(err);
+	}
+});
+
 $("#button-login_background_preview").click (function (e) {
 	var icon_name = $("select#login_background option:selected").val();
 	var icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index f572ebd148..472744c66c 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -509,6 +509,8 @@ function config_update_config () {
 					if (!config_update_value ('custom_docs_logo', (string) get_parameter ('custom_docs_logo')))
 						$error_update[] = __('Custom documentation logo');
 					if (!config_update_value ('custom_support_logo', (string) get_parameter ('custom_support_logo')))
+						$error_update[] = __('Custom networkmap center logo');
+					if (!config_update_value ('custom_network_center_logo', (string) get_parameter ('custom_network_center_logo')))
 						$error_update[] = __('Custom support logo');
 					if (!config_update_value ('custom_title1_login', (string) get_parameter ('custom_title1_login')))
 						$error_update[] = __('Custom title1 login');
@@ -1207,7 +1209,11 @@ function config_process_config () {
 	if (!isset ($config["custom_support_logo"])) {
 		config_update_value ('custom_support_logo', '');
 	}
-	
+
+	if (!isset ($config["custom_network_center_logo"])) {
+		config_update_value ('custom_network_center_logo', '');
+	}
+
 	if (!isset ($config["custom_title1_login"])) {
 		config_update_value ('custom_title1_login', __('WELCOME TO PANDORA FMS'));
 	}
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index 8c9860caae..7578f4bbfd 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -29,6 +29,11 @@ require_once($config['homedir'] . "/include/functions_modules.php");
 require_once($config['homedir'] . "/include/functions_groups.php");
 ui_require_css_file ('cluetip');
 
+/**
+ * Definitions
+ */
+define('DEFAULT_NETWORKMAP_CENTER_LOGO', 'images/networkmap/bola_pandora_network_maps.png');
+
 // Check if a node descends from a given node
 function networkmap_is_descendant ($node, $ascendant, $parents) {
 	if (! isset ($parents[$node])) {
@@ -1327,7 +1332,7 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s
 	}
 	$stats_json = base64_encode(json_encode($summary));
 	
-	$img_src = "images/networkmap/bola_pandora_network_maps.png";
+	$img_src = networkmap_get_center_logo();
 	if (defined('METACONSOLE')) {
 		
 		$url_tooltip = '../../ajax.php?' .
@@ -1346,11 +1351,11 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s
 	
 	if ($hack_networkmap_mobile) {
 		$img = '<TR><TD>' .
-			"<img src='" . $config['homedir'] . '/' . "images/networkmap/bola_pandora_network_maps.png' />" .
+			"<img src='" . $config['homedir'] . '/' . networkmap_get_center_logo() . "' />" .
 			'</TD></TR>';
 	}
 	else {
-		$image = html_print_image("images/networkmap/bola_pandora_network_maps.png", true, false, false, true);
+		$image = html_print_image(networkmap_get_center_logo(), true, false, false, true);
 		//$image = str_replace('"',"'",$image);
 		$img = '<TR><TD>' . $image . '</TD></TR>';
 	}
@@ -1866,6 +1871,23 @@ function modules_get_all_interfaces($id_agent) {
 	return $return;
 }
 
+/**
+ * Get the central networkmap logo
+ *
+ * @return string with the path to logo. If it is not set, return the default.
+ *
+ */
+function networkmap_get_center_logo () {
+	global $config;
+
+	html_debug("hola", true);
+	if ((!enterprise_installed()) || empty($config['custom_network_center_logo'])) {
+		return DEFAULT_NETWORKMAP_CENTER_LOGO;
+	}
+
+	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
+}
+
 ?>
 <script language="javascript" type="text/javascript">
 	$(document).ready (function () {
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index 8b5d68b711..2e0fa2f3d9 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -3445,7 +3445,9 @@ function draw_elements_graph() {
 	node_temp.append("image")
 		.attr("class", "node_image")
 		.attr("xlink:href", function (d) {
-			return d.image_url;
+			return is_central_node(d)
+				? $("#hidden-center_logo").val()
+				: d.image_url;
 		})
 		.attr("x", function (d) {
 			return d.x - (d.image_width / 2);
@@ -3665,9 +3667,13 @@ function draw_elements_graph() {
 	node.exit().remove();
 }
 
+function is_central_node (data) {
+	return (data.type == 0 && data.id_agent == 0);
+}
+
 function get_node_name_ov (data) {
 	// Node central name should be the product name
-	return (data.type == 0 && data.id_agent == 0)
+	return (is_central_node(data))
 		? $("#hidden-product_name").val()
 		: data.text;
 }
diff --git a/pandora_console/operation/agentes/pandora_networkmap.view.php b/pandora_console/operation/agentes/pandora_networkmap.view.php
index 521f7bea88..341464523b 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.view.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.view.php
@@ -700,8 +700,9 @@ else {
 	$id = (int) get_parameter('id_networkmap', 0);
 }
 
-// Print the product name to handle it in js
+// Print some params to handle it in js
 html_print_input_hidden ('product_name', get_product_name());
+html_print_input_hidden ('center_logo', ui_get_full_url(networkmap_get_center_logo()));
 
 $dash_mode = 0;
 $map_dash_details = array();

From 25666e1bff77fdc63c73acfdf1f5828f912c48ee Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 22 May 2018 10:50:38 +0200
Subject: [PATCH 057/146] fixed errors

---
 pandora_console/include/graphs/fgraph.php     |  30 +--
 .../flot/jquery.flot.exportdata.pandora.js    |   2 +-
 .../include/graphs/functions_pchart.php       | 207 +++++++++++++++---
 pandora_console/include/javascript/pandora.js |   2 +-
 4 files changed, 193 insertions(+), 48 deletions(-)

diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index e2a4d310fc..ffe13f74d0 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -251,22 +251,24 @@ function area_graph(
 		//tener en cuenta stacked, area, line
 
 		$graph = array();
-		$graph['data']            = $chart_data;
-		$graph['width']           = $width;
-		$graph['height']          = $height;
-		$graph['color']           = $color;
+		$graph['data']            = $array_data;
+		$graph['width']           = 900;
+		$graph['height']          = 400;
+	//	$graph['color']           = $color;
 		$graph['legend']          = $legend;
-		$graph['xaxisname']       = $xaxisname;
-		$graph['yaxisname']       = $yaxisname;
-		$graph['water_mark']      = $water_mark_file;
-		$graph['font']            = $font;
-		$graph['font_size']       = $font_size;
-		$graph['backgroundColor'] = $backgroundColor;
-		$graph['unit']            = $unit;
-		$graph['series_type']     = $series_type;
-		$graph['percentil']       = $percentil_values;
+		$graph['xaxisname']       = 'me la pela';
+		$graph['yaxisname']       = 'borja es gay';
+	//  $graph['water_mark']      = $water_mark_file;
+		$graph['font']            = $format_graph['font'];
+		$graph['font_size']       = $format_graph['font_size'];
+		$graph['backgroundColor'] = 'white';
+		$graph['unit']            = '';
+		$graph['series_type']     = array();
+		$graph['percentil']       = false;
 
-		$id_graph = serialize_in_temp($graph, null, $ttl);
+//XXX $ttl tercer parametro
+
+		$id_graph = serialize_in_temp($graph, null, 1);
 		// Warning: This string is used in the function "api_get_module_graph" from 'functions_api.php' with the regec patern "/<img src='(.+)'>/"
 		return "<img src='" .
 			ui_get_full_url (false, false, false, false) .
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 8b72dbced9..3150dce94d 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
@@ -98,12 +98,12 @@
 										(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" +
 										(d.getSeconds()<10?'0':'') + d.getSeconds();
 
-
 						var date  = date_format;
 
 						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]);
 					});
 				}
diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php
index 0114d36e32..732c4388a0 100644
--- a/pandora_console/include/graphs/functions_pchart.php
+++ b/pandora_console/include/graphs/functions_pchart.php
@@ -27,7 +27,6 @@ include_once("pChart/pScatter.class.php");
 include_once("pChart/pRadar.class.php");
 
 // Define default fine colors
-
 $default_fine_colors = array();
 $default_fine_colors[] = "#2222FF";
 $default_fine_colors[] = "#00DD00";
@@ -45,7 +44,7 @@ $yaxisname = '';
 $legend = null;
 $colors = null;
 $font_size = 8;
-$force_steps = true; 
+$force_steps = true;
 $legend_position = null;
 $series_type = null;
 
@@ -72,6 +71,9 @@ if (!$graph) {
 }
 
 $data = $graph['data'];
+
+html_debug_print($data, true);
+
 $width = $graph['width'];
 $height = $graph['height'];
 
@@ -882,8 +884,9 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 	$graph_threshold = false, $id_module) {
 	
 	global $config;
-	
+
 	/* CAT:Vertical Charts */
+/*
 	if (!is_array($legend) || empty($legend)) {
 		unset($legend);
 	}
@@ -902,8 +905,9 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 	else {
 		$data = array($data);
 	}
-	
+*/
 	/* Create and populate the pData object */
+/*
 	$MyData = new pData();
 	
 	foreach ($data as $i => $values) {
@@ -958,13 +962,149 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		$reduction_coefficient = 0.31;
 		$MyData->setSerieWeight($point_id, $config['custom_graph_width'] * $reduction_coefficient);
 	}
-	
+*/
+/*
+	$MyData = new pData();
+	$MyData->addPoints(array(0.11, 0.91, 0.58, 1.11),"Probe 1");
+	$MyData->setAxisName(0,"Temperatures");
+	$MyData->addPoints(array(1328112000, 1328126400, 1330610400, 1330610420),"Labels");
+	$MyData->setAbscissa("Labels");
+	$MyData->setXAxisDisplay(AXIS_FORMAT_TIME,"d/m\nH:i");
+*/
+/*
+	$MyData = new pData();
+	$MyData->addPoints(array(1700,2500,7800,5),"Distance");
+	$MyData->setAxisName(0,"Maximum distance");
+	$MyData->setAxisUnit(0,"m");
+	$MyData->setAxisDisplay(0,AXIS_FORMAT_METRIC);
+
 	$MyData->setAxisName(0,$unit);
-	$MyData->addPoints($index,"Xaxis");
-	$MyData->setSerieDescription("Xaxis", $xaxisname);
-	$MyData->setAbscissa("Xaxis");
-	$MyData->setAxisDisplay(0, AXIS_FORMAT_TWO_SIGNIFICANT, 0);
-	
+	$MyData->addPoints(array(1526886033000, 1526893630000, 1526972433000, 1526972433300),"Timestamp");
+	$MyData->setSerieDescription("Timestamp", $xaxisname);
+	$MyData->setAbscissa("Timestamp");
+	$MyData->setXAxisDisplay(AXIS_FORMAT_DATE);
+*/
+	// Create the pChart object
+	//$myPicture = new pImage(800,  800, $MyData);
+
+/*
+	$myPicture->setGraphArea(60,60,660,190);
+	$myPicture->drawText(350,55,"My chart title",array("FontSize"=>20,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+	$myPicture->drawFilledRectangle(60,60,660,190,array("R"=>255,"G"=>255,"B"=>255,"Surrounding"=>-200,"Alpha"=>10));
+*/
+/*
+	$myPicture->setGraphArea(60,60,800,400);
+	$myPicture->drawText(350,55,"My chart title",array("FontSize"=>20,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+	$myPicture->drawFilledRectangle(60,60,800,400,array("R"=>255,"G"=>255,"B"=>255,"Surrounding"=>-200,"Alpha"=>10));
+	$myPicture->drawScale(array("DrawSubTicks"=>TRUE,"LabelShowBoundaries"=>TRUE,"ScaleModeAuto"=>TRUE));
+	$myPicture->setShadow(TRUE,array("X"=>1,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
+	$myPicture->setFontProperties(array("FontName"=>"fonts/pf_arma_five.ttf","FontSize"=>6));
+	$myPicture->drawStepChart(array("DisplayValues"=>TRUE,"DisplayColor"=>DISPLAY_AUTO,"ScaleModeAuto"=>TRUE));
+	$myPicture->drawAreaChart(array("DisplayValues"=>TRUE,"DisplayColor"=>DISPLAY_AUTO));
+	//$myPicture->setShadow(FALSE);
+*/
+
+
+/* Create and populate the pData object */
+$MyData = new pData();  
+$MyData->addPoints(array(-4,VOID,VOID,12,8,3),"Probe 1");
+$MyData->addPoints(array(3,12,15,8,5,-5),"Probe 2");
+$MyData->addPoints(array(2,7,5,18,19,22),"Probe 3");
+$MyData->setSerieTicks("Probe 2",4);
+$MyData->setAxisName(0,"Temperatures");
+$MyData->addPoints(array(1296299019,1296302903,1296307001,1296308071,1296309901,1296318931),"Labels");
+$MyData->setSerieDescription("Labels","Timestamp");
+$MyData->setXAxisDisplay(AXIS_FORMAT_DATE,"H:i");
+$MyData->setAbscissa("Labels");
+
+/* Create the pChart object */
+$myPicture = new pImage(700,230,$MyData);
+
+/* Draw the background */
+$Settings = array("R"=>170, "G"=>183, "B"=>87, "Dash"=>1, "DashR"=>190, "DashG"=>203, "DashB"=>107);
+$myPicture->drawFilledRectangle(0,0,700,230,$Settings);
+
+/* Overlay with a gradient */
+$Settings = array("StartR"=>219, "StartG"=>231, "StartB"=>139, "EndR"=>1, "EndG"=>138, "EndB"=>68, "Alpha"=>50);
+$myPicture->drawGradientArea(0,0,700,230,DIRECTION_VERTICAL,$Settings);
+$myPicture->drawGradientArea(0,0,700,20,DIRECTION_VERTICAL,array("StartR"=>0,"StartG"=>0,"StartB"=>0,"EndR"=>50,"EndG"=>50,"EndB"=>50,"Alpha"=>80));
+
+/* Add a border to the picture */
+$myPicture->drawRectangle(0,0,699,229,array("R"=>0,"G"=>0,"B"=>0));
+
+/* Write the picture title */
+$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
+$myPicture->drawText(10,13,"drawStepChart() - draw a step chart",array("R"=>255,"G"=>255,"B"=>255));
+
+/* Write the chart title */ 
+$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
+$myPicture->drawText(250,55,"Average temperature",array("FontSize"=>20,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+/* Draw the scale and the 1st chart */
+$myPicture->setGraphArea(60,60,450,190);
+$myPicture->drawFilledRectangle(60,60,450,190,array("R"=>255,"G"=>255,"B"=>255,"Surrounding"=>-200,"Alpha"=>10));
+$myPicture->drawScale(array("DrawSubTicks"=>TRUE,"LabelShowBoundaries"=>TRUE,"ScaleModeAuto"=>TRUE));
+$myPicture->setShadow(TRUE,array("X"=>1,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
+$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
+$myPicture->drawStepChart(array("DisplayValues"=>TRUE,"DisplayColor"=>DISPLAY_AUTO,"ScaleModeAuto"=>TRUE));
+$myPicture->setShadow(FALSE);
+
+/* Draw the scale and the 2nd chart */
+$myPicture->setGraphArea(500,60,670,190);
+$myPicture->drawFilledRectangle(500,60,670,190,array("R"=>255,"G"=>255,"B"=>255,"Surrounding"=>-200,"Alpha"=>10));
+$myPicture->drawScale(array("Pos"=>SCALE_POS_TOPBOTTOM,"DrawSubTicks"=>TRUE,"ScaleModeAuto"=>TRUE));
+$myPicture->setShadow(TRUE,array("X"=>-1,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
+$myPicture->drawStepChart(array("ScaleModeAuto"=>TRUE));
+$myPicture->setShadow(FALSE);
+
+/* Write the chart legend */
+$myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL));
+
+/* Render the picture (choose the best way) */
+//$myPicture->autoOutput("pictures/example.drawStepChart.png");
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	$myPicture->stroke();
+/*
 	switch ($backgroundColor) {
 		case 'white':
 			$transparent = false;
@@ -980,26 +1120,26 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 			// Now the color of the text will be grey
 			$fontColor = array('R' => 200, 'G' => 200, 'B' => 200);
 			break;
-		
 	}
-	/* Create the pChart object */
+
+	// Create the pChart object
 	$myPicture = new pImage($width, $height + $font_size, $MyData, $transparent,
 		$backgroundColor, $fontColor);
-	
-	/* Turn of Antialiasing */
+
+	//Turn of Antialiasing
 	$myPicture->Antialias = $antialiasing;
-	
-	/* Add a border to the picture */
+
+	//Add a border to the picture
 	//$myPicture->drawRectangle(0,0,$width,$height,array("R"=>0,"G"=>0,"B"=>0));
-	
-	/* Set the default font */
+	//Set the default font
 	$myPicture->setFontProperties(
 		array("FontName" =>$font, "FontSize" => $font_size));
-	
+
 	// By default, set a top margin of 5 px
 	$top_margin = 5;
 	if (isset($legend)) {
-		/* Set horizontal legend if is posible */
+
+		//Set horizontal legend if is posible
 		$legend_mode = LEGEND_HORIZONTAL;
 		$size = $myPicture->getLegendSize(
 			array("Style" => LEGEND_NOBORDER,"Mode" => $legend_mode));
@@ -1010,12 +1150,13 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		
 		// Update the top margin to add the legend Height
 		$top_margin = $size['Height'];
-		
-		/* Write the chart legend */
+
+		//Write the chart legend
+
 		$myPicture->drawLegend($width - $size['Width'], 8,
 			array("Style" => LEGEND_NOBORDER, "Mode" => $legend_mode));
 	}
-	
+
 	//Calculate the bottom margin from the size of string in each index
 	$max_chars = graph_get_max_index($index);
 	$margin_bottom = $font_size * $max_chars;
@@ -1076,8 +1217,9 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		}
 	}
 	$chart_margin = 36;
-	
-	/* Area depends on yaxisname */
+
+	//Area depends on yaxisname
+
 	if ($yaxisname != '') {
 		$chart_margin += $chart_size;
 	}
@@ -1211,7 +1353,7 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		$ManualScale = array( 0 => array("Min" => $check_scale_min, "Max" => $check_scale) );
 		$mode = SCALE_MODE_MANUAL;
 
-		/* Draw the scale */
+		//Draw the scale 
 		$scaleSettings = array(
 			"GridR" => 200,
 			"GridG" => 200,
@@ -1305,7 +1447,7 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		//html_debug("MAX: $max_data, ROUND: $max_round", true);
 		$mode = SCALE_MODE_MANUAL;
 
-		/* Draw the scale */
+		//Draw the scale
 		$scaleSettings = array(
 			"GridR" => 200,
 			"GridG" => 200,
@@ -1332,7 +1474,7 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		$myPicture->drawScale($scaleSettings);
 	}
 
-	/* Turn on shadow computing */ 
+	//Turn on shadow computing
 	//$myPicture->setShadow(TRUE,array("X"=>0,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
 	
 	switch ($graph_type) {
@@ -1344,7 +1486,7 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 			break;
 	}
 	
-	/* Draw the chart */
+	// Draw the chart
 	$settings = array(
 		"ForceTransparency" => 20,
 		"Gradient" => TRUE,
@@ -1404,9 +1546,10 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 			$MyData->setSerieDrawable($id, false); //Disable the serie to paint the rest
 		}
 	}
-	
-	/* Render the picture */
-	$myPicture->stroke(); 
+
+	//Render the picture
+	$myPicture->stroke();
+*/
 }
 
 function pch_threshold_graph ($graph_type, $index, $data, $width, $height, $font,
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 4aaf466876..c0bdbe5ca6 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -1558,7 +1558,7 @@ function round_with_decimals (value, multiplier = 1) {
 	if (typeof(value) !== "number") return value;
 
 	if ((value * multiplier) == 0) return 0;
-	if ((value * multiplier) >= 1) {
+	if ((Math.abs(value) * multiplier) >= 1) {
 		return Math.round(value * multiplier) / multiplier;
 	}
 	return round_with_decimals (value, multiplier * 10);

From 9f140e619718deb45657c050c80c0ad7da999adc Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 22 May 2018 10:51:03 +0200
Subject: [PATCH 058/146] Applied lukasr patch for pchart

---
 .../include/graphs/pChart/pDraw.class.php     | 338 ++++++++++++++++--
 1 file changed, 306 insertions(+), 32 deletions(-)

diff --git a/pandora_console/include/graphs/pChart/pDraw.class.php b/pandora_console/include/graphs/pChart/pDraw.class.php
index f1dfe780d5..76ed6030bb 100755
--- a/pandora_console/include/graphs/pChart/pDraw.class.php
+++ b/pandora_console/include/graphs/pChart/pDraw.class.php
@@ -1758,6 +1758,12 @@
      $SkippedTickAlpha	= isset($Format["SkippedTickAlpha"]) ? $Format["SkippedTickAlpha"] : $TickAlpha-80;
      $SkippedInnerTickWidth	= isset($Format["SkippedInnerTickWidth"]) ? $Format["SkippedInnerTickWidth"] : 0;
      $SkippedOuterTickWidth	= isset($Format["SkippedOuterTickWidth"]) ? $Format["SkippedOuterTickWidth"] : 2;
+     $ScaleModeAuto	= isset($Format["ScaleModeAuto"]) ? $Format["ScaleModeAuto"] : FALSE;
+     $LabelSkipOffset		= isset($Format["LabelSkipOffset"]) ? $Format["LabelSkipOffset"] : 0;
+     $LabelShowBoundaries	= isset($Format["LabelShowBoundaries"]) ? $Format["LabelShowBoundaries"] : FALSE;
+     $DrawXBoundaryLines	= isset($Format["DrawXBoundaryLines"]) ? $Format["DrawXBoundaryLines"] : FALSE;
+     $ScaleModeAutoGridInterval	= isset($Format["ScaleModeAutoGridInterval"]) ? $Format["ScaleModeAutoGridInterval"] : 0;
+     $ScaleModeAutoGridLabel	= isset($Format["ScaleModeAutoGridLabel"]) ? $Format["ScaleModeAutoGridLabel"] : FALSE;
 
      /* Floating scale require X & Y margins to be set manually */
      if ( $Floating && ( $XMargin == AUTO || $YMargin == 0 ) ) { $Floating = FALSE; }
@@ -1884,8 +1890,10 @@
         {
          $Points = 0;
          $AxisName = isset($Data["XAxisName"]) ? $Data["XAxisName"] : NULL;
-         foreach($Data["Series"] as $SerieID => $SerieParameter)
-          { if ( $SerieParameter["isDrawable"] ) { $Points = max($Points,count($SerieParameter["Data"])); } }
+		 if (count($Data["Series"]) > 0) {
+			 foreach($Data["Series"] as $SerieID => $SerieParameter)
+			  { if ( $SerieParameter["isDrawable"] ) { $Points = max($Points,count($SerieParameter["Data"])); } }
+		 }
         }
 
        $AxisID = count($Data["Axis"]);
@@ -1901,7 +1909,7 @@
 
          if ( $Points == 1 )
           $Data["Axis"][$AxisID]["Margin"] = $Height / 2;
-         else
+         else if ($Points > 1)
           $Data["Axis"][$AxisID]["Margin"] = ($Height/$Points) / 2;
         }
        else
@@ -1938,6 +1946,24 @@
         {
          if ( $Pos == SCALE_POS_LEFTRIGHT )
           {
+          $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+             
+          if ( $ScaleModeAuto && isset($Data["Series"][$Abscissa]["Data"][0]) ) { 
+          	$AbscissaScaleValueMin = $Data["Series"][$Abscissa]["Data"][0];
+          } else {
+          	$AbscissaScaleValueMin = 0;
+          }
+          if ( $ScaleModeAuto && isset($Data["Series"][$Abscissa]["Data"][$Parameters["Rows"]]) ) { 
+          	$AbscissaScaleValueMax = $Data["Series"][$Abscissa]["Data"][$Parameters["Rows"]];
+          } else {
+          	$AbscissaScaleValueMax = $Width;
+          }
+          $AbscissaScaleValueWidth = $AbscissaScaleValueMax - $AbscissaScaleValueMin;
+		  if ($AbscissaScaleValueWidth > 0)
+          	$AbscissaScaleFactor = $AbscissaScaleValueWidth / $Width;
+		  else
+          	$AbscissaScaleFactor = 1;
+		
            if ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
             {
              if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 2; }
@@ -1951,15 +1977,23 @@
               { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
              if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
-
-             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
-
+			 
              if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / ($Parameters["Rows"]); }
-             
+			 
              $MaxBottom = $AxisPos["B"];
              for($i=0;$i<=$Parameters["Rows"];$i++)
               {
-               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+			   if ( $ScaleModeAuto && $Abscissa != NULL ) { 
+					if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { 
+						$AbscissaScaleValue = $Data["Series"][$Abscissa]["Data"][$i] - $AbscissaScaleValueMin;
+						$XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $AbscissaScaleValue / $AbscissaScaleFactor;
+					} else {
+						$XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+					}
+                } else {
+					$XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+				}
+			   
                $YPos  = $AxisPos["B"];
 
                if ( $Abscissa != NULL )
@@ -1973,7 +2007,7 @@
                 }
 
                $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) )
+               if ( ($LabelShowBoundaries && ($i==0 || $i==$Parameters["Rows"])) || $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip,$LabelSkipOffset) )
                 {
                  $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+$YLabelOffset,$Value,array("FontSize"=>$TicksFontSize,"Angle"=>$LabelRotation,"Align"=>$LabelAlign));
                  $TxtBottom = $YPos+$OuterTickWidth+2+($Bounds[0]["Y"]-$Bounds[2]["Y"]);
@@ -1981,7 +2015,12 @@
                  $LastValue = $Value;
                  $Skipped   = FALSE;
                 }
-
+               
+               if ( $DrawXBoundaryLines && ($i==0 || $i==$Parameters["Rows"]) )
+			    {
+					$this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks));
+			    }
+               
                if ( $Skipped )
                 {
                  if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
@@ -2002,6 +2041,31 @@
                 }
 
               }
+               
+             if ( $ScaleModeAuto && ($ScaleModeAutoGridInterval > 0) )
+              {
+				$ScaleModeAutoGridIntervalDraw = true;
+				$ScaleModeAutoGridIntervalStep = 0;
+				
+				while ($ScaleModeAutoGridIntervalDraw) {
+					$ScaleModeAutoGridIntervalStep++;
+					$ScaleModeAutoGridIntervalValue = $ScaleModeAutoGridIntervalStep*$ScaleModeAutoGridInterval;
+					
+					if ($ScaleModeAutoGridIntervalValue < ($AbscissaScaleValueMax-$AbscissaScaleValueMin)) {
+						$ScaleModeAutoGridIntervalX  = $this->GraphAreaX1 + $Parameters["Margin"] + $ScaleModeAutoGridIntervalValue / $AbscissaScaleFactor;
+						$this->drawLine($ScaleModeAutoGridIntervalX,$this->GraphAreaY1+$FloatingOffset,$ScaleModeAutoGridIntervalX,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks));
+						
+						if ($ScaleModeAutoGridLabel) {
+							$ScaleModeAutoGridLabelDescription = $this->scaleFormat($AbscissaScaleValueMin+$ScaleModeAutoGridIntervalValue,$Data["XAxisDisplay"],$Data["XAxisFormat"],"");
+							
+							$this->drawText($ScaleModeAutoGridIntervalX,$this->GraphAreaY1+$FloatingOffset+5,$ScaleModeAutoGridLabelDescription,array("Align"=>TEXT_ALIGN_MIDDLERIGHT,"Angle"=>90,"R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>floor($GridAlpha*2)));
+						}
+					} else {
+						$ScaleModeAutoGridIntervalDraw = false;
+					}
+				}
+              }
+			 
              if ( isset($Parameters["Name"]) )
               {
                $YPos   = $MaxBottom+2;
@@ -2027,15 +2091,22 @@
               { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
              if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
-
-             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
-
+			 
              if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / $Parameters["Rows"]; }
              
              $MinTop = $AxisPos["T"];
              for($i=0;$i<=$Parameters["Rows"];$i++)
               {
-               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+			   if ( $ScaleModeAuto && $Abscissa != NULL ) { 
+					if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { 
+						$AbscissaScaleValue = $Data["Series"][$Abscissa]["Data"][$i] - $AbscissaScaleValueMin;
+						$XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $AbscissaScaleValue / $AbscissaScaleFactor;
+					} else {
+						$XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+					}
+                } else {
+					$XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+				}
                $YPos  = $AxisPos["T"];
 
                if ( $Abscissa != NULL )
@@ -2049,7 +2120,7 @@
                 }
 
                $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) )
+               if ( ($LabelShowBoundaries && ($i==0 || $i==$Parameters["Rows"])) || $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip,$LabelSkipOffset) )
                 {
                  $Bounds = $this->drawText($XPos,$YPos-$OuterTickWidth-$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
                  $TxtBox = $YPos-$OuterTickWidth-2-($Bounds[0]["Y"]-$Bounds[2]["Y"]);
@@ -2057,6 +2128,11 @@
                  $LastValue = $Value;
                  $Skipped   = FALSE;
                 }
+               
+               if ( $DrawXBoundaryLines && ($i==0 || $i==$Parameters["Rows"]) )
+			    {
+					$this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks));
+			    }
 
                if ( $Skipped )
                 {
@@ -2070,6 +2146,31 @@
                 }
 
               }
+               
+             if ( $ScaleModeAuto && ($ScaleModeAutoGridInterval > 0) )
+              {
+				$ScaleModeAutoGridIntervalDraw = true;
+				$ScaleModeAutoGridIntervalStep = 0;
+				
+				while ($ScaleModeAutoGridIntervalDraw) {
+					$ScaleModeAutoGridIntervalStep++;
+					$ScaleModeAutoGridIntervalValue = $ScaleModeAutoGridIntervalStep*$ScaleModeAutoGridInterval;
+					
+					if ($ScaleModeAutoGridIntervalValue < ($AbscissaScaleValueMax-$AbscissaScaleValueMin)) {
+						$ScaleModeAutoGridIntervalX  = $this->GraphAreaX1 + $Parameters["Margin"] + $ScaleModeAutoGridIntervalValue / $AbscissaScaleFactor;
+						$this->drawLine($ScaleModeAutoGridIntervalX,$this->GraphAreaY1+$FloatingOffset,$ScaleModeAutoGridIntervalX,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks));
+						
+						if ($ScaleModeAutoGridLabel) {
+							$ScaleModeAutoGridLabelDescription = $this->scaleFormat($AbscissaScaleValueMin+$ScaleModeAutoGridIntervalValue,$Data["XAxisDisplay"],$Data["XAxisFormat"],"");
+							
+							$this->drawText($ScaleModeAutoGridIntervalX,$this->GraphAreaY1+$FloatingOffset+5,$ScaleModeAutoGridLabelDescription,array("Align"=>TEXT_ALIGN_MIDDLERIGHT,"Angle"=>90,"R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>floor($GridAlpha*2)));
+						}
+					} else {
+						$ScaleModeAutoGridIntervalDraw = false;
+					}
+				}
+              }
+             
              if ( isset($Parameters["Name"]) )
               {
                $YPos   = $MinTop-2;
@@ -2085,6 +2186,21 @@
           }
          elseif ( $Pos == SCALE_POS_TOPBOTTOM )
           {
+           $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+		   
+           if ( $ScaleModeAuto && isset($Data["Series"][$Abscissa]["Data"][0]) ) { 
+           	$AbscissaScaleValueMin = $Data["Series"][$Abscissa]["Data"][0];
+           } else {
+           	$AbscissaScaleValueMin = 0;
+           }
+           if ( $ScaleModeAuto && isset($Data["Series"][$Abscissa]["Data"][$Parameters["Rows"]]) ) { 
+           	$AbscissaScaleValueMax = $Data["Series"][$Abscissa]["Data"][$Parameters["Rows"]];
+           } else {
+           	$AbscissaScaleValueMax = $Height;
+           }
+           $AbscissaScaleValueWidth = $AbscissaScaleValueMax - $AbscissaScaleValueMin;
+           $AbscissaScaleFactor = $AbscissaScaleValueWidth / $Height;
+		  
            if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
             {
              if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -2; }
@@ -2098,15 +2214,22 @@
               { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
              if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
-
-             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
-
+			 
              if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
 
              $MinLeft = $AxisPos["L"];
              for($i=0;$i<=$Parameters["Rows"];$i++)
               {
-               $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+			   if ( $ScaleModeAuto && $Abscissa != NULL ) { 
+					if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { 
+						$AbscissaScaleValue = $Data["Series"][$Abscissa]["Data"][$i] - $AbscissaScaleValueMin;
+						$YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $AbscissaScaleValue / $AbscissaScaleFactor;
+					} else {
+						$YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+					}
+                } else {
+					$YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+				}
                $XPos  = $AxisPos["L"];
 
                if ( $Abscissa != NULL )
@@ -2120,7 +2243,7 @@
                 }
 
                $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) )
+               if ( ($LabelShowBoundaries && ($i==0 || $i==$Parameters["Rows"])) || $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip,$LabelSkipOffset) )
                 {
                  $Bounds  = $this->drawText($XPos-$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
                  $TxtBox  = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
@@ -2128,6 +2251,11 @@
                  $LastValue = $Value;
                  $Skipped   = FALSE;
                 }
+               
+               if ( $DrawXBoundaryLines && ($i==0 || $i==$Parameters["Rows"]) )
+			    {
+					$this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks));
+			    }
 
                if ( $Skipped )
                 {
@@ -2141,6 +2269,31 @@
                 }
 
               }
+               
+             if ( $ScaleModeAuto && ($ScaleModeAutoGridInterval > 0) )
+              {
+				$ScaleModeAutoGridIntervalDraw = true;
+				$ScaleModeAutoGridIntervalStep = 0;
+				
+				while ($ScaleModeAutoGridIntervalDraw) {
+					$ScaleModeAutoGridIntervalStep++;
+					$ScaleModeAutoGridIntervalValue = $ScaleModeAutoGridIntervalStep*$ScaleModeAutoGridInterval;
+					
+					if ($ScaleModeAutoGridIntervalValue < ($AbscissaScaleValueMax-$AbscissaScaleValueMin)) {
+						$ScaleModeAutoGridIntervalY  = $this->GraphAreaY1 + $Parameters["Margin"] + $ScaleModeAutoGridIntervalValue / $AbscissaScaleFactor;
+						$this->drawLine($this->GraphAreaX1+$FloatingOffset,$ScaleModeAutoGridIntervalY,$this->GraphAreaX2-$FloatingOffset,$ScaleModeAutoGridIntervalY,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks));
+						
+						if ($ScaleModeAutoGridLabel) {
+							$ScaleModeAutoGridLabelDescription = $this->scaleFormat($AbscissaScaleValueMin+$ScaleModeAutoGridIntervalValue,$Data["XAxisDisplay"],$Data["XAxisFormat"],"");
+							
+							$this->drawText($this->GraphAreaX2+$FloatingOffset-5,$ScaleModeAutoGridIntervalY,$ScaleModeAutoGridLabelDescription,array("Align"=>TEXT_ALIGN_MIDDLERIGHT,"Angle"=>0,"R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>floor($GridAlpha*2)));
+						}
+					} else {
+						$ScaleModeAutoGridIntervalDraw = false;
+					}
+				}
+              }
+             
              if ( isset($Parameters["Name"]) )
               {
                $XPos   = $MinLeft-2;
@@ -2167,14 +2320,21 @@
 
              if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
 
-             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
-
              if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
              
              $MaxRight = $AxisPos["R"];
              for($i=0;$i<=$Parameters["Rows"];$i++)
               {
-               $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+			   if ( $ScaleModeAuto && $Abscissa != NULL ) { 
+					if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { 
+						$AbscissaScaleValue = $Data["Series"][$Abscissa]["Data"][$i] - $AbscissaScaleValueMin;
+						$YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $AbscissaScaleValue / $AbscissaScaleFactor;
+					} else {
+						$YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+					}
+                } else {
+					$YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+				}
                $XPos  = $AxisPos["R"];
 
                if ( $Abscissa != NULL )
@@ -2188,7 +2348,7 @@
                 }
 
                $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) )
+               if ( ($LabelShowBoundaries && ($i==0 || $i==$Parameters["Rows"])) || $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip,$LabelSkipOffset) )
                 {
                  $Bounds   = $this->drawText($XPos+$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
                  $TxtBox   = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
@@ -2196,6 +2356,11 @@
                  $LastValue = $Value;
                  $Skipped   = FALSE;
                 }
+               
+               if ( $DrawXBoundaryLines && ($i==0 || $i==$Parameters["Rows"]) )
+			    {
+					$this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks));
+			    }
 
                if ( $Skipped )
                 {
@@ -2209,6 +2374,31 @@
                 }
 
               }
+               
+             if ( $ScaleModeAuto && ($ScaleModeAutoGridInterval > 0) )
+              {
+				$ScaleModeAutoGridIntervalDraw = true;
+				$ScaleModeAutoGridIntervalStep = 0;
+				
+				while ($ScaleModeAutoGridIntervalDraw) {
+					$ScaleModeAutoGridIntervalStep++;
+					$ScaleModeAutoGridIntervalValue = $ScaleModeAutoGridIntervalStep*$ScaleModeAutoGridInterval;
+					
+					if ($ScaleModeAutoGridIntervalValue < ($AbscissaScaleValueMax-$AbscissaScaleValueMin)) {
+						$ScaleModeAutoGridIntervalY  = $this->GraphAreaY1 + $Parameters["Margin"] + $ScaleModeAutoGridIntervalValue / $AbscissaScaleFactor;
+						$this->drawLine($this->GraphAreaX1+$FloatingOffset,$ScaleModeAutoGridIntervalY,$this->GraphAreaX2-$FloatingOffset,$ScaleModeAutoGridIntervalY,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks));
+						
+						if ($ScaleModeAutoGridLabel) {
+							$ScaleModeAutoGridLabelDescription = $this->scaleFormat($AbscissaScaleValueMin+$ScaleModeAutoGridIntervalValue,$Data["XAxisDisplay"],$Data["XAxisFormat"],"");
+							
+							$this->drawText($this->GraphAreaX2+$FloatingOffset-5,$ScaleModeAutoGridIntervalY,$ScaleModeAutoGridLabelDescription,array("Align"=>TEXT_ALIGN_MIDDLERIGHT,"Angle"=>0,"R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>floor($GridAlpha*2)));
+						}
+					} else {
+						$ScaleModeAutoGridIntervalDraw = false;
+					}
+				}
+              }
+             
              if ( isset($Parameters["Name"]) )
               {
                $XPos   = $MaxRight+4;
@@ -2433,12 +2623,12 @@
       }
     }
 
-   function isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip)
+   function isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip,$LabelSkipOffset=0)
     {
      if ( $LabelingMethod == LABELING_DIFFERENT && $Value != $LastValue ) { return(TRUE); }
      if ( $LabelingMethod == LABELING_DIFFERENT && $Value == $LastValue ) { return(FALSE); }
-     if ( $LabelingMethod == LABELING_ALL && $LabelSkip == 1 ) { return(TRUE); }
-     if ( $LabelingMethod == LABELING_ALL && ($ID+$LabelSkip) % ($LabelSkip+1) != 1 ) { return(FALSE); }
+     if ( $LabelingMethod == LABELING_ALL && $LabelSkip == 0 ) { return(TRUE); }
+     if ( $LabelingMethod == LABELING_ALL && ($ID+$LabelSkip+$LabelSkipOffset) % ($LabelSkip+1) != 1 ) { return(FALSE); }
 
      return(TRUE);
     }
@@ -3456,6 +3646,7 @@
      $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
      $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
      $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+     $ScaleModeAuto	= isset($Format["ScaleModeAuto"]) ? $Format["ScaleModeAuto"] : FALSE;
 
      $Data = $this->DataSet->getData();
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
@@ -3481,7 +3672,32 @@
          $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
 
          $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
-
+		 
+		 $Width = $this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2;
+		 $Height = $this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2;
+		 if ( $ScaleModeAuto && isset($Data["Series"][$Data["Abscissa"]]["Data"][0]) ) { 
+			$AbscissaScaleValueMin = $Data["Series"][$Data["Abscissa"]]["Data"][0];
+		 } else {
+			$AbscissaScaleValueMin = 0;
+		 }
+		 if ( $ScaleModeAuto && isset($Data["Series"][$Data["Abscissa"]]["Data"][$XDivs]) ) { 
+			$AbscissaScaleValueMax = $Data["Series"][$Data["Abscissa"]]["Data"][$XDivs];
+		 } else {
+			$AbscissaScaleValueMax = $Width;
+		 }
+		 $AbscissaScaleValueWidth = $AbscissaScaleValueMax - $AbscissaScaleValueMin;
+		 if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
+			  if ($AbscissaScaleValueWidth > 0)
+				$AbscissaScaleFactor = $AbscissaScaleValueWidth / $Width;
+			  else
+				$AbscissaScaleFactor = 1;
+		 } else {
+			  if ($AbscissaScaleValueWidth > 0)
+				$AbscissaScaleFactor = $AbscissaScaleValueWidth / $Height;
+			  else
+				$AbscissaScaleFactor = 1;
+		 }
+		 
          if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
           {
            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
@@ -3491,6 +3707,11 @@
            $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
            foreach($PosArray as $Key => $Y)
             {
+			 if ($ScaleModeAuto) {
+			 	$AbscissaScaleValue = $Data["Series"][$Data["Abscissa"]]["Data"][$Key] - $AbscissaScaleValueMin;
+			 	$X = $this->GraphAreaX1 + $XMargin + $AbscissaScaleValue / $AbscissaScaleFactor;
+			 }
+			 
              if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
               {
                if ( $Y <= $LastY ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
@@ -3523,7 +3744,10 @@
              if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
              $LastX = $X; $LastY = $Y;
              if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
-             $X = $X + $XStep;
+			 
+			 if (!$ScaleModeAuto)  {
+             	$X = $X + $XStep;
+			 }
             }
            if ( $ReCenter ) { $this->drawLine($LastX,$LastY,$this->GraphAreaX2 - $XMargin,$LastY,$Color); }
           }
@@ -3536,6 +3760,11 @@
            $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
            foreach($PosArray as $Key => $X)
             {
+			 if ($ScaleModeAuto) {
+			 	$AbscissaScaleValue = $Data["Series"][$Data["Abscissa"]]["Data"][$Key] - $AbscissaScaleValueMin;
+			 	$Y = $this->GraphAreaY1 + $XMargin + $AbscissaScaleValue / $AbscissaScaleFactor;
+			 }
+			 
              if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
               {
                if ( $X >= $LastX ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
@@ -3565,7 +3794,10 @@
              if ( !$Init && $ReCenter ) { $Y = $Y - $YStep/2; $Init = TRUE; }
              $LastX = $X; $LastY = $Y;
              if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
-             $Y = $Y + $YStep;
+			 
+			 if (!$ScaleModeAuto)  {
+             	$Y = $Y + $YStep;
+			 }
             }
            if ( $ReCenter ) { $this->drawLine($LastX,$LastY,$LastX,$this->GraphAreaY2 - $XMargin,$Color); }
           }
@@ -3585,6 +3817,7 @@
      $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
      $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
      $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+     $ScaleModeAuto	= isset($Format["ScaleModeAuto"]) ? $Format["ScaleModeAuto"] : FALSE;
 
      $Data = $this->DataSet->getData();
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
@@ -3608,6 +3841,31 @@
          $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
 
          $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+		 
+		 $Width = $this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2;
+		 $Height = $this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2;
+		 if ( $ScaleModeAuto && isset($Data["Series"][$Data["Abscissa"]]["Data"][0]) ) { 
+			$AbscissaScaleValueMin = $Data["Series"][$Data["Abscissa"]]["Data"][0];
+		 } else {
+			$AbscissaScaleValueMin = 0;
+		 }
+		 if ( $ScaleModeAuto && isset($Data["Series"][$Data["Abscissa"]]["Data"][$XDivs]) ) { 
+			$AbscissaScaleValueMax = $Data["Series"][$Data["Abscissa"]]["Data"][$XDivs];
+		 } else {
+			$AbscissaScaleValueMax = $Width;
+		 }
+		 $AbscissaScaleValueWidth = $AbscissaScaleValueMax - $AbscissaScaleValueMin;
+		 if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
+			  if ($AbscissaScaleValueWidth > 0)
+				$AbscissaScaleFactor = $AbscissaScaleValueWidth / $Width;
+			  else
+				$AbscissaScaleFactor = 1;
+		 } else {
+			  if ($AbscissaScaleValueWidth > 0)
+				$AbscissaScaleFactor = $AbscissaScaleValueWidth / $Height;
+			  else
+				$AbscissaScaleFactor = 1;
+		 }
 
          if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
           {
@@ -3623,6 +3881,11 @@
            $LastGoodY = NULL; $LastGoodX = NULL; $Points = ""; $Init = FALSE;
            foreach($PosArray as $Key => $Y)
             {
+			 if ($ScaleModeAuto) {
+			 	$AbscissaScaleValue = $Data["Series"][$Data["Abscissa"]]["Data"][$Key] - $AbscissaScaleValueMin;
+			 	$X = $this->GraphAreaX1 + $XMargin + $AbscissaScaleValue / $AbscissaScaleFactor;
+			 }
+			 
              if ( $Y == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
               {
                $Points[] = $LastX; $Points[] = $LastY;
@@ -3646,7 +3909,10 @@
              if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
              $LastX = $X; $LastY = $Y;
              if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
-             $X = $X + $XStep;
+			 
+			 if (!$ScaleModeAuto)  {
+             	$X = $X + $XStep;
+			 }
             }
 
            if ( $ReCenter )
@@ -3671,6 +3937,11 @@
            $LastGoodY = NULL; $LastGoodX = NULL; $Points = "";
            foreach($PosArray as $Key => $X)
             {
+			 if ($ScaleModeAuto) {
+			 	$AbscissaScaleValue = $Data["Series"][$Data["Abscissa"]]["Data"][$Key] - $AbscissaScaleValueMin;
+			 	$Y = $this->GraphAreaY1 + $XMargin + $AbscissaScaleValue / $AbscissaScaleFactor;
+			 }
+			 
              if ( $X == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
               {
                $Points[] = $LastX; $Points[] = $LastY;
@@ -3694,7 +3965,10 @@
              if ( $LastX == NULL && $ReCenter ) { $Y = $Y - $YStep/2; }
              $LastX = $X; $LastY = $Y;
              if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
-             $Y = $Y + $YStep;
+			 
+			 if (!$ScaleModeAuto)  {
+             	$Y = $Y + $YStep;
+			 }
             }
 
            if ( $ReCenter )

From 727b1733926fbdc990a056a2ced9fae10221e916 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 22 May 2018 13:15:09 +0200
Subject: [PATCH 059/146] fixed error library pdf example

---
 .../include/graphs/functions_pchart.php       | 355 +++++++-----------
 1 file changed, 131 insertions(+), 224 deletions(-)

diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php
index 732c4388a0..dd66d9173d 100644
--- a/pandora_console/include/graphs/functions_pchart.php
+++ b/pandora_console/include/graphs/functions_pchart.php
@@ -27,6 +27,7 @@ include_once("pChart/pScatter.class.php");
 include_once("pChart/pRadar.class.php");
 
 // Define default fine colors
+
 $default_fine_colors = array();
 $default_fine_colors[] = "#2222FF";
 $default_fine_colors[] = "#00DD00";
@@ -44,7 +45,7 @@ $yaxisname = '';
 $legend = null;
 $colors = null;
 $font_size = 8;
-$force_steps = true;
+$force_steps = true; 
 $legend_position = null;
 $series_type = null;
 
@@ -71,9 +72,6 @@ if (!$graph) {
 }
 
 $data = $graph['data'];
-
-html_debug_print($data, true);
-
 $width = $graph['width'];
 $height = $graph['height'];
 
@@ -880,17 +878,72 @@ function pch_bar_graph ($graph_type, $index, $data, $width, $height, $font,
 function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 	$rgb_color = false, $xaxisname = "", $yaxisname = "", $show_values = false,
 	$legend = array(), $font, $antialiasing, $water_mark = '', $font_size,
-	$backgroundColor = 'white', $unit = '', $series_type = array(), 
+	$backgroundColor = 'white', $unit = '', $series_type = array(),
 	$graph_threshold = false, $id_module) {
-	
+
 	global $config;
 
-	/* CAT:Vertical Charts */
+	html_debug_print($graph_type, true);
+	html_debug_print($index, true);
+	html_debug_print($data, true);
+
+
+	/* Create and populate the pData object */
+	$MyData = new pData();
+	$MyData->addPoints(array(20,22,25,5,12,8,30,8),"Probe 1");
+	//$MyData->addPoints(array(3,12,15,8,8,5,-5),"Probe 2");
+	$MyData->setSerieTicks("Probe 2",4);
+	$MyData->setAxisName(0,"Temperatures");
+	$MyData->addPoints(array(1296299019,1296302903,1296307001,1296308071,1296309901,1296318931, 1296318941, 1296318942,1296338941),"Labels");
+	$MyData->setSerieDescription("Labels","Timestamp");
+	$MyData->setXAxisDisplay(AXIS_FORMAT_DATE,"H:i");
+	$MyData->setAbscissa("Labels");
+
+	/* Create the pChart object */
+	$myPicture = new pImage(700,230,$MyData);
+
+	/* Draw the background */
+	$Settings = array("R"=>170, "G"=>183, "B"=>87);
+	$myPicture->drawFilledRectangle(0,0,700,230,$Settings);
+
+	/* Overlay with a gradient */
+	$Settings = array("StartR"=>219, "StartG"=>231, "StartB"=>139, "EndR"=>1, "EndG"=>138, "EndB"=>68, "Alpha"=>50);
+	$myPicture->drawGradientArea(0,0,700,230,DIRECTION_VERTICAL,$Settings);
+	$myPicture->drawGradientArea(0,0,700,20,DIRECTION_VERTICAL,array("StartR"=>0,"StartG"=>0,"StartB"=>0,"EndR"=>50,"EndG"=>50,"EndB"=>50,"Alpha"=>80));
+
+	/* Add a border to the picture */
+	$myPicture->drawRectangle(0,0,699,229,array("R"=>0,"G"=>0,"B"=>0));
+
+	/* Write the picture title */
+	$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
+	$myPicture->drawText(10,13,"drawStepChart() - draw a step chart",array("R"=>255,"G"=>255,"B"=>255));
+
+	/* Write the chart title */
+	$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
+	$myPicture->drawText(250,55,"Average temperature",array("FontSize"=>20,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+	/* Draw the scale and the 1st chart */
+	$myPicture->setGraphArea(60,60,450,190);
+	$myPicture->drawFilledRectangle(60,60,450,190,array("R"=>255,"G"=>255,"B"=>255,"Surrounding"=>-200,"Alpha"=>10));
+	$myPicture->drawScale(array("DrawSubTicks"=>TRUE,"LabelShowBoundaries"=>TRUE,"ScaleModeAuto"=>TRUE));
+	$myPicture->setShadow(TRUE,array("X"=>1,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
+	$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
+	$myPicture->drawAreaChart(array("BreakVoid"=>FALSE, "BreakR"=>234, "BreakG"=>55, "BreakB"=>26, "DisplayValues"=>FALSE,"DisplayColor"=>DISPLAY_AUTO,"ScaleModeAuto"=>TRUE));
+	$myPicture->setShadow(FALSE);
+
+	/* Write the chart legend */
+	$myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL));
+
+	$myPicture->stroke();
+
+
+
+
 /*
+	// CAT:Vertical Charts
 	if (!is_array($legend) || empty($legend)) {
 		unset($legend);
 	}
-	
 	if (is_array(reset($data))) {
 		$data2 = array();
 		foreach ($data as $i =>$values) {
@@ -905,15 +958,13 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 	else {
 		$data = array($data);
 	}
-*/
-	/* Create and populate the pData object */
-/*
+
+	// Create and populate the pData object
 	$MyData = new pData();
-	
+
 	foreach ($data as $i => $values) {
 		if (isset($legend)) {
 			$point_id = $legend[$i];
-			
 			// Translate the id of serie to legend of id
 			if (!empty($series_type)) {
 				if (!isset($series_type[$point_id])) {
@@ -925,21 +976,19 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		else {
 			$point_id = $i;
 		}
-		
+
 		$MyData->addPoints($values, $point_id);
-		
-		
+
 		if (!empty($rgb_color)) {
-			$MyData->setPalette($point_id, 
+			$MyData->setPalette($point_id,
 				array(
-					"R" => $rgb_color[$i]['color']["R"], 
-					"G" => $rgb_color[$i]['color']["G"], 
+					"R" => $rgb_color[$i]['color']["R"],
+					"G" => $rgb_color[$i]['color']["G"],
 					"B" => $rgb_color[$i]['color']["B"],
-					"BorderR" => $rgb_color[$i]['border']["R"], 
-					"BorderG" => $rgb_color[$i]['border']["G"], 
-					"BorderB" => $rgb_color[$i]['border']["B"], 
+					"BorderR" => $rgb_color[$i]['border']["R"],
+					"BorderG" => $rgb_color[$i]['border']["G"],
+					"BorderB" => $rgb_color[$i]['border']["B"],
 					"Alpha" => $rgb_color[$i]['alpha']));
-				
 			$palette_color = array();
 			if (isset($rgb_color[$i]['color'])) {
 				$palette_color["R"] = $rgb_color[$i]['color']["R"];
@@ -954,157 +1003,19 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 			if (isset($rgb_color[$i]['color'])) {
 				$palette_color["Alpha"] = $rgb_color[$i]['Alpha'];
 			}
-			
+
 			$MyData->setPalette($point_id, $palette_color);
 		}
-		
 		// The weight of the line is not calculated in pixels, so it needs to be transformed
 		$reduction_coefficient = 0.31;
 		$MyData->setSerieWeight($point_id, $config['custom_graph_width'] * $reduction_coefficient);
 	}
-*/
-/*
-	$MyData = new pData();
-	$MyData->addPoints(array(0.11, 0.91, 0.58, 1.11),"Probe 1");
-	$MyData->setAxisName(0,"Temperatures");
-	$MyData->addPoints(array(1328112000, 1328126400, 1330610400, 1330610420),"Labels");
-	$MyData->setAbscissa("Labels");
-	$MyData->setXAxisDisplay(AXIS_FORMAT_TIME,"d/m\nH:i");
-*/
-/*
-	$MyData = new pData();
-	$MyData->addPoints(array(1700,2500,7800,5),"Distance");
-	$MyData->setAxisName(0,"Maximum distance");
-	$MyData->setAxisUnit(0,"m");
-	$MyData->setAxisDisplay(0,AXIS_FORMAT_METRIC);
-
 	$MyData->setAxisName(0,$unit);
-	$MyData->addPoints(array(1526886033000, 1526893630000, 1526972433000, 1526972433300),"Timestamp");
-	$MyData->setSerieDescription("Timestamp", $xaxisname);
-	$MyData->setAbscissa("Timestamp");
-	$MyData->setXAxisDisplay(AXIS_FORMAT_DATE);
-*/
-	// Create the pChart object
-	//$myPicture = new pImage(800,  800, $MyData);
+	$MyData->addPoints($index,"Xaxis");
+	$MyData->setSerieDescription("Xaxis", $xaxisname);
+	$MyData->setAbscissa("Xaxis");
+	$MyData->setAxisDisplay(0, AXIS_FORMAT_TWO_SIGNIFICANT, 0);
 
-/*
-	$myPicture->setGraphArea(60,60,660,190);
-	$myPicture->drawText(350,55,"My chart title",array("FontSize"=>20,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-	$myPicture->drawFilledRectangle(60,60,660,190,array("R"=>255,"G"=>255,"B"=>255,"Surrounding"=>-200,"Alpha"=>10));
-*/
-/*
-	$myPicture->setGraphArea(60,60,800,400);
-	$myPicture->drawText(350,55,"My chart title",array("FontSize"=>20,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-	$myPicture->drawFilledRectangle(60,60,800,400,array("R"=>255,"G"=>255,"B"=>255,"Surrounding"=>-200,"Alpha"=>10));
-	$myPicture->drawScale(array("DrawSubTicks"=>TRUE,"LabelShowBoundaries"=>TRUE,"ScaleModeAuto"=>TRUE));
-	$myPicture->setShadow(TRUE,array("X"=>1,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
-	$myPicture->setFontProperties(array("FontName"=>"fonts/pf_arma_five.ttf","FontSize"=>6));
-	$myPicture->drawStepChart(array("DisplayValues"=>TRUE,"DisplayColor"=>DISPLAY_AUTO,"ScaleModeAuto"=>TRUE));
-	$myPicture->drawAreaChart(array("DisplayValues"=>TRUE,"DisplayColor"=>DISPLAY_AUTO));
-	//$myPicture->setShadow(FALSE);
-*/
-
-
-/* Create and populate the pData object */
-$MyData = new pData();  
-$MyData->addPoints(array(-4,VOID,VOID,12,8,3),"Probe 1");
-$MyData->addPoints(array(3,12,15,8,5,-5),"Probe 2");
-$MyData->addPoints(array(2,7,5,18,19,22),"Probe 3");
-$MyData->setSerieTicks("Probe 2",4);
-$MyData->setAxisName(0,"Temperatures");
-$MyData->addPoints(array(1296299019,1296302903,1296307001,1296308071,1296309901,1296318931),"Labels");
-$MyData->setSerieDescription("Labels","Timestamp");
-$MyData->setXAxisDisplay(AXIS_FORMAT_DATE,"H:i");
-$MyData->setAbscissa("Labels");
-
-/* Create the pChart object */
-$myPicture = new pImage(700,230,$MyData);
-
-/* Draw the background */
-$Settings = array("R"=>170, "G"=>183, "B"=>87, "Dash"=>1, "DashR"=>190, "DashG"=>203, "DashB"=>107);
-$myPicture->drawFilledRectangle(0,0,700,230,$Settings);
-
-/* Overlay with a gradient */
-$Settings = array("StartR"=>219, "StartG"=>231, "StartB"=>139, "EndR"=>1, "EndG"=>138, "EndB"=>68, "Alpha"=>50);
-$myPicture->drawGradientArea(0,0,700,230,DIRECTION_VERTICAL,$Settings);
-$myPicture->drawGradientArea(0,0,700,20,DIRECTION_VERTICAL,array("StartR"=>0,"StartG"=>0,"StartB"=>0,"EndR"=>50,"EndG"=>50,"EndB"=>50,"Alpha"=>80));
-
-/* Add a border to the picture */
-$myPicture->drawRectangle(0,0,699,229,array("R"=>0,"G"=>0,"B"=>0));
-
-/* Write the picture title */
-$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
-$myPicture->drawText(10,13,"drawStepChart() - draw a step chart",array("R"=>255,"G"=>255,"B"=>255));
-
-/* Write the chart title */ 
-$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
-$myPicture->drawText(250,55,"Average temperature",array("FontSize"=>20,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-
-/* Draw the scale and the 1st chart */
-$myPicture->setGraphArea(60,60,450,190);
-$myPicture->drawFilledRectangle(60,60,450,190,array("R"=>255,"G"=>255,"B"=>255,"Surrounding"=>-200,"Alpha"=>10));
-$myPicture->drawScale(array("DrawSubTicks"=>TRUE,"LabelShowBoundaries"=>TRUE,"ScaleModeAuto"=>TRUE));
-$myPicture->setShadow(TRUE,array("X"=>1,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
-$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
-$myPicture->drawStepChart(array("DisplayValues"=>TRUE,"DisplayColor"=>DISPLAY_AUTO,"ScaleModeAuto"=>TRUE));
-$myPicture->setShadow(FALSE);
-
-/* Draw the scale and the 2nd chart */
-$myPicture->setGraphArea(500,60,670,190);
-$myPicture->drawFilledRectangle(500,60,670,190,array("R"=>255,"G"=>255,"B"=>255,"Surrounding"=>-200,"Alpha"=>10));
-$myPicture->drawScale(array("Pos"=>SCALE_POS_TOPBOTTOM,"DrawSubTicks"=>TRUE,"ScaleModeAuto"=>TRUE));
-$myPicture->setShadow(TRUE,array("X"=>-1,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
-$myPicture->drawStepChart(array("ScaleModeAuto"=>TRUE));
-$myPicture->setShadow(FALSE);
-
-/* Write the chart legend */
-$myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL));
-
-/* Render the picture (choose the best way) */
-//$myPicture->autoOutput("pictures/example.drawStepChart.png");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	$myPicture->stroke();
-/*
 	switch ($backgroundColor) {
 		case 'white':
 			$transparent = false;
@@ -1121,16 +1032,16 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 			$fontColor = array('R' => 200, 'G' => 200, 'B' => 200);
 			break;
 	}
-
-	// Create the pChart object
+	//Create the pChart object
 	$myPicture = new pImage($width, $height + $font_size, $MyData, $transparent,
 		$backgroundColor, $fontColor);
 
-	//Turn of Antialiasing
+	// Turn of Antialiasing
 	$myPicture->Antialias = $antialiasing;
 
-	//Add a border to the picture
+	// Add a border to the picture
 	//$myPicture->drawRectangle(0,0,$width,$height,array("R"=>0,"G"=>0,"B"=>0));
+
 	//Set the default font
 	$myPicture->setFontProperties(
 		array("FontName" =>$font, "FontSize" => $font_size));
@@ -1138,7 +1049,6 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 	// By default, set a top margin of 5 px
 	$top_margin = 5;
 	if (isset($legend)) {
-
 		//Set horizontal legend if is posible
 		$legend_mode = LEGEND_HORIZONTAL;
 		$size = $myPicture->getLegendSize(
@@ -1147,12 +1057,11 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 			$legend_mode = LEGEND_VERTICAL;
 			$size = $myPicture->getLegendSize(array("Style"=>LEGEND_NOBORDER,"Mode"=>$legend_mode));
 		}
-		
+
 		// Update the top margin to add the legend Height
 		$top_margin = $size['Height'];
 
 		//Write the chart legend
-
 		$myPicture->drawLegend($width - $size['Width'], 8,
 			array("Style" => LEGEND_NOBORDER, "Mode" => $legend_mode));
 	}
@@ -1160,52 +1069,52 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 	//Calculate the bottom margin from the size of string in each index
 	$max_chars = graph_get_max_index($index);
 	$margin_bottom = $font_size * $max_chars;
-	
+
 	$water_mark_height = 0;
 	$water_mark_width = 0;
 	if (!empty($water_mark)) {
 		$size_water_mark = getimagesize($water_mark);
 		$water_mark_height = $size_water_mark[1];
 		$water_mark_width = $size_water_mark[0];
-		
+
 		$myPicture->drawFromPNG(
 			($width - $water_mark_width),
 			$top_margin,
 			$water_mark);
 	}
-	
+
 	// Get the max number of scale
 	$max_all = 0;
-	
+
 	$serie_ne_zero = false;
 	foreach ($data as $serie) {
 		$max_this_serie = max($serie);
 		if ($max_this_serie > $max_all) {
-			$max_all = $max_this_serie; 
+			$max_all = $max_this_serie;
 		}
 		// Detect if all serie is equal to zero or not
 		if ($serie != 0)
 			$serie_ne_zero = true;
 	}
-	
+
 	// Get the number of digits of the scale
 	$digits_left = 0;
 	while ($max_all > 1) {
 		$digits_left ++;
 		$max_all /= 10;
 	}
-	
+
 	// If the number is less than 1 we count the decimals
 	// Also check if the serie is not all equal to zero (!$serie_ne_zero)
-	if ($digits_left == 0 and !$serie_ne_zero) { 
+	if ($digits_left == 0 and !$serie_ne_zero) {
 		while($max_all < 1) {
 			$digits_left ++;
 			$max_all *= 10;
 		}
 	}
-	
+
 	$chart_size = ($digits_left * $font_size) + 20;
-	
+
 	$min_data = 0;
 	$max_data = 0;
 	foreach ($data as $k => $v) {
@@ -1219,15 +1128,14 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 	$chart_margin = 36;
 
 	//Area depends on yaxisname
-
 	if ($yaxisname != '') {
 		$chart_margin += $chart_size;
 	}
-	
-	$myPicture->setGraphArea($chart_margin, $top_margin, 
+
+	$myPicture->setGraphArea($chart_margin, $top_margin,
 		$width,
 		($height - $margin_bottom));
-	
+
 	if($graph_threshold){
 		$sql_treshold = 'select min_critical, max_critical, min_warning, max_warning, critical_inverse, warning_inverse from tagente_modulo where id_agente_modulo =' . $id_module;
 		$treshold_position = db_get_all_rows_sql($sql_treshold);
@@ -1257,10 +1165,10 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 
 					$p_min_warn = $p_max_warn;
 					if($p_max_warn > $max_data){
-						$p_max_warn = $p_max_warn + 21;	
+						$p_max_warn = $p_max_warn + 21;
 					}
 					else{
-						$p_max_warn = $max_data + 21;	
+						$p_max_warn = $max_data + 21;
 					}
 				}
 			}
@@ -1270,7 +1178,7 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 						$p_max_warn = $max_data + 21;
 					}
 					else{
-						$p_max_warn = $p_min_warn + 21;	
+						$p_max_warn = $p_min_warn + 21;
 					}
 				}
 			}
@@ -1295,21 +1203,21 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 					$p_min_crit = $p_max_crit;
 					if($p_inv_warn){
 						if($p_max_crit < $p_max_warn){
-							$p_max_crit = $p_max_warn;	
+							$p_max_crit = $p_max_warn;
 						}
 					}
 					else{
 						if($p_max_crit > $max_data){
-							$p_max_crit = $p_max_crit + 21;	
+							$p_max_crit = $p_max_crit + 21;
 						}
 						else{
-							$p_max_crit = $max_data + 21;	
+							$p_max_crit = $max_data + 21;
 						}
 					}
 				}
 			}
 			else{
-				if($p_max_crit == 0){ 
+				if($p_max_crit == 0){
 					if($p_max_warn > $p_min_crit){
 						$p_max_crit = $p_max_warn;
 					}
@@ -1318,7 +1226,7 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 							$p_max_crit = $max_data + 21;
 						}
 						else{
-							$p_max_crit = $p_min_crit + 21;	
+							$p_max_crit = $p_min_crit + 21;
 						}
 					} 
 				}
@@ -1328,24 +1236,24 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 		//Check size scale
 		//Which of the thresholds is higher?
 		if($p_max_crit > $p_max_warn){
-			$check_scale = $p_max_crit; 
+			$check_scale = $p_max_crit;
 		}
 		else{
-			$check_scale = $p_max_warn;	
+			$check_scale = $p_max_warn;
 		}
 
 		if($p_min_crit < $p_min_warn){
-			$check_scale_min = $p_min_crit; 
+			$check_scale_min = $p_min_crit;
 		}
 		else{
-			$check_scale_min = $p_min_warn;	
+			$check_scale_min = $p_min_warn;
 		}
 
 		//Is the threshold higher than our maximum?
 		if($max_data > $check_scale){
-			$check_scale = $max_data;	 
+			$check_scale = $max_data;
 		}
-		
+
 		if($min_data < $check_scale_min){
 			$check_scale_min = $min_data;
 		}
@@ -1353,7 +1261,7 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 		$ManualScale = array( 0 => array("Min" => $check_scale_min, "Max" => $check_scale) );
 		$mode = SCALE_MODE_MANUAL;
 
-		//Draw the scale 
+		// Draw the scale
 		$scaleSettings = array(
 			"GridR" => 200,
 			"GridG" => 200,
@@ -1365,18 +1273,18 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 			"BackgroundAlpha2" => 35,
 			"Mode" => $mode,
 			"ManualScale" => $ManualScale,
-			"LabelRotation" => 40, 
-			"XMargin" => 0, 
+			"LabelRotation" => 40,
+			"XMargin" => 0,
 			"MinDivHeight" => 15,
 			"TicksFontSize" => $font_size - 1);
-		
+
 		$scaleSettings['AxisR'] = '200';
 		$scaleSettings['AxisG'] = '200';
 		$scaleSettings['AxisB'] = '200';
 		$scaleSettings['TickR'] = '200';
 		$scaleSettings['TickG'] = '200';
 		$scaleSettings['TickB'] = '200';
-		
+
 		$myPicture->drawScale($scaleSettings);
 
 
@@ -1391,7 +1299,7 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 		$position3   = $myPicture->GraphAreaX2;
 
 		$cte = ($position_y2 - $position_y1) / ($scale_max - $scale_min);
-		
+
 		//warning
 		if($print_rectangle_warning){
 			$RectangleSettings = array("R"=>255,"G"=>255,"B"=>000,"Dash"=>TRUE,"DashR"=>170,"DashG"=>220,"DashB"=>190);
@@ -1399,16 +1307,16 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 				$p_min_warn = $scale_min;
 			}
 
-			$position2 = ($scale_max - $p_min_warn)*$cte + $position_y1;	
+			$position2 = ($scale_max - $p_min_warn)*$cte + $position_y1;
 			$position4 = ($scale_max - $p_max_warn)*$cte + $position_y1;
 
-			$myPicture->drawFilledRectangle($position1, floor($position2), 
+			$myPicture->drawFilledRectangle($position1, floor($position2),
 											$position3, floor($position4),
 											$RectangleSettings);
 			if($p_inv_warn){
-				$position2 = ($scale_max - $p_min_warn_inv)*$cte + $position_y1;	
+				$position2 = ($scale_max - $p_min_warn_inv)*$cte + $position_y1;
 				$position4 = ($scale_max - $p_max_warn_inv)*$cte + $position_y1;
-				$myPicture->drawFilledRectangle($position1, floor($position2), 
+				$myPicture->drawFilledRectangle($position1, floor($position2),
 												$position3, floor($position4),
 												$RectangleSettings);
 			}
@@ -1422,16 +1330,16 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 				$p_min_crit = $scale_min;
 			}
 
-			$position2 = ($scale_max - $p_min_crit)*$cte + $position_y1;	
+			$position2 = ($scale_max - $p_min_crit)*$cte + $position_y1;
 			$position4 = ($scale_max - $p_max_crit)*$cte + $position_y1;
-			$myPicture->drawFilledRectangle($position1, $position2, 
+			$myPicture->drawFilledRectangle($position1, $position2,
 											$position3, $position4,
 											$RectangleSettings);
 
 			if($p_inv_crit){
-				$position2 = ($scale_max - $p_min_crit_inv)*$cte + $position_y1;	
+				$position2 = ($scale_max - $p_min_crit_inv)*$cte + $position_y1;
 				$position4 = ($scale_max - $p_max_crit_inv)*$cte + $position_y1;
-				$myPicture->drawFilledRectangle($position1, $position2, 
+				$myPicture->drawFilledRectangle($position1, $position2,
 												$position3, $position4,
 												$RectangleSettings);
 			}
@@ -1459,24 +1367,24 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 			"BackgroundAlpha2" => 35,
 			"Mode" => $mode,
 			"ManualScale" => $ManualScale,
-			"LabelRotation" => 40, 
-			"XMargin" => 0, 
+			"LabelRotation" => 40,
+			"XMargin" => 0,
 			"MinDivHeight" => 15,
 			"TicksFontSize" => $font_size - 1);
-		
+
 		$scaleSettings['AxisR'] = '200';
 		$scaleSettings['AxisG'] = '200';
 		$scaleSettings['AxisB'] = '200';
 		$scaleSettings['TickR'] = '200';
 		$scaleSettings['TickG'] = '200';
 		$scaleSettings['TickB'] = '200';
-		
+
 		$myPicture->drawScale($scaleSettings);
 	}
 
 	//Turn on shadow computing
 	//$myPicture->setShadow(TRUE,array("X"=>0,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
-	
+
 	switch ($graph_type) {
 		case 'stacked_area':
 			$ForceTransparency = "-1";
@@ -1485,8 +1393,8 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 			$ForceTransparency = "100";
 			break;
 	}
-	
-	// Draw the chart
+
+	//Draw the chart
 	$settings = array(
 		"ForceTransparency" => 20,
 		"Gradient" => TRUE,
@@ -1500,8 +1408,7 @@ $myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HOR
 		"DisplayShadow" => TRUE,
 		"Surrounding" => 5,
 		"AroundZero" => TRUE);
-	
-	
+
 	if (empty($series_type)) {
 		switch($graph_type) {
 			case "stacked_area":

From cb10d6d4a47e65b3ad1996ae20a019ecd7f66e47 Mon Sep 17 00:00:00 2001
From: Junichi Satoh <junichi@rworks.jp>
Date: Tue, 22 May 2018 20:18:49 +0900
Subject: [PATCH 060/146] Fixed warnings and some icons are not shown correctly
 with php7.2.

---
 pandora_console/godmode/agentes/configurar_agente.php | 2 +-
 pandora_console/operation/agentes/ver_agente.php      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 5cf8e8a03d..05fcba4a77 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -391,7 +391,7 @@ if ($id_agente) {
 	
 	$grouptab['active'] = false;
 	
-	$gistab = "";
+	$gistab = array();
 	
 	/* GIS tab */
 	if ($config['activate_gis']) {
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 1fe124f841..8880959bb1 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1060,7 +1060,7 @@ else {
 $tab = get_parameter ("tab", "main");
 
 /* Manage tab */
-$managetab = "";
+$managetab = array();
 
 if (check_acl_one_of_groups ($config['id_user'],$all_groups, "AW") || $is_extra) {
 	$managetab['text'] ='<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'">'
@@ -1141,7 +1141,7 @@ if ($url_route_analyzer) {
 }
 
 /* GIS tab */
-$gistab="";
+$gistab=array();
 if ($config['activate_gis']) {
 	$gistab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=gis&id_agente='.$id_agente.'">'
 		.html_print_image("images/op_gis.png", true, array( "title" => __('GIS data')))

From 2e8e3c27b65681148892f1a0728df5ec5df719f4 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 22 May 2018 13:40:23 +0200
Subject: [PATCH 061/146] [Rebranding] Modified tinylogo by custom_logo in node

---
 pandora_console/general/login_page.php   |  6 +++---
 pandora_console/general/pandora_help.php | 14 +++++---------
 pandora_console/include/functions_ui.php | 17 +++++++++++++++++
 pandora_console/index.php                |  4 ++--
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 8387d62366..737148751d 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -95,14 +95,14 @@ echo '<div id="header_login">';
 	
 		if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
 			if(isset ($config['custom_logo'])){
-				echo '<img src="enterprise/images/custom_logo/' . $config['custom_logo'] .'" alt="pandora_console">';
+				echo '<img src="enterprise/images/custom_logo/' . $config['custom_logo'] .'" alt="monitoring_console">';
 			}
 			else{
-				echo '<img src="images/custom_logo/pandora_logo_head_4.png" alt="pandora_console">';
+				echo '<img src="images/custom_logo/pandora_logo_head_4.png" alt="monitoring_console">';
 			}
 		}
 		else{
-			echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="pandora_console">';	
+			echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="monitoring_console">';	
 		}
 	echo '</div>';
 		echo '<div id="list_icon_docs_support"><ul style="line-height: 36px;">';
diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php
index 8d04fb6bde..fa1696370c 100644
--- a/pandora_console/general/pandora_help.php
+++ b/pandora_console/general/pandora_help.php
@@ -61,11 +61,12 @@ foreach ($files as $file) {
 	}
 }
 
+$logo = ui_get_custom_header_logo();
 
 if (! $id || ! file_exists ($help_file)) {
 	echo '<div id="main_help" style="background-color: #fff;text-align:center; padding-top: 15px; padding-bottom: 15px; ">';
 		if (!is_metaconsole()) {
-			echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
+			echo html_print_image($logo, true, array("border" => '0'));
 		}
 	echo '</div>';
 	echo '<div style="font-family: verdana, arial; font-size: 11px; text-align:left; background-color: #fff;">';
@@ -86,16 +87,11 @@ if (! $id || ! file_exists ($help_file)) {
 
 /* Show help */
 echo '<div id="main_help_new" style="background-color: #fff">';
-	if (empty($config['enterprise_installed'])) {
-		echo html_print_image('images/pandora_tinylogo_open.png', true, array("border" => '0'));
+	if (!empty($config['enterprise_installed']) && is_metaconsole()) {
+		echo '<img src="' . $config["homeurl"] . $logo . '">';
 	}
 	else {
-		if (is_metaconsole()) {
-			echo '<img src="'.$config["homeurl"].'images/pandora_tinylogo.png">';
-		}
-		else{
-			echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
-		}
+		echo html_print_image($logo, true, array("border" => '0'));
 	}
 echo '</div>';
 echo '<div id="main_help_new_content" style="height: auto ! important;overfloat: auto;">';
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index bfcd3ed44f..35765882b9 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3956,4 +3956,21 @@ function ui_get_support_logo () {
 	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
 }
 
+/**
+ * Get the custom header logo
+ *
+ * @return string with the path to logo. If it is not set, return the default value
+ *
+ */
+function ui_get_custom_header_logo () {
+	global $config;
+
+	if (empty($config['enterprise_installed'])) {
+		return 'images/pandora_tinylogo_open.png';
+	}
+
+	if (empty($config['custom_logo'])) return 'images/pandora_tinylogo.png';
+	return 'enterprise/images/custom_logo/' . $config['custom_logo'];
+}
+
 ?>
diff --git a/pandora_console/index.php b/pandora_console/index.php
index db2ce4b2ca..d7d7baba3e 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -702,7 +702,7 @@ if (! isset ($config['id_user'])) {
 							
 							$cod_hash = $user_reset_pass . "::::" . md5(rand(10, 1000000) . rand(10, 1000000) . rand(10, 1000000));
 
-							$subject = '[Pandora] '.__('Reset password');
+							$subject = '[' . get_product_name() . '] '.__('Reset password');
 							$body = __('This is an automatically sent message for user ');
 							$body .= ' "<strong>' . $user_reset_pass . '"</strong>';
 							$body .= '<p />';
@@ -710,7 +710,7 @@ if (! isset ($config['id_user'])) {
 							$body .= '<p />';
 							$body .= '<a href="' . $config['homeurl'] . 'index.php?reset_hash=' . $cod_hash . '">' . __('Reset your password') . '</a>';
 							$body .= '<p />';
-							$body .= 'Pandora FMS';
+							$body .= get_product_name();
 							$body .= '<p />';
 							$body .= '<em>'.__('Please do not reply to this email.').'</em>';
 							

From 946e897db6d558ad8c854ff3d8f0f76f65e7afb6 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 22 May 2018 15:26:11 +0200
Subject: [PATCH 062/146] [Rebranding] Get the correct header logo in the
 metaconsole

---
 pandora_console/include/functions_ui.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 35765882b9..bc09f5eceb 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3969,8 +3969,9 @@ function ui_get_custom_header_logo () {
 		return 'images/pandora_tinylogo_open.png';
 	}
 
-	if (empty($config['custom_logo'])) return 'images/pandora_tinylogo.png';
-	return 'enterprise/images/custom_logo/' . $config['custom_logo'];
+	$stored_logo = is_metaconsole() ? $config['meta_custom_logo'] : $config['custom_logo'];
+	if (empty($stored_logo)) return 'images/pandora_tinylogo.png';
+	return 'enterprise/images/custom_logo/' . $stored_logo;
 }
 
 ?>

From 3accc313729ec88d46d7253796c610bffb8302cc Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 22 May 2018 15:57:36 +0200
Subject: [PATCH 063/146] add zoom graphs xy

---
 .../include/graphs/flot/pandora.flot.js       | 47 +++++++++++++------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index c1abf15186..0ab870c20c 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1546,7 +1546,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 				shadowSize: 0.1
 			},
 			crosshair: { mode: 'xy' },
-			selection: { mode: 'x', color: '#777' },
+			selection: { mode: 'xy', color: '#777' },
 			export: {
 				export_data: true,
 				labels_long: labels_long,
@@ -1640,7 +1640,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 					color: ''
 					} ],
 			yaxis: {ticks: [], autoscaleMargin: 0.1 },
-			selection: {mode: 'x', color: '#777' },
+			selection: {mode: 'xy', color: '#777' },
 			legend: {show: false},
 			crosshair: {mode: 'x'}
 		});
@@ -1652,6 +1652,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		if (menu == 0) {
 			return;
 		}
+
 		dataInSelection = ranges.xaxis.to - ranges.xaxis.from;
 		dataInPlot = plot.getData()[0].data.length;
 
@@ -1660,18 +1661,36 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		new_steps = parseInt(factor * steps);
 
 		plot = $.plot($('#' + graph_id), data_base,
-			$.extend(true, {}, options, {
-				xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to},
-				xaxes: [ {
-						tickFormatter: xFormatter,
-						minTickSize: new_steps,
-						color: ''
-						} ],
-				legend: { show: false }
-			}));
+		$.extend(true, {}, options, {
+			yaxis: {
+				min: ranges.yaxis.from,
+				max: ranges.yaxis.to
+			},
+			yaxes: [{
+				tickFormatter: yFormatter,
+				color: '',
+				alignTicksWithAxis: 1,
+				labelWidth: 30,
+				position: 'left',
+				font: font,
+				reserveSpace: true,
+				min: ranges.yaxis.from
+			}],
+			xaxis: {
+				min: ranges.xaxis.from,
+				max: ranges.xaxis.to
+			},
+			xaxes: [ {
+					tickFormatter: xFormatter,
+					minTickSize: new_steps,
+					color: ''
+					} ],
+			legend: { show: false }
+		}));
+
 		if (thresholded) {
 			var zoom_data_threshold = new Array ();
-			
+
 			var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
 									red_threshold, extremes, red_up);
 			plot = $.plot($('#' + graph_id), data_base,
@@ -1690,7 +1709,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 			plot.setData(zoom_data_threshold);
 			plot.draw();
 		}
-			
+
 
 		$('#menu_cancelzoom_' + graph_id)
 			.attr('src', homeurl + '/images/zoom_cross_grey.png');
@@ -1760,7 +1779,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 			}
 			else if (y < -1000) {
 				how_bigger = "K";
-				y = y / 1000;	
+				y = y / 1000;
 			}
 
 			if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) {

From 37f19dc9fd99afd712dc5024fb4fa6b2d12e3a35 Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alejandro.gallardo@artica.es>
Date: Tue, 22 May 2018 16:17:08 +0200
Subject: [PATCH 064/146] Fixed a column name

---
 pandora_console/include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 27dd557c24..038b05bcf7 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2368,7 +2368,7 @@ function print_audit_csv ($data) {
 	echo __('User') . ';' .
 		__('Action') . ';' .
 		__('Date') . ';' .
-		__('Source ID') . ';' .
+		__('Source IP') . ';' .
 		__('Comments') ."\n";
 	foreach ($data as $line) {
 		echo io_safe_output($line['id_usuario']) . ';' .  io_safe_output($line['accion']) . ';' .  $line['fecha'] . ';' .  $line['ip_origen'] . ';'.  io_safe_output($line['descripcion']). "\n";

From 9d558fb7cb0b6fdf0f9e960aebd6b1cdd718b2d3 Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alejandro.gallardo@artica.es>
Date: Tue, 22 May 2018 16:30:33 +0200
Subject: [PATCH 065/146] Removed some duplicated html entities

---
 pandora_console/godmode/agentes/configurar_agente.php | 3 ++-
 pandora_console/godmode/alerts/alert_list.php         | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 5cf8e8a03d..0b4b32d819 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -284,8 +284,9 @@ if ($create_agent) {
 				"Url description":"' . $url_description .'",
 				"Quiet":"' . (int)$quiet.'"}';
 			
+			$unsafe_alias = io_safe_output($alias);
 			db_pandora_audit("Agent management",
-				"Created agent $alias", false, true, $info);
+				"Created agent $unsafe_alias", false, true, $info);
 		}
 		else {
 			$id_agente = 0;
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index 335766606b..a65b925a44 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -90,14 +90,17 @@ if ($create_alert) {
 			"tagente_modulo","id_agente_modulo", $id_agent_module));
 		
 		// Audit the creation only when the alert creation is correct
+		$unsafe_alert_template_name = io_safe_output($alert_template_name);
+		$unsafe_module_name = io_safe_output($module_name);
+		$unsafe_agent_alias = io_safe_output($agent_alias);
 		if ($id) {
 			db_pandora_audit("Alert management",
-				"Added alert '$alert_template_name' for module '$module_name' in agent '$agent_alias'",
+				"Added alert '$unsafe_alert_template_name' for module '$unsafe_module_name' in agent '$unsafe_agent_alias'",
 				false, false, 'ID: ' . $id);
 		}
 		else {
 			db_pandora_audit("Alert management",
-				"Fail Added alert '$alert_template_name' for module '$module_name' in agent '$agent_alias'");
+				"Fail Added alert '$unsafe_alert_template_name' for module '$unsafe_module_name' in agent '$unsafe_agent_alias'");
 		}
 		
 		$messageAction = ui_print_result_message ($id,

From 9935b7f8a327bbae9d67dc8cec3e3d635928826a Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 22 May 2018 16:49:49 +0200
Subject: [PATCH 066/146] [Rebranding] Added custom logo to node request new
 license

---
 pandora_console/godmode/setup/license.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/setup/license.php b/pandora_console/godmode/setup/license.php
index e06a617ed1..ecff0c27ce 100644
--- a/pandora_console/godmode/setup/license.php
+++ b/pandora_console/godmode/setup/license.php
@@ -103,9 +103,9 @@ if (enterprise_installed()) {
 echo '</form>';
 echo '<div id="code_license_dialog" style="display: none; text-align: left;" title="' . __('Request new license') . '">';
 echo '<div id="logo">';
-html_print_image('images/pandora_tinylogo.png');
+html_print_image(ui_get_custom_header_logo());
 echo '</div>';
-echo '' . __('To get your <b>Pandora FMS Enterprise License</b>:') . '<br />';
+echo '' . __('To get your <b>%s Enterprise License</b>:', get_product_name()) . '<br />';
 echo '<ul>';
 echo '<li>';
 echo '' . sprintf(__('Go to %s'), "<a target=\"_blank\" href=\"https://licensing.artica.es/pandoraupdate7/index.php?section=generate_key_client\">https://licensing.artica.es/pandoraupdate7/index.php?section=generate_key_client</a>");

From ef778f296c5c5954152853235379d4a8a160226b Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 22 May 2018 17:18:11 +0200
Subject: [PATCH 067/146] PluginTools Added get_value_translated

---
 pandora_server/lib/PandoraFMS/PluginTools.pm | 34 +++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 185f3d5067..4e75cf776f 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -51,11 +51,12 @@ our @EXPORT = qw(
 	extract_dbpass
 	extract_key_map
 	get_addresses
+	get_current_utime_milis
 	get_lib_version
 	get_unit
 	get_unix_time
 	get_sys_environment
-	get_current_utime_milis
+	get_value_translated
 	getCurrentUTimeMilis
 	head
 	in_array
@@ -296,6 +297,37 @@ sub get_unit {
 	return $str;
 }
 
+################################################################################
+# Get unit
+################################################################################
+sub get_value_translated {
+	my $str = shift;
+
+	if (empty($str)) {
+		return $str;
+	}
+	$str = trim($str);
+
+	my $value = $str;
+	my $unit = get_unit($str);
+	if(empty($unit)) {
+		return $str;
+	}
+
+	$value =~ s/$unit//g;
+
+	if ($unit =~ /kb/i) { return $value * (2**10);}
+	if ($unit =~ /kib/i) { return $value * (2**10);}
+	if ($unit =~ /mb/i) { return $value * (2**20);}
+	if ($unit =~ /mib/i) { return $value * (2**20);}
+	if ($unit =~ /gb/i) { return $value * (2**30);}
+	if ($unit =~ /gib/i) { return $value * (2**30);}
+	if ($unit =~ /tb/i) { return $value * (2**40);}
+	
+	return $value;
+
+}
+
 ################################################################################
 ## Decodes a json strin into an hash
 ################################################################################

From 2c97232f90258ec4887296d22afb1a5da26c91c5 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 22 May 2018 19:22:37 +0200
Subject: [PATCH 068/146] [Rebranding] Miscelaneous rebranding

---
 pandora_console/godmode/db/db_main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/godmode/db/db_main.php b/pandora_console/godmode/db/db_main.php
index 7246a62ed7..6b0138e908 100644
--- a/pandora_console/godmode/db/db_main.php
+++ b/pandora_console/godmode/db/db_main.php
@@ -197,7 +197,7 @@ echo "</td></tr>";
 
 echo '<tr><td colspan=2>';
 echo '<div align="justify"><br><hr width=100%>';
-echo '(*) '.__('Please check your Pandora Server setup and be sure that database maintenance daemon is running. It\'s very important to keep up-to-date database to get the best performance and results in Pandora');
+echo '(*) '.__("Please make sure your %s Server settings are correct and that the database maintenance daemon is running. It's very important to keep your database up to date in order to get the best performance and results from %s.", get_product_name(), get_product_name());
 echo '</div>';
 echo '</td></tr></table>';
 ?>

From e015354a99ff75443024e9e272bc319cafc3d625 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 23 May 2018 00:01:24 +0200
Subject: [PATCH 069/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index aa45b0b23c..1949c24f0c 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180522
+Version: 7.0NG.722-180523
 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 a891688f34..70747174ed 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.722-180522"
+pandora_version="7.0NG.722-180523"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index b5e245dc96..218a50fc32 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.722';
-use constant AGENT_BUILD => '180522';
+use constant AGENT_BUILD => '180523';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index c86087f9c7..27a0919bbd 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.722
-%define release     180522
+%define release     180523
 
 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 e9706ca567..eb75470502 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.722
-%define release     180522
+%define release     180523
 
 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 545cccc233..313b8a9695 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180522"
+PI_BUILD="180523"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 4d5d20319a..1acc9af3b7 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180522}
+{180523}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 978947be91..ca79433773 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.722(Build 180522)")
+#define PANDORA_VERSION ("7.0NG.722(Build 180523)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index e695181758..596622603d 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.722(Build 180522))"
+      VALUE "ProductVersion", "(7.0NG.722(Build 180523))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 6ab6811d54..c1489b58f9 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180522
+Version: 7.0NG.722-180523
 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 53eae0dffd..762e1fe921 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.722-180522"
+pandora_version="7.0NG.722-180523"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index c0dd651384..a814960f00 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180522';
+$build_version = 'PC180523';
 $pandora_version = 'v7.0NG.722';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index a2111071f1..0e06bbb36c 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.722';
-$build = '180522';
+$build = '180523';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 76d5ead50a..b407786905 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.722
-%define release     180522
+%define release     180523
 
 # 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 92134c35ff..e0c8f224d4 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.722
-%define release     180522
+%define release     180523
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 52ac0926fe..171a5f7dd9 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180522
+Version: 7.0NG.722-180523
 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 64409cc5c7..96667b90c4 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.722-180522"
+pandora_version="7.0NG.722-180523"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index caf83b133d..970bc47b28 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180522";
+my $pandora_build = "180523";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 5306d5f151..eeaf287a0d 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180522";
+my $pandora_build = "180523";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 7990759321..72ef3130fd 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.722
-%define release     180522
+%define release     180523
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index fbed5583ab..2ff23e0686 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.722
-%define release     180522
+%define release     180523
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index e4b7efcf58..fb51e346a4 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180522"
+PI_BUILD="180523"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index b86cab69a4..6fc4b5760c 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180522";
+my $version = "7.0NG.722 PS180523";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 099841098a..58e94208e2 100644
--- 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.722 PS180522";
+my $version = "7.0NG.722 PS180523";
 
 # save program name for logging
 my $progname = basename($0);

From 4a58b8cb7dd8f149f1b63919423163595451097e Mon Sep 17 00:00:00 2001
From: nknsh <nknsh@rworks.jp>
Date: Wed, 23 May 2018 13:49:14 +0900
Subject: [PATCH 070/146] I fixed the bug about async_recovery. When the async
 module recovers automatically, known_status and last_known_status are updated
 to 0.

---
 pandora_server/lib/PandoraFMS/Core.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 0537628dc2..1ae5385db8 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -4886,7 +4886,7 @@ sub pandora_module_unknown ($$) {
 			
 			# Set the module state to normal
 			logger ($pa_config, "Module " . $module->{'nombre'} . " is going to NORMAL", 10);
-			db_do ($dbh, 'UPDATE tagente_estado SET last_status = 0, estado = 0 WHERE id_agente_estado = ?', $module->{'id_agente_estado'});
+			db_do ($dbh, 'UPDATE tagente_estado SET last_status = 0, estado = 0, known_status = 0, last_known_status = 0 WHERE id_agente_estado = ?', $module->{'id_agente_estado'});
 			
 			# Get agent information
 			my $agent = get_db_single_row ($dbh, 'SELECT *

From b68948307bab984ebe3c02769b12e5222e23f177 Mon Sep 17 00:00:00 2001
From: "manuel.montes" <manuel.montes@support.artica.es>
Date: Wed, 23 May 2018 17:55:07 +0200
Subject: [PATCH 071/146] Fixed white-space / pre-wrap

---
 pandora_console/include/styles/pandora.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index b1467fa7d1..ebe2617ad7 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -893,6 +893,9 @@ div#cont {
 table, img {
 	border: 0px;
 }
+table pre{
+	white-space: pre-wrap;
+}
 
 tr:first-child>th {
 	background-color: #373737;

From 43447bbee4cded8a985a689f4d6260d086065e40 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 23 May 2018 18:19:24 +0200
Subject: [PATCH 072/146] [Rebranding] Minor ended fixed

---
 .../extensions/plugin_registration.php        |  8 +++----
 .../extensions/resource_registration.php      |  4 ++--
 pandora_console/general/alert_enterprise.php  |  4 ++--
 pandora_console/general/login_help_dialog.php |  4 ++--
 .../godmode/agentes/agent_manager.php         |  2 +-
 .../godmode/agentes/module_manager.php        |  2 +-
 .../godmode/massive/massive_edit_agents.php   |  2 +-
 pandora_console/include/auth/dev.php          |  5 ++--
 pandora_console/include/auth/ldap.php         |  5 ++--
 pandora_console/include/auth/mysql.php        |  5 ++--
 .../include/functions_networkmap.php          | 23 +++----------------
 pandora_console/include/functions_ui.php      | 20 +++++++++++++---
 .../include/help/en/help_main_help.php        |  4 ++--
 .../include/help/es/help_main_help.php        |  4 ++--
 .../include/help/ja/help_main_help.php        |  2 +-
 .../agentes/pandora_networkmap.view.php       |  2 +-
 16 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php
index 8807fbe153..63c2d56920 100644
--- a/pandora_console/extensions/plugin_registration.php
+++ b/pandora_console/extensions/plugin_registration.php
@@ -31,10 +31,10 @@ function pluginreg_extension_main () {
 			echo '</div>';
 				echo '<div class="text_task">';
 					echo '<h3>' . __("Plugin registration") . '</h3>';
-					echo '<p id="description_task">' . 
-					__("This extension makes registration of server plugins more easy. 
-						Here you can upload a server plugin in Pandora FMS 3.x zipped format (.pspz). 
-						Please refer to documentation on how to obtain and use Pandora FMS Server Plugins.
+					echo '<p id="description_task">' .
+					__("This extension makes registering server plugins an easier task.
+						Here you can upload a server plugin in .pspz zipped format.
+						Please refer to the official documentation on how to obtain and use Server Plugins.
 						<br><br>You can get more plugins in our <a href='http://pandorafms.com/Library/Library/'>Public Resource Library</a> ") . '</p>';
 						// Upload form
 					echo "<form name='submit_plugin' method='post' enctype='multipart/form-data'>";
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index 61ae26f55b..9158876901 100755
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -857,9 +857,9 @@ function resource_registration_extension_main() {
 	echo "<div class=notify>";
 	echo __("This extension makes registering resource templates easier.") . " " .
 		__("Here you can upload a resource template in .ptr format.") . " " .
-		__("Please refer to our documentation for more information on how to obtain and use Pandora FMS' resources.") . " " .
+		__("Please refer to our documentation for more information on how to obtain and use %s resources.", get_product_name()) . " " .
 		"<br> <br>" .
-		__("You can get more resurces in our <a href='http://pandorafms.org/index.php?sec=community&sec2=repository&lng=en'>Public Resource Library</a>")
+		__("You can get more resurces in our <a href='http://pandorafms.com/Library/Library/'>Public Resource Library</a>")
 	;
 	echo "</div>";
 	
diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php
index 3b099fe677..ea5d1d97e5 100644
--- a/pandora_console/general/alert_enterprise.php
+++ b/pandora_console/general/alert_enterprise.php
@@ -94,8 +94,8 @@ switch ($tipo) {
 	case "helpmodal":
 	
 	echo __("This is the online help for %s console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use %s. Official documentation of %s is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.<br><br>
-  <a href='https://pandorafms.org/en/docs/monitoring-documentation/' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>",
-  get_product_name(), get_product_name(), get_product_name());
+  <a href='%s' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>",
+  get_product_name(), get_product_name(), get_product_name(), $config['custom_docs_url']);
 	
 	break;
 	
diff --git a/pandora_console/general/login_help_dialog.php b/pandora_console/general/login_help_dialog.php
index c3b05e8553..6e38d4ece0 100644
--- a/pandora_console/general/login_help_dialog.php
+++ b/pandora_console/general/login_help_dialog.php
@@ -71,11 +71,11 @@ echo '<div id="login_help_dialog" title="' .
 			echo '</td>';
 			
 			echo '<td style="border:1px solid #FFF; text-align:center;">';
-				echo '<a href="http://pandorafms.com/pandora/doc/en" target="_blank" style="text-decoration:none;">' .
+				echo '<a href="' . $config['custom_docs_url'] . '" target="_blank" style="text-decoration:none;">' .
 					html_print_image('images/documentation.png', true,
 						array("alt" => __('Documentation'), "border" => 0)) . '</a>';
 				echo '<br style="margin-bottom: 40px;" />';
-				echo '<a style="font-size: 9pt;" href="http://pandorafms.com/pandora/doc/en" target="_blank">' . __('Documentation') . '</span></a>';
+				echo '<a style="font-size: 9pt;" href="' . $config['custom_docs_url'] . '" target="_blank">' . __('Documentation') . '</span></a>';
 			echo '</td>';
 		echo '</tr>';
 		echo '</table>';
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 151b47e03a..d4a725a42c 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -542,7 +542,7 @@ foreach ($fields as $field) {
 		. '.<br />'
 		. __('The format is: [url=\'url to navigate\']\'text to show\'[/url]')
 		. '.<br /><br />'
-		. __('e.g.: [url=pandorafms.org]Pandora FMS Community[/url]')
+		. __('e.g.: [url=google.com]Google web search[/url]')
 		, true);
 	
 	$custom_value = db_get_value_filter('description',
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 85f2fd8f5f..145f7312d5 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -154,7 +154,7 @@ echo "</table>";
 
 echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
 echo "<strong>";
-echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules in Pandora FMS Library")."</a>";
+echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules on Monitoring Library")."</a>";
 echo "</strong>";
 echo '</div>';
 
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index 3918ada3be..849101f169 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -507,7 +507,7 @@ foreach ($fields as $field) {
 		. '.<br />'
 		. __('The format is: [url=\'url to navigate\']\'text to show\'[/url]')
 		. '.<br /><br />'
-		. __('e.g.: [url=pandorafms.org]Pandora FMS Community[/url]')
+		. __('e.g.: [url=google.com]Google web search[/url]')
 		, true);
 	
 	$custom_value = db_get_value_filter('description', 'tagent_custom_data', array('id_field' => $field['id_field'], 'id_agent' => $id_agente));
diff --git a/pandora_console/include/auth/dev.php b/pandora_console/include/auth/dev.php
index 82a3f7d524..8c5774daaa 100644
--- a/pandora_console/include/auth/dev.php
+++ b/pandora_console/include/auth/dev.php
@@ -27,9 +27,8 @@ if (!isset ($config)) {
 <meta http-equiv="content-type" content="text/html; charset=utf8">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
-<meta name="author" content="Sancho Lerena">
-<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
-<meta name="keywords" content="pandora, monitoring, system, GPL, software">
+<meta name="author" content="Artica ST">
+<meta name="copyright" content="(c) Artica ST">
 <meta name="robots" content="index, follow">
 <link rel="icon" href="../../images/pandora.ico" type="image/ico">
 <link rel="stylesheet" href="../styles/pandora.css" type="text/css">
diff --git a/pandora_console/include/auth/ldap.php b/pandora_console/include/auth/ldap.php
index a157b1ddd7..30edd77644 100644
--- a/pandora_console/include/auth/ldap.php
+++ b/pandora_console/include/auth/ldap.php
@@ -28,9 +28,8 @@ if (!isset ($config)) {
 		<meta http-equiv="content-type" content="text/html; charset=utf8">
 		<meta name="resource-type" content="document">
 		<meta name="distribution" content="global">
-		<meta name="author" content="Sancho Lerena">
-		<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
-		<meta name="keywords" content="pandora, monitoring, system, GPL, software">
+		<meta name="author" content="Artica ST">
+		<meta name="copyright" content="(c) Artica ST">
 		<meta name="robots" content="index, follow">
 		<link rel="icon" href="../../images/pandora.ico" type="image/ico">
 		<link rel="stylesheet" href="../styles/pandora.css" type="text/css">
diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index ddc3828c59..705c600943 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -28,9 +28,8 @@ if (!isset ($config)) {
 		<meta http-equiv="content-type" content="text/html; charset=utf8">
 		<meta name="resource-type" content="document">
 		<meta name="distribution" content="global">
-		<meta name="author" content="Sancho Lerena">
-		<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
-		<meta name="keywords" content="pandora, monitoring, system, GPL, software">
+		<meta name="author" content="Artica ST">
+		<meta name="copyright" content="(c) Artica ST">
 		<meta name="robots" content="index, follow">
 		<link rel="icon" href="../../images/pandora.ico" type="image/ico">
 		<link rel="stylesheet" href="../styles/pandora.css" type="text/css">
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index 7578f4bbfd..4e4ad37cee 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -1332,7 +1332,7 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s
 	}
 	$stats_json = base64_encode(json_encode($summary));
 	
-	$img_src = networkmap_get_center_logo();
+	$img_src = ui_get_logo_to_center_networkmap();
 	if (defined('METACONSOLE')) {
 		
 		$url_tooltip = '../../ajax.php?' .
@@ -1351,11 +1351,11 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s
 	
 	if ($hack_networkmap_mobile) {
 		$img = '<TR><TD>' .
-			"<img src='" . $config['homedir'] . '/' . networkmap_get_center_logo() . "' />" .
+			"<img src='" . $config['homedir'] . '/' . ui_get_logo_to_center_networkmap() . "' />" .
 			'</TD></TR>';
 	}
 	else {
-		$image = html_print_image(networkmap_get_center_logo(), true, false, false, true);
+		$image = html_print_image(ui_get_logo_to_center_networkmap(), true, false, false, true);
 		//$image = str_replace('"',"'",$image);
 		$img = '<TR><TD>' . $image . '</TD></TR>';
 	}
@@ -1871,23 +1871,6 @@ function modules_get_all_interfaces($id_agent) {
 	return $return;
 }
 
-/**
- * Get the central networkmap logo
- *
- * @return string with the path to logo. If it is not set, return the default.
- *
- */
-function networkmap_get_center_logo () {
-	global $config;
-
-	html_debug("hola", true);
-	if ((!enterprise_installed()) || empty($config['custom_network_center_logo'])) {
-		return DEFAULT_NETWORKMAP_CENTER_LOGO;
-	}
-
-	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
-}
-
 ?>
 <script language="javascript" type="text/javascript">
 	$(document).ready (function () {
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index f2f8c81f61..5343fd7e23 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1352,9 +1352,8 @@ function ui_process_page_head ($string, $bitfield) {
 		<meta http-equiv="Content-Style-Type" content="text/css" />
 		<meta name="resource-type" content="document" />
 		<meta name="distribution" content="global" />
-		<meta name="author" content="Pandora FMS Developer team" />
-		<meta name="copyright" content="(c) Artica Soluciones Tecnologicas" />
-		<meta name="keywords" content="pandora, monitoring, system, GPL, software" />
+		<meta name="author" content="' . get_copyright_notice() . '" />
+		<meta name="copyright" content="(c) ' . get_copyright_notice() . '" />
 		<meta name="robots" content="index, follow" />';
 		if(defined ('METACONSOLE')){
 		$output .='<link rel="icon" href="images/favicon_meta.ico" type="image/ico" />';
@@ -3973,4 +3972,19 @@ function ui_get_custom_header_logo () {
 	return 'enterprise/images/custom_logo/' . $stored_logo;
 }
 
+/**
+ * Get the central networkmap logo
+ *
+ * @return string with the path to logo. If it is not set, return the default.
+ *
+ */
+function ui_get_logo_to_center_networkmap () {
+	global $config;
+
+	if ((!enterprise_installed()) || empty($config['custom_network_center_logo'])) {
+		return DEFAULT_NETWORKMAP_CENTER_LOGO;
+	}
+
+	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
+}
 ?>
diff --git a/pandora_console/include/help/en/help_main_help.php b/pandora_console/include/help/en/help_main_help.php
index 31f88c0098..bfd5897efc 100644
--- a/pandora_console/include/help/en/help_main_help.php
+++ b/pandora_console/include/help/en/help_main_help.php
@@ -6,9 +6,9 @@
 <h1><?php echo get_product_name();?> - Help index</h1>
 <h3>Introduction</h3>
 <p>
-This is the online help for <?php echo get_product_name();?> console. This help is -in best cases- just a "brief" contextual help, not intented to teach you how to use <?php echo get_product_name();?>. Official documentation of <?php echo get_product_name();?> is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.
+This is the online help for <?php echo get_product_name();?> console. This help is -in best cases- just a "brief" contextual help, not intented to teach you how to use <?php echo get_product_name();?>. Official documentation of <?php echo get_product_name();?> is large, and you probably don't need to read it entirely, but sure, you should download it and take a look.
 
 <br><br>
-<a href="http://pandorafms.com/pandora/doc/"><b>Download the official documentation</b></a>
+<a href="<?php echo $config['custom_docs_url']; ?>"><b>Download the official documentation</b></a>
  
 </p>
diff --git a/pandora_console/include/help/es/help_main_help.php b/pandora_console/include/help/es/help_main_help.php
index dfb00e176c..b5b0e1da1d 100644
--- a/pandora_console/include/help/es/help_main_help.php
+++ b/pandora_console/include/help/es/help_main_help.php
@@ -6,9 +6,9 @@
 <h1><?php echo get_product_name();?> - Índice de la ayuda</h1>
 <h3>Introdución</h3>
 <p>
-Esta es la ayuda online para la consola de <?php echo get_product_name();?>. Esta ayuda es -en el mejor de los casos-, simplemente una ayuda contextual breve, no pretende enseñar en detalle como usar <?php echo get_product_name();?>. La documentación oficial de <?php echo get_product_name();?> son 1000 páginas, y probablemente no es necesario leerla entera, pero en cualquier caso, es importante echarle un buen vistazo.
+Esta es la ayuda online para la consola de <?php echo get_product_name();?>. Esta ayuda es -en el mejor de los casos-, simplemente una ayuda contextual breve, no pretende enseñar en detalle como usar <?php echo get_product_name();?>. La documentación oficial de <?php echo get_product_name();?> es larga, y probablemente no es necesario leerla entera, pero en cualquier caso, es importante echarle un buen vistazo.
 
 <br><br>
-<a href="http://pandorafms.com/pandora/doc/"><b>Descargue la documentación oficial</b></a>
+<a href="<?php echo $config['custom_docs_url']; ?>"><b>Descargue la documentación oficial</b></a>
  
 </p>
diff --git a/pandora_console/include/help/ja/help_main_help.php b/pandora_console/include/help/ja/help_main_help.php
index 54e64a3d81..18f40f3afc 100644
--- a/pandora_console/include/help/ja/help_main_help.php
+++ b/pandora_console/include/help/ja/help_main_help.php
@@ -9,6 +9,6 @@
 これは、<?php echo get_product_name();?> コンソールのオンラインヘルプです。このヘルプは簡単に説明することを目的としたもので、<?php echo get_product_name();?> の使い方を教えることを意図しているわけではありません。<?php echo get_product_name();?> の公式ドキュメントは約 900ページにも及びます。全体を読む必要はありませんが、参照できるようにダウンロードしておくことをお勧めします。
 
 <br><br>
-<a href="http://pandorafms.com/pandora/doc/"><b>公式ドキュメントのダウンロード</b></a>
+<a href="<?php echo $config['custom_docs_url']; ?>"><b>公式ドキュメントのダウンロード</b></a>
  
 </p>
diff --git a/pandora_console/operation/agentes/pandora_networkmap.view.php b/pandora_console/operation/agentes/pandora_networkmap.view.php
index 341464523b..32225b9ad1 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.view.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.view.php
@@ -702,7 +702,7 @@ else {
 
 // Print some params to handle it in js
 html_print_input_hidden ('product_name', get_product_name());
-html_print_input_hidden ('center_logo', ui_get_full_url(networkmap_get_center_logo()));
+html_print_input_hidden ('center_logo', ui_get_full_url(ui_get_logo_to_center_networkmap()));
 
 $dash_mode = 0;
 $map_dash_details = array();

From 5e9cf384746361c2c67c7e041b3b7e2f478a78ca Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 23 May 2018 18:21:42 +0200
Subject: [PATCH 073/146] [Rebranding] Modified some strings to new
 installations

---
 pandora_console/pandoradb_data.sql | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index fb1de26061..069d82186b 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -12,15 +12,15 @@
 -- Dumping data for table `talert_commands`
 --
 
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (1,'eMail','Internal&#x20;type','This&#x20;alert&#x20;send&#x20;an&#x20;email&#x20;using&#x20;internal&#x20;Pandora&#x20;FMS&#x20;Server&#x20;SMTP&#x20;capabilities&#x20;&#40;defined&#x20;in&#x20;each&#x20;server,&#x20;using:&#x0d;&#x0a;_field1_&#x20;as&#x20;destination&#x20;email&#x20;address,&#x20;and&#x0d;&#x0a;_field2_&#x20;as&#x20;subject&#x20;for&#x20;message.&#x20;&#x0d;&#x0a;_field3_&#x20;as&#x20;text&#x20;of&#x20;message.&#x20;&#x0d;&#x0a;_field4_&#x20;as&#x20;content&#x20;type&#x20;&#40;plain/text&#x20;or&#x20;html/text&#41;.',1,'[\"Destination&#x20;address\",\"Subject\",\"Text\",\"Content&#x20;Type\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"_html_editor_\",\"_content_type_\",\"\",\"\",\"\",\"\",\"\",\"\"]');
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (2,'Internal&#x20;Audit','Internal&#x20;type','This&#x20;alert&#x20;save&#x20;alert&#x20;in&#x20;Pandora&#x20;internal&#x20;audit&#x20;system.&#x20;Fields&#x20;are&#x20;static&#x20;and&#x20;only&#x20;_field1_&#x20;is&#x20;used.',1,'[\"Description\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (3,'Pandora&#x20;FMS&#x20;Event','Internal&#x20;type','This&#x20;alert&#x20;create&#x20;an&#x20;special&#x20;event&#x20;into&#x20;Pandora&#x20;FMS&#x20;event&#x20;manager.',1,'[\"Event&#x20;text\",\"Event&#x20;type\",\"Source\",\"Agent&#x20;name&#x20;or&#x20;_agent_\",\"Event&#x20;criticity\",\"ID&#x20;extra\",\"Tags&#x20;separated&#x20;by&#x20;commas\",\"Comments\",\"\",\"\"]','[\"\",\"alert_ceased,Alert&#x20;ceased;alert_fired,Alert&#x20;fired;alert_manual_validation,Alert&#x20;manual&#x20;validation;alert_recovered,Alert&#x20;recovered;configuration_change,Configuration&#x20;change&#x20;;error,Error;critical,Monitor&#x20;Critical;normal,Monitor&#x20;Normal;going_unknown,Monitor\",\"\",\"\",\"4,Critical;1,Informational;0,Maintenance;6,Major;5,Minor;2,Normal;3,Warning\",\"\",\"\",\"\",\"\",\"\"]');
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (4,'Pandora&#x20;FMS&#x20;Alertlog','echo&#x20;_timestamp_&#x20;pandora&#x20;_agent_&#x20;_data_&#x20;_field1_&#x20;_field2_&#x20;&gt;&gt;&#x20;/var/log/pandora/pandora_alert.log','This&#x20;is&#x20;a&#x20;default&#x20;alert&#x20;to&#x20;write&#x20;alerts&#x20;in&#x20;a&#x20;standard&#x20;ASCII&#x20;&#x20;plaintext&#x20;log&#x20;file&#x20;in&#x20;/var/log/pandora/pandora_alert.log&#x0d;&#x0a;',0,'[\"Log&#x20;Info&#x20;1\",\"Log&#x20;Info&#x20;2\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (1,'eMail','Internal&#x20;type','This&#x20;alert&#x20;send&#x20;an&#x20;email&#x20;using&#x20;internal&#x20;Server&#x20;SMTP&#x20;capabilities&#x20;&#40;defined&#x20;in&#x20;each&#x20;server,&#x20;using:&#x0d;&#x0a;_field1_&#x20;as&#x20;destination&#x20;email&#x20;address,&#x20;and&#x0d;&#x0a;_field2_&#x20;as&#x20;subject&#x20;for&#x20;message.&#x20;&#x0d;&#x0a;_field3_&#x20;as&#x20;text&#x20;of&#x20;message.&#x20;&#x0d;&#x0a;_field4_&#x20;as&#x20;content&#x20;type&#x20;&#40;plain/text&#x20;or&#x20;html/text&#41;.',1,'[\"Destination&#x20;address\",\"Subject\",\"Text\",\"Content&#x20;Type\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"_html_editor_\",\"_content_type_\",\"\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (2,'Internal&#x20;Audit','Internal&#x20;type','This&#x20;alert&#x20;save&#x20;alert&#x20;in&#x20;internal&#x20;audit&#x20;system.&#x20;Fields&#x20;are&#x20;static&#x20;and&#x20;only&#x20;_field1_&#x20;is&#x20;used.',1,'[\"Description\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (3,'Monitoring&#x20;Event','Internal&#x20;type','This&#x20;alert&#x20;create&#x20;an&#x20;special&#x20;event&#x20;into&#x20;event&#x20;manager.',1,'[\"Event&#x20;text\",\"Event&#x20;type\",\"Source\",\"Agent&#x20;name&#x20;or&#x20;_agent_\",\"Event&#x20;criticity\",\"ID&#x20;extra\",\"Tags&#x20;separated&#x20;by&#x20;commas\",\"Comments\",\"\",\"\"]','[\"\",\"alert_ceased,Alert&#x20;ceased;alert_fired,Alert&#x20;fired;alert_manual_validation,Alert&#x20;manual&#x20;validation;alert_recovered,Alert&#x20;recovered;configuration_change,Configuration&#x20;change&#x20;;error,Error;critical,Monitor&#x20;Critical;normal,Monitor&#x20;Normal;going_unknown,Monitor\",\"\",\"\",\"4,Critical;1,Informational;0,Maintenance;6,Major;5,Minor;2,Normal;3,Warning\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (4,'Alertlog','echo&#x20;_timestamp_&#x20;pandora&#x20;_agent_&#x20;_data_&#x20;_field1_&#x20;_field2_&#x20;&gt;&gt;&#x20;/var/log/pandora/pandora_alert.log','This&#x20;is&#x20;a&#x20;default&#x20;alert&#x20;to&#x20;write&#x20;alerts&#x20;in&#x20;a&#x20;standard&#x20;ASCII&#x20;&#x20;plaintext&#x20;log&#x20;file&#x20;in&#x20;/var/log/pandora/pandora_alert.log&#x0d;&#x0a;',0,'[\"Log&#x20;Info&#x20;1\",\"Log&#x20;Info&#x20;2\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (5,'SNMP&#x20;Trap','/usr/bin/snmptrap&#x20;-v&#x20;1&#x20;-c&#x20;_field1_&#x20;_field2_&#x20;_field3_&#x20;_field4_','Send&#x20;a&#x20;SNMPTRAP&#x20;to&#x20;192.168.0.4.&#x20;Please&#x20;review&#x20;config&#x20;and&#x20;adapt&#x20;to&#x20;your&#x20;needs,&#x20;this&#x20;is&#x20;only&#x20;a&#x20;sample,&#x20;not&#x20;functional&#x20;itself.',0,'[\"Community\",\"Destination&#x20;address\",\"OID\",\"Source&#x20;address\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (6,'Syslog','logger&#x20;-p&#x20;daemon.alert&#x20;Pandora&#x20;Alert&#x20;_agent_&#x20;_data_&#x20;_field1_&#x20;_field2_','Uses&#x20;field1&#x20;and&#x20;field2&#x20;to&#x20;generate&#x20;Syslog&#x20;alert&#x20;in&#x20;facility&#x20;daemon&#x20;with&#x20;&quot;alert&quot;&#x20;level.',0,'[\"Log&#x20;Info&#x20;1\",\"Log&#x20;Info&#x20;2\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (7,'Sound Alert','/usr/bin/play /usr/share/sounds/alarm.wav','',0,NULL,NULL);
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (8,'Jabber&#x20;Alert','echo&#x20;_field3_&#x20;|&#x20;sendxmpp&#x20;-r&#x20;_field1_&#x20;--chatroom&#x20;_field2_','Send&#x20;jabber&#x20;alert&#x20;to&#x20;chat&#x20;room&#x20;in&#x20;a&#x20;predefined&#x20;server&#x20;&#40;configure&#x20;first&#x20;.sendxmpprc&#x20;file&#41;.&#x20;Uses&#x20;field3&#x20;as&#x20;text&#x20;message,&#x20;field1&#x20;as&#x20;useralias&#x20;for&#x20;source&#x20;message,&#x20;and&#x20;field2&#x20;for&#x20;chatroom&#x20;name',0,'[\"User&#x20;alias\",\"Chatroom&#x20;name\",\"Message\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (9,'SMS','sendsms&#x20;_field1_&#x20;_field2_','Send&#x20;SMS&#x20;using&#x20;the&#x20;Pandora&#x20;FMS&#x20;standard&#x20;SMS&#x20;device,&#x20;using&#x20;smstools.&#x20;&#x20;Uses&#x20;field2&#x20;as&#x20;text&#x20;message,&#x20;field1&#x20;as&#x20;destination&#x20;phone&#x20;&#40;include&#x20;international&#x20;prefix!&#41;',0,'[\"Destination&#x20;number\",\"Message\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (9,'SMS','sendsms&#x20;_field1_&#x20;_field2_','Send&#x20;SMS&#x20;using&#x20;the&#x20;standard&#x20;SMS&#x20;device,&#x20;using&#x20;smstools.&#x20;&#x20;Uses&#x20;field2&#x20;as&#x20;text&#x20;message,&#x20;field1&#x20;as&#x20;destination&#x20;phone&#x20;&#40;include&#x20;international&#x20;prefix!&#41;',0,'[\"Destination&#x20;number\",\"Message\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (10,'Validate&#x20;Event','Internal&#x20;type','This&#x20;alert&#x20;validate&#x20;the&#x20;events&#x20;matched&#x20;with&#x20;a&#x20;module&#x20;given&#x20;the&#x20;agent&#x20;name&#x20;&#40;_field1_&#41;&#x20;and&#x20;module&#x20;name&#x20;&#40;_field2_&#41;',1,'[\"Agent&#x20;name\",\"Module&#x20;name\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (11,'Integria&#x20;IMS&#x20;Ticket','Internal&#x20;type','This&#x20;alert&#x20;create&#x20;a&#x20;ticket&#x20;into&#x20;your&#x20;Integria&#x20;IMS.',1,'[\"Integria&#x20;IMS&#x20;API&#x20;path\",\"Integria&#x20;IMS&#x20;API&#x20;pass\",\"Integria&#x20;IMS&#x20;user\",\"Integria&#x20;IMS&#x20;user&#x20;pass\",\"Ticket&#x20;title\",\"Ticket&#x20;group&#x20;ID\",\"Ticket&#x20;priority\",\"Email&#x20;copy\",\"Ticket&#x20;owner\",\"Ticket&#x20;description\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"10,Maintenance;0,Informative;1,Low;2,Medium;3,Serious;4,Very&#x20;Serious\",\"\",\"\",\"\"]');
 
@@ -133,10 +133,10 @@ INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`) VALUES
 (8,'MacOS','MAC OS','so_mac.png'),
 (9,'Windows','Microsoft Windows OS','so_win.png'),
 (10,'Other','Other SO','so_other.png'),
-(11,'Network','Pandora FMS Network Agent','network.png'),
+(11,'Network','Network Agent','network.png'),
 (12,'Web Server','Web Server/Application','network.png'),
-(13,'Sensor',' Pandora FMS Hardware Agent (Sensor)','network.png'),
-(14,'Embedded','Embedded device running a Pandora FMS agent','embedded.png'),
+(13,'Sensor','Hardware Agent (Sensor)','network.png'),
+(14,'Embedded','Embedded device running an agent','embedded.png'),
 (15,'Android','Android agent','android.png'),
 (16, 'VMware', 'VMware Architecture', 'so_vmware.png'),
 (17, 'Router', 'Generic router', 'so_router.png'),
@@ -236,7 +236,7 @@ INSERT INTO `torigen` VALUES
 ('Application data'),
 ('Logfiles'),
 ('Other data source'),
-('Pandora FMS Event'),
+('Monitoring Event'),
 ('User report'),
 ('Unknown source');
 
@@ -1102,7 +1102,7 @@ INSERT INTO `tgis_map_layer` VALUES (1,'Group All',1,0,1,0);
 
 -- example alert template
 
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (12,'Remote&#x20;agent&#x20;control','/usr/share/pandora_server/util/udp_client.pl&#x20;_address_&#x20;41122&#x20;&quot;_field1_&quot;','This&#x20;command&#x20;is&#x20;used&#x20;to&#x20;send&#x20;commands&#x20;to&#x20;the&#x20;Pandora&#x20;FMS&#x20;agents&#x20;with&#x20;the&#x20;UDP&#x20;server&#x20;enabled.&#x20;The&#x20;UDP&#x20;server&#x20;is&#x20;used&#x20;to&#x20;order&#x20;agents&#x20;&#40;Windows&#x20;and&#x20;UNIX&#41;&#x20;to&#x20;&quot;refresh&quot;&#x20;the&#x20;agent&#x20;execution:&#x20;that&#x20;means,&#x20;to&#x20;force&#x20;the&#x20;agent&#x20;to&#x20;execute&#x20;and&#x20;send&#x20;data',0,'[\"Command\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (12,'Remote&#x20;agent&#x20;control','/usr/share/pandora_server/util/udp_client.pl&#x20;_address_&#x20;41122&#x20;&quot;_field1_&quot;','This&#x20;command&#x20;is&#x20;used&#x20;to&#x20;send&#x20;commands&#x20;to&#x20;the&#x20;agents&#x20;with&#x20;the&#x20;UDP&#x20;server&#x20;enabled.&#x20;The&#x20;UDP&#x20;server&#x20;is&#x20;used&#x20;to&#x20;order&#x20;agents&#x20;&#40;Windows&#x20;and&#x20;UNIX&#41;&#x20;to&#x20;&quot;refresh&quot;&#x20;the&#x20;agent&#x20;execution:&#x20;that&#x20;means,&#x20;to&#x20;force&#x20;the&#x20;agent&#x20;to&#x20;execute&#x20;and&#x20;send&#x20;data',0,'[\"Command\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 
 -- alert actions (default)
 
@@ -1111,7 +1111,7 @@ INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field
 INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES
 (2,'Restart&#x20;agent',12,'REFRESH AGENT *','','','','','','','','','',0,0,'','','','','','','','','','');
 INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES
-(3,'Pandora&#x20;FMS&#x20;Event',3,'_agent_&#x20;_module_&#x20;generated&#x20;an&#x20;event&#x20;alert&#x20;&#40;_data_&#41;','alert_fired','pandora','','4','','','','','',0,0,'RECOVERED:&#x20;_agent_&#x20;_module_&#x20;generated&#x20;event&#x20;alert&#x20;&#40;_data_&#41;','alert_ceased','pandora','','4','','','','','');
+(3,'Monitoring&#x20;Event',3,'_agent_&#x20;_module_&#x20;generated&#x20;an&#x20;event&#x20;alert&#x20;&#40;_data_&#41;','alert_fired','pandora','','4','','','','','',0,0,'RECOVERED:&#x20;_agent_&#x20;_module_&#x20;generated&#x20;event&#x20;alert&#x20;&#40;_data_&#41;','alert_ceased','pandora','','4','','','','','');
 INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES
 (4,'Create&#x20;a&#x20;ticket&#x20;in&#x20;Integria&#x20;IMS',11,'http://localhost/integria/include/api.php','1234','admin','integria','_agent_:&#x20;_alert_name_','1','3','copy@dom.com','admin','_alert_description_',0,0,'','','','','','','','','','');
 

From dbafab2ae753034915a0bb961a323c3c09421af5 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 23 May 2018 19:13:47 +0200
Subject: [PATCH 074/146] Add cluster and API get functions - #2294

---
 pandora_console/include/functions_agents.php | 13 +--
 pandora_console/include/functions_api.php    | 91 ++++++++++++++++++++
 2 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index 0d90d8f725..5ec86aed89 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -83,9 +83,6 @@ function agents_create_agent ($name, $id_group, $interval, $ip_address, $values
 	if (empty ($id_group) && (int)$id_group != 0)
 		return false;
 	
-	if (empty ($ip_address))
-		return false;
-	
 	// Check interval greater than zero
 	if ($interval < 0)
 		$interval = false;
@@ -97,16 +94,20 @@ function agents_create_agent ($name, $id_group, $interval, $ip_address, $values
 	$values['nombre'] = $name;
 	$values['id_grupo'] = $id_group;
 	$values['intervalo'] = $interval;
-	$values['direccion'] = $ip_address;
 	
+	if (!empty ($ip_address)){
+			$values['direccion'] = $ip_address;
+	}
+		
 	$id_agent = db_process_sql_insert ('tagente', $values);
 	if ($id_agent === false) {
 		return false;
 	}
 	
 	// Create address for this agent in taddress
-	agents_add_address ($id_agent, $ip_address);
-	
+	if (!empty ($ip_address)){
+		agents_add_address ($id_agent, $ip_address);
+	}
 	
 	db_pandora_audit ("Agent management", "New agent '$name' created");
 	
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index a4a737b280..81fb2ce369 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -34,6 +34,7 @@ enterprise_include_once ('include/functions_local_components.php');
 enterprise_include_once ('include/functions_events.php');
 enterprise_include_once ('include/functions_agents.php');
 enterprise_include_once ('include/functions_modules.php');
+enterprise_include_once ('include/functions_clusters.php');
 
 /**
  * Parse the "other" parameter.
@@ -10636,4 +10637,94 @@ function api_get_cluster_status($id_cluster, $trash1, $trash2, $returnType) {
 	returnData($returnType, $data);
 }
 
+function api_get_cluster_id_by_name($cluster_name, $trash1, $trash2, $returnType) {
+	if (defined ('METACONSOLE')) {
+		return;
+	}
+	
+	$cluster_name = io_safe_output($cluster_name);
+	
+	$value = cluster_get_id_by_name($cluster_name);
+	
+	if ($value === false) {
+		returnError('id_not_found', $returnType);
+	}
+	
+	$data = array('type' => 'string', 'data' => $value);
+	
+	returnData($returnType, $data);
+}
+
+function api_get_agents_id_name_by_cluster_id($cluster_id, $trash1, $trash2, $returnType) {
+	if (defined ('METACONSOLE')) {
+		return;
+	}
+	
+	$all_agents = cluster_get_agents_id_name_by_cluster_id($cluster_id);	
+	
+	if (count($all_agents) > 0 and $all_agents !== false) {
+		$data = array('type' => 'array', 'data' => $all_agents);
+		
+		returnData('json', $data);
+	}
+	else {
+		returnError('error_agents', 'No agents retrieved.');
+	}
+}
+
+function api_get_agents_id_name_by_cluster_name($cluster_name, $trash1, $trash2, $returnType) {
+	if (defined ('METACONSOLE')) {
+		return;
+	}
+		
+	$all_agents = cluster_get_agents_id_name_by_cluster_name($cluster_name);
+	
+	if (count($all_agents) > 0 and $all_agents !== false) {
+		$data = array('type' => 'array', 'data' => $all_agents);
+		
+		returnData('json', $data);
+	}
+	else {
+		returnError('error_agents', 'No agents retrieved.');
+	}
+}
+
+function api_get_modules_id_name_by_cluster_id ($cluster_id){
+	if (defined ('METACONSOLE')) {
+		return;
+	}
+	
+	$all_modules = cluster_get_modules_id_name_by_cluster_id($cluster_id);	
+	
+	if (count($all_modules) > 0 and $all_modules !== false) {
+		$data = array('type' => 'array', 'data' => $all_modules);
+		
+		returnData('json', $data);
+	}
+	else {
+		returnError('error_agent_modules', 'No modules retrieved.');
+	}
+	
+}
+
+function api_get_modules_id_name_by_cluster_name ($cluster_name){
+	if (defined ('METACONSOLE')) {
+		return;
+	}
+	
+	$all_modules = cluster_get_modules_id_name_by_cluster_name($cluster_name);	
+	
+	if (count($all_modules) > 0 and $all_modules !== false) {
+		$data = array('type' => 'array', 'data' => $all_modules);
+		
+		returnData('json', $data);
+	}
+	else {
+		returnError('error_agent_modules', 'No modules retrieved.');
+	}
+	
+}
+
+
+
 ?>
\ No newline at end of file

From bd48fe4fe6961649116616eee0bc79cfa42f9079 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 24 May 2018 00:01:24 +0200
Subject: [PATCH 075/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 1949c24f0c..516394dd2d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180523
+Version: 7.0NG.722-180524
 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 70747174ed..f53ecd37c0 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.722-180523"
+pandora_version="7.0NG.722-180524"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index 218a50fc32..a83c4e1e53 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.722';
-use constant AGENT_BUILD => '180523';
+use constant AGENT_BUILD => '180524';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 27a0919bbd..4c3c0368fa 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.722
-%define release     180523
+%define release     180524
 
 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 eb75470502..e8c3cabcfe 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.722
-%define release     180523
+%define release     180524
 
 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 313b8a9695..0a27708b5e 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180523"
+PI_BUILD="180524"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 1acc9af3b7..552b6b0c11 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180523}
+{180524}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index ca79433773..5ba937ff6b 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.722(Build 180523)")
+#define PANDORA_VERSION ("7.0NG.722(Build 180524)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 596622603d..ae24c614ce 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.722(Build 180523))"
+      VALUE "ProductVersion", "(7.0NG.722(Build 180524))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index c1489b58f9..c07ea3b16a 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180523
+Version: 7.0NG.722-180524
 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 762e1fe921..54e6b71b8c 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.722-180523"
+pandora_version="7.0NG.722-180524"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a814960f00..d6a0b69cc0 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180523';
+$build_version = 'PC180524';
 $pandora_version = 'v7.0NG.722';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 0e06bbb36c..c6083a61d0 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.722';
-$build = '180523';
+$build = '180524';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index b407786905..78ef5db7e9 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.722
-%define release     180523
+%define release     180524
 
 # 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 e0c8f224d4..d72159345d 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.722
-%define release     180523
+%define release     180524
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 171a5f7dd9..5c6f58d4ba 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180523
+Version: 7.0NG.722-180524
 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 96667b90c4..80bc27953e 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.722-180523"
+pandora_version="7.0NG.722-180524"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 970bc47b28..f1df3cbe65 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180523";
+my $pandora_build = "180524";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index eeaf287a0d..54b51f52d1 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180523";
+my $pandora_build = "180524";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 72ef3130fd..926db945ef 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.722
-%define release     180523
+%define release     180524
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 2ff23e0686..f7508b4d88 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.722
-%define release     180523
+%define release     180524
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index fb51e346a4..8931bac041 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180523"
+PI_BUILD="180524"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 6fc4b5760c..d00df6e0e9 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180523";
+my $version = "7.0NG.722 PS180524";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 58e94208e2..9be4d45402 100644
--- 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.722 PS180523";
+my $version = "7.0NG.722 PS180524";
 
 # save program name for logging
 my $progname = basename($0);

From 653248698d5dc77fce7b3179ab82251fa1566a1c Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 10:31:51 +0200
Subject: [PATCH 076/146] [Rebranding] Remove a obsolete link

---
 .../include/help/en/help_network_map_enterprise.php          | 5 +----
 .../include/help/es/help_network_map_enterprise.php          | 2 --
 .../include/help/ja/help_network_map_enterprise.php          | 5 +----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/pandora_console/include/help/en/help_network_map_enterprise.php b/pandora_console/include/help/en/help_network_map_enterprise.php
index 2209e03af0..4bf47e5790 100644
--- a/pandora_console/include/help/en/help_network_map_enterprise.php
+++ b/pandora_console/include/help/en/help_network_map_enterprise.php
@@ -113,7 +113,4 @@
         - <i>spring1, spring2:</i> are variations of the Flat.  <br>
     <li><b>Networkmap Refresh:</b> the refresh velocity of the status of the nodes contained in the networkmap, by default is any 5 minutes.  </p>
 
-The rest of the fields disabled, as for example "resizing map" is because there are only actives in the edition of one map already created. <br><br>
-
-
-For more information about editing maps see http://www.openideas.info/wiki/index.php?title=Pandora:Documentation_en:Data_Presentation#Network_Enteprise_Console
+The rest of the fields disabled, as for example "resizing map" is because there are only actives in the edition of one map already created.
diff --git a/pandora_console/include/help/es/help_network_map_enterprise.php b/pandora_console/include/help/es/help_network_map_enterprise.php
index 06142c36b2..6465ff8e28 100644
--- a/pandora_console/include/help/es/help_network_map_enterprise.php
+++ b/pandora_console/include/help/es/help_network_map_enterprise.php
@@ -107,5 +107,3 @@
     <li><b>Distancia minima entre nodos (solo circular):</b> Establece la distancia minima entre los nodos del mapa.</li>
     <li><b>separación entre flechas (solo flat y radial):</b> Separación entre las flechas del mapa.</li>
     <li><b>Separación por defecto para nodos (solo spring2):</b> Establece la distancia minima entre los nodos del mapa.</li><br><br>
-
-Para más información sobre la edición de mapas consulte http://openideas.info/wiki/index.php?title=Pandora:Documentation_es:Presentacion_datos#Consola_Network_Enteprise
diff --git a/pandora_console/include/help/ja/help_network_map_enterprise.php b/pandora_console/include/help/ja/help_network_map_enterprise.php
index e035bb8bc8..94a887cdb4 100644
--- a/pandora_console/include/help/ja/help_network_map_enterprise.php
+++ b/pandora_console/include/help/ja/help_network_map_enterprise.php
@@ -112,7 +112,4 @@
         - <i>スプリング 1、スプリング 2(spring1, spring2):</i> フラットの異なるパターンです。<br>
     <li><b>ネットワークマップ更新(Networkmap Refresh):</b> ネットワークマップに含まれるノードの状態の更新間隔です。デフォルトは 5分です。</p>
 
-残りのフィールドは無効になっています。例えば、"マップのリサイズ(resizing map)"は、マップが作成された後にのみ有効になります。<br><br>
-
-
-マップ編集の詳細については、<a href="http://www.openideas.info/wiki/index.php?title=Pandora:Documentation_ja:Data_Presentation#.E3.82.A8.E3.83.B3.E3.82.BF.E3.83.BC.E3.83.97.E3.83.A9.E3.82.A4.E3.82.BA.E7.89.88.E3.81.AE.E3.83.8D.E3.83.83.E3.83.88.E3.83.AF.E3.83.BC.E3.82.AF.E3.83.9E.E3.83.83.E3.83.97.E3.82.B3.E3.83.B3.E3.82.BD.E3.83.BC.E3.83.AB">公式ドキュメント(エンタープライズ版のネットワークマップコンソール)</a> を参照してください。
+残りのフィールドは無効になっています。例えば、"マップのリサイズ(resizing map)"は、マップが作成された後にのみ有効になります。<br><br>
\ No newline at end of file

From bcb3af09ca0a805b61c43fb99bb0df7847a47844 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 10:56:24 +0200
Subject: [PATCH 077/146] [Rebranding] Minor fix 2

---
 pandora_console/include/help/en/help_web_checks.php | 4 ++--
 pandora_console/include/help/es/help_web_checks.php | 4 ++--
 pandora_console/include/help/ja/help_web_checks.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/help/en/help_web_checks.php b/pandora_console/include/help/en/help_web_checks.php
index fd4b5981c8..5aad76468a 100644
--- a/pandora_console/include/help/en/help_web_checks.php
+++ b/pandora_console/include/help/en/help_web_checks.php
@@ -13,7 +13,7 @@ This is a sample of GOLIAT Webcheck module:
 </p>
 <pre>
 task_begin
-post http://galaga.artica.es/pandora/index.php?login=1
+post http://galaga.artica.es/monitoring/index.php?login=1
 variable_name nick
 variable_value demo
 variable_name pass
@@ -23,7 +23,7 @@ resource 1
 task_end
 
 task_begin
-get http://galaga.artica.es/pandora/index.php?sec=messages&amp;sec2=operation/messages/message
+get http://galaga.artica.es/monitoring/index.php?sec=messages&amp;sec2=operation/messages/message
 cookie 1
 resource 1
 check_string Read messages
diff --git a/pandora_console/include/help/es/help_web_checks.php b/pandora_console/include/help/es/help_web_checks.php
index ddb113ae63..48c277c076 100644
--- a/pandora_console/include/help/es/help_web_checks.php
+++ b/pandora_console/include/help/es/help_web_checks.php
@@ -14,7 +14,7 @@ Este es un ejemplo del modulo Webcheck de GOLIAT:
 </p>
 <pre>
 task_begin
-post http://galaga.artica.es/pandora/index.php?login=1
+post http://galaga.artica.es/monitoring/index.php?login=1
 variable_name nick
 variable_value demo
 variable_name pass
@@ -24,7 +24,7 @@ resource 1
 task_end
 
 task_begin
-get http://galaga.artica.es/pandora/index.php?sec=messages&amp;sec2=operation/messages/message
+get http://galaga.artica.es/monitoring/index.php?sec=messages&amp;sec2=operation/messages/message
 cookie 1
 resource 1
 check_string Read messages
diff --git a/pandora_console/include/help/ja/help_web_checks.php b/pandora_console/include/help/ja/help_web_checks.php
index ade3608367..f63831c01f 100644
--- a/pandora_console/include/help/ja/help_web_checks.php
+++ b/pandora_console/include/help/ja/help_web_checks.php
@@ -13,7 +13,7 @@
 </p>
 <pre>
 task_begin
-post http://galaga.artica.es/pandora/index.php?login=1
+post http://galaga.artica.es/monitoring/index.php?login=1
 variable_name nick
 variable_value demo
 variable_name pass
@@ -23,7 +23,7 @@ resource 1
 task_end
 
 task_begin
-get http://galaga.artica.es/pandora/index.php?sec=messages&amp;sec2=operation/messages/message
+get http://galaga.artica.es/monitoring/index.php?sec=messages&amp;sec2=operation/messages/message
 cookie 1
 resource 1
 check_string Read messages

From 66dfd9b171b501d084e068494f0fb208057481b0 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 11:16:30 +0200
Subject: [PATCH 078/146] [Rebranding] Change alert action Pandora FMS Event to
 Monitoring Event

---
 pandora_console/extras/mr/16.sql                          | 8 ++++++++
 .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql         | 1 +
 pandora_server/lib/PandoraFMS/Core.pm                     | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 pandora_console/extras/mr/16.sql

diff --git a/pandora_console/extras/mr/16.sql b/pandora_console/extras/mr/16.sql
new file mode 100644
index 0000000000..354d3377f2
--- /dev/null
+++ b/pandora_console/extras/mr/16.sql
@@ -0,0 +1,8 @@
+START TRANSACTION;
+
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
+
+UPDATE talert_actions SET name='Monitoring&#x20;Event' WHERE name='Pandora&#x20;FMS&#x20;Event';
+
+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 b8f41cedf4..551225e14d 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
@@ -1123,6 +1123,7 @@ UPDATE talert_actions SET   `field4` = 'integria',
 							`field9` = 'admin',
 							`field10` = '_alert_description_'
 WHERE `id` = 4 AND `id_alert_command` = 11;
+UPDATE talert_actions SET name='Monitoring&#x20;Event' WHERE name='Pandora&#x20;FMS&#x20;Event';
 ALTER TABLE talert_actions ADD COLUMN `field11` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_actions ADD COLUMN `field12` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_actions ADD COLUMN `field13` TEXT NOT NULL DEFAULT "";
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index c3e0bba259..f5e1c1ff30 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -822,7 +822,7 @@ sub pandora_execute_alert ($$$$$$$$$;$) {
 		if (time () >= ($action->{'last_execution'} + $threshold)) {
 			
 			# Does the action generate an event?
-			if (safe_output($action->{'name'}) eq "Pandora FMS Event") {
+			if (safe_output($action->{'name'}) eq "Monitoring Event") {
 				$event_generated = 1;
 			}
 			
@@ -1290,7 +1290,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		}
 	
 	# Pandora FMS Event
-	} elsif ($clean_name eq "Pandora FMS Event") {
+	} elsif ($clean_name eq "Monitoring Event") {
 		$field1 = subst_alert_macros ($field1, \%macros, $pa_config, $dbh, $agent, $module);
 		$field3 = subst_alert_macros ($field3, \%macros, $pa_config, $dbh, $agent, $module);
 		$field4 = subst_alert_macros ($field4, \%macros, $pa_config, $dbh, $agent, $module);

From acad8d537b99a8e3cc16544714754ec0b3eb805e Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 11:37:26 +0200
Subject: [PATCH 079/146] [Rebranding] Added tooltip to avoid Monitoring Event
 name will be changed

---
 pandora_console/godmode/alerts/configure_alert_action.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index 0156603d4d..d1fe842469 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -111,6 +111,13 @@ $table->size[0] = '20%';
 $table->data = array ();
 $table->data[0][0] = __('Name');
 $table->data[0][1] = html_print_input_text ('name', $name, '', 35, 255, true);
+if (io_safe_output($name) == "Monitoring Event") {
+	$table->data[0][1] .= '&nbsp;&nbsp;' . ui_print_help_tip(
+		__("This action may stop working, if you change its name."),
+		true,
+		"images/header_yellow.png"
+	);
+}
 $table->colspan[0][1] = 2;
 
 $table->data[1][0] = __('Group');

From 063865e1792972de3791c759744899d58e45a172 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 12:50:24 +0200
Subject: [PATCH 080/146] [Rebranding] Refactorized logos preview in nodo

---
 .../godmode/setup/setup_visuals.php           | 342 +++---------------
 pandora_console/include/javascript/pandora.js |  51 +++
 2 files changed, 106 insertions(+), 287 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 1a57c376b8..c885b1f2cc 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -163,7 +163,7 @@ $iconsets["color_text"] = __('Colors and text');
 $table_styles->data[$row][1] = html_print_select($iconsets,
 	'status_images_set', $config["status_images_set"], '', '', '', true);
 $table_styles->data[$row][1] .= "&nbsp;" .
-	html_print_button(__("View"), 'status_set_preview', false, '', '', true);
+	html_print_button(__("View"), 'status_set_preview', false, '', 'class="sub camera logo_preview"', true);
 $row++;
 
 $table_styles->data[$row][0] = __('Login background') .
@@ -183,7 +183,7 @@ $table_styles->data[$row][1] = html_print_select ($backgrounds_list,
 	'login_background', $config["login_background"], '', __('Default'),
 	'', true,false,true,'',false,'width:240px');
 $table_styles->data[$row][1] .= "&nbsp;" .
-	html_print_button(__("View"), 'login_background_preview', false, '', 'class="sub camera"', true);
+	html_print_button(__("View"), 'login_background_preview', false, '', 'class="sub camera logo_preview"', true);
 $row++;
 
 $table_styles->data[$row][0] = __('Custom logo (header)') . ui_print_help_icon("custom_logo", true);
@@ -202,7 +202,7 @@ else{
 	$config["custom_logo"], '', '', '',true,false,true,'',$open,'width:240px');
 }
 	
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 $row++;
 
 $table_styles->data[$row][0] = __('Custom logo (login)') . ui_print_help_icon("custom_logo", true);
@@ -218,7 +218,7 @@ else {
                 $config["custom_logo_login"], '', '', '',true,false,true,'',$open,'width:240px');
 }
 
-$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_login_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_login_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 $row++;
 
 //Splash login
@@ -229,7 +229,7 @@ if(enterprise_installed()) {
 		list_files('enterprise/images/custom_splash_login', "png", 1, 0), 'custom_splash_login',
 		$config["custom_splash_login"], '', '', '',true,false,true,'',$open,'width:240px');
 
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_splash_login_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_splash_login_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 	
 	$row++;
 }
@@ -256,7 +256,7 @@ if(enterprise_installed()){
 		false,
 		'width:240px'
 	);
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_docs_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_docs_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 	$row++;
 
 	// Custom support icon
@@ -276,7 +276,7 @@ if(enterprise_installed()){
 		false,
 		'width:240px'
 	);
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_support_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_support_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 	$row++;
 
 	// Custom center networkmap icon
@@ -296,7 +296,7 @@ if(enterprise_installed()){
 		false,
 		'width:240px'
 	);
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_network_center_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_network_center_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 	$row++;
 }
 
@@ -414,7 +414,7 @@ $table_gis->data[$row][1] = html_print_select($arraySelectIcon,
 	"gis_default_icon", $config["gis_default_icon"], "", __('Agent icon group'),
 		'', true);
 $table_gis->data[$row][1] .= "&nbsp;" .
-	html_print_button(__("View"), 'gis_icon_preview', false, '', '', true);
+html_print_button(__("View"), 'gis_icon_preview', false, '', 'class="sub camera logo_preview"', true);
 $row++;
 
 echo "<fieldset>";
@@ -952,6 +952,7 @@ function load_fonts() {
 }
 
 ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
+ui_require_javascript_file('pandora');
 
 ?>
 <script language="javascript" type="text/javascript">
@@ -1135,287 +1136,54 @@ $(document).ready (function () {
 });
 
 // Dialog loaders for the images previews
+$(".logo_preview").click (function(e) {
+	// Init the vars
+	var icon_name = '';
+	var icon_path = '';
+	var options = {
+		title: "<?php echo __('Logo preview!'); ?>"
+	};
 
-$("#button-custom_logo_preview").click (function (e) {
-	var icon_name = $("select#custom_logo option:selected").val();
-	var icon_path = "<?php echo $config['homeurl'];  if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<div style='background-color:grey'><img src=\"" + icon_path + "\"></div>");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Logo preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
+	// Fill it seing the target has been clicked
+	switch (e.target.id) {
+		case 'button-custom_logo_preview':
+			icon_name = $("select#custom_logo option:selected").val();
+			icon_path = "<?php echo $config['homeurl'];  if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
+			options.grayed = true;
+			break;
+		case 'button-custom_logo_login_preview':
+			icon_name = $("select#custom_logo_login option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo_login/" + icon_name;
+			options.grayed = true;
+			break;
+		case 'button-custom_splash_login_preview':
+			icon_name = $("select#custom_splash_login option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_splash_login/" + icon_name;
+			options.title = "<?php echo __('Splash Preview'); ?>";
+			break;
+		case 'button-custom_docs_logo_preview':
+			icon_name = $("select#custom_docs_logo option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+			options.grayed = true;
+			break;
+		case 'button-custom_support_logo_preview':
+			icon_name = $("select#custom_support_logo option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+			options.grayed = true;
+			break;
+		case 'button-custom_network_center_logo_preview':
+			icon_name = $("select#custom_network_center_logo option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+			break;
+		case 'button-login_background_preview':
+			icon_name = $("select#login_background option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
+			options.title = "<?php echo __('Background preview'); ?>";
+			break;
 	}
-	catch (err) {
-		// console.log(err);
-	}
-});
 
-$("#button-custom_logo_login_preview").click (function (e) {
-	var icon_name = $("select#custom_logo_login option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo_login/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<div style='background-color:grey'><img src=\"" + icon_path + "\"></div>");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Logo preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
-});
-
-$("#button-custom_splash_login_preview").click (function (e) {
-	var icon_name = $("select#custom_splash_login option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_splash_login/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<img src=\"" + icon_path + "\">");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Splash Preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
-});
-
-$("#button-custom_docs_logo_preview").click (function (e) {
-	var icon_name = $("select#custom_docs_logo option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<img src=\"" + icon_path + "\">");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Logo preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				dialogClass: 'dialog-grayed',
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
-});
-
-$("#button-custom_support_logo_preview").click (function (e) {
-	var icon_name = $("select#custom_support_logo option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<img src=\"" + icon_path + "\">");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Logo preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				dialogClass: 'dialog-grayed',
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
-});
-
-$("#button-custom_network_center_logo_preview").click (function (e) {
-	var icon_name = $("select#custom_network_center_logo option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<img src=\"" + icon_path + "\">");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Logo preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
-});
-
-$("#button-login_background_preview").click (function (e) {
-	var icon_name = $("select#login_background option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<img src=\"" + icon_path + "\">");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Background preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
+	// Display the preview
+	logo_preview (icon_name, icon_path, options);
 });
 
 $("#button-gis_icon_preview").click (function (e) {
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 4aaf466876..57bcfa82b9 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -1634,3 +1634,54 @@ function ellipsize (str, max, ellipse) {
 
 	return str.trim().length > max ? str.substr(0, max).trim() + ellipse : str;
 }
+
+/**
+ * Display a dialog with an image
+ *
+ * @param {string} icon_name The name of the icon you will display
+ * @param {string} icon_path The path to the icon
+ * @param {Object} incoming_options All options 
+ * 		grayed: {bool} True to display the background black
+ * 		title {string} 'Logo preview' by default
+ */
+function logo_preview (icon_name, icon_path, incoming_options) {
+	// Get the options
+	options = {
+		grayed: false,
+		title: "Logo preview"
+	}
+	$.extend(options, incoming_options);
+
+	if (icon_name == "") return;
+
+	$dialog = $("<div></div>");
+	$image = $("<img src=\"" + icon_path + "\">");
+	$image.css('max-width', '500px').css('max-height', '500px');
+
+	try {
+		$dialog
+			.hide()
+			.html($image)
+			.dialog({
+				title: options.title,
+				resizable: true,
+				draggable: true,
+				modal: true,
+				dialogClass: options.grayed ? 'dialog-grayed' : '',
+				overlay: {
+					opacity: 0.5,
+					background: "black"
+				},
+				minHeight: 1,
+				width: $image.width,
+				close: function () {
+					$dialog
+						.empty()
+						.remove();
+				}
+			}).show();
+	}
+	catch (err) {
+		// console.log(err);
+	}
+}

From 8a6755d224f7396628eb29e5d8c97ca7d48f47e0 Mon Sep 17 00:00:00 2001
From: danielmaya <daniel.maya@artica.es>
Date: Thu, 24 May 2018 16:28:51 +0200
Subject: [PATCH 081/146] fixed conditional in ajax.php

---
 pandora_console/ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/ajax.php b/pandora_console/ajax.php
index b3e9fff95f..b8b7481786 100644
--- a/pandora_console/ajax.php
+++ b/pandora_console/ajax.php
@@ -49,7 +49,7 @@ if (isset ($_GET["loginhash"])) {
 $public_hash = get_parameter('hash', false);
 
 // Check user
-if ($public_hash === false) {
+if ($public_hash == false) {
 	check_login();
 } else {
 	enterprise_include_once('include/functions_dashboard.php');

From 750ed29ac953cc6feaedd4f60cb1e106e52e9ad7 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 16:59:50 +0200
Subject: [PATCH 082/146] [Rebranding] Added a header to white backgrounds and
 make the favicon and the mobile console configurable

---
 pandora_console/extras/mr/16.sql              |   1 +
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |   1 +
 pandora_console/general/pandora_help.php      |   2 +-
 pandora_console/godmode/setup/license.php     |   2 +-
 .../godmode/setup/setup_visuals.php           |  86 +++++++++++++++++-
 .../images/custom_favicon/favicon_meta.ico    | Bin 0 -> 1150 bytes
 .../images/custom_favicon/pandora.ico         | Bin 0 -> 1150 bytes
 .../pandora_logo_head_white_bg.png            | Bin 0 -> 4341 bytes
 .../pandora_logo_head_white_bg_2.png          | Bin 0 -> 4198 bytes
 pandora_console/include/functions_config.php  |  24 ++++-
 pandora_console/include/functions_ui.php      |  52 +++++++++--
 pandora_console/mobile/include/user.class.php |   8 +-
 .../operation/events/events_marquee.php       |   2 +-
 .../operation/events/sound_events.php         |   2 +-
 pandora_console/pandoradb_data.sql            |   3 +-
 15 files changed, 158 insertions(+), 25 deletions(-)
 create mode 100644 pandora_console/images/custom_favicon/favicon_meta.ico
 create mode 100644 pandora_console/images/custom_favicon/pandora.ico
 create mode 100755 pandora_console/images/custom_logo/pandora_logo_head_white_bg.png
 create mode 100644 pandora_console/images/custom_logo/pandora_logo_head_white_bg_2.png

diff --git a/pandora_console/extras/mr/16.sql b/pandora_console/extras/mr/16.sql
index 354d3377f2..65bbe43c7d 100644
--- a/pandora_console/extras/mr/16.sql
+++ b/pandora_console/extras/mr/16.sql
@@ -2,6 +2,7 @@ START TRANSACTION;
 
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 
 UPDATE talert_actions SET name='Monitoring&#x20;Event' WHERE name='Pandora&#x20;FMS&#x20;Event';
 
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 551225e14d..436081f2b1 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
@@ -1163,6 +1163,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '3
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 13);
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
 DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '720');
diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php
index fa1696370c..72ed4ec827 100644
--- a/pandora_console/general/pandora_help.php
+++ b/pandora_console/general/pandora_help.php
@@ -61,7 +61,7 @@ foreach ($files as $file) {
 	}
 }
 
-$logo = ui_get_custom_header_logo();
+$logo = ui_get_custom_header_logo(true);
 
 if (! $id || ! file_exists ($help_file)) {
 	echo '<div id="main_help" style="background-color: #fff;text-align:center; padding-top: 15px; padding-bottom: 15px; ">';
diff --git a/pandora_console/godmode/setup/license.php b/pandora_console/godmode/setup/license.php
index ecff0c27ce..a772c0e015 100644
--- a/pandora_console/godmode/setup/license.php
+++ b/pandora_console/godmode/setup/license.php
@@ -103,7 +103,7 @@ if (enterprise_installed()) {
 echo '</form>';
 echo '<div id="code_license_dialog" style="display: none; text-align: left;" title="' . __('Request new license') . '">';
 echo '<div id="logo">';
-html_print_image(ui_get_custom_header_logo());
+html_print_image(ui_get_custom_header_logo(true));
 echo '</div>';
 echo '' . __('To get your <b>%s Enterprise License</b>:', get_product_name()) . '<br />';
 echo '<ul>';
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index c885b1f2cc..dfa3758309 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -179,6 +179,32 @@ if(!enterprise_installed()){
 	$open=true; 
 }
 
+// Custom favicon
+$files = list_files('images/custom_favicon', "ico", 1, 0);
+$table_styles->data[$row][0] = __('Custom favicon');
+$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your favicon into the folder images/custom_favicon/. This file should be in .ico format with a size of 16x16.'), true);
+$table_styles->data[$row][1] = html_print_select(
+	$files,
+	'custom_favicon',
+	$config["custom_favicon"],
+	'setup_visuals_change_favicon();',
+	__('Default'),
+	'',
+	true,
+	false,
+	true,
+	'',
+	false,
+	'width:240px'
+);
+$table_styles->data[$row][1] .= "&nbsp;&nbsp;&nbsp;" . html_print_image(
+	ui_get_favicon(),
+	true,
+	array('id' => 'favicon_preview')
+);
+$row++;
+
+$table_styles->data[$row][0] = __('Custom background logo');
 $table_styles->data[$row][1] = html_print_select ($backgrounds_list,
 	'login_background', $config["login_background"], '', __('Default'),
 	'', true,false,true,'',false,'width:240px');
@@ -187,7 +213,6 @@ $table_styles->data[$row][1] .= "&nbsp;" .
 $row++;
 
 $table_styles->data[$row][0] = __('Custom logo (header)') . ui_print_help_icon("custom_logo", true);
-
 if(enterprise_installed()){
 	$ent_files = list_files('enterprise/images/custom_logo', "png", 1, 0);
 	$open_files = list_files('images/custom_logo', "png", 1, 0);
@@ -201,8 +226,24 @@ else{
 	list_files('images/custom_logo', "png", 1, 0), 'custom_logo',
 	$config["custom_logo"], '', '', '',true,false,true,'',$open,'width:240px');
 }
+$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
+$row++;
+
+$table_styles->data[$row][0] = __('Custom logo (header white background)');
+if(enterprise_installed()){
+	$ent_files = list_files('enterprise/images/custom_logo', "png", 1, 0);
+	$open_files = list_files('images/custom_logo', "png", 1, 0);
 	
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] = html_print_select(
+	array_merge($open_files, $ent_files), 'custom_logo_white_bg',
+	$config["custom_logo_white_bg"], '', '', '',true,false,true,'',$open,'width:240px');
+}
+else{
+	$table_styles->data[$row][1] = html_print_select(
+	list_files('images/custom_logo', "png", 1, 0), 'custom_logo_white_bg',
+	$config["custom_logo_white_bg"], '', '', '',true,false,true,'',$open,'width:240px');
+}
+$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_white_bg_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 $row++;
 
 $table_styles->data[$row][0] = __('Custom logo (login)') . ui_print_help_icon("custom_logo", true);
@@ -230,7 +271,6 @@ if(enterprise_installed()) {
 		$config["custom_splash_login"], '', '', '',true,false,true,'',$open,'width:240px');
 
 	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_splash_login_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
-	
 	$row++;
 }
 
@@ -298,6 +338,26 @@ if(enterprise_installed()){
 	);
 	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_network_center_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 	$row++;
+
+	// Custom center mobile console icon
+	$table_styles->data[$row][0] = __('Custom mobile console icon');
+	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
+	$table_styles->data[$row][1] = html_print_select(
+		$files,
+		'custom_mobile_console_logo',
+		$config["custom_mobile_console_logo"],
+		'',
+		__('Default'),
+		'',
+		true,
+		false,
+		true,
+		'',
+		false,
+		'width:240px'
+	);
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_mobile_console_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
+	$row++;
 }
 
 //login title1
@@ -1135,13 +1195,22 @@ $(document).ready (function () {
 	});
 });
 
+// Change the favicon preview when is changed
+function setup_visuals_change_favicon(meta) {
+	var icon_name = $("select#custom_favicon option:selected").val();
+	var icon_path = (icon_name == "")
+		? "images/pandora.ico"
+		: "images/custom_favicon/" + icon_name;
+	$("#favicon_preview").attr("src", "<?php echo $config['homeurl'];?>" + icon_path);
+}
+
 // Dialog loaders for the images previews
 $(".logo_preview").click (function(e) {
 	// Init the vars
 	var icon_name = '';
 	var icon_path = '';
 	var options = {
-		title: "<?php echo __('Logo preview!'); ?>"
+		title: "<?php echo __('Logo preview'); ?>"
 	};
 
 	// Fill it seing the target has been clicked
@@ -1151,6 +1220,10 @@ $(".logo_preview").click (function(e) {
 			icon_path = "<?php echo $config['homeurl'];  if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
 			options.grayed = true;
 			break;
+		case 'button-custom_logo_white_bg_preview':
+			icon_name = $("select#custom_logo_white_bg option:selected").val();
+			icon_path = "<?php echo $config['homeurl'];  if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
+			break;
 		case 'button-custom_logo_login_preview':
 			icon_name = $("select#custom_logo_login option:selected").val();
 			icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo_login/" + icon_name;
@@ -1175,6 +1248,11 @@ $(".logo_preview").click (function(e) {
 			icon_name = $("select#custom_network_center_logo option:selected").val();
 			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
 			break;
+		case 'button-custom_mobile_console_logo_preview':
+			icon_name = $("select#custom_mobile_console_logo option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+			options.title = "<?php echo __('Mobile console logo preview'); ?>";
+			break;
 		case 'button-login_background_preview':
 			icon_name = $("select#login_background option:selected").val();
 			icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
diff --git a/pandora_console/images/custom_favicon/favicon_meta.ico b/pandora_console/images/custom_favicon/favicon_meta.ico
new file mode 100644
index 0000000000000000000000000000000000000000..71713c757fd482eb950f3021672f4cf5ebd544bc
GIT binary patch
literal 1150
zcmb_aJxc>Y5S^f4=~dR2R(gI!ji#{BLJ$cGHYqI91hi1ZLIgQd+6b052X>a0R`DO?
zCnWzMmUioVo110a<P^a>-tFw}yf<(5R-}SANd(_{X-|vHiO2$gC9I6rF^FLAw`aRv
zPk;>Q1I}QGI0w=)4ekNVv%E?1MXd1$uIhc$0Kd1jyW<G0zu7!=Yn_%`e!BD{=ek#n
zz8Ay|&a1blZvE`UYjCU`?}vQqR<D|F^}Zd}z{%MMNAlB`8(+(M;JO7hs9mfL3x1dL
z#kY>f1fQDkxW|4})ACmy&pn?$$~<hej!OCDq|eu0BkD8M<37(Rs{f$#SVMi(4)(lu
z<gH)$=e-G<<giDc2lMHfXU2bN{|Pu5`Fs!u52{6u_OtYQ=QWLY-qU2n_I%#^o^tI-
zKRkC+n_Pc)lwWwD#+VPQg_t$QxRDOegF0P<9C5?u{YU&UBQls0d9MHv%zgm(naBLk
JSrO+%z5pN8UXuU-

literal 0
HcmV?d00001

diff --git a/pandora_console/images/custom_favicon/pandora.ico b/pandora_console/images/custom_favicon/pandora.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f72d6cee90fb3d863a4917eadec20c668e665d7d
GIT binary patch
literal 1150
zcmb_au}T9$5S^f4=~dR2R$}iDSf=p@tnBmyEDk$u1RJqB1RKkgDKu&!LW&b?t`Krf
zKpRg|Xux89Z?kiZ8!sZbVY0I`^WMDKTagxiNh0`PmhE|wB@tPHA%w^zj!gu)-_~k(
zKY^vN0n8bz;AgP4CJyFcth2bE{N0%24_M{<#sPf3etGC<+JCEm=FZD|*MBYj&a>vi
z?q`AD=K195#_c_JJO_7MPu_!~>pH^+%aL&oU^C)}@0IUmH85_C9OMqMD&TuO>#}_<
zmOgWwN8=WM^-_2W>S)rilV3FAi77_Uo+FyG?#DduDe8Zu=a@rvY}_7u?nv7p=;yns
zIf>znT&$;N-Wk8;=G|#s2TV#l7yMd-auK8Rj6Od+r_s)LnoQ6h&v&0I*6!59dpEs_
z^>0V<K?6CabXYF<>@kIncz7S==^4x5w{6{j_-_j$<($ZM3kJe;hB41N){hrOoD=y1
DEgc48

literal 0
HcmV?d00001

diff --git a/pandora_console/images/custom_logo/pandora_logo_head_white_bg.png b/pandora_console/images/custom_logo/pandora_logo_head_white_bg.png
new file mode 100755
index 0000000000000000000000000000000000000000..56d101e463aed0fa44b057267438e4c4c9658571
GIT binary patch
literal 4341
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

literal 0
HcmV?d00001

diff --git a/pandora_console/images/custom_logo/pandora_logo_head_white_bg_2.png b/pandora_console/images/custom_logo/pandora_logo_head_white_bg_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9591e2fab119835e744b707d564d5617e1213e2d
GIT binary patch
literal 4198
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

literal 0
HcmV?d00001

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 472744c66c..395d83731c 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -500,8 +500,12 @@ function config_update_config () {
 					if (!config_update_value ('flash_charts', (bool) get_parameter ('flash_charts')))
 						$error_update[] = __('Interactive charts');
 					
+					if (!config_update_value ('custom_favicon', (string) get_parameter ('custom_favicon')))
+						$error_update[] = __('Custom favicon');
 					if (!config_update_value ('custom_logo', (string) get_parameter ('custom_logo')))
 						$error_update[] = __('Custom logo');
+					if (!config_update_value ('custom_logo_white_bg', (string) get_parameter ('custom_logo_white_bg')))
+						$error_update[] = __('Custom logo white background');
 					if (!config_update_value ('custom_logo_login', (string) get_parameter ('custom_logo_login')))
 						$error_update[] = __('Custom logo login');
 					if (!config_update_value ('custom_splash_login', (string) get_parameter ('custom_splash_login')))
@@ -509,9 +513,11 @@ function config_update_config () {
 					if (!config_update_value ('custom_docs_logo', (string) get_parameter ('custom_docs_logo')))
 						$error_update[] = __('Custom documentation logo');
 					if (!config_update_value ('custom_support_logo', (string) get_parameter ('custom_support_logo')))
-						$error_update[] = __('Custom networkmap center logo');
-					if (!config_update_value ('custom_network_center_logo', (string) get_parameter ('custom_network_center_logo')))
 						$error_update[] = __('Custom support logo');
+					if (!config_update_value ('custom_network_center_logo', (string) get_parameter ('custom_network_center_logo')))
+						$error_update[] = __('Custom networkmap center logo');
+					if (!config_update_value ('custom_mobile_console_logo', (string) get_parameter ('custom_mobile_console_logo')))
+						$error_update[] = __('Custom networkmap center logo');
 					if (!config_update_value ('custom_title1_login', (string) get_parameter ('custom_title1_login')))
 						$error_update[] = __('Custom title1 login');
 					if (!config_update_value ('custom_title2_login', (string) get_parameter ('custom_title2_login')))
@@ -1189,11 +1195,19 @@ function config_process_config () {
 	if (!isset ($config["fixed_menu"])) {
 		config_update_value ('fixed_menu', false);
 	}
-	
+
+	if (!isset ($config["custom_favicon"])) {
+		config_update_value ('custom_favicon', '');
+	}
+
 	if (!isset ($config["custom_logo"])) {
 		config_update_value ('custom_logo', 'pandora_logo_head_4.png');
 	}
 
+	if (!isset ($config["custom_logo_white_bg"])) {
+		config_update_value ('custom_logo_white_bg', 'pandora_logo_head_white_bg.png');
+	}
+
 	if (!isset ($config["custom_logo_login"])) {
 		config_update_value ('custom_logo_login', 'login_logo_v7.png');
 	}
@@ -1214,6 +1228,10 @@ function config_process_config () {
 		config_update_value ('custom_network_center_logo', '');
 	}
 
+	if (!isset ($config["custom_mobile_console_logo"])) {
+		config_update_value ('custom_mobile_console_logo', '');
+	}
+
 	if (!isset ($config["custom_title1_login"])) {
 		config_update_value ('custom_title1_login', __('WELCOME TO PANDORA FMS'));
 	}
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 5343fd7e23..42d839b81e 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1355,14 +1355,9 @@ function ui_process_page_head ($string, $bitfield) {
 		<meta name="author" content="' . get_copyright_notice() . '" />
 		<meta name="copyright" content="(c) ' . get_copyright_notice() . '" />
 		<meta name="robots" content="index, follow" />';
-		if(defined ('METACONSOLE')){
-		$output .='<link rel="icon" href="images/favicon_meta.ico" type="image/ico" />';
-		}
-		else{
-		$output .='<link rel="icon" href="images/pandora.ico" type="image/ico" />';	
-		}
+		$output .='<link rel="icon" href="' . ui_get_favicon() . '" type="image/ico" />';
 		$output .='	
-		<link rel="shortcut icon" href="images/pandora.ico" type="image/x-icon" />
+		<link rel="shortcut icon" href="' . ui_get_favicon() . '" type="image/x-icon" />
 		<link rel="alternate" href="operation/events/events_rss.php" title="Pandora RSS Feed" type="application/rss+xml" />';
 	
 	if ($config["language"] != "en") {
@@ -3960,14 +3955,16 @@ function ui_get_support_logo () {
  * @return string with the path to logo. If it is not set, return the default value
  *
  */
-function ui_get_custom_header_logo () {
+function ui_get_custom_header_logo ($white_bg = false) {
 	global $config;
 
 	if (empty($config['enterprise_installed'])) {
 		return 'images/pandora_tinylogo_open.png';
 	}
 
-	$stored_logo = is_metaconsole() ? $config['meta_custom_logo'] : $config['custom_logo'];
+	$stored_logo = is_metaconsole()
+		? $config['meta_custom_logo']
+		: $white_bg ? $config['custom_logo_white_bg'] : $config['custom_logo'];
 	if (empty($stored_logo)) return 'images/pandora_tinylogo.png';
 	return 'enterprise/images/custom_logo/' . $stored_logo;
 }
@@ -3987,4 +3984,41 @@ function ui_get_logo_to_center_networkmap () {
 
 	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
 }
+
+/**
+ * Get the mobile console login logo
+ *
+ * @return string with the path to logo. If it is not set, return the default.
+ *
+ */
+function ui_get_mobile_login_icon () {
+	global $config;
+
+	if ((!enterprise_installed()) || empty($config['custom_mobile_console_logo'])) {
+		return is_metaconsole()
+			? "mobile/images/metaconsole_mobile.png"
+			: "mobile/images/pandora_mobile_console.png";
+	}
+
+	return 'enterprise/images/custom_general_logos/' . $config['custom_mobile_console_logo'];
+}
+
+/**
+ * Get the favicon
+ *
+ * @return string with the path to logo. If it is not set, return the default.
+ *
+ */
+function ui_get_favicon () {
+	global $config;
+
+	if (empty($config['custom_favicon'])) {
+		return !is_metaconsole()
+			? "images/pandora.ico"
+			: "enterprise/meta/images/favicon_meta.ico";
+	}
+
+	return 'images/custom_favicon/' . $config['custom_favicon'];
+}
+
 ?>
diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index ba16b537cf..82f10fd38e 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -226,11 +226,11 @@ class User {
 		$ui->showFooter(false);
 		$ui->beginContent();
 		
-		if (!$system->getConfig('metaconsole'))
-			$logo_image = html_print_image ("mobile/images/pandora_mobile_console.png",
+		if ($system->getConfig('metaconsole'))
+			$logo_image = html_print_image (ui_get_mobile_login_icon(),
 						true, array ("alt" => "logo", "border" => 0));
 		else
-			$logo_image = html_print_image ("mobile/images/metaconsole_mobile.png",
+			$logo_image = html_print_image (ui_get_mobile_login_icon(),
 						true, array ("alt" => "logo", "border" => 0),false, false, false, true);
 		
 		$ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' .
@@ -289,7 +289,7 @@ class User {
 		$ui->showFooter(false);
 		$ui->beginContent();
 			$ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' .
-				html_print_image ("mobile/images/pandora_mobile_console.png",
+				html_print_image (ui_get_mobile_login_icon(),
 					true, array ("alt" => "logo", "border" => 0)) .
 					'</div>');
 			$ui->contentAddHtml('<div id="login_container">');
diff --git a/pandora_console/operation/events/events_marquee.php b/pandora_console/operation/events/events_marquee.php
index 9ffea8f61d..e3b04e39da 100644
--- a/pandora_console/operation/events/events_marquee.php
+++ b/pandora_console/operation/events/events_marquee.php
@@ -110,7 +110,7 @@ echo "<title>" . __("%s - Latest events", get_product_name()) . "</title>";
 
 $query = ui_get_full_url();
 echo '<meta http-equiv="refresh" content="' . $MARQUEE_INTERVAL . '; URL=' . $query . '">';
-echo '<link rel="icon" href="../../images/pandora.ico" type="image/ico">';
+echo '<link rel="icon" href="../../' . ui_get_favicon() . '" type="image/ico">';
 echo "</head>";
 
 echo "<body bgcolor='#000000' >";
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index f9a89364a1..d8e3ce8cd3 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -61,7 +61,7 @@ echo "<title>" . __("Sound Events") . "</title>";
 	}
 </style>
 <?php
-echo '<link rel="icon" href="../../images/pandora.ico" type="image/ico" />';
+echo '<link rel="icon" href="../../' . ui_get_favicon() . '" type="image/ico" />';
 echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css" />';
 echo "</head>";
 echo "<body style='background-color: #494949; max-width: 550px; max-height: 400px; margin-top:40px;'>";
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 069d82186b..c8ed8f61cd 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -115,7 +115,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('current_package_enterprise', '722'),
 ('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.0009765625":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
 ('custom_docs_logo', 'default_docs.png'),
-('custom_support_logo', 'default_support.png');
+('custom_support_logo', 'default_support.png'),
+('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 UNLOCK TABLES;
 
 --

From 3f1a1a816bf4d8f0cdbcea4a6dbdcabba533a38c Mon Sep 17 00:00:00 2001
From: danielmaya <daniel.maya@artica.es>
Date: Thu, 24 May 2018 17:24:53 +0200
Subject: [PATCH 083/146] Fixed id_agente lost in insert_data

---
 pandora_console/extensions/insert_data.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php
index 8357c96113..7495c54600 100644
--- a/pandora_console/extensions/insert_data.php
+++ b/pandora_console/extensions/insert_data.php
@@ -167,6 +167,7 @@ function mainInsertData() {
 	$params['use_hidden_input_idagent'] = true;
 	$params['print_hidden_input_idagent'] = true;
 	$params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent';
+	$params['hidden_input_idagent_value'] = $id_agente;
 	
 	$table->data[0][1] = ui_print_agent_autocomplete_input($params);
 	

From 8eb44762b2067c72c3bb11179a17087d8742bb73 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 18:33:45 +0200
Subject: [PATCH 084/146] [Rebranding] Added custom favicon and white
 background to meta

---
 pandora_console/include/functions_config.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 395d83731c..c60bf4f345 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -534,8 +534,10 @@ function config_update_config () {
 					if (!config_update_value ('rb_copyright_notice', (string) get_parameter ('rb_copyright_notice')))
 						$error_update[] = __('Copyright notice');
 					
-						if (!config_update_value ('meta_custom_logo', (string) get_parameter ('meta_custom_logo')))
+					if (!config_update_value ('meta_custom_logo', (string) get_parameter ('meta_custom_logo')))
 						$error_update[] = __('Custom logo metaconsole');
+					if (!config_update_value ('meta_custom_logo_white_bg', (string) get_parameter ('meta_custom_logo_white_bg')))
+						$error_update[] = __('Custom logo metaconsole (white background)');
 					if (!config_update_value ('meta_custom_logo_login', (string) get_parameter ('meta_custom_logo_login')))
 						$error_update[] = __('Custom logo login metaconsole');
 					if (!config_update_value ('meta_custom_splash_login', (string) get_parameter ('meta_custom_splash_login')))
@@ -1268,6 +1270,10 @@ function config_process_config () {
 		config_update_value ('meta_custom_logo', 'logo_pandora_metaconsola.png');
 	}
 
+	if (!isset ($config["meta_custom_logo_white_bg"])) {
+		config_update_value ('pandora_logo_head_white_bg', 'pandora_logo_head_white_bg.png');
+	}
+
 	if (!isset ($config["meta_custom_logo_login"])) {
 		config_update_value ('meta_custom_logo_login', 'pandora_logo.png');
 	}

From 6675597b62d1a38bbb596ff83f54c4363da1f370 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 18:34:53 +0200
Subject: [PATCH 085/146] [Rebranding] Minor fix

---
 pandora_console/godmode/setup/setup_visuals.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index dfa3758309..9131a03b6b 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -1196,7 +1196,7 @@ $(document).ready (function () {
 });
 
 // Change the favicon preview when is changed
-function setup_visuals_change_favicon(meta) {
+function setup_visuals_change_favicon() {
 	var icon_name = $("select#custom_favicon option:selected").val();
 	var icon_path = (icon_name == "")
 		? "images/pandora.ico"

From 643a07a16318a5b2b7f8043115372e360ebfee0e Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 25 May 2018 00:01:22 +0200
Subject: [PATCH 086/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 516394dd2d..6e1d203560 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180524
+Version: 7.0NG.722-180525
 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 f53ecd37c0..6c59a89e3e 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.722-180524"
+pandora_version="7.0NG.722-180525"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index a83c4e1e53..9f1b6c2540 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.722';
-use constant AGENT_BUILD => '180524';
+use constant AGENT_BUILD => '180525';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 4c3c0368fa..50a0a52560 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.722
-%define release     180524
+%define release     180525
 
 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 e8c3cabcfe..b4e8f97bb8 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.722
-%define release     180524
+%define release     180525
 
 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 0a27708b5e..13e9362cb5 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180524"
+PI_BUILD="180525"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 552b6b0c11..b7f336ac56 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180524}
+{180525}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 5ba937ff6b..2a55d2cd45 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.722(Build 180524)")
+#define PANDORA_VERSION ("7.0NG.722(Build 180525)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index ae24c614ce..a20910a17b 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.722(Build 180524))"
+      VALUE "ProductVersion", "(7.0NG.722(Build 180525))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index c07ea3b16a..eaa05cfaf6 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180524
+Version: 7.0NG.722-180525
 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 54e6b71b8c..7a18ec2e3f 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.722-180524"
+pandora_version="7.0NG.722-180525"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index d6a0b69cc0..fffe56beb0 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180524';
+$build_version = 'PC180525';
 $pandora_version = 'v7.0NG.722';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index c6083a61d0..372650e08a 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.722';
-$build = '180524';
+$build = '180525';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 78ef5db7e9..e34eb8d21f 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.722
-%define release     180524
+%define release     180525
 
 # 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 d72159345d..e9d43b0b37 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.722
-%define release     180524
+%define release     180525
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 5c6f58d4ba..0b7199e070 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180524
+Version: 7.0NG.722-180525
 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 80bc27953e..b3deccfa48 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.722-180524"
+pandora_version="7.0NG.722-180525"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index f1df3cbe65..c7d2e79df7 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180524";
+my $pandora_build = "180525";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 54b51f52d1..81ea5293d8 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180524";
+my $pandora_build = "180525";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 926db945ef..ed813a39c9 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.722
-%define release     180524
+%define release     180525
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index f7508b4d88..1e487c1ec9 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.722
-%define release     180524
+%define release     180525
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 8931bac041..819670cc40 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180524"
+PI_BUILD="180525"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d00df6e0e9..d0df17d11c 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180524";
+my $version = "7.0NG.722 PS180525";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 9be4d45402..6fa3e218a7 100644
--- 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.722 PS180524";
+my $version = "7.0NG.722 PS180525";
 
 # save program name for logging
 my $progname = basename($0);

From a54c074b11340d3f228566fe6e32cf33fe048cd9 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 25 May 2018 10:29:40 +0200
Subject: [PATCH 087/146] [Rebranding] Added hide help on node

---
 pandora_console/general/header.php               | 16 ++++++++++------
 .../godmode/agentes/module_manager.php           | 13 +++++++------
 pandora_console/godmode/setup/setup_visuals.php  |  7 +++++++
 pandora_console/include/functions_config.php     | 10 ++++++++--
 pandora_console/include/functions_ui.php         |  3 +++
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index acefd20a2b..ac18da48d1 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -158,7 +158,7 @@ config_check();
 				</script>
 				<?php
 				
-				if ($config['tutorial_mode'] !== 'expert') {
+				if ($config['tutorial_mode'] !== 'expert' && !$config['disable_help']) {
 					$table->data[0]['clippy'] = 
 						'<a href="javascript: show_clippy();">' .
 							html_print_image(
@@ -307,11 +307,15 @@ config_check();
 				$table->data[0][3] = $maintenance_img;
 				
 				// Main help icon
-				$table->data[0][4] = '<a href="#" class="modalpopup" id="helpmodal">'.html_print_image("images/header_help.png",
-					true, array(
-						"title" => __('Main help'),
-						"id" => "helpmodal",
-						"class" => "modalpopup")).'</a>';
+				if (!$config['disable_help']) {
+					$table->data[0][4] =
+						'<a href="#" class="modalpopup" id="helpmodal">' .
+						html_print_image("images/header_help.png", true, array(
+							"title" => __('Main help'),
+							"id" => "helpmodal",
+							"class" => "modalpopup")) .
+						'</a>';
+				}
 				
 				// Logout
 				$table->data[0][5] = '<a class="white" href="' . ui_get_full_url('index.php?bye=bye') . '">';
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 145f7312d5..335bd287fa 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -151,12 +151,13 @@ if (($policy_page) || (isset($agent))) {
 
 echo "</table>";
 
-
-echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
-echo "<strong>";
-echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules on Monitoring Library")."</a>";
-echo "</strong>";
-echo '</div>';
+if (!$config['disable_help']) {
+	echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
+	echo "<strong>";
+	echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules on Monitoring Library")."</a>";
+	echo "</strong>";
+	echo '</div>';
+}
 
 if (! isset ($id_agente))
 	return;
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 9131a03b6b..c9ae4d9a0c 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -411,6 +411,13 @@ $table_styles->data[$row][1] .= __('No') . '&nbsp;' .
 	html_print_radio_button_extended ('fixed_graph', 0, '', $config["fixed_graph"], $open, '','',true, $open,'visualmodal');
 $row++;
 
+$table_styles->data[$row][0] = __('Disable helps');
+$table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
+	html_print_radio_button ('disable_help', 1, '', $config["disable_help"], true) .
+	'&nbsp;&nbsp;';
+$table_styles->data[$row][1] .= __('No') . '&nbsp;' .
+	html_print_radio_button ('disable_help', 0, '', $config["disable_help"], true);
+$row++;
 
 $table_styles->data[$row][0] = __('Fixed header');
 $table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index c60bf4f345..11ab9f3c94 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -585,8 +585,10 @@ function config_update_config () {
 						$error_update[] = __('Autohidden menu');
 					if (!config_update_value ('visual_animation', get_parameter('visual_animation')))
 						$error_update[] = __('visual_animation');
+					if (!config_update_value ('disable_help', get_parameter('disable_help')))
+						$error_update[] = __('Disable help');
 					if (!config_update_value ('fixed_graph', get_parameter('fixed_graph')))
-							$error_update[] = __('Fixed graph');
+						$error_update[] = __('Fixed graph');
 					if (!config_update_value ('fixed_header', get_parameter('fixed_header')))
 						$error_update[] = __('Fixed header');
 					if (!config_update_value ('fixed_menu', get_parameter('fixed_menu')))
@@ -1185,7 +1187,11 @@ function config_process_config () {
 	if (!isset ($config["graphviz_bin_dir"])) {
 		config_update_value ('graphviz_bin_dir', "");
 	}
-	
+
+	if (!isset ($config["disable_help"])) {
+		config_update_value ('disable_help', false);
+	}
+
 	if (!isset ($config["fixed_header"])) {
 		config_update_value ('fixed_header', false);
 	}
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 42d839b81e..f7142ed889 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1104,6 +1104,9 @@ function ui_print_alert_template_example ($id_alert_template, $return = false, $
 function ui_print_help_icon ($help_id, $return = false, $home_url = '', $image = "images/help.png", $is_relative = false) {
 	global $config;
 
+	// Do not display the help icon if help is disabled
+	if ($config['disable_help']) return '';
+
 	if (empty($home_url))
 		$home_url = "";
 	

From 7afc617e626b22ed6cb44b4dc6154f7e9e51b333 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 25 May 2018 12:39:30 +0200
Subject: [PATCH 088/146] [Rebranding] Implemented server rebranding through
 environment vars

---
 pandora_server/bin/pandora_server       |  8 +++---
 pandora_server/lib/PandoraFMS/Config.pm | 38 +++++++++++++++++++------
 pandora_server/lib/PandoraFMS/Tools.pm  | 13 +++++----
 pandora_server/util/pandora_db.pl       | 10 +++----
 4 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 49d3c97cba..7e60690ae1 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -519,7 +519,7 @@ sub main() {
 
 	# Daemonize and put in background
 	if ($Config{'daemon'} == 1) {
-		print_message (\%Config, " [*] Backgrounding Pandora FMS Server process.\n", 1);
+		print_message (\%Config, " [*] Backgrounding " . pandora_get_initial_product_name() . " Server process.\n", 1);
 		pandora_daemonize (\%Config);
 	}
 	
@@ -528,8 +528,8 @@ sub main() {
 		print_message (\%Config, " [*] Pandora FMS Enterprise module not available.", 1);
 		logger (\%Config, " [*] Pandora FMS Enterprise module not available.", 1);
 	} else {
-		print_message (\%Config, " [*] Pandora FMS Enterprise module loaded.", 1);
-		logger (\%Config, " [*] Pandora FMS Enterprise module loaded.", 1);
+		print_message (\%Config, " [*] " . pandora_get_initial_product_name() . " Enterprise module loaded.", 1);
+		logger (\%Config, " [*] " . pandora_get_initial_product_name() . " Enterprise module loaded.", 1);
 	
 		if($Config{'policy_manager'} == 1) {
 			# Start thread to patrol policy queue
@@ -687,7 +687,7 @@ $SIG{__DIE__} = 'pandora_crash';
 $SIG{'ALRM'} = 'IGNORE';
 	
 # Initialize
-pandora_init(\%Config, 'Pandora FMS Server');
+pandora_init(\%Config, pandora_get_initial_product_name() . ' Server');
 pandora_load_config (\%Config);
 	
 # Parse command line options.
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 6941a7d9f3..179fa75c72 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -39,6 +39,8 @@ our @EXPORT = qw(
 	pandora_start_log
 	pandora_get_sharedconfig
 	pandora_get_tconfig_token
+	pandora_get_initial_product_name
+	pandora_get_initial_copyright_notice
 	);
 
 # version: Defines actual version of Pandora Server for this module only
@@ -56,7 +58,7 @@ my %pa_config;
 ##########################################################################
 
 sub help_screen {
-	print "\nSyntax: \n\n pandora_server [ options ] < fullpathname to configuration file (pandora_server.conf) > \n\n";
+	print "\nSyntax: \n\n pandora_server [ options ] < fullpathname to configuration file > \n\n";
 	print "Following options are optional : \n";
 	print "	-v        :  Verbose mode activated. Writes more information in the logfile \n";
 	print "	-d        :  Debug mode activated. Writes extensive information in the logfile \n";
@@ -77,13 +79,13 @@ sub help_screen {
 sub pandora_init {
 	my $pa_config = $_[0];
 	my $init_string = $_[1];
-	print "\n$init_string $pandora_version Build $pandora_build Copyright (c) 2004-2015 ArticaST\n";
+	print "\n$init_string $pandora_version Build $pandora_build Copyright (c) 2004-2018 " . pandora_get_initial_copyright_notice() . "\n";
 	print "This program is OpenSource, licensed under the terms of GPL License version 2.\n";
-	print "You can download latest versions and documentation at http://www.pandorafms.org \n\n";
+	print "You can download latest versions and documentation at official web page.\n\n";
 
 	# Load config file from command line
 	if ($#ARGV == -1 ){
-		print "I need at least one parameter: Complete path to Pandora FMS Server configuration file \n";
+		print "I need at least one parameter: Complete path to " . pandora_get_initial_product_name() . " Server configuration file \n";
 		help_screen;
 		exit;
 	}
@@ -124,7 +126,7 @@ sub pandora_init {
 		}
 	}
 	if ($pa_config->{"pandora_path"} eq ""){
-		print " [ERROR] I need at least one parameter: Complete path to Pandora FMS configuration file. \n";
+		print " [ERROR] I need at least one parameter: Complete path to " . pandora_get_initial_product_name() . " configuration file. \n";
 		print "		For example: ./pandora_server /etc/pandora/pandora_server.conf \n\n";
 		exit;
 	}
@@ -496,7 +498,7 @@ sub pandora_load_config {
 	# Check for file
 	if ( ! -f $archivo_cfg ) {
 		printf "\n [ERROR] Cannot open configuration file at $archivo_cfg. \n";
-		printf "	Please specify a valid Pandora FMS configuration file in command line. \n";
+		printf "	Please specify a valid " . pandora_get_initial_product_name() ." configuration file in command line. \n";
 		print "	Standard configuration file is at /etc/pandora/pandora_server.conf \n";
 		exit 1;
 	}
@@ -1165,10 +1167,10 @@ sub pandora_start_log ($){
 	my $pa_config = shift;
 
 	# Dump all errors to errorlog
-	open (STDERR, ">> " . $pa_config->{'errorlog_file'}) or die " [ERROR] Pandora FMS can't write to Errorlog. Aborting : \n $! \n";
+	open (STDERR, ">> " . $pa_config->{'errorlog_file'}) or die " [ERROR] " . pandora_get_initial_product_name() . " can't write to Errorlog. Aborting : \n $! \n";
 	my $mode = 0664;
 	chmod $mode, $pa_config->{'errorlog_file'};
-	print STDERR strftime ("%Y-%m-%d %H:%M:%S", localtime()) . ' - ' . $pa_config->{'servername'} . " Starting Pandora FMS Server. Error logging activated.\n";
+	print STDERR strftime ("%Y-%m-%d %H:%M:%S", localtime()) . ' - ' . $pa_config->{'servername'} . " Starting " . pandora_get_initial_product_name() . " Server. Error logging activated.\n";
 }
 
 ##########################################################################
@@ -1185,6 +1187,26 @@ sub pandora_get_tconfig_token ($$$) {
 	return $default_value;
 }
 
+##########################################################################
+# Get the product name in previous tasks to read from database.
+##########################################################################
+sub pandora_get_initial_product_name {
+	# PandoraFMS product name
+	my $product_name = $ENV{'PANDORA_RB_PRODUCT_NAME'};
+	return 'Pandora FMS' unless (defined ($product_name) && $product_name ne '');
+	return $product_name;
+}
+
+##########################################################################
+# Get the copyright notice.
+##########################################################################
+sub pandora_get_initial_copyright_notice {
+	# PandoraFMS product name
+	my $name = $ENV{'PANDORA_RB_COPYRIGHT_NOTICE'};
+	return 'Artica ST' unless (defined ($name) && $name ne '');
+	return $name;
+}
+
 # End of function declaration
 # End of defined Code
 
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index a81aa6bfb5..c257e2de57 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -399,7 +399,7 @@ sub pandora_daemonize {
 			
 			# check if pandora_server is running
 			if (kill (0, $pid)) {
-				die "[FATAL] pandora_server already running, pid: $pid.";
+				die "[FATAL] " . pandora_get_initial_product_name() . " Server already running, pid: $pid.";
 			}
 			logger ($pa_config, '[W] Stale PID file, overwriting.', 1);
 		}
@@ -673,12 +673,15 @@ sub enterprise_load ($) {
 	else {
 		eval 'require PandoraFMS::Enterprise;';
 	}
-	
-	
-	
+
 	# Ops
 	if ($@) {
-		
+		# Remove the rebranding if open version
+		if ($^O ne 'MSWin32') {
+			`unset PANDORA_RB_PRODUCT_NAME`;
+			`unset PANDORA_RB_COPYRIGHT_NOTICE`;
+		}
+
 		# Enterprise.pm not found.
 		return 0 if ($@ =~ m/PandoraFMS\/Enterprise\.pm.*\@INC/);
 
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 1f79725fb0..6dcbdda778 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -555,9 +555,9 @@ sub pandora_compactdb ($$) {
 sub pandora_init ($) {
 	my $conf = shift;
 	
-	log_message ('', "\nDB Tool $version Copyright (c) 2004-2018 Artica ST\n");
+	log_message ('', "\nDB Tool $version Copyright (c) 2004-2018 " . pandora_get_initial_copyright_notice() . "\n");
 	log_message ('', "This program is Free Software, licensed under the terms of GPL License v2\n");
-	log_message ('', "You can download latest versions and documentation at http://www.pandorafms.org\n\n");
+	log_message ('', "You can download latest versions and documentation at official web\n\n");
 	
 	# Load config file from command line
 	help_screen () if ($#ARGV < 0);
@@ -897,7 +897,7 @@ sub pandora_checkdb_consistency {
 # Print a help screen and exit.
 ##############################################################################
 sub help_screen{
-	log_message ('', "Usage: $0 <path to pandora_server.conf> [options]\n\n");
+	log_message ('', "Usage: $0 <path to configuration file> [options]\n\n");
 	log_message ('', "\t\t-p   Only purge and consistency check, skip compact.\n");
 	log_message ('', "\t\t-f   Force execution event if another instance of $0 is running.\n\n");
 	exit -1;
@@ -1031,10 +1031,10 @@ pandora_load_config (\%conf);
 
 # Load enterprise module
 if (enterprise_load (\%conf) == 0) {
-	log_message ('', " [*] Pandora FMS Enterprise module not available.\n\n");
+	log_message ('', " [*] " . pandora_get_initial_product_name() . " Enterprise module not available.\n\n");
 }
 else {
-	log_message ('', " [*] Pandora FMS Enterprise module loaded.\n\n");
+	log_message ('', " [*] " . pandora_get_initial_product_name() . " Enterprise module loaded.\n\n");
 }
 
 # Connect to the DB

From f0e7a59ae733b972a365431d61137787b06dfbb9 Mon Sep 17 00:00:00 2001
From: "manuel.montes" <manuel.montes@support.artica.es>
Date: Fri, 25 May 2018 14:21:52 +0200
Subject: [PATCH 089/146] Implement function io_safe_output

---
 pandora_console/godmode/massive/massive_edit_plugins.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/godmode/massive/massive_edit_plugins.php b/pandora_console/godmode/massive/massive_edit_plugins.php
index e24ed1cde3..4c84821095 100644
--- a/pandora_console/godmode/massive/massive_edit_plugins.php
+++ b/pandora_console/godmode/massive/massive_edit_plugins.php
@@ -109,6 +109,7 @@ if (is_ajax()) {
 				'nombre' => $module_names
 			);
 		$module_plugin_macros = db_get_all_rows_filter('tagente_modulo', $filter, $fields);
+		$module_plugin_macros = io_safe_output($module_plugin_macros);
 		if (empty($module_plugin_macros)) $module_plugin_macros = array();
 		
 		$module_plugin_macros = array_reduce($module_plugin_macros, function($carry, $item) {

From edd38ac9c89130a01163cadbf833002b64d3e0b6 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 26 May 2018 00:01:24 +0200
Subject: [PATCH 090/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 6e1d203560..3418a15cdc 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180525
+Version: 7.0NG.722-180526
 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 6c59a89e3e..799bf367ad 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.722-180525"
+pandora_version="7.0NG.722-180526"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index 9f1b6c2540..d70442b274 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.722';
-use constant AGENT_BUILD => '180525';
+use constant AGENT_BUILD => '180526';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 50a0a52560..456841ba4a 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.722
-%define release     180525
+%define release     180526
 
 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 b4e8f97bb8..6e49280280 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.722
-%define release     180525
+%define release     180526
 
 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 13e9362cb5..5a07b10822 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180525"
+PI_BUILD="180526"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index b7f336ac56..2f7175fe5e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180525}
+{180526}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 2a55d2cd45..53abe3dba8 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.722(Build 180525)")
+#define PANDORA_VERSION ("7.0NG.722(Build 180526)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index a20910a17b..06a2be7611 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.722(Build 180525))"
+      VALUE "ProductVersion", "(7.0NG.722(Build 180526))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index eaa05cfaf6..5cdcfaa44c 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180525
+Version: 7.0NG.722-180526
 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 7a18ec2e3f..7bea08926b 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.722-180525"
+pandora_version="7.0NG.722-180526"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index fffe56beb0..ea4f58aea0 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180525';
+$build_version = 'PC180526';
 $pandora_version = 'v7.0NG.722';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 372650e08a..34cf61df80 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.722';
-$build = '180525';
+$build = '180526';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index e34eb8d21f..cd68e8212b 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.722
-%define release     180525
+%define release     180526
 
 # 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 e9d43b0b37..b303622098 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.722
-%define release     180525
+%define release     180526
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 0b7199e070..a82292e4c9 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180525
+Version: 7.0NG.722-180526
 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 b3deccfa48..3f4ed0a58c 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.722-180525"
+pandora_version="7.0NG.722-180526"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index c7d2e79df7..2a522225a9 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180525";
+my $pandora_build = "180526";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 81ea5293d8..2de55aec56 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180525";
+my $pandora_build = "180526";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index ed813a39c9..b98ed750e4 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.722
-%define release     180525
+%define release     180526
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 1e487c1ec9..191314c3a3 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.722
-%define release     180525
+%define release     180526
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 819670cc40..24955f3aaf 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180525"
+PI_BUILD="180526"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d0df17d11c..e6577477cf 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180525";
+my $version = "7.0NG.722 PS180526";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 6fa3e218a7..234b162acb 100644
--- 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.722 PS180525";
+my $version = "7.0NG.722 PS180526";
 
 # save program name for logging
 my $progname = basename($0);

From 9ff98af9a5e844737b2bb9e588fd78264c829124 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 27 May 2018 00:01:26 +0200
Subject: [PATCH 091/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 3418a15cdc..6782e34362 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180526
+Version: 7.0NG.722-180527
 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 799bf367ad..36940ee1ad 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.722-180526"
+pandora_version="7.0NG.722-180527"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index d70442b274..5cec0e0865 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.722';
-use constant AGENT_BUILD => '180526';
+use constant AGENT_BUILD => '180527';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 456841ba4a..8f0e959d27 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.722
-%define release     180526
+%define release     180527
 
 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 6e49280280..726b3089b6 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.722
-%define release     180526
+%define release     180527
 
 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 5a07b10822..5f55b149b0 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180526"
+PI_BUILD="180527"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 2f7175fe5e..1a5363044e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180526}
+{180527}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 53abe3dba8..8d867be68d 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.722(Build 180526)")
+#define PANDORA_VERSION ("7.0NG.722(Build 180527)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 06a2be7611..6f675daf25 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.722(Build 180526))"
+      VALUE "ProductVersion", "(7.0NG.722(Build 180527))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 5cdcfaa44c..0a381360be 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180526
+Version: 7.0NG.722-180527
 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 7bea08926b..350a20955f 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.722-180526"
+pandora_version="7.0NG.722-180527"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index ea4f58aea0..71e48a1876 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180526';
+$build_version = 'PC180527';
 $pandora_version = 'v7.0NG.722';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 34cf61df80..c9a02f5e05 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.722';
-$build = '180526';
+$build = '180527';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index cd68e8212b..475676885f 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.722
-%define release     180526
+%define release     180527
 
 # 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 b303622098..ec2368aead 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.722
-%define release     180526
+%define release     180527
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index a82292e4c9..a690549cd6 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180526
+Version: 7.0NG.722-180527
 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 3f4ed0a58c..25ea0fbdee 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.722-180526"
+pandora_version="7.0NG.722-180527"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 2a522225a9..170ee03597 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180526";
+my $pandora_build = "180527";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 2de55aec56..4410ff60eb 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180526";
+my $pandora_build = "180527";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index b98ed750e4..1283c6e9ba 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.722
-%define release     180526
+%define release     180527
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 191314c3a3..0628e37af8 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.722
-%define release     180526
+%define release     180527
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 24955f3aaf..e0e8ac0a2b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180526"
+PI_BUILD="180527"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e6577477cf..2bed6fcd87 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180526";
+my $version = "7.0NG.722 PS180527";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 234b162acb..7e7bc2c826 100644
--- 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.722 PS180526";
+my $version = "7.0NG.722 PS180527";
 
 # save program name for logging
 my $progname = basename($0);

From 2e4b320861e3be2284215b8808358c07f4bf3b63 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 28 May 2018 00:01:21 +0200
Subject: [PATCH 092/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 6782e34362..da154ad674 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180527
+Version: 7.0NG.722-180528
 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 36940ee1ad..a8e47c0413 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.722-180527"
+pandora_version="7.0NG.722-180528"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index 5cec0e0865..96c3ee38d5 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.722';
-use constant AGENT_BUILD => '180527';
+use constant AGENT_BUILD => '180528';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 8f0e959d27..fae183ef4f 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.722
-%define release     180527
+%define release     180528
 
 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 726b3089b6..e6cbdbe1f4 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.722
-%define release     180527
+%define release     180528
 
 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 5f55b149b0..cdba332136 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180527"
+PI_BUILD="180528"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 1a5363044e..7b1b0f4c9e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180527}
+{180528}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 8d867be68d..03c0805baf 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.722(Build 180527)")
+#define PANDORA_VERSION ("7.0NG.722(Build 180528)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 6f675daf25..63a2b23f30 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.722(Build 180527))"
+      VALUE "ProductVersion", "(7.0NG.722(Build 180528))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 0a381360be..b0585b9842 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180527
+Version: 7.0NG.722-180528
 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 350a20955f..553e2bbe86 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.722-180527"
+pandora_version="7.0NG.722-180528"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 71e48a1876..b8ba89e59b 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180527';
+$build_version = 'PC180528';
 $pandora_version = 'v7.0NG.722';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index c9a02f5e05..0caa210815 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.722';
-$build = '180527';
+$build = '180528';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 475676885f..84e67fd1eb 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.722
-%define release     180527
+%define release     180528
 
 # 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 ec2368aead..c1b964afca 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.722
-%define release     180527
+%define release     180528
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index a690549cd6..9a39269185 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180527
+Version: 7.0NG.722-180528
 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 25ea0fbdee..19f3dbd0f3 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.722-180527"
+pandora_version="7.0NG.722-180528"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 170ee03597..c25a8b81f7 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180527";
+my $pandora_build = "180528";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 4410ff60eb..fbd72cd135 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180527";
+my $pandora_build = "180528";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 1283c6e9ba..909eb974c1 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.722
-%define release     180527
+%define release     180528
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 0628e37af8..93c66ebccf 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.722
-%define release     180527
+%define release     180528
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index e0e8ac0a2b..3fd7c16427 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180527"
+PI_BUILD="180528"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 2bed6fcd87..eef8764910 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180527";
+my $version = "7.0NG.722 PS180528";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7e7bc2c826..1f1e31a88c 100644
--- 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.722 PS180527";
+my $version = "7.0NG.722 PS180528";
 
 # save program name for logging
 my $progname = basename($0);

From 2f8cdb5ea529426c56f9de8f0bd29a276c6db4b6 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 28 May 2018 11:31:09 +0200
Subject: [PATCH 093/146] Added check_login to plugin registration

---
 pandora_console/extensions/plugin_registration.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php
index 8807fbe153..5f95cdb73e 100644
--- a/pandora_console/extensions/plugin_registration.php
+++ b/pandora_console/extensions/plugin_registration.php
@@ -16,6 +16,8 @@
 
 function pluginreg_extension_main () {
 	global $config;
+
+	check_login();
 	
 	if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
 		db_pandora_audit("ACL Violation", "Trying to access Setup Management");

From 23b6dd5bdb5d8174b0782e024c25a8b215a7ebc3 Mon Sep 17 00:00:00 2001
From: "manuel.montes" <manuel.montes@support.artica.es>
Date: Mon, 28 May 2018 12:58:23 +0200
Subject: [PATCH 094/146] Fixed menu with top property

---
 pandora_console/general/main_menu.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 8f07228b39..687bd4a5ed 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -244,6 +244,7 @@ $(document).ready( function() {
 			openTimeMenu = new Date().getTime();
 			$('#menu').css('width', '145px');
 			$('#menu').css('position', 'block');
+			$('div#menu').css('top', '80px');
 			$('li.menu_icon').addClass( " no_hidden_menu" );
 			$('ul.submenu').css('left', '144px');
 

From 01cce1595518da13ff225021b5259da3fe781873 Mon Sep 17 00:00:00 2001
From: artica <git@artica.es>
Date: Mon, 28 May 2018 13:20:38 +0200
Subject: [PATCH 095/146] Updated version and build strings.

---
 pandora_agents/pc/AIX/pandora_agent.conf               | 2 +-
 pandora_agents/pc/FreeBSD/pandora_agent.conf           | 2 +-
 pandora_agents/pc/HP-UX/pandora_agent.conf             | 2 +-
 pandora_agents/pc/Linux/pandora_agent.conf             | 2 +-
 pandora_agents/pc/NT4/pandora_agent.conf               | 2 +-
 pandora_agents/pc/SunOS/pandora_agent.conf             | 2 +-
 pandora_agents/pc/Win32/pandora_agent.conf             | 2 +-
 pandora_agents/shellscript/aix/pandora_agent.conf      | 2 +-
 pandora_agents/shellscript/bsd-ipso/pandora_agent.conf | 2 +-
 pandora_agents/shellscript/hp-ux/pandora_agent.conf    | 2 +-
 pandora_agents/shellscript/linux/pandora_agent.conf    | 2 +-
 pandora_agents/shellscript/mac_osx/pandora_agent.conf  | 2 +-
 pandora_agents/shellscript/openWRT/pandora_agent.conf  | 2 +-
 pandora_agents/shellscript/solaris/pandora_agent.conf  | 2 +-
 pandora_agents/unix/AIX/pandora_agent.conf             | 2 +-
 pandora_agents/unix/DEBIAN/control                     | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh         | 2 +-
 pandora_agents/unix/Darwin/pandora_agent.conf          | 2 +-
 pandora_agents/unix/FreeBSD/pandora_agent.conf         | 2 +-
 pandora_agents/unix/HP-UX/pandora_agent.conf           | 2 +-
 pandora_agents/unix/Linux/pandora_agent.conf           | 2 +-
 pandora_agents/unix/NT4/pandora_agent.conf             | 2 +-
 pandora_agents/unix/NetBSD/pandora_agent.conf          | 2 +-
 pandora_agents/unix/SunOS/pandora_agent.conf           | 2 +-
 pandora_agents/unix/pandora_agent                      | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec          | 4 ++--
 pandora_agents/unix/pandora_agent.spec                 | 4 ++--
 pandora_agents/unix/pandora_agent_installer            | 2 +-
 pandora_agents/win32/bin/pandora_agent.conf            | 2 +-
 pandora_agents/win32/installer/pandora.mpi             | 4 ++--
 pandora_agents/win32/pandora.cc                        | 2 +-
 pandora_agents/win32/versioninfo.rc                    | 2 +-
 pandora_console/DEBIAN/control                         | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh             | 2 +-
 pandora_console/include/config_process.php             | 2 +-
 pandora_console/install.php                            | 2 +-
 pandora_console/pandora_console.redhat.spec            | 4 ++--
 pandora_console/pandora_console.spec                   | 4 ++--
 pandora_console/pandora_console_install                | 2 +-
 pandora_console/pandoradb_data.sql                     | 2 +-
 pandora_server/DEBIAN/control                          | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh              | 2 +-
 pandora_server/conf/pandora_server.conf.new            | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm                | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm           | 2 +-
 pandora_server/pandora_server.redhat.spec              | 4 ++--
 pandora_server/pandora_server.spec                     | 4 ++--
 pandora_server/pandora_server_installer                | 2 +-
 pandora_server/util/pandora_db.pl                      | 2 +-
 pandora_server/util/pandora_manage.pl                  | 2 +-
 50 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf
index 3022070bbd..eb20b095f1 100644
--- a/pandora_agents/pc/AIX/pandora_agent.conf
+++ b/pandora_agents/pc/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, AIX version
+# Version 7.0NG.723, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf
index f02ed5d074..93b3cdb927 100644
--- a/pandora_agents/pc/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, FreeBSD Version
+# Version 7.0NG.723, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf
index f84bce9f77..41d482d6d3 100644
--- a/pandora_agents/pc/HP-UX/pandora_agent.conf
+++ b/pandora_agents/pc/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, HP-UX Version
+# Version 7.0NG.723, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf
index 79d8bb8e28..534718ad29 100644
--- a/pandora_agents/pc/Linux/pandora_agent.conf
+++ b/pandora_agents/pc/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, GNU/Linux
+# Version 7.0NG.723, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf
index 372477a38b..e4d585a062 100644
--- a/pandora_agents/pc/NT4/pandora_agent.conf
+++ b/pandora_agents/pc/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, GNU/Linux
+# Version 7.0NG.723, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf
index a0515edf7e..ddce174eed 100644
--- a/pandora_agents/pc/SunOS/pandora_agent.conf
+++ b/pandora_agents/pc/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, Solaris Version
+# Version 7.0NG.723, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf
index 049e95ba35..1b3ea967ac 100644
--- a/pandora_agents/pc/Win32/pandora_agent.conf
+++ b/pandora_agents/pc/Win32/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2010 Artica Soluciones Tecnologicas 
-# Version 7.0NG.722
+# Version 7.0NG.723
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf
index edf8253d42..0d6558aa12 100644
--- a/pandora_agents/shellscript/aix/pandora_agent.conf
+++ b/pandora_agents/shellscript/aix/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.722, AIX version
+# Version 7.0NG.723, AIX version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
index 147de81c02..7478d64f27 100644
--- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
+++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.722
+# Version 7.0NG.723
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena
 
diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
index c46db65c34..4f3694a530 100644
--- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf
+++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.722, HPUX Version
+# Version 7.0NG.723, HPUX Version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index fcc0ac412f..374a998426 100644
--- a/pandora_agents/shellscript/linux/pandora_agent.conf
+++ b/pandora_agents/shellscript/linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722
+# Version 7.0NG.723
 # Licensed under GPL license v2,
 # (c) 2003-2010 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
index 2b4a90b2f3..3de4952d24 100644
--- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf
+++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722
+# Version 7.0NG.723
 # Licensed under GPL license v2,
 # (c) 2003-2009 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf
index e1476e40cc..8cfc4f51aa 100644
--- a/pandora_agents/shellscript/openWRT/pandora_agent.conf
+++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722
+# Version 7.0NG.723
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net
 
diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf
index a87e711a5b..d962b005e4 100644
--- a/pandora_agents/shellscript/solaris/pandora_agent.conf
+++ b/pandora_agents/shellscript/solaris/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.722, Solaris version
+# Version 7.0NG.723, Solaris version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index 30ba7e3649..6fb838938d 100644
--- a/pandora_agents/unix/AIX/pandora_agent.conf
+++ b/pandora_agents/unix/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, AIX version
+# Version 7.0NG.723, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index da154ad674..12cd910618 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180528
+Version: 7.0NG.723
 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 a8e47c0413..48b07403e0 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.722-180528"
+pandora_version="7.0NG.723"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf
index 558a657412..2a03683bd8 100644
--- a/pandora_agents/unix/Darwin/pandora_agent.conf
+++ b/pandora_agents/unix/Darwin/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, GNU/Linux
+# Version 7.0NG.723, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf
index 5300a3c81c..c1eb8072e6 100644
--- a/pandora_agents/unix/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, FreeBSD Version
+# Version 7.0NG.723, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf
index 2522f3f853..3cf05b23eb 100644
--- a/pandora_agents/unix/HP-UX/pandora_agent.conf
+++ b/pandora_agents/unix/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, HP-UX Version
+# Version 7.0NG.723, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 141ab9963f..607bdc9d3c 100644
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, GNU/Linux
+# Version 7.0NG.723, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf
index aff62ba017..846ced852c 100644
--- a/pandora_agents/unix/NT4/pandora_agent.conf
+++ b/pandora_agents/unix/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, GNU/Linux
+# Version 7.0NG.723, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf
index ed4185441d..d67e9bd6c3 100644
--- a/pandora_agents/unix/NetBSD/pandora_agent.conf
+++ b/pandora_agents/unix/NetBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, NetBSD Version
+# Version 7.0NG.723, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf
index ddcbe9710e..b6197225dd 100644
--- a/pandora_agents/unix/SunOS/pandora_agent.conf
+++ b/pandora_agents/unix/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, Solaris Version
+# Version 7.0NG.723, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 96c3ee38d5..f7102647a6 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.722';
+use constant AGENT_VERSION => '7.0NG.723';
 use constant AGENT_BUILD => '180528';
 
 # Agent log default file size maximum and instances
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index fae183ef4f..6d96a816cb 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 
 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 e6cbdbe1f4..d9e10622e3 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 
 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 cdba332136..e88cea3849 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -9,7 +9,7 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.722"
+PI_VERSION="7.0NG.723"
 PI_BUILD="180528"
 OS_NAME=`uname -s`
 
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 185002e369..70e1ae25f6 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2017 Artica Soluciones Tecnologicas 
-# Version 7.0NG.722
+# Version 7.0NG.723
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 7b1b0f4c9e..e0364cec84 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent v7.0NG.722}
+{Pandora FMS Windows Agent v7.0NG.723}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
 {No}
 
 Windows,Executable
-{<%AppName%>-<%Version%>-Setup<%Ext%>}
+{<%AppName%>-Setup<%Ext%>}
 
 Windows,FileDescription
 {<%AppName%> <%Version%> Setup}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 03c0805baf..db590470c2 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.722(Build 180528)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180528)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 63a2b23f30..bdafd13a3d 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.722(Build 180528))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180528))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b0585b9842..15bb19a021 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180528
+Version: 7.0NG.723
 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 553e2bbe86..d0130bab1c 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.722-180528"
+pandora_version="7.0NG.723"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index b8ba89e59b..08b312010d 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -23,7 +23,7 @@
  * Pandora build version and version 
  */
 $build_version = 'PC180528';
-$pandora_version = 'v7.0NG.722';
+$pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
 $script_tz = @date_default_timezone_get();
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 0caa210815..3a8826f0ae 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -70,7 +70,7 @@
 	<body>
 		<div style='height: 10px'>
 			<?php
-$version = '7.0NG.722';
+$version = '7.0NG.723';
 $build = '180528';
 			$banner = "v$version Build $build";
 			
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 84e67fd1eb..6abb38707f 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 
 # 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 c1b964afca..7cd90352f6 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandora_console_install b/pandora_console/pandora_console_install
index 406cf4c335..4f4b3e1052 100644
--- a/pandora_console/pandora_console_install
+++ b/pandora_console/pandora_console_install
@@ -9,7 +9,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.722"
+PI_VERSION="7.0NG.723"
 FORCE=0
 DESTDIR=""
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index c8ed8f61cd..9465b014ad 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -112,7 +112,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('MR', 14),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
-('current_package_enterprise', '722'),
+('current_package_enterprise', '723'),
 ('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.0009765625":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
 ('custom_docs_logo', 'default_docs.png'),
 ('custom_support_logo', 'default_support.png'),
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 9a39269185..cc2e4dd39f 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180528
+Version: 7.0NG.723
 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 19f3dbd0f3..01324ef3bd 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.722-180528"
+pandora_version="7.0NG.723"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index ee131a0343..20d6eebbd9 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -1,7 +1,7 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
-# Version 7.0NG.722
+# Version 7.0NG.723
 # Licensed under GPL license v2,
 # (c) 2003-2017 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 55ff95529b..5e25f53d6b 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -44,7 +44,7 @@ our @EXPORT = qw(
 	);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.722";
+my $pandora_version = "7.0NG.723";
 my $pandora_build = "180528";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index fbd72cd135..9eeaa5e29d 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -30,7 +30,7 @@ use base 'Exporter';
 our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.722";
+my $pandora_version = "7.0NG.723";
 my $pandora_build = "180528";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 909eb974c1..1ca51790b2 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 93c66ebccf..a8ec3a31ff 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 3fd7c16427..f3d7b65269 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -8,7 +8,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.722"
+PI_VERSION="7.0NG.723"
 PI_BUILD="180528"
 
 MODE=$1
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 2c40a2aeec..9f510feff3 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180528";
+my $version = "7.0NG.723 PS180528";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 1f1e31a88c..3db9954daf 100644
--- 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.722 PS180528";
+my $version = "7.0NG.723 PS180528";
 
 # save program name for logging
 my $progname = basename($0);

From bc98327bb4bd537d401f6ca6f2738f81fa6989ef Mon Sep 17 00:00:00 2001
From: "manuel.montes" <manuel.montes@support.artica.es>
Date: Mon, 28 May 2018 17:33:35 +0200
Subject: [PATCH 096/146] Fixed cache in functions_users.php

---
 pandora_console/include/functions_users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index 331e08845b..e20b2c6ef5 100755
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -344,7 +344,7 @@ function users_get_groups ($id_user = false, $privilege = "AR", $returnAllGroup
 	
 	$acl_column = get_acl_column($privilege);
 
-	if (array_key_exists($users_group_cache_key, $users_group_cache)) {
+	if (array_key_exists($users_group_cache_key, $users_group_cache) && $cache) {
 		return $users_group_cache[$users_group_cache_key];
 	}
 

From 02a442a8dbaa806911e6bfbc5f95c0f21392e3d4 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 28 May 2018 17:47:40 +0200
Subject: [PATCH 097/146] fixed errors in graph add phantom js

---
 pandora_console/include/ajax/graph.ajax.php   | 193 +++----
 pandora_console/include/chart_generator.php   | 108 ++++
 pandora_console/include/functions.php         | 209 +++----
 pandora_console/include/functions_graph.php   | 524 ++++++++++++------
 .../include/functions_reporting.php           | 288 +++-------
 pandora_console/include/graphs/fgraph.php     |  62 +--
 .../include/graphs/flot/pandora.flot.js       |  28 +-
 .../include/graphs/functions_flot.php         |  65 ++-
 pandora_console/include/test.js               |  26 +
 pandora_console/include/web2image.js          |  34 ++
 .../mobile/operation/module_graph.php         |  43 +-
 .../operation/agentes/stat_win.php            |  29 +-
 .../extensions/intel_dcm_agent_view.php       |  63 ++-
 13 files changed, 923 insertions(+), 749 deletions(-)
 create mode 100644 pandora_console/include/chart_generator.php
 create mode 100644 pandora_console/include/test.js
 create mode 100644 pandora_console/include/web2image.js

diff --git a/pandora_console/include/ajax/graph.ajax.php b/pandora_console/include/ajax/graph.ajax.php
index ed1651ee3c..3449cb5cab 100644
--- a/pandora_console/include/ajax/graph.ajax.php
+++ b/pandora_console/include/ajax/graph.ajax.php
@@ -22,7 +22,7 @@ $get_graphs = (bool)get_parameter('get_graphs_container');
 
 if ($save_custom_graph) {
 	$return = array();
-	
+
 	$id_modules = (array)get_parameter('id_modules', array());
 	$name = get_parameter('name', '');
 	$description = get_parameter('description', '');
@@ -32,20 +32,19 @@ if ($save_custom_graph) {
 	$events = get_parameter('events', 0);
 	$period = get_parameter('period', 0);
 	$fullscale = get_parameter('fullscale', 0);
-	
+
 	$result = (bool)custom_graphs_create($id_modules, $name,
 		$description, $stacked, $width, $height, $events, $period, 0, 0, false, $fullscale);
-	
-	
+
 	$return['correct'] = $result;
-	
+
 	echo json_encode($return);
 	return;
 }
 
 if ($print_custom_graph) {
 	ob_clean();
-	
+
 	$id_graph = (int) get_parameter('id_graph');
 	$height = (int) get_parameter('height', CHART_DEFAULT_HEIGHT);
 	$width = (int) get_parameter('width', CHART_DEFAULT_WIDTH);
@@ -76,43 +75,41 @@ if ($print_custom_graph) {
 
 if ($print_sparse_graph) {
 	ob_clean();
-	
-	$agent_module_id = (int) get_parameter('agent_module_id');
-	$period = (int) get_parameter('period', SECONDS_5MINUTES);
-	$show_events = (bool) get_parameter('show_events');
-	$width = (int) get_parameter('width', CHART_DEFAULT_WIDTH);
-	$height = (int) get_parameter('height', CHART_DEFAULT_HEIGHT);
-	$title = (string) get_parameter('title');
-	$unit_name = (string) get_parameter('unit_name');
-	$show_alerts = (bool) get_parameter('show_alerts');
-	$avg_only = (int) get_parameter('avg_only');
-	$pure = (bool) get_parameter('pure');
-	$date = (int) get_parameter('date', time());
-	$unit = (string) get_parameter('unit');
-	$baseline = (int) get_parameter('baseline');
-	$return_data = (int) get_parameter('return_data');
-	$show_title = (bool) get_parameter('show_title', true);
-	$only_image = (bool) get_parameter('only_image');
-	$homeurl = (string) get_parameter('homeurl');
-	$ttl = (int) get_parameter('ttl', 1);
-	$projection = (bool) get_parameter('projection');
-	$adapt_key = (string) get_parameter('adapt_key');
-	$compare = (bool) get_parameter('compare');
-	$show_unknown = (bool) get_parameter('show_unknown');
-	$menu = (bool) get_parameter('menu', true);
-	$background_color = (string) get_parameter('background_color', 'white');
-	$percentil = get_parameter('percentil', null);
-	$dashboard = (bool) get_parameter('dashboard');
-	$vconsole = (bool) get_parameter('vconsole');
-	$type_g = get_parameter('type_g', $config['type_module_charts']);
-	$fullscale = get_parameter('fullscale', 0);
-	
-	echo grafico_modulo_sparse($agent_module_id, $period, $show_events,
-		$width, $height , $title, $unit_name, $show_alerts, $avg_only,
-		$pure, $date, $unit, $baseline, $return_data, $show_title,
-		$only_image, $homeurl, $ttl, $projection, $adapt_key, $compare,
-		$show_unknown, $menu, $backgroundColor, $percentil,
-		$dashboard, $vconsole, $type_g, $fullscale);
+	$params =array(
+		'agent_module_id'     => (int)get_parameter('agent_module_id'),
+		'period'              => (int) get_parameter('period', SECONDS_5MINUTES),
+		'show_events'         => (bool) get_parameter('show_events'),
+		'title'               => (string) get_parameter('title'),
+		'unit_name'           => (string) get_parameter('unit_name'),
+		'show_alerts'         => (bool) get_parameter('show_alerts'),
+		'avg_only'            => (int) get_parameter('avg_only'),
+		'pure'                => (bool) get_parameter('pure'),
+		'date'                => (int) get_parameter('date', time()),
+		'unit'                => (string) get_parameter('unit'),
+		'baseline'            => (int) get_parameter('baseline'),
+		'return_data'         => (int) get_parameter('return_data'),
+		'show_title'          => (bool) get_parameter('show_title', true),
+		'only_image'          => (bool) get_parameter('only_image'),
+		'homeurl'             => (string) get_parameter('homeurl'),
+		'ttl'                 => (int) get_parameter('ttl', 1),
+		'projection'          => (bool) get_parameter('projection'),
+		'adapt_key'           => (string) get_parameter('adapt_key'),
+		'compare'             => (bool) get_parameter('compare'),
+		'show_unknown'        => (bool) get_parameter('show_unknown'),
+		'menu'                => (bool) get_parameter('menu', true),
+		'backgroundColor'     => (string) get_parameter('background_color', 'white'),
+		'percentil'           => get_parameter('percentil', null),
+		'dashboard'           => (bool) get_parameter('dashboard'),
+		'vconsole'            => (bool) get_parameter('vconsole'),
+		'type_graph'          => get_parameter('type_g', $config['type_module_charts']),
+		'fullscale'           => get_parameter('fullscale', 0),
+		'id_widget_dashboard' => false,
+		'force_interval'      => '',
+		'time_interval'       => 300,
+		'array_data_create'   => 0
+	);
+
+	echo grafico_modulo_sparse($params);
 	return;
 }
 
@@ -124,7 +121,7 @@ if ($get_graphs){
 	if (!empty($result_items)){
 		$hash = get_parameter('hash',0);
 		$period = get_parameter('time',0);
-		
+
 		$periods = array ();
 		$periods[1] = __('none');
 		$periods[SECONDS_1HOUR] = __('1 hour');
@@ -137,7 +134,7 @@ if ($get_graphs){
 		$periods[SECONDS_1WEEK] = __('1 week');
 		$periods[SECONDS_15DAYS] = __('15 days');
 		$periods[SECONDS_1MONTH] = __('1 month');
-		
+
 		$table = '';
 		$single_table = "<table width='100%' cellpadding=4 cellspacing=4>";
 	        $single_table .= "<tr id='row_time_lapse' style='' class='datos'>";
@@ -151,7 +148,7 @@ if ($get_graphs){
 	            $single_table .= "</td>";
 	        $single_table .= "</tr>";
 		$single_table .= "</table>";
-		
+
 		$table .= $single_table;
 		$contador = $config['max_graph_container'];
 		foreach ($result_items as $key => $value) {
@@ -159,9 +156,9 @@ if ($get_graphs){
 			if($period > 1){
 				$value['time_lapse'] = $period;
 			}
-			
+
 			$type_graph = ($value['type_graph'])? "line" : "area";
-			
+
 			switch ($value['type']) {
 				case 'simple_graph':
 					if ($contador > 0) {
@@ -170,36 +167,17 @@ if ($get_graphs){
 						$sql_alias = db_get_all_rows_sql("SELECT alias from tagente 
 							WHERE id_agente = ". $sql_modulo[0]['id_agente']);
 						$table .= "<div style='width: 90%'><h4>AGENT " .$sql_alias[0]['alias']." MODULE ".$sql_modulo[0]['nombre']."</h4><hr></div>";
-						$table .= grafico_modulo_sparse(
-							$value['id_agent_module'],
-							$value['time_lapse'],
-							0,
-							1000,
-							300,
-							'',
-							'',
-							false,
-							$value['only_average'],
-							false,
-							0,
-							'',
-							0,
-							0,
-							1,
-							false,
-							ui_get_full_url(false, false, false, false),
-							1,
-							false,
-							0,
-							false,
-							false,
-							1,
-							'white',
-							null,
-							false,
-							false,
-							$type_graph,
-							$value['fullscale']);
+
+						$params =array(
+							'agent_module_id'     => $value['id_agent_module'],
+							'period'              => $value['time_lapse'],
+							'avg_only'            => $value['only_average'],
+							'homeurl'             => ui_get_full_url(false, false, false, false),
+							'type_graph'          => $type_graph,
+							'fullscale'           => $value['fullscale']
+						);
+
+						$table .= grafico_modulo_sparse($params);
 						$contador --;
 					}
 					// $table .= "</br>";
@@ -207,7 +185,7 @@ if ($get_graphs){
 				case 'custom_graph':
 					if ($contador > 0) {
 						$graph = db_get_all_rows_field_filter('tgraph', 'id_graph',$value['id_graph']);
-						
+
 						$sources = db_get_all_rows_field_filter('tgraph_source', 'id_graph',$value['id_graph']);
 						$modules = array ();
 						$weights = array ();
@@ -222,7 +200,7 @@ if ($get_graphs){
 									$labels[$source['id_agent_module']] = reporting_label_macro($item, $source['label']);
 							}
 						}
-						
+
 						$homeurl = ui_get_full_url(false, false, false, false);
 						$graph_conf = db_get_row('tgraph', 'id_graph', $value['id_graph']);
 
@@ -280,13 +258,13 @@ if ($get_graphs){
 					} else {
 						$id_group = " AND id_grupo = ".$value['id_group'];
 					}
-					
+
 					if($value['id_module_group'] === '0'){
 						$id_module_group = "";
 					} else {
 						$id_module_group = " AND id_module_group = ".$value['id_module_group'];
 					}
-					
+
 					if($value['id_tag'] === '0'){
 						$tag = "";
 						$id_tag = "";
@@ -294,7 +272,7 @@ if ($get_graphs){
 						$tag = " INNER JOIN ttag_module ON ttag_module.id_agente_modulo = tagente_modulo.id_agente_modulo ";
 						$id_tag = " AND ttag_module.id_tag = ".$value['id_tag'];
 					}
-					
+
 					if($value['module'] != ''){
 						$module_name = " AND nombre REGEXP '".$value['module']."'";
 					}
@@ -303,47 +281,27 @@ if ($get_graphs){
 						". $tag . "WHERE  1=1" . $id_module_group  . $module_name .
 						" AND id_agente IN (SELECT id_agente FROM tagente WHERE 1=1" .$alias.$id_group.")" 
 						. $id_tag);
-						
+
 					foreach ($id_agent_module as $key2 => $value2) {
 						if ($contador > 0) {
 							$sql_modulo2 = db_get_all_rows_sql("SELECT nombre, id_agente FROM 
 								tagente_modulo WHERE id_agente_modulo = ". $value2['id_agente_modulo']);
-								
+
 							$sql_alias2 = db_get_all_rows_sql("SELECT alias from tagente 
 								WHERE id_agente = ". $sql_modulo2[0]['id_agente']);
-								
+
 							$table .= "<div style='width: 90%'><h4>AGENT " .$sql_alias2[0]['alias']." MODULE ".$sql_modulo2[0]['nombre']."</h4><hr></div>";
-							
-							$table .= grafico_modulo_sparse(
-								$value2['id_agente_modulo'],
-								$value['time_lapse'],
-								0,
-								1000,
-								300,
-								'',
-								'',
-								false,
-								$value['only_average'],
-								false,
-								0,
-								'',
-								0,
-								0,
-								1,
-								false,
-								ui_get_full_url(false, false, false, false),
-								1,
-								false,
-								0,
-								false,
-								false,
-								1,
-								'white',
-								null,
-								false,
-								false,
-								$type_graph,
-								$value['fullscale']);
+
+							$params =array(
+								'agent_module_id'     => $value2['id_agente_modulo'],
+								'period'              => $value['time_lapse'],
+								'avg_only'            => $value['only_average'],
+								'homeurl'             => ui_get_full_url(false, false, false, false),
+								'type_graph'          => $type_graph,
+								'fullscale'           => $value['fullscale']
+							);
+
+							$table .= grafico_modulo_sparse($params);
 							$contador --;
 						}
 					}
@@ -353,7 +311,6 @@ if ($get_graphs){
 		$table .= "</br>";
 		echo $table;
 		return;
-		
 	}
 }
 
diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
new file mode 100644
index 0000000000..a99db1be2b
--- /dev/null
+++ b/pandora_console/include/chart_generator.php
@@ -0,0 +1,108 @@
+<?php
+// 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.
+
+// XXX
+/*
+if (! isset($_SESSION['id_usuario'])) {
+	session_start();
+	session_write_close();
+}
+*/
+
+// Global & session manageme
+require_once ('config.php');
+require_once ($config['homedir'] . '/include/auth/mysql.php');
+require_once ($config['homedir'] . '/include/functions.php');
+require_once ($config['homedir'] . '/include/functions_db.php');
+require_once ($config['homedir'] . '/include/functions_reporting.php');
+require_once ($config['homedir'] . '/include/functions_graph.php');
+require_once ($config['homedir'] . '/include/functions_custom_graphs.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');
+
+// XXX
+//check_login();
+
+/*
+$params_json = base64_decode((string) get_parameter('params'));
+$params = json_decode($params_json, true);
+
+// Metaconsole connection to the node
+$server_id = (int) (isset($params['server']) ? $params['server'] : 0);
+
+if ($config["metaconsole"] && !empty($server_id)) {
+	$server = metaconsole_get_connection_by_id($server_id);
+
+	// Error connecting
+	if (metaconsole_connect($server) !== NOERR) {
+		echo "<html>";
+			echo "<body>";
+				ui_print_error_message(__('There was a problem connecting with the node'));
+			echo "</body>";
+		echo "</html>";
+		exit;
+	}
+}
+
+
+$user_language = get_user_language($config['id_user']);
+if (file_exists ('languages/'.$user_language.'.mo')) {
+	$l10n = new gettext_reader (new CachedFileReader ('languages/'.$user_language.'.mo'));
+	$l10n->load_tables();
+}
+*/
+?>
+<!DOCTYPE>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<title>Pandora FMS Graph (<?php echo agents_get_alias($agent_id) . ' - ' . $interface_name; ?>)</title>
+        <link rel="stylesheet" href="styles/pandora.css" type="text/css" />
+		<link rel="stylesheet" href="styles/pandora_minimal.css" type="text/css" />
+		<link rel="stylesheet" href="styles/jquery-ui-1.10.0.custom.css" type="text/css" />
+        <script language="javascript" type='text/javascript' src='javascript/pandora.js'></script>
+		<script language="javascript" type='text/javascript' src='javascript/jquery-1.9.0.js'></script>
+		<script language="javascript" type='text/javascript' src='javascript/jquery.pandora.js'></script>
+		<script language="javascript" type='text/javascript' src='javascript/jquery.jquery-ui-1.10.0.custom.js'></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.min.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.time.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.pie.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.crosshair.min.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.stack.min.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.selection.min.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.resize.min.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.threshold.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.threshold.multiple.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.symbol.min.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.exportdata.pandora.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.axislabels.js"></script>
+		<script language="javascript" type="text/javascript" src="graphs/flot/pandora.flot.js"></script>
+	</head>
+	<body bgcolor="#ffffff" style='background:#ffffff;'>
+<?php
+
+        $params = json_decode($_GET['data'], true);
+        //XXXXXX
+        $params['only_image'] = false;
+        $params['width'] = '1048';
+
+        echo '<p> Grafica molona para ' .  $params['agent_module_id'] . '</p>';
+        echo '<div>';
+            echo grafico_modulo_sparse ($params);
+		echo '</div>';
+?>
+	</body>
+</html>
\ No newline at end of file
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 0f411a58ac..79d7035acd 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3005,108 +3005,125 @@ function color_graph_array($series_suffix, $compare = false){
 
 function series_type_graph_array($data, $show_elements_graph){
 	global $config;
-	foreach ($data as $key => $value) {
-		if(strpos($key, 'summatory') !== false){
-			$data_return['series_type'][$key] = 'area';
-			$data_return['legend'][$key] = __('Summatory series') . ' ' . $series_suffix_str;
-		}
-		elseif(strpos($key, 'average') !== false){
-			$data_return['series_type'][$key] = 'area';
-			$data_return['legend'][$key] = __('Average series') . ' ' . $series_suffix_str;
-		}
-		elseif(strpos($key, 'sum') !== false || strpos($key, 'baseline') !== false){
-			switch ($value['id_module_type']) {
-				case 21: case 2: case 6:
-				case 18: case 9: case 31:
-					$data_return['series_type'][$key] = 'boolean';
-					break;
-				default:
-					$data_return['series_type'][$key] = 'area';
-					break;
+	if(isset($data) && is_array($data)){
+		foreach ($data as $key => $value) {
+			if(strpos($key, 'summatory') !== false){
+				$data_return['series_type'][$key] = 'area';
+				$data_return['legend'][$key] = __('Summatory series') . ' ' . $series_suffix_str;
 			}
+			elseif(strpos($key, 'average') !== false){
+				$data_return['series_type'][$key] = 'area';
+				$data_return['legend'][$key] = __('Average series') . ' ' . $series_suffix_str;
+			}
+			elseif(strpos($key, 'sum') !== false || strpos($key, 'baseline') !== false){
+				switch ($value['id_module_type']) {
+					case 21: case 2: case 6:
+					case 18: case 9: case 31:
+						$data_return['series_type'][$key] = 'boolean';
+						break;
+					default:
+						$data_return['series_type'][$key] = 'area';
+						break;
+				}
 
-			if (isset($show_elements_graph['labels']) &&
-				is_array($show_elements_graph['labels']) &&
-				(count($show_elements_graph['labels']) > 0)){
-				$data_return['legend'][$key] = $show_elements_graph['labels'][$value['id_module_type']] . ' ' ;
+				if (isset($show_elements_graph['labels']) &&
+					is_array($show_elements_graph['labels']) &&
+					(count($show_elements_graph['labels']) > 0)){
+					$data_return['legend'][$key] = $show_elements_graph['labels'][$value['id_module_type']] . ' ' ;
+				}
+				else{
+					if(strpos($key, 'baseline') !== false){
+						$data_return['legend'][$key] = $value['agent_name']  . ' / ' .
+													$value['module_name'] . ' Baseline ';
+					}
+					else{
+						$data_return['legend'][$key] = $value['agent_name']  . ' / ' .
+													$value['module_name'] . ': ';
+					}
+				}
+
+				if(strpos($key, 'baseline') === false){
+					$data_return['legend'][$key] .=
+						__('Min:') . remove_right_zeros(
+							number_format(
+								$value['min'],
+								$config['graph_precision']
+							)
+						)  . ' ' .
+						__('Max:') . remove_right_zeros(
+							number_format(
+								$value['max'],
+								$config['graph_precision']
+							)
+						) . ' ' .
+						_('Avg:') . remove_right_zeros(
+							number_format(
+								$value['avg'],
+								$config['graph_precision']
+							)
+						) . ' ' . $series_suffix_str;
+				}
+			}
+			elseif(strpos($key, 'event') !== false){
+				$data_return['series_type'][$key] = 'points';
+				if($show_elements_graph['show_events']){
+					$data_return['legend'][$key] = __('Events') . ' ' . $series_suffix_str;
+				}
+			}
+			elseif(strpos($key, 'alert') !== false){
+				$data_return['series_type'][$key] = 'points';
+				if($show_elements_graph['show_alerts']){
+					$data_return['legend'][$key] = __('Alert') . ' ' . $series_suffix_str;
+				}
+			}
+			elseif(strpos($key, 'unknown') !== false){
+				$data_return['series_type'][$key] = 'unknown';
+				if($show_elements_graph['show_unknown']){
+					$data_return['legend'][$key] = __('Unknown') . ' ' . $series_suffix_str;
+				}
+			}
+			elseif(strpos($key, 'percentil') !== false){
+				$data_return['series_type'][$key] = 'percentil';
+				if($show_elements_graph['percentil']){
+					$data_return['legend'][$key] =
+						__('Percentil') . ' ' .
+						$config['percentil']  .
+						'º ' . __('of module') . ' ';
+					if (isset($show_elements_graph['labels']) && is_array($show_elements_graph['labels'])){
+						$data_return['legend'][$key] .= $show_elements_graph['labels'][$value['id_module_type']] . ' ' ;
+					}
+					else{
+						$data_return['legend'][$key] .= $value['agent_name']  . ' / ' .
+												$value['module_name'] . ': ' . ' Value: ';
+					}
+					$data_return['legend'][$key] .= remove_right_zeros(
+													number_format(
+														$value['data'][0][1],
+														$config['graph_precision']
+													)
+												) . ' ' . $series_suffix_str;
+				}
 			}
 			else{
-				if(strpos($key, 'baseline') !== false){
-					$data_return['legend'][$key] = $value['agent_name']  . ' / ' .
-												$value['module_name'] . ' Baseline ';
-				}
-				else{
-					$data_return['legend'][$key] = $value['agent_name']  . ' / ' .
-												$value['module_name'] . ': ';
-				}
-			}
-
-			if(strpos($key, 'baseline') === false){
-				$data_return['legend'][$key] .=
-					__('Min:') . remove_right_zeros(
-						number_format(
-							$value['min'],
-							$config['graph_precision']
-						)
-					)  . ' ' .
-					__('Max:') . remove_right_zeros(
-						number_format(
-							$value['max'],
-							$config['graph_precision']
-						)
-					) . ' ' .
-					_('Avg:') . remove_right_zeros(
-						number_format(
-							$value['avg'],
-							$config['graph_precision']
-						)
-					) . ' ' . $series_suffix_str;
+				$data_return['series_type'][$key] = 'area';
 			}
 		}
-		elseif(strpos($key, 'event') !== false){
-			$data_return['series_type'][$key] = 'points';
-			if($show_elements_graph['show_events']){
-				$data_return['legend'][$key] = __('Events') . ' ' . $series_suffix_str;
-			}
-		}
-		elseif(strpos($key, 'alert') !== false){
-			$data_return['series_type'][$key] = 'points';
-			if($show_elements_graph['show_alerts']){
-				$data_return['legend'][$key] = __('Alert') . ' ' . $series_suffix_str;
-			}
-		}
-		elseif(strpos($key, 'unknown') !== false){
-			$data_return['series_type'][$key] = 'unknown';
-			if($show_elements_graph['show_unknown']){
-				$data_return['legend'][$key] = __('Unknown') . ' ' . $series_suffix_str;
-			}
-		}
-		elseif(strpos($key, 'percentil') !== false){
-			$data_return['series_type'][$key] = 'percentil';
-			if($show_elements_graph['percentil']){
-				$data_return['legend'][$key] =
-					__('Percentil') . ' ' .
-					$config['percentil']  .
-					'º ' . __('of module') . ' ';
-				if (isset($show_elements_graph['labels']) && is_array($show_elements_graph['labels'])){
-					$data_return['legend'][$key] .= $show_elements_graph['labels'][$value['id_module_type']] . ' ' ;
-				}
-				else{
-					$data_return['legend'][$key] .= $value['agent_name']  . ' / ' .
-											$value['module_name'] . ': ' . ' Value: ';
-				}
-				$data_return['legend'][$key] .= remove_right_zeros(
-												number_format(
-													$value['data'][0][1],
-													$config['graph_precision']
-												)
-											) . ' ' . $series_suffix_str;
-			}
-		}
-		else{
-			$data_return['series_type'][$key] = 'area';
-		}
+		return $data_return;
 	}
-	return $data_return;
+	return false;
+}
+
+function generator_chart_to_pdf($params){
+	global $config;
+	$params_encode_json = urlencode(json_encode($params));
+	$file_js = "/var/www/html/pandora_console/include/web2image.js";
+	$url = "http://localhost/pandora_console/include/chart_generator.php";
+	$img_destination = "/var/www/html/pandora_console/attachment/imagen_". $params['agent_module_id'] .".png";
+	$width_img = 1048;
+	$height_img = 568;
+html_debug_print("entra con: " . $params['agent_module_id'] ."  en el tiempo " . date("Y-m-d H:i:s"), true);
+	exec("phantomjs " . $file_js . " " . $url . "  '" . $params_encode_json . "' " . $img_destination . " " . $width_img . " " . $height_img);
+html_debug_print("sale con:  " . $params['agent_module_id'] ."  en el tiempo " . date("Y-m-d H:i:s"), true);
+return "<img src='/var/www/html/pandora_console/attachment/imagen_". $params['agent_module_id'] .".png' alt='la imagen bonica'>";
 }
 ?>
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index c64f8ce20d..06048496b4 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -228,8 +228,7 @@ function grafico_modulo_sparse_data_chart (
 		$agent_module_id,
 		$date_array,
 		$data_module_graph,
-		$show_elements_graph,
-		$format_graph,
+		$params,
 		$series_suffix
 	) {
 
@@ -294,7 +293,7 @@ function grafico_modulo_sparse_data_chart (
 
 	foreach ($data as $k => $v) {
 		//convert array
-		if($show_elements_graph['flag_overlapped']){
+		if($params['flag_overlapped']){
 			$array_data["sum" . $series_suffix]['data'][$k] = array(
 				($v['utimestamp'] + $date_array['period']  )* 1000,
 				$v['datos']
@@ -322,7 +321,7 @@ function grafico_modulo_sparse_data_chart (
 		$count_data++;
 
 		//percentil
-		if (!is_null($show_elements_graph['percentil']) && $show_elements_graph['percentil']) {
+		if (!is_null($params['percentil']) && $params['percentil']) {
 			$array_percentil[] = $v['datos'];
 		}
 	}
@@ -334,10 +333,10 @@ function grafico_modulo_sparse_data_chart (
 	$array_data["sum" . $series_suffix]['agent_name']    = $data_module_graph['agent_name'];
 	$array_data["sum" . $series_suffix]['module_name']   = $data_module_graph['module_name'];
 
-	if (!is_null($show_elements_graph['percentil']) &&
-		$show_elements_graph['percentil'] &&
-		!$show_elements_graph['flag_overlapped']) {
-		$percentil_result = get_percentile($show_elements_graph['percentil'], $array_percentil);
+	if (!is_null($params['percentil']) &&
+		$params['percentil'] &&
+		!$params['flag_overlapped']) {
+		$percentil_result = get_percentile($params['percentil'], $array_percentil);
 		$array_data["percentil" . $series_suffix]['data'][0] = array(
 			$date_array['start_date'] * 1000,
 			$percentil_result
@@ -352,22 +351,21 @@ function grafico_modulo_sparse_data_chart (
 
 function grafico_modulo_sparse_data(
 	$agent_module_id, $date_array,
-	$data_module_graph, $show_elements_graph,
-	$format_graph, $exception_interval_graph,
+	$data_module_graph, $params,
 	$series_suffix, $str_series_suffix) {
 
 	global $config;
 	global $array_events_alerts;
 
-	if($show_elements_graph['fullscale']){
+	if($params['fullscale']){
 		$array_data = fullscale_data(
 			$agent_module_id,
 			$date_array,
-			$show_elements_graph['show_unknown'],
-			$show_elements_graph['percentil'],
+			$params['show_unknown'],
+			$params['percentil'],
 			$series_suffix,
 			$str_series_suffix,
-			$show_elements_graph['flag_overlapped']
+			$params['flag_overlapped']
 		);
 	}
 	else{
@@ -375,8 +373,7 @@ function grafico_modulo_sparse_data(
 			$agent_module_id,
 			$date_array,
 			$data_module_graph,
-			$show_elements_graph,
-			$format_graph,
+			$params,
 			$series_suffix
 		);
 	}
@@ -385,7 +382,71 @@ function grafico_modulo_sparse_data(
 		return false;
 	}
 
-	if($show_elements_graph['percentil']){
+	//XXX Para un tipo de reports en concreto habria que optimizar que la tabla que crea coincida con los datos documentar
+	if($params['force_interval'] != ''){
+		$period_time_interval = $date_array['period'] * 1000;
+		$start_period = $date_array['start_date'] * 1000;
+		$i = 0;
+
+		$sum_data = 0;
+		$count_data = 0;
+		$data_last_acum = $array_data['sum1']['data'][0][1];
+
+		while($period_time_interval > 0) {
+			foreach ($array_data['sum1']['data'] as $key => $value) {
+				if($value[0] >= $start_period && $value[0] < $start_period + $params['time_interval'] * 1000){
+					$sum_data = $value[1];
+					$array_data_only[] = $value[1];
+					$count_data++;
+					unset($array_data['sum1']['data'][$key]);
+				}
+				else{
+					if($params['force_interval'] == 'max_only'){
+						$acum_array_data[$i][0] = $start_period;
+						if(is_array($array_data_only) && count($array_data_only) > 0){
+							$acum_array_data[$i][1] = max($array_data_only);
+							$data_last_acum = $array_data_only[count($array_data_only) - 1];
+						}
+						else{
+							$acum_array_data[$i][1] = $data_last_acum;
+						}
+					}
+
+					if($params['force_interval'] == 'min_only'){
+						$acum_array_data[$i][0] = $start_period;
+						if(is_array($array_data_only) && count($array_data_only) > 0){
+							$acum_array_data[$i][1] = min($array_data_only);
+							$data_last_acum = $array_data_only[count($array_data_only) - 1];
+						}
+						else{
+							$acum_array_data[$i][1] = $data_last_acum;
+						}
+					}
+
+					if($params['force_interval'] == 'avg_only'){
+						$acum_array_data[$i][0] = $start_period;
+						if(is_array($array_data_only) && count($array_data_only) > 0){
+							$acum_array_data[$i][1] = $sum_data / $count_data;
+						}
+						else{
+							$acum_array_data[$i][1] = $data_last_acum;
+						}
+					}
+
+					$start_period = $start_period + $params['time_interval'] * 1000;
+					$array_data_only = array();
+					$sum_data = 0;
+					$count_data = 0;
+					$i++;
+					break;
+				}
+			}
+			$period_time_interval = $period_time_interval - $params['time_interval'];
+		}
+		$array_data['sum1']['data'] = $acum_array_data;
+	}
+
+	if($params['percentil']){
 		$percentil_value = $array_data['percentil' . $series_suffix]['data'][0][1];
 	}
 	else{
@@ -399,9 +460,9 @@ function grafico_modulo_sparse_data(
 		$avg = $array_data['sum'. $series_suffix]['avg'];
 	}
 
-	if(!$show_elements_graph['flag_overlapped']){
-		if($show_elements_graph['fullscale']){
-			if(	$show_elements_graph['show_unknown'] &&
+	if(!$params['flag_overlapped']){
+		if($params['fullscale']){
+			if(	$params['show_unknown'] &&
 				isset($array_data['unknown' . $series_suffix]) &&
 				is_array($array_data['unknown' . $series_suffix]['data']) ){
 				foreach ($array_data['unknown' . $series_suffix]['data'] as $key => $s_date) {
@@ -412,7 +473,7 @@ function grafico_modulo_sparse_data(
 			}
 		}
 		else{
-			if(	$show_elements_graph['show_unknown'] ) {
+			if(	$params['show_unknown'] ) {
 				$unknown_events = db_get_module_ranges_unknown(
 					$agent_module_id,
 					$date_array['start_date'],
@@ -463,8 +524,8 @@ function grafico_modulo_sparse_data(
 			}
 		}
 
-		if ($show_elements_graph['show_events']  ||
-			$show_elements_graph['show_alerts'] ) {
+		if ($params['show_events']  ||
+			$params['show_alerts'] ) {
 
 			$events = db_get_all_rows_filter (
 				'tevento',
@@ -486,7 +547,7 @@ function grafico_modulo_sparse_data(
 				$count_alerts=0;
 				foreach ($events as $k => $v) {
 					if (strpos($v["event_type"], "alert") !== false){
-						if($show_elements_graph['flag_overlapped']){
+						if($params['flag_overlapped']){
 							$alerts_array['data'][$count_alerts] = array(
 								($v['utimestamp'] + $date_array['period'] *1000),
 								$max * 1.10
@@ -501,7 +562,7 @@ function grafico_modulo_sparse_data(
 						$count_alerts++;
 					}
 					else{
-						if($show_elements_graph['flag_overlapped']){
+						if($params['flag_overlapped']){
 							if( ( strstr($v['event_type'], 'going_up') ) ||
 									( strstr($v['event_type'], 'going_down') ) ){
 								$events_array['data'][$count_events] = array(
@@ -537,22 +598,22 @@ function grafico_modulo_sparse_data(
 			}
 		}
 
-		if($show_elements_graph['show_events']){
+		if($params['show_events']){
 			$array_data['event' . $series_suffix] = $events_array;
 		}
 
-		if($show_elements_graph['show_alerts']){
+		if($params['show_alerts']){
 			$array_data['alert' . $series_suffix] = $alerts_array;
 		}
 	}
 
-	if ($show_elements_graph['return_data'] == 1) {
+	if ($params['return_data'] == 1) {
 		return $array_data;
 	}
 
 	$color = color_graph_array(
 		$series_suffix,
-		$show_elements_graph['flag_overlapped']
+		$params['flag_overlapped']
 	);
 
 	foreach ($color as $k => $v) {
@@ -566,36 +627,215 @@ function grafico_modulo_sparse_data(
 	return $array_data;
 }
 
-function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
-	$width, $height , $title = '', $unit_name = null,
-	$show_alerts = false, $avg_only = 0, $pure = false, $date = 0,
-	$unit = '', $baseline = 0, $return_data = 0, $show_title = true,
-	$only_image = false, $homeurl = '', $ttl = 1, $projection = false,
-	$adapt_key = '', $compare = false, $show_unknown = false,
-	$menu = true, $backgroundColor = 'white', $percentil = null,
-	$dashboard = false, $vconsole = false, $type_graph = 'area', $fullscale = false,
-	$id_widget_dashboard = false,$force_interval = 0,$time_interval = 300,
-	$max_only = 0, $min_only = 0, $array_data_create = 0) {
-
+/*
+	$params =array(
+		'agent_module_id'     => $agent_module_id,
+		'period'              => $period,
+		'show_events'         => false,
+		'width'               => $width,
+		'height'              => $height,
+		'title'               => '',
+		'unit_name'           => null,
+		'show_alerts'         => false,
+		'avg_only'            => 0,
+		'pure'                => false,
+		'date'                => 0,
+		'unit'                => '',
+		'baseline'            => 0,
+		'return_data'         => 0,
+		'show_title'          => true,
+		'only_image'          => false,
+		'homeurl'             => '',
+		'ttl'                 => 1,
+		'projection'          => false,
+		'adapt_key'           => '',
+		'compare'             => false,
+		'show_unknown'        => false,
+		'menu'                => true,
+		'backgroundColor'     => 'white',
+		'percentil'           => null,
+		'dashboard'           => false,
+		'vconsole'            => false,
+		'type_graph'          => 'area',
+		'fullscale'           => false,
+		'id_widget_dashboard' => false,
+		'force_interval'      => '',
+		'time_interval'       => 300,
+		'array_data_create'   => 0
+	);
+ */
+function grafico_modulo_sparse ($params) {
+	html_debug_print('entra por este sitio', true);
 	global $config;
 
+	/*XXXXXXXXXXXX Documnetar
+	*Set all variable
+	*/
+
+	if(!isset($params) || !is_array($params)){
+		return false;
+	}
+
+	if(!isset($params['agent_module_id'])){
+		return false;
+	}
+	else{
+		$agent_module_id = $params['agent_module_id'];
+	}
+
+	if(!isset($params['period'])){
+		return false;
+	}
+
+	if(!isset($params['show_events'])){
+		$params['show_events'] = false;
+	}
+
+	// ATTENTION: The min size is in constants.php
+	// It's not the same minsize for all graphs, but we are choosed a prudent minsize for all
+	if(!isset($params['width'])){
+		$params['width'] = '90%';
+	}
+
+	if(!isset($params['height'])){
+		$params['height'] = 450;
+	}
+
+	if(!isset($params['title'])){
+		$params['title'] = '';
+	}
+
+	if(!isset($params['unit_name'])){
+		$params['unit_name'] = null;
+	}
+
+	if(!isset($params['show_alerts'])){
+		$params['show_alerts'] = false;
+	}
+
+	if(!isset($params['avg_only'])){
+		$params['avg_only'] = 0;
+	}
+
+	if(!isset($params['pure'])){
+		$params['pure'] = false;
+	}
+
+	if(!isset($params['date']) || !$params['date']){
+		$params['date'] = get_system_time();
+	}
+
+	if(!isset($params['unit'])){
+		$params['unit'] = '';
+	}
+
+	if(!isset($params['baseline'])){
+		$params['baseline'] = 0;
+	}
+
+	if(!isset($params['return_data'])){
+		$params['return_data'] = 0;
+	}
+
+	if(!isset($params['show_title'])){
+		$show_title = true;
+	}
+
+	if(!isset($params['only_image'])){
+		$params['only_image'] = false;
+	}
+
+	if(!isset($params['homeurl'])){
+		$params['homeurl'] = '';
+	}
+
+	if(!isset($params['ttl'])){
+		$params['ttl'] = 1;
+	}
+
+	if(!isset($params['projection'])){
+		$params['projection'] = false;
+	}
+
+	if(!isset($params['adapt_key'])){
+		$params['adapt_key'] = '';
+	}
+
+	if(!isset($params['compare'])){
+		$params['compare'] = false;
+	}
+
+	if(!isset($params['show_unknown'])){
+		$params['show_unknown'] = false;
+	}
+
+	if(!isset($params['menu'])){
+		$params['menu'] = true;
+	}
+
+	if(!isset($params['backgroundColor'])){
+		$params['backgroundColor'] = 'white';
+	}
+
+	if(!isset($params['percentil'])){
+		$params['percentil'] = null;
+	}
+
+	if(!isset($params['dashboard'])){
+		$params['dashboard'] = false;
+	}
+
+	if(!isset($params['vconsole'])){
+		$params['vconsole'] = false;
+	}
+	else{
+		$params['menu'] = false;
+	}
+
+	if(!isset($params['type_graph'])){
+		$params['type_graph'] = $config['type_module_charts'];
+	}
+
+	if(!isset($params['fullscale'])){
+		$params['fullscale'] = false;
+	}
+
+	if(!isset($params['id_widget_dashboard'])){
+		$params['id_widget_dashboard'] = false;
+	}
+
+	if(!isset($params['force_interval'])){
+		$params['force_interval'] = '';
+	}
+
+	if(!isset($params['time_interval'])){
+		$params['time_interval'] = 300;
+	}
+
+	if(!isset($params['array_data_create'])){
+		$params['array_data_create'] = 0;
+	}
+
+	$params['font']       = $config['fontpath'];
+	$params['font-size']  = $config['font_size'];
+
+	//XXXXXXXXXXXX se devuelve phantom.js
+	if($params['only_image']){
+		return	generator_chart_to_pdf($params);
+	}
+
 	global $graphic_type;
 	global $array_events_alerts;
 
-
 	$array_data   = array();
 	$legend       = array();
 	$array_events_alerts = array();
 
-	//date start final period
-	if($date == 0){
-		$date = get_system_time();
-	}
 
 	$date_array = array();
-	$date_array["period"]     = $period;
-	$date_array["final_date"] = $date;
-	$date_array["start_date"] = $date - $period;
+	$date_array["period"]     = $params['period'];
+	$date_array["final_date"] = $params['date'];
+	$date_array["start_date"] = $params['date'] - $params['period'];
 
 	$module_data = db_get_row_sql (
 		'SELECT * FROM tagente_modulo
@@ -618,72 +858,16 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	$data_module_graph['c_max']    		 = $module_data['max_critical'];
 	$data_module_graph['c_inv']    		 = $module_data['critical_inverse'];
 
-	//show elements in the graph
-	if ($vconsole){
-		$menu = false;
-	}
-
-	$show_elements_graph = array();
-	$show_elements_graph['show_events']  = $show_events;
-	$show_elements_graph['show_alerts']  = $show_alerts;
-	$show_elements_graph['show_unknown'] = $show_unknown;
-	$show_elements_graph['avg_only']     = $avg_only;
-	$show_elements_graph['fullscale']    = $fullscale;
-	$show_elements_graph['show_title']   = $show_title;
-	$show_elements_graph['menu']         = $menu;
-	$show_elements_graph['percentil']    = $percentil;
-	$show_elements_graph['projection']   = $projection;
-	$show_elements_graph['adapt_key']    = $adapt_key;
-	$show_elements_graph['compare']      = $compare;
-	$show_elements_graph['dashboard']    = $dashboard;
-	$show_elements_graph['vconsole']     = $vconsole;
-	$show_elements_graph['pure']         = $pure;
-	$show_elements_graph['baseline']     = $baseline;
-	$show_elements_graph['only_image']   = $only_image;
-	$show_elements_graph['return_data']  = $return_data;
-	$show_elements_graph['id_widget']    = $id_widget_dashboard;
-
 	//format of the graph
-	if (empty($unit)) {
-		$unit = $module_data['unit'];
-		if(modules_is_unit_macro($unit)){
-			$unit = "";
+	if (empty($params['unit'])) {
+		$params['unit'] = $module_data['unit'];
+		if(modules_is_unit_macro($params['unit'])){
+			$params['unit'] = "";
 		}
 	}
 
-	// ATTENTION: The min size is in constants.php
-	// It's not the same minsize for all graphs, but we are choosed a prudent minsize for all
-	/*
-	if ($height <= CHART_DEFAULT_HEIGHT) {
-		$height = CHART_DEFAULT_HEIGHT;
-	}
-	if ($width < CHART_DEFAULT_WIDTH) {
-		$width = CHART_DEFAULT_WIDTH;
-	}
-	*/
-	$format_graph = array();
-	$format_graph['width']      = $width;
-	$format_graph['height']     = $height;
-	$format_graph['type_graph'] = $type_graph;
-	$format_graph['unit_name']  = $unit_name;
-	$format_graph['unit']       = $unit;
-	$format_graph['title']      = $title;
-	$format_graph['homeurl']    = $homeurl;
-	$format_graph['ttl']        = $ttl;
-	$format_graph['background'] = $backgroundColor;
-	$format_graph['font']       = $config['fontpath'];
-	$format_graph['font-size']  = $config['font_size'];
-
-	//exception to change the interval of the graph and show media min max @enriquecd
-	$exception_interval_graph['force_interval'] = $force_interval;
-	$exception_interval_graph['time_interval']  = $time_interval;
-	$exception_interval_graph['max_only']       = $max_only;
-	$exception_interval_graph['min_only']       = $min_only;
-
-	$type_graph = $config['type_module_charts'];
-
-	if(!$array_data_create){
-		if ($show_elements_graph['compare'] !== false) {
+	if(!$params['array_data_create']){
+		if ($params['compare'] !== false) {
 			$series_suffix = 2;
 			$series_suffix_str = ' (' . __('Previous') . ')';
 
@@ -691,21 +875,20 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 			$date_array_prev['start_date'] = $date_array['start_date'] - $date_array['period'];
 			$date_array_prev['period']     = $date_array['period'];
 
-			if ($show_elements_graph['compare'] === 'overlapped') {
-				$show_elements_graph['flag_overlapped'] = 1;
+			if ($params['compare'] === 'overlapped') {
+				$params['flag_overlapped'] = 1;
 			}
 			else{
-				$show_elements_graph['flag_overlapped'] = 0;
+				$params['flag_overlapped'] = 0;
 			}
 
 			$array_data = grafico_modulo_sparse_data(
 				$agent_module_id, $date_array_prev,
-				$data_module_graph, $show_elements_graph,
-				$format_graph, $exception_interval_graph,
+				$data_module_graph, $params,
 				$series_suffix, $series_suffix_str
 			);
 
-			switch ($show_elements_graph['compare']) {
+			switch ($params['compare']) {
 				case 'separated':
 				case 'overlapped':
 					// Store the chart calculated
@@ -717,27 +900,26 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 
 		$series_suffix = 1;
 		$series_suffix_str = '';
-		$show_elements_graph['flag_overlapped'] = 0;
+		$params['flag_overlapped'] = 0;
 
 		$array_data = grafico_modulo_sparse_data(
 			$agent_module_id, $date_array,
-			$data_module_graph, $show_elements_graph,
-			$format_graph, $exception_interval_graph,
+			$data_module_graph, $params,
 			$series_suffix, $str_series_suffix
 		);
 
-		if($show_elements_graph['compare']){
-			if ($show_elements_graph['compare'] === 'overlapped') {
+		if($params['compare']){
+			if ($params['compare'] === 'overlapped') {
 				$array_data = array_merge($array_data, $array_data_prev);
 				$legend     = array_merge($legend, $legend_prev);
 			}
 		}
 	}
 	else{
-		$array_data = $array_data_create;
+		$array_data = $params['array_data_create'];
 	}
 
-	if($show_elements_graph['return_data']){
+	if($params['return_data']){
 		return $array_data;
 	}
 
@@ -755,7 +937,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 
 	$series_type_array = series_type_graph_array(
 		$array_data,
-		$show_elements_graph
+		$params
 	);
 
 	$series_type = $series_type_array['series_type'];
@@ -767,7 +949,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	$data_module_graph['series_suffix'] = $series_suffix;
 
 	// Check available data
-	if ($show_elements_graph['compare'] === 'separated') {
+	if ($params['compare'] === 'separated') {
 		if (!empty($array_data)) {
 			$return = area_graph(
 				$agent_module_id,
@@ -776,22 +958,21 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 				$series_type,
 				$date_array,
 				$data_module_graph,
-				$show_elements_graph,
-				$format_graph,
+				$params,
 				$water_mark,
 				$series_suffix_str,
 				$array_events_alerts
 			);
 		}
 		else{
-			$return = graph_nodata_image($width, $height);
+			$return = graph_nodata_image($params['width'], $params['height']);
 		}
 		$return .= '<br>';
 		if (!empty($array_data_prev)) {
 
 			$series_type_array = series_type_graph_array(
 				$array_data_prev,
-				$show_elements_graph
+				$params
 			);
 
 			$series_type = $series_type_array['series_type'];
@@ -804,15 +985,14 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 				$series_type,
 				$date_array,
 				$data_module_graph,
-				$show_elements_graph,
-				$format_graph,
+				$params,
 				$water_mark,
 				$series_suffix_str,
 				$array_events_alerts
 			);
 		}
 		else{
-			$return .= graph_nodata_image($width, $height);
+			$return .= graph_nodata_image($params['width'], $params['height']);
 		}
 	}
 	else{
@@ -824,21 +1004,22 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 				$series_type,
 				$date_array,
 				$data_module_graph,
-				$show_elements_graph,
-				$format_graph,
+				$params,
 				$water_mark,
 				$series_suffix_str,
 				$array_events_alerts
 			);
 		}
 		else{
-			$return = graph_nodata_image($width, $height);
+			$return = graph_nodata_image($params['width'], $params['height']);
 		}
 	}
 
 return $return;
 }
 
+
+
 function graph_get_formatted_date($timestamp, $format1, $format2) {
 	global $config;
 
@@ -950,43 +1131,33 @@ function graphic_combined_module (
 		$menu = false;
 	}
 
-	$show_elements_graph = array();
-	$show_elements_graph['show_events']  = $show_events;
-	$show_elements_graph['show_alerts']  = $show_alerts;
-	$show_elements_graph['show_unknown'] = false; // dont use
-	$show_elements_graph['avg_only']     = false; // dont use
-	$show_elements_graph['fullscale']    = $fullscale;
-	$show_elements_graph['show_title']   = ''; // dont use
-	$show_elements_graph['menu']         = $menu; // dont use
-	$show_elements_graph['adapt_key']    = ''; // dont use
-	$show_elements_graph['percentil']    = $percentil;
-	$show_elements_graph['projection']   = $projection;
-	$show_elements_graph['compare']      = false; //dont use
-	$show_elements_graph['dashboard']    = $dashboard;
-	$show_elements_graph['vconsole']     = $vconsole;
-	$show_elements_graph['pure']         = $pure;
-	$show_elements_graph['baseline']     = false; //dont use
-	$show_elements_graph['only_image']   = $only_image;
-	$show_elements_graph['return_data']  = false; //dont use
-	$show_elements_graph['id_widget']    = $id_widget_dashboard;
-	$show_elements_graph['labels']       = $labels;
-	$show_elements_graph['stacked']      = $stacked;
-	$show_elements_graph['combined']     = true;
-	$show_elements_graph['from_interface'] = $from_interface;
-
-	$format_graph = array();
-	$format_graph['width']      = "90%";
-	$format_graph['height']     = "450";
-	$format_graph['type_graph'] = ''; //dont use
-	$format_graph['unit_name']  = $unit_name;
-	$format_graph['unit']       = ''; //dont use
-	$format_graph['title']      = $title;
-	$format_graph['homeurl']    = $homeurl;
-	$format_graph['ttl']        = $ttl;
-	$format_graph['background'] = $backgroundColor;
-	$format_graph['font']       = $config['fontpath'];
-	$format_graph['font-size']  = $config['font_size'];
-
+	$params = array();
+	$params['show_events']    = $show_events;
+	$params['show_alerts']    = $show_alerts;
+	$params['show_unknown']   = false; // dont use
+	$params['avg_only']       = false; // dont use
+	$params['fullscale']      = $fullscale;
+	$params['show_title']     = ''; // dont use
+	$params['menu']           = $menu; // dont use
+	$params['adapt_key']      = ''; // dont use
+	$params['percentil']      = $percentil;
+	$params['projection']     = $projection;
+	$params['compare']        = false; //dont use
+	$params['dashboard']      = $dashboard;
+	$params['vconsole']       = $vconsole;
+	$params['pure']           = $pure;
+	$params['baseline']       = false; //dont use
+	$params['only_image']     = $only_image;
+	$params['return_data']    = false; //dont use
+	$params['id_widget']      = $id_widget_dashboard;
+	$params['labels']         = $labels;
+	$params['stacked']        = $stacked;
+	$params['combined']       = true;
+	$params['from_interface'] = $from_interface;
+	$params['font']           = $config['fontpath'];
+	$params['font-size']      = $config['font_size'];
+	$params['width']          ='90%';
+	$params['height']         = $height;
 	//for flash_charts
 	$user              = users_get_user_by_id($config['id_user']);
 	$user_flash_charts = $user['flash_chart'];
@@ -1032,9 +1203,7 @@ function graphic_combined_module (
 			$agent_module_id,
 			$date_array,
 			$data_module_graph,
-			$show_elements_graph,
-			$format_graph,
-			array(),
+			$param,
 			$i,
 			$data_module_graph['agent_name']
 		);
@@ -1581,9 +1750,8 @@ function graphic_combined_module (
 		case CUSTOM_GRAPH_AREA:
 		case CUSTOM_GRAPH_LINE:
 			return area_graph($agent_module_id, $array_data,
-				$legend, $series_type, $date_array,
-				$data_module_graph, $show_elements_graph,
-				$format_graph, $water_mark, $series_suffix_str,
+				$legend, $series_type, $date_array, $data_module_graph,
+				$params, $water_mark, $series_suffix_str,
 				$array_events_alerts);
 			break;
 		case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD:
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index f3a6766835..e6c3d1da8f 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -3507,18 +3507,6 @@ function reporting_simple_baseline_graph($report, $content,
 	reporting_set_conf_charts($width, $height, $only_image, $type,
 		$content, $ttl);
 
-	if (!empty($force_width_chart)) {
-		$width = $force_width_chart;
-	}
-
-	if (!empty($force_height_chart)) {
-		$height = $force_height_chart;
-	}
-
-//XXXXXXXX
-	$width  = '90%';
-	$height = 300;
-
 	$baseline_data = enterprise_hook(
 		'reporting_enterprise_get_baseline',
 		array (
@@ -3535,43 +3523,17 @@ function reporting_simple_baseline_graph($report, $content,
 	switch ($type) {
 		case 'dinamic':
 		case 'static':
-			$return['chart'] = grafico_modulo_sparse (
-				$content['id_agent_module'],
-				$content['period'],
-				false,
-				$width,
-				$height,
-				'',
-				null,
-				false,
-				0,
-				false,
-				$report["datetime"],
-				'',
-				0,
-				0,
-				true,
-				$only_image,
-				ui_get_full_url(false, false, false, false),
-				$ttl,
-				false,
-				'',
-				false,
-				false,
-				true,
-				'white',
-				null,
-				false,
-				false,
-				'area',
-				false,
-				false,
-				0,
-				300,
-				0,
-				0,
-				$baseline_data
+			$params =array(
+				'agent_module_id'     => $content['id_agent_module'],
+				'period'              => $content['period'],
+				'date'                => $report["datetime"],
+				'only_image'          => $only_image,
+				'homeurl'             => ui_get_full_url(false, false, false, false),
+				'ttl'                 => $ttl,
+				'array_data_create'   => $baseline_data
 			);
+
+			$return['chart'] = grafico_modulo_sparse ($params);
 			break;
 		case 'data':
 			break;
@@ -3934,7 +3896,6 @@ function reporting_value($report, $content, $type,$pdf) {
 	switch ($type) {
 		case 'max':
 		if($content['lapse_calc'] == 0){
-		
 			$value = reporting_get_agentmodule_data_max(
 				$content['id_agent_module'], $content['period'], $report["datetime"]);
 			if (!$config['simple_module_value']) {
@@ -3943,17 +3904,27 @@ function reporting_value($report, $content, $type,$pdf) {
 			else {
 				$formated_value = format_for_graph($value, $config['graph_precision']) . " " . $unit;
 			}
-			
 		}
 		else{
-			
+			$params =array(
+				'agent_module_id'     => $content['id_agent_module'],
+				'period'              => $content['period'],
+				'width'               => '600px',
+				'pure'                => false,///true
+				'date'                => $report["datetime"],
+				'only_image'          => $only_image,
+				'homeurl'             => ui_get_full_url(false, false, false, false),
+				'ttl'                 => 1,///2
+				'type_graph'          => $config['type_module_charts'],
+				'time_interval'       => $content['lapse']
+			);
+
 			$value = '
 			<table border="0" style="margin:0 auto;text-align:center;">
 				<tr>
 					<td width="400px;" height="20%;">';
-					
 					if($content['visual_format'] == 1 || $content['visual_format'] == 2 || $content['visual_format'] == 3){
-					
+
 					$value .= '
 						<table style="width:90%;margin:0 auto;background-color:#eee;border: solid lightgray 1px;">
 							<tr>
@@ -3979,62 +3950,28 @@ function reporting_value($report, $content, $type,$pdf) {
 								</td>
 							</tr>
 						</table>';
-						
 					}
-						
+
 					$value .= '
 				</td>
 				<td rowspan="2" width="150px">
 				</td>
 				<td rowspan="2">';
-				
+
 				if($content['visual_format'] == 2 || $content['visual_format'] == 3){
-					$value .=
-					grafico_modulo_sparse(
-					$content['id_agent_module'],
-					$content['period'],
-					false,
-					600,
-					300,
-					'',
-					'',
-					false,
-					0,
-					true,
-					$report["datetime"],
-					'',
-					0,
-					0,
-					true,
-					$only_image,
-					ui_get_full_url(false, false, false, false),
-					2,
-					false,
-					'',
-					$time_compare_overlapped,
-					true,
-					true,
-					'white',
-					($content['style']['percentil'] == 1) ? $config['percentil'] : null,
-					false,
-					false,
-					$config['type_module_charts'],
-					false,
-					false,
-					$content['lapse_calc'],
-					$content['lapse'],
-					1);
+					$params['force_interval'] = 'max_only';
+					$value .= grafico_modulo_sparse($params);
 				}
-				
+
 				$value .= '
-				
-				</td>				
+
+				</td>
 			</tr>
 			<tr>
 				<td>';
-				
+
 				if($content['visual_format'] == 1 || $content['visual_format'] == 3){
-				
+
 				$value .= '
 					<table style="width:90%;margin:0 auto;margin-top:30px;background-color:#eee;border: solid lightgray 1px;">
 						<tr>
@@ -4048,11 +3985,11 @@ function reporting_value($report, $content, $type,$pdf) {
 						<tr>';
 							$time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module']);
 							$date_reference = getdate();
-							
+
 							for ($i=$date_reference[0]; $i > ($date_reference[0]-$content["period"]); $i -= $content["lapse"]) { 
-									
+
 								$value .= '<tr><td style="padding:5px;">'. date("Y-m-d H:i:s", ($i-$content["lapse"]+1)).' to '.date("Y-m-d H:i:s",$i).'</td><td>';
-								
+
 								if($i>$time_begin['utimestamp']){
 									$value .= format_for_graph(reporting_get_agentmodule_data_max(
 									$content['id_agent_module'], $content["lapse"], $i), $config['graph_precision']) . ' ' . $unit.'</td></tr>';
@@ -4060,37 +3997,35 @@ function reporting_value($report, $content, $type,$pdf) {
 								else{
 										$value .= 'N/A</td></tr>';
 								}
-			
+
 							}
-							
+
 							$value .='</table>';
 				}
-					
 					$value .= '
-					
 				</td>
 			</tr>
 		</table>';
-			
+
 			$formated_value = $value;
 		}
-		
+
 		break;
 		case 'min':
 			if($content['lapse_calc'] == 0){
 				$value = reporting_get_agentmodule_data_min(
 				$content['id_agent_module'], $content['period'], $report["datetime"]);
-			
+
 				if (!$config['simple_module_value']) {
 					$formated_value = $value;
 				}
 				else {
 					$formated_value = format_for_graph($value, $config['graph_precision']) . " " . $unit;
 				}
-						
+
 			}
 			else{
-				
+
 				$value = '
 				<table border="0" style="margin:0 auto;text-align:center;">
 					<tr>
@@ -4123,57 +4058,21 @@ function reporting_value($report, $content, $type,$pdf) {
 									</td>
 								</tr>
 							</table>';
-							
 						}
-							
+
 						$value .= '
 					</td>
 					<td rowspan="2" width="150px">
 					</td>
 					<td rowspan="2">';
-					
+
 					if($content['visual_format'] == 2 || $content['visual_format'] == 3){
-						$value .=
-						grafico_modulo_sparse(
-						$content['id_agent_module'],
-						$content['period'],
-						false,
-						600,
-						300,
-						'',
-						'',
-						false,
-						0,
-						true,
-						$report["datetime"],
-						'',
-						0,
-						0,
-						true,
-						$only_image,
-						ui_get_full_url(false, false, false, false),
-						2,
-						false,
-						'',
-						$time_compare_overlapped,
-						true,
-						true,
-						'white',
-						($content['style']['percentil'] == 1) ? $config['percentil'] : null,
-						false,
-						false,
-						$config['type_module_charts'],
-						false,
-						false,
-						$content['lapse_calc'],
-						$content['lapse'],
-						0,
-						1);
+						$params['force_interval'] = 'min_only';
+						$value .= grafico_modulo_sparse($params);
 					}
-					
+
 					$value .= '
-					
-					</td>				
+					</td>
 				</tr>
 				<tr>
 					<td>';
@@ -4239,7 +4138,6 @@ function reporting_value($report, $content, $type,$pdf) {
 					<td width="400px;" height="20%;">';
 					
 					if($content['visual_format'] == 1 || $content['visual_format'] == 2 || $content['visual_format'] == 3){
-					
 					$value .= '
 						<table style="width:90%;margin:0 auto;background-color:#eee;border: solid lightgray 1px;">
 							<tr>
@@ -4275,41 +4173,8 @@ function reporting_value($report, $content, $type,$pdf) {
 				<td rowspan="2">';
 				
 				if($content['visual_format'] == 2 || $content['visual_format'] == 3){
-					$value .=
-					grafico_modulo_sparse(
-					$content['id_agent_module'],
-					$content['period'],
-					false,
-					600,
-					300,
-					'',
-					'',
-					false,
-					1,
-					true,
-					$report["datetime"],
-					'',
-					0,
-					0,
-					true,
-					$only_image,
-					ui_get_full_url(false, false, false, false),
-					2,
-					false,
-					'',
-					$time_compare_overlapped,
-					true,
-					true,
-					'white',
-					($content['style']['percentil'] == 1) ? $config['percentil'] : null,
-					false,
-					false,
-					$config['type_module_charts'],
-					false,
-					false,
-					$content['lapse_calc'],
-					$content['lapse']
-					);
+					$params['force_interval'] = 'avg_only';
+					$value .= grafico_modulo_sparse($params);
 				}
 				
 				$value .= '
@@ -6635,6 +6500,7 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 		case 'static':
 			if (preg_match ("/string/", $moduletype_name)) {
 				$urlImage = ui_get_full_url(false, false, false, false);
+				/*
 				$return['chart'] = grafico_modulo_string(
 					$content['id_agent_module'],
 					$content['period'],
@@ -6651,6 +6517,8 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 					$urlImage,
 					"",
 					$ttl);
+				*/
+				$return['chart'] = 'arreglar la grafica de string de una vez por todassssssssss';
 
 			}
 			else {
@@ -6660,36 +6528,23 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 					$time_compare_overlapped = 'overlapped';
 				}
 
-				$return['chart'] = grafico_modulo_sparse(
-					$content['id_agent_module'],
-					$content['period'],
-					false,
-					'90%',
-					400,
-					$label,
-					'',
-					false,
-					$only_avg,
-					true,
-					$report["datetime"],
-					'',
-					0,
-					0,
-					true,
-					$only_image,
-					ui_get_full_url(false, false, false, false),
-					$ttl,
-					false,
-					'',
-					$time_compare_overlapped,
-					true,
-					true,
-					'white',
-					($content['style']['percentil'] == 1) ? $config['percentil'] : null,
-					false,
-					false,
-					$config['type_module_charts'],
-					$fullscale);
+				$params =array(
+					'agent_module_id'     => $content['id_agent_module'],
+					'period'              => $content['period'],
+					'title'               => $label,
+					'avg_only'            => $only_avg,
+					'pure'                => false, //XXX
+					'date'                => $report["datetime"],
+					'only_image'          => $only_image,
+					'homeurl'             => ui_get_full_url(false, false, false, false),
+					'ttl'                 => $ttl,
+					'compare'             => $time_compare_overlapped,
+					'show_unknown'        => true,
+					'percentil'           => ($content['style']['percentil'] == 1) ? $config['percentil'] : null,
+					'fullscale'           => $fullscale
+				);
+
+				$return['chart'] = grafico_modulo_sparse($params);
 			}
 			break;
 		case 'data':
@@ -6708,7 +6563,6 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 	if ($config['metaconsole']) {
 		metaconsole_restore_db();
 	}
-
 	return reporting_check_structure_content($return);
 }
 
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index ffe13f74d0..f0da8a2b95 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -223,61 +223,25 @@ function vbar_graph(
 function area_graph(
 	$agent_module_id, $array_data,
 	$legend, $series_type, $date_array,
-	$data_module_graph, $show_elements_graph,
-	$format_graph, $water_mark, $series_suffix_str,
+	$data_module_graph, $params, $water_mark, $series_suffix_str,
 	$array_events_alerts
 ) {
 	global $config;
 
 	include_once('functions_flot.php');
-	if ($config['flash_charts']) {
-		return flot_area_graph(
-			$agent_module_id,
-			$array_data,
-			$legend,
-			$series_type,
-			$date_array,
-			$data_module_graph,
-			$show_elements_graph,
-			$format_graph,
-			$water_mark,
-			$series_suffix_str,
-			$array_events_alerts
-		);
-	}
-	else {
-		//XXXXX
-		//Corregir este problema
-		//tener en cuenta stacked, area, line
 
-		$graph = array();
-		$graph['data']            = $array_data;
-		$graph['width']           = 900;
-		$graph['height']          = 400;
-	//	$graph['color']           = $color;
-		$graph['legend']          = $legend;
-		$graph['xaxisname']       = 'me la pela';
-		$graph['yaxisname']       = 'borja es gay';
-	//  $graph['water_mark']      = $water_mark_file;
-		$graph['font']            = $format_graph['font'];
-		$graph['font_size']       = $format_graph['font_size'];
-		$graph['backgroundColor'] = 'white';
-		$graph['unit']            = '';
-		$graph['series_type']     = array();
-		$graph['percentil']       = false;
-
-//XXX $ttl tercer parametro
-
-		$id_graph = serialize_in_temp($graph, null, 1);
-		// Warning: This string is used in the function "api_get_module_graph" from 'functions_api.php' with the regec patern "/<img src='(.+)'>/"
-		return "<img src='" .
-			ui_get_full_url (false, false, false, false) .
-			"include/graphs/functions_pchart.php?" .
-				"static_graph=1&" .
-				"graph_type=area&" .
-				"ttl=" . $ttl . "&" .
-				"id_graph=" . $id_graph . "'>";
-	}
+	return flot_area_graph(
+		$agent_module_id,
+		$array_data,
+		$legend,
+		$series_type,
+		$date_array,
+		$data_module_graph,
+		$params,
+		$water_mark,
+		$series_suffix_str,
+		$array_events_alerts
+	);
 }
 
 function stacked_bullet_chart($flash_chart, $chart_data, $width, $height,
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index a51e3a0760..4570ba91ca 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -858,28 +858,28 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 function pandoraFlotArea(
 	graph_id, values, legend, agent_module_id,
 	series_type, watermark, date_array,
-	data_module_graph, show_elements_graph,
-	format_graph, force_integer, series_suffix_str,
+	data_module_graph, params,
+	force_integer, series_suffix_str,
 	background_color, legend_color, short_data,
 	events_array
 ) {
 
 	//diferents vars
-	var unit      = format_graph.unit ? format_graph.unit : '';
-	var homeurl   = format_graph.homeurl;
-	var font_size = format_graph.font_size;
-	var font      = format_graph.font;
-	var width     = format_graph.width;
-	var height    = format_graph.height;
-	var vconsole  = show_elements_graph.vconsole;
-	var dashboard = show_elements_graph.dashboard;
-	var menu      = show_elements_graph.menu;
+	var unit      = params.unit ? params.unit : '';
+	var homeurl   = params.homeurl;
+	var font_size = params.font_size;
+	var font      = params.font;
+	var width     = params.width;
+	var height    = params.height;
+	var vconsole  = params.vconsole;
+	var dashboard = params.dashboard;
+	var menu      = params.menu;
 	var min_x     = date_array['start_date'] *1000;
 	var max_x     = date_array['final_date'] *1000;
-	var type      = show_elements_graph.stacked;
+	var type      = params.stacked;
 
 	if(typeof type === 'undefined' || type == ''){
-		type = format_graph.type_graph;
+		type = params.type_graph;
 	}
 
 	//for threshold
@@ -2125,7 +2125,7 @@ console.log(legend);
 
 		// Get only two decimals
 		//XXXXXXXXXX
-		formatted = round_with_decimals(formatted, 100);
+		//formatted = round_with_decimals(formatted, 100);
 		return '<div class='+font+' style="font-size:'+font_size+'pt;">'+formatted+'</div>';
 	}
 
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index ca5e6b375c..fc47e6d7c6 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -103,8 +103,7 @@ function include_javascript_dependencies_flot_graph($return = false) {
 function flot_area_graph (
 	$agent_module_id, $array_data,
 	$legend, $series_type, $date_array,
-	$data_module_graph, $show_elements_graph,
-	$format_graph, $water_mark, $series_suffix_str,
+	$data_module_graph, $params, $water_mark, $series_suffix_str,
 	$array_events_alerts ) {
 
 	global $config;
@@ -115,7 +114,7 @@ function flot_area_graph (
 	$graph_id = uniqid('graph_');
 
 	$background_style = '';
-	switch ($format_graph['background']) {
+	switch ($params['background']) {
 		default:
 		case 'white':
 			$background_style = ' background: #fff; ';
@@ -130,10 +129,10 @@ function flot_area_graph (
 
 	///XXXXXXX los px caca
 	// Parent layer
-	$return = "<div class='parent_graph' style='width: " . ($format_graph['width']) . "; " . $background_style . "'>";
+	$return = "<div class='parent_graph' style='width: " . ($params['width']) . "; " . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
-	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:" . $format_graph['font_size'] ."pt !important;'></p>";
-	if(!isset($show_elements_graph['combined']) || !$show_elements_graph['combined']){
+	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:" . $params['font_size'] ."pt !important;'></p>";
+	if(!isset($params['combined']) || !$params['combined']){
 		$yellow_threshold = $data_module_graph['w_min'];
 		$red_threshold    = $data_module_graph['c_min'];
 		// Get other required module datas to draw warning and critical
@@ -149,12 +148,12 @@ function flot_area_graph (
 			$red_inverse    = !($data_module_graph['c_inv'] == 0);
 		}
 	}
-	elseif(isset($show_elements_graph['from_interface']) && $show_elements_graph['from_interface']){
-		if(	isset($show_elements_graph['threshold_data']) && is_array($show_elements_graph['threshold_data'])){
-			$yellow_up      = $show_elements_graph['threshold_data']['yellow_up'];
-			$red_up         = $show_elements_graph['threshold_data']['red_up'];
-			$yellow_inverse = $show_elements_graph['threshold_data']['yellow_inverse'];
-			$red_inverse    = $show_elements_graph['threshold_data']['red_inverse'];
+	elseif(isset($params['from_interface']) && $params['from_interface']){
+		if(	isset($params['threshold_data']) && is_array($params['threshold_data'])){
+			$yellow_up      = $params['threshold_data']['yellow_up'];
+			$red_up         = $params['threshold_data']['red_up'];
+			$yellow_inverse = $params['threshold_data']['yellow_inverse'];
+			$red_inverse    = $params['threshold_data']['red_inverse'];
 		}
 		else{
 			$yellow_up      = 0;
@@ -170,44 +169,44 @@ function flot_area_graph (
 		$red_inverse    = false;
 	}
 
-	if ($show_elements_graph['menu']) {
+	if ($params['menu']) {
 		$return .= menu_graph(
 			$yellow_threshold, $red_threshold,
 			$yellow_up, $red_up, $yellow_inverse,
-			$red_inverse, $show_elements_graph['dashboard'],
-			$show_elements_graph['vconsole'],
-			$graph_id, $format_graph['width'],
-			$format_graph['homeurl']
+			$red_inverse, $params['dashboard'],
+			$params['vconsole'],
+			$graph_id, $params['width'],
+			$params['homeurl']
 		);
 	}
 
 	$return .= html_print_input_hidden('line_width_graph', $config['custom_graph_width'], true);
 	$return .= "<div id='timestamp_$graph_id'
 					class='timestamp_graph'
-					style='	font-size:".$format_graph['font_size']."pt;
+					style='	font-size:".$params['font_size']."pt;
 							display:none; position:absolute;
 							background:#fff; border: solid 1px #aaa;
 							padding: 2px; z-index:1000;'></div>";
 	$return .= "<div id='$graph_id' class='";
 
-	if($format_graph['type'] == 'area_simple'){
+	if($params['type'] == 'area_simple'){
 		$return .= "noresizevc ";
 	}
-//XXXXXX  height: ".$format_graph['height']."px;'
-	$return .= "graph" .$format_graph['adapt_key'] ."'
-				style='	width: ".$format_graph['width']."px;
-				height: ".$format_graph['height']."px;'></div>";
+//XXXXXX  height: ".$params['height']."px;'
+	$return .= "graph" .$params['adapt_key'] ."'
+				style='	width: ".$params['width']."px;
+				height: ".$params['height']."px;'></div>";
 
-	if ($show_elements_graph['menu']) {
-		$format_graph['height'] = 100;
+	if ($params['menu']) {
+		$params['height'] = 100;
 	}
 	else {
-		$format_graph['height'] = 1;
+		$params['height'] = 1;
 	}
 
 	if (!$vconsole){
 		$return .= "<div id='overview_$graph_id' class='overview_graph'
-						style='margin:0px; margin-top:30px; margin-bottom:50px; display:none; width: ".$format_graph['width']."; height: 200px;'></div>";
+						style='margin:0px; margin-top:30px; margin-bottom:50px; display:none; width: ".$params['width']."; height: 200px;'></div>";
 	}
 
 	//XXXXTODO
@@ -225,11 +224,11 @@ function flot_area_graph (
 	}
 
 	// Store data series in javascript format
-	$extra_width = (int)($format_graph['width'] / 3);
+	$extra_width = (int)($params['width'] / 3);
 	$return .= "<div id='extra_$graph_id'
-					style='font-size: " . $format_graph['font_size'] . "pt;
+					style='font-size: " . $params['font_size'] . "pt;
 					display:none; position:absolute; overflow: auto;
-					max-height: ".($format_graph['height']+50)."px;
+					max-height: ".($params['height']+50)."px;
 					width: ".$extra_width."px;
 					background:#fff; padding: 2px 2px 2px 2px;
 					border: solid #000 1px;'></div>";
@@ -264,8 +263,7 @@ function flot_area_graph (
 	$series_type         = json_encode($series_type);
 	$date_array          = json_encode($date_array);
 	$data_module_graph   = json_encode($data_module_graph);
-	$show_elements_graph = json_encode($show_elements_graph);
-	$format_graph        = json_encode($format_graph);
+	$params 			 = json_encode($params);
 	$array_events_alerts = json_encode($array_events_alerts);
 
 	// Javascript code
@@ -281,8 +279,7 @@ function flot_area_graph (
 		"'$watermark', \n" .
 		"JSON.parse('$date_array'), \n" .
 		"JSON.parse('$data_module_graph'), \n" .
-		"JSON.parse('$show_elements_graph'), \n" .
-		"JSON.parse('$format_graph'), \n" .
+		"JSON.parse('$params'), \n" .
 		"$force_integer, \n" .
 		"'$series_suffix_str', \n" .
 		"'$background_color', \n" .
diff --git a/pandora_console/include/test.js b/pandora_console/include/test.js
new file mode 100644
index 0000000000..e47d8a5e41
--- /dev/null
+++ b/pandora_console/include/test.js
@@ -0,0 +1,26 @@
+var webPage = require('webpage');
+var page = webPage.create();
+var url = "http://nova/pandora_console/operation/agentes/stat_win.php?type=sparse&period=86400&id=136574&label=QXJ0aWNhJiN4MjA7d2ViJiN4MjA7cGFnZSYjeDIwO2V4YW1wbGU%3D&refresh=600&draw_events=0";
+
+var r = page.addCookie({
+  'name'     : 'PHPSESSID',   /* required property */
+  'value'    : '23qu7l1sgb3iq3bkaedr724hp3',  /* required property */
+  'path'     : '/pandora_console',
+  'domain'   : 'nova',
+});
+
+console.log(r);
+
+
+
+
+
+
+
+page.viewportSize = { width: 750, height: 350 };
+page.open(url, function start(status) {
+  page.render('output.jpeg', {format: 'jpeg', quality: '100'});
+  phantom.exit();
+});
+
+
diff --git a/pandora_console/include/web2image.js b/pandora_console/include/web2image.js
new file mode 100644
index 0000000000..cfb36726f6
--- /dev/null
+++ b/pandora_console/include/web2image.js
@@ -0,0 +1,34 @@
+var system = require('system');
+
+if (system.args.length < 2 || system.args.length > 6) {
+	//console.log('Usage web2image.js url url_parameters output_filename width height');
+	phantom.exit(1);
+}
+
+var webPage	        = require('webpage');
+var page            = webPage.create();
+var url             = system.args[1];
+var url_params      = system.args[2];
+var output_filename = system.args[3];
+var _width          = system.args[4];
+var _height         = system.args[5];
+
+if (!_width) {
+	_width = 750;
+}
+
+if (!_height) {
+	_height = 350;
+}
+
+page.viewportSize = { width: _width, height: _height };
+
+//console.log("Pagina: " + url);
+//console.log("parametros: " + url_params);
+//console.log("Archivo salida: " + output_filename);
+page.open(url + "?" + "data=" + url_params, function start(status) {
+	page.render(output_filename, {format: 'png'}); //, 'quality': 100});
+	phantom.exit();
+});
+
+
diff --git a/pandora_console/mobile/operation/module_graph.php b/pandora_console/mobile/operation/module_graph.php
index c4aa52fe04..aefad92c50 100644
--- a/pandora_console/mobile/operation/module_graph.php
+++ b/pandora_console/mobile/operation/module_graph.php
@@ -136,29 +136,26 @@ class ModuleGraph {
 					switch ($this->graph_type) {
 						case 'boolean':
 						case 'sparse':
-							$graph = grafico_modulo_sparse(
-								$this->id,
-								$this->period,
-								$this->draw_events,
-								$this->width,
-								$this->height,
-								false,
-								null,
-								$this->draw_alerts,
-								$this->avg_only,
-								false,
-								$date,
-								$unit,
-								$this->baseline,
-								0,
-								true,
-								false,
-								$urlImage,
-								1,
-								false,
-								'adapter_' . $this->graph_type,
-								$time_compare, $this->unknown_graph, false,
-								'white', null, false, false, $config['type_module_charts']);
+							$params =array(
+								'agent_module_id'     => $this->id,
+								'period'              => $this->period,
+								'show_events'         => $this->draw_events,
+								'width'               => $this->width,
+								'height'              => $this->height,
+								'show_alerts'         => $this->draw_alerts,
+								'avg_only'            => $this->avg_only,
+								'date'                => $date,
+								'unit'                => $unit,
+								'baseline'            => $this->baseline,
+								'homeurl'             => $urlImage,
+								'adapt_key'           => 'adapter_' . $this->graph_type,
+								'compare'             => $time_compare,
+								'show_unknown'        => $this->unknown_graph,
+								'menu'                => false,
+								'type_graph'          => $config['type_module_charts']
+							);
+
+							$graph = grafico_modulo_sparse($params);
 							if ($this->draw_events) {
 								$graph .= '<br>';
 								$graph .= graphic_module_events($this->id,
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 6d4527aedf..818fbf61d8 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -235,14 +235,27 @@ $alias    = db_get_value ("alias","tagente","id_agente",$id_agent);
 		switch ($graph_type) {
 			case 'boolean':
 			case 'sparse':
-				echo grafico_modulo_sparse ($id, $period, $draw_events,
-					$width, $height, $label_graph, $unit, $draw_alerts,
-					$avg_only, false, $date, $unit, $baseline, 0, true,
-					false, $urlImage, 1, false,
-					'adapter_' . $graph_type, $time_compare,
-					$unknown_graph, true, 'white',
-					(($show_percentil)? $config['percentil'] : null),
-					false, false, $config['type_module_charts'], $fullscale);
+			$params =array(
+				'agent_module_id'     => $id,
+				'period'              => $period,
+				'show_events'         => $draw_events,
+				'title'               => $label_graph,
+				'unit_name'           => $unit,
+				'show_alerts'         => $draw_alerts,
+				'avg_only'            => $avg_only,
+				'date'                => $date,
+				'unit'                => $unit,
+				'baseline'            => $baseline,
+				'homeurl'             => $urlImage,
+				'adapt_key'           => 'adapter_' . $graph_type,
+				'compare'             => $time_compare,
+				'show_unknown'        => $unknown_graph,
+				'percentil'           => (($show_percentil)? $config['percentil'] : null),
+				'type_graph'          => $config['type_module_charts'],
+				'fullscale'           => $fullscale
+			);
+
+				echo grafico_modulo_sparse ($params);
 				echo '<br>';
 				if ($show_events_graph){
 					$width = '500';
diff --git a/pandora_plugins/intel_dcm/extensions/intel_dcm_agent_view.php b/pandora_plugins/intel_dcm/extensions/intel_dcm_agent_view.php
index 69e2a9cd81..837e5d35ea 100644
--- a/pandora_plugins/intel_dcm/extensions/intel_dcm_agent_view.php
+++ b/pandora_plugins/intel_dcm/extensions/intel_dcm_agent_view.php
@@ -168,9 +168,23 @@ function main_intel_dcm_agent_view () {
 		
 	$module = modules_get_agentmodule_id (io_safe_input("Avg. Power"), $id_agent);		
 	$unit = modules_get_unit ($module['id_agente_modulo']);
-		
-	$data[1] = grafico_modulo_sparse($module['id_agente_modulo'], 7200, $draw_events, 400, 250,
-		$module['nombre'], null, $draw_alerts, $avg_only, false, $date, $unit);
+
+	$params_1 =array(
+		'agent_module_id'     => $module['id_agente_modulo'],
+		'period'              => 7200,
+		'show_events'         => $draw_events,
+		'width'               => 400,
+		'height'              => 250,
+		'title'               => $module['nombre'],
+		'unit_name'           => null,
+		'show_alerts'         => $draw_alerts,
+		'avg_only'            => $avg_only,
+		'pure'                => false,
+		'date'                => $date,
+		'unit'                => $unit
+	);
+
+	$data[1] = grafico_modulo_sparse($params_1);
 		
 	array_push ($table->data, $data);
 		
@@ -190,19 +204,44 @@ function main_intel_dcm_agent_view () {
 	
 	$module = modules_get_agentmodule_id (io_safe_input("Avg. Inlet Temperature"), $id_agent);		
 	$unit = modules_get_unit ($module['id_agente_modulo']);
-		
-	$data[0] = grafico_modulo_sparse($module['id_agente_modulo'], 7200, $draw_events, 400, 250,
-		$module['nombre'], null, $draw_alerts, $avg_only, false, $date, $unit);
-
+	$params_2 =array(
+		'agent_module_id'     => $module['id_agente_modulo'],
+		'period'              => 7200,
+		'show_events'         => $draw_events,
+		'width'               => 400,
+		'height'              => 250,
+		'title'               => $module['nombre'],
+		'unit_name'           => null,
+		'show_alerts'         => $draw_alerts,
+		'avg_only'            => $avg_only,
+		'pure'                => false,
+		'date'                => $date,
+		'unit'                => $unit
+	);
+	$data[0] = grafico_modulo_sparse($params_2);
 
 	$module = modules_get_agentmodule_id (io_safe_input("Calculated Cooling Power"), $id_agent);		
 	$unit = modules_get_unit ($module['id_agente_modulo']);
-		
-	$data[1] = grafico_modulo_sparse($module['id_agente_modulo'], 7200, $draw_events, 400, 250,
-		$module['nombre'], null, $draw_alerts, $avg_only, false, $date, $unit);
-	
+
+	$params_3 =array(
+		'agent_module_id'     => $module['id_agente_modulo'],
+		'period'              => 7200,
+		'show_events'         => $draw_events,
+		'width'               => 400,
+		'height'              => 250,
+		'title'               => $module['nombre'],
+		'unit_name'           => null,
+		'show_alerts'         => $draw_alerts,
+		'avg_only'            => $avg_only,
+		'pure'                => false,
+		'date'                => $date,
+		'unit'                => $unit
+	);
+
+	$data[1] = grafico_modulo_sparse($params_3);
+
 	array_push ($table->data, $data);
-	
+
 	echo "<center>";
 	html_print_table($table);
 	echo "</center>";

From aa1e7ff4d268bf51c3ff6cdc1d7d3733e2996cc8 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 29 May 2018 00:01:28 +0200
Subject: [PATCH 098/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 4 ++--
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 12cd910618..4c7d34d17a 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723
+Version: 7.0NG.723-180529
 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 48b07403e0..dc24b92778 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.723"
+pandora_version="7.0NG.723-180529"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index f7102647a6..ef2db938f5 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180528';
+use constant AGENT_BUILD => '180529';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 6d96a816cb..8cf1809ee0 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.723
-%define release     1
+%define release     180529
 
 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 d9e10622e3..f05691e2dd 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.723
-%define release     1
+%define release     180529
 
 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 e88cea3849..92f10e5e1d 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180528"
+PI_BUILD="180529"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index e0364cec84..a8f2c9e6df 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180528}
+{180529}
 
 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/pandora.cc b/pandora_agents/win32/pandora.cc
index db590470c2..e453d7a109 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.723(Build 180528)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180529)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index bdafd13a3d..c44b78e1de 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.723(Build 180528))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180529))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 15bb19a021..769455e2d4 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723
+Version: 7.0NG.723-180529
 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 d0130bab1c..83b420a50a 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.723"
+pandora_version="7.0NG.723-180529"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 08b312010d..c4bb09604b 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180528';
+$build_version = 'PC180529';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 3a8826f0ae..a22678a34f 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180528';
+$build = '180529';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 6abb38707f..d28272a596 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.723
-%define release     1
+%define release     180529
 
 # 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 7cd90352f6..3bc999411e 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.723
-%define release     1
+%define release     180529
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index cc2e4dd39f..91fadada5b 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723
+Version: 7.0NG.723-180529
 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 01324ef3bd..1145e92065 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.723"
+pandora_version="7.0NG.723-180529"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 5e25f53d6b..80ba8c05dd 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.723";
-my $pandora_build = "180528";
+my $pandora_build = "180529";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 9eeaa5e29d..c5e8bb6c53 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180528";
+my $pandora_build = "180529";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 1ca51790b2..778d826354 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.723
-%define release     1
+%define release     180529
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index a8ec3a31ff..da7d5cc118 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.723
-%define release     1
+%define release     180529
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index f3d7b65269..8b581c8a33 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180528"
+PI_BUILD="180529"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 9f510feff3..f2e30cee4f 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180528";
+my $version = "7.0NG.723 PS180529";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 3db9954daf..898eb7db04 100644
--- 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.723 PS180528";
+my $version = "7.0NG.723 PS180529";
 
 # save program name for logging
 my $progname = basename($0);

From 1391f8cc116e9fcbb6ea3b22c20af197ca68c6c1 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 29 May 2018 12:45:08 +0200
Subject: [PATCH 099/146] [Rebranding] Fixed get header logo on metaconsole

---
 pandora_console/include/functions_ui.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index f7142ed889..214ac50eb7 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3966,8 +3966,8 @@ function ui_get_custom_header_logo ($white_bg = false) {
 	}
 
 	$stored_logo = is_metaconsole()
-		? $config['meta_custom_logo']
-		: $white_bg ? $config['custom_logo_white_bg'] : $config['custom_logo'];
+		? ($white_bg ? $config['meta_custom_logo_white_bg'] : $config['meta_custom_logo'])
+		: ($white_bg ? $config['custom_logo_white_bg'] : $config['custom_logo']);
 	if (empty($stored_logo)) return 'images/pandora_tinylogo.png';
 	return 'enterprise/images/custom_logo/' . $stored_logo;
 }

From 0acaf2312df4b6e8c0881c82734a038194972b86 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 29 May 2018 13:26:47 +0200
Subject: [PATCH 100/146] [Rebranding] Mobile console head title

---
 pandora_console/mobile/include/ui.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/mobile/include/ui.class.php b/pandora_console/mobile/include/ui.class.php
index e423e52fd8..c1525e8722 100755
--- a/pandora_console/mobile/include/ui.class.php
+++ b/pandora_console/mobile/include/ui.class.php
@@ -84,7 +84,7 @@ class Ui {
 	
 	public function createPage($title = null, $page_name = null) {
 		if (!isset($title)) {
-			$this->title = __('Pandora FMS mobile');
+			$this->title = __('%s mobile', get_product_name());
 		}
 		else {
 			$this->title = $title;

From 53cbc4ebde42a3c19eeca8cb8c3a90f4d4712fea Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 29 May 2018 16:50:30 +0200
Subject: [PATCH 101/146] [Rebranding] Fixed missing include in pandora_db

---
 pandora_server/util/pandora_db.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index f2e30cee4f..e91df483de 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -30,6 +30,7 @@ use Time::HiRes qw(usleep);
 use lib '/usr/lib/perl5';
 
 use PandoraFMS::Tools;
+use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version

From aa6d9313316ff90fe3d023605aefb1562b78c124 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 29 May 2018 17:10:05 +0200
Subject: [PATCH 102/146] [Rebranding] Modified server source events by generic
 monitoring_event

---
 pandora_server/lib/PandoraFMS/Core.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index a3b84f430b..b19657ca2f 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -605,13 +605,13 @@ sub pandora_process_alert ($$$$$$$$;$) {
 			pandora_event ($pa_config, "Alert ceased (" .
 				safe_output($alert->{'name'}) . ")", 0, 0, $alert->{'priority'}, $id,
 				(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0), 
-				"alert_ceased", 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
+				"alert_ceased", 0, $dbh, 'monitoring_server', '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
 		}  else {
 			pandora_event ($pa_config, "Alert ceased (" .
 					safe_output($alert->{'name'}) . ")", $agent->{'id_grupo'},
 					$agent->{'id_agente'}, $alert->{'priority'}, $id,
 					(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0),
-					"alert_ceased", 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
+					"alert_ceased", 0, $dbh, 'monitoring_server', '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
 		}
 		return;
 	}
@@ -844,7 +844,7 @@ sub pandora_execute_alert ($$$$$$$$$;$) {
 
 		pandora_event ($pa_config, "Alert $text (" . safe_output($alert->{'name'}) . ") " . (defined ($module) ? 'assigned to ('. safe_output($module->{'nombre'}) . ")" : ""),
  			(defined ($agent) ? $agent->{'id_grupo'} : 0), (defined ($agent) ? $agent->{'id_agente'} : 0), $severity, (defined ($alert->{'id_template_module'}) ? $alert->{'id_template_module'} : 0),
-			(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0), $event, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
+			(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0), $event, 0, $dbh, 'monitoring_server', '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
 	}
 }
 
@@ -3146,7 +3146,7 @@ sub pandora_event ($$$$$$$$$$;$$$$$$$$$) {
 	
 	
 	# Set default values for optional parameters
-	$source = $pa_config->{'rb_product_name'} unless defined ($source);
+	$source = 'monitoring_server' unless defined ($source);
 	$comment = '' unless defined ($comment);
 	$id_extra = '' unless defined ($id_extra);
 	$user_name = '' unless defined ($user_name);
@@ -4160,11 +4160,11 @@ sub generate_status_event ($$$$$$$$) {
 	# Generate the event
 	if ($status != 0){
 		pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, 'monitoring_server', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 	} else { 
 		# Self validate this event if has "normal" status
 		pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 1, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 1, $dbh, 'monitoring_server', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 	}
 
 }
@@ -4919,7 +4919,7 @@ sub pandora_module_unknown ($$) {
 			# Are unknown events enabled?
 			if ($pa_config->{'unknown_events'} == 1) {
 				pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, 'monitoring_server', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 			}
 		}
 		# Regular module
@@ -4985,7 +4985,7 @@ sub pandora_module_unknown ($$) {
 		        $description = subst_alert_macros ($description, \%macros, $pa_config, $dbh, $agent, $module);
 		        
 				pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, 'monitoring_server', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 			}
 		}
 	}

From 0a2c744ef0fdbcf8b88e06f16fe97065ea60edbd Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 29 May 2018 17:32:24 +0200
Subject: [PATCH 103/146] [Rebranding] Modified daemon to load environment vars

---
 pandora_server/util/pandora_server | 32 +++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pandora_server/util/pandora_server b/pandora_server/util/pandora_server
index ff6a865259..601946edf4 100755
--- a/pandora_server/util/pandora_server
+++ b/pandora_server/util/pandora_server
@@ -34,6 +34,20 @@ fi
 export PANDORA_HOME="/etc/pandora/pandora_server.conf"
 export PANDORA_DAEMON=/usr/bin/pandora_server
 
+# Environment variables
+if [ -f /etc/pandora/pandora_server.env ]; then
+	source /etc/pandora/pandora_server.env
+fi
+if [[ -z ${PANDORA_RB_PRODUCT_NAME} ]]; then
+	PANDORA_RB_PRODUCT_NAME="Pandora FMS"
+fi
+if [[ -z ${PANDORA_RB_COPYRIGHT_NOTICE} ]]; then
+	PANDORA_RB_COPYRIGHT_NOTICE="Artica ST"
+fi
+
+export PANDORA_RB_PRODUCT_NAME=$PANDORA_RB_PRODUCT_NAME
+export PANDORA_RB_COPYRIGHT_NOTICE=$PANDORA_RB_COPYRIGHT_NOTICE
+
 # Uses a wait limit before sending a KILL signal, before trying to stop
 # Pandora FMS server nicely. Some big systems need some time before close
 # all pending tasks / threads.
@@ -73,7 +87,7 @@ function pidof_pandora () {
 
 if [ ! -f $PANDORA_DAEMON ]
 then
-	echo "Pandora FMS Server not found, please check setup and read manual"
+	echo "$PANDORA_RB_PRODUCT_NAME Server not found, please check setup and read manual"
 	rc_failed 5 # program is not installed
 	rc_exit
 fi
@@ -83,7 +97,7 @@ case "$1" in
 		PANDORA_PID=`pidof_pandora`
 		if [ ! -z "$PANDORA_PID" ]
 		then
-			echo "Pandora FMS Server is currently running on this machine with PID ($PANDORA_PID)."
+			echo "$PANDORA_RB_PRODUCT_NAME Server is currently running on this machine with PID ($PANDORA_PID)."
 			rc_exit # running start on a service already running
 		fi
 	
@@ -94,11 +108,11 @@ case "$1" in
 		
 		if [ ! -z "$PANDORA_PID" ]
 		then
-			echo "Pandora Server is now running with PID $PANDORA_PID"
+			echo "$PANDORA_RB_PRODUCT_NAME Server is now running with PID $PANDORA_PID"
 			rc_status -v
 		else
-			echo "Cannot start Pandora FMS Server. Aborted."
-			echo "Check Pandora FMS log files at '/var/log/pandora/pandora_server.error & pandora_server.log'"
+			echo "Cannot start $PANDORA_RB_PRODUCT_NAME Server. Aborted."
+			echo "Check $PANDORA_RB_PRODUCT_NAME log files at '/var/log/pandora/pandora_server.error & pandora_server.log'"
 			rc_failed 7 # program is not running
 		fi
 	;;
@@ -107,10 +121,10 @@ case "$1" in
 		PANDORA_PID=`pidof_pandora`
 		if [ -z "$PANDORA_PID" ]
 		then
-			echo "Pandora FMS Server is not running, cannot stop it."
+			echo "$PANDORA_RB_PRODUCT_NAME Server is not running, cannot stop it."
 			rc_exit # running stop on a service already stopped or not running
 		else
-			echo "Stopping Pandora FMS Server"
+			echo "Stopping $PANDORA_RB_PRODUCT_NAME Server"
 			kill $PANDORA_PID > /dev/null 2>&1
 			COUNTER=0
 
@@ -138,10 +152,10 @@ case "$1" in
 		PANDORA_PID=`pidof_pandora`
 		if [ -z "$PANDORA_PID" ]
 		then
-			echo "Pandora FMS Server is not running."
+			echo "$PANDORA_RB_PRODUCT_NAME Server is not running."
 			rc_failed 7 # program is not running
 		else
-			echo "Pandora FMS Server is running with PID $PANDORA_PID."
+			echo "$PANDORA_RB_PRODUCT_NAME Server is running with PID $PANDORA_PID."
 			rc_status
 		fi
 	;;

From 7147667d8c709673fbaea5b52b2c80be694d3953 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 30 May 2018 00:01:21 +0200
Subject: [PATCH 104/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 4c7d34d17a..82567e4815 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180529
+Version: 7.0NG.723-180530
 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 dc24b92778..492bd7e87e 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.723-180529"
+pandora_version="7.0NG.723-180530"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index ef2db938f5..0ea0e01bd1 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180529';
+use constant AGENT_BUILD => '180530';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 8cf1809ee0..6f080ae29c 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.723
-%define release     180529
+%define release     180530
 
 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 f05691e2dd..34bf115ae1 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.723
-%define release     180529
+%define release     180530
 
 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 92f10e5e1d..f58de6f228 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180529"
+PI_BUILD="180530"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index a8f2c9e6df..029012417e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180529}
+{180530}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e453d7a109..e40c5b3c58 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.723(Build 180529)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180530)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index c44b78e1de..d510659b2d 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.723(Build 180529))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180530))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 769455e2d4..ae06bada2a 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180529
+Version: 7.0NG.723-180530
 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 83b420a50a..fc6b1872e3 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.723-180529"
+pandora_version="7.0NG.723-180530"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index c4bb09604b..8c16d861f6 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180529';
+$build_version = 'PC180530';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index a22678a34f..44b3698da1 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180529';
+$build = '180530';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index d28272a596..6775966f08 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.723
-%define release     180529
+%define release     180530
 
 # 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 3bc999411e..26da243922 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.723
-%define release     180529
+%define release     180530
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 91fadada5b..2696e1a6b2 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180529
+Version: 7.0NG.723-180530
 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 1145e92065..fc4b666a04 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.723-180529"
+pandora_version="7.0NG.723-180530"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 80ba8c05dd..d9ce0e955d 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.723";
-my $pandora_build = "180529";
+my $pandora_build = "180530";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index c5e8bb6c53..1371cf2c4e 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180529";
+my $pandora_build = "180530";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 778d826354..95fcac8760 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.723
-%define release     180529
+%define release     180530
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index da7d5cc118..72f35bf1f8 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.723
-%define release     180529
+%define release     180530
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 8b581c8a33..160ffbc772 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180529"
+PI_BUILD="180530"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e91df483de..63e3694da4 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180529";
+my $version = "7.0NG.723 PS180530";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 898eb7db04..78eafb2a50 100644
--- 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.723 PS180529";
+my $version = "7.0NG.723 PS180530";
 
 # save program name for logging
 my $progname = basename($0);

From 5c6e22c9b6e66eb6108a03910c2746c385dba8a1 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 30 May 2018 11:08:48 +0200
Subject: [PATCH 105/146] [Rebranding] Remove delete environment vars and fixed
 pandora_db redefinitions

---
 pandora_server/lib/PandoraFMS/Tools.pm | 6 ------
 pandora_server/util/pandora_db.pl      | 8 ++++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index c257e2de57..896b6c3f35 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -676,12 +676,6 @@ sub enterprise_load ($) {
 
 	# Ops
 	if ($@) {
-		# Remove the rebranding if open version
-		if ($^O ne 'MSWin32') {
-			`unset PANDORA_RB_PRODUCT_NAME`;
-			`unset PANDORA_RB_COPYRIGHT_NOTICE`;
-		}
-
 		# Enterprise.pm not found.
 		return 0 if ($@ =~ m/PandoraFMS\/Enterprise\.pm.*\@INC/);
 
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 63e3694da4..d18ea02ab0 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -553,7 +553,7 @@ sub pandora_compactdb ($$) {
 ########################################################################
 # Check command line parameters.
 ########################################################################
-sub pandora_init ($) {
+sub pandora_init_pdb ($) {
 	my $conf = shift;
 	
 	log_message ('', "\nDB Tool $version Copyright (c) 2004-2018 " . pandora_get_initial_copyright_notice() . "\n");
@@ -595,7 +595,7 @@ sub pandora_init ($) {
 ########################################################################
 # Read external configuration file.
 ########################################################################
-sub pandora_load_config ($) {
+sub pandora_load_config_pdb ($) {
 	my $conf = shift;
 
 	# Read conf file
@@ -1025,10 +1025,10 @@ sub pandoradb_main ($$$) {
 }
 
 # Init
-pandora_init(\%conf);
+pandora_init_pdb(\%conf);
 
 # Read config file
-pandora_load_config (\%conf);
+pandora_load_config_pdb (\%conf);
 
 # Load enterprise module
 if (enterprise_load (\%conf) == 0) {

From 3155fecbfe15e226b45f7e1f169915377a8e40ec Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 30 May 2018 15:09:47 +0200
Subject: [PATCH 106/146] Fixed ACL in reports created by another user in bit
 RM

---
 .../godmode/reporting/reporting_builder.php   | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index f07ee98f86..33b304d81f 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -690,25 +690,18 @@ switch ($action) {
 				
 				switch ($type_access_selected) {
 					case 'group_view':
-						$edit = check_acl($config['id_user'],
-							$report['id_group'], "RW");
-						
-						if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) {
-							$delete = true; //owner can delete
-						} else {
-							$delete = false;
-						}
+						$edit = check_acl($config['id_user'], $report['id_group'], "RW");
+						$delete =
+							$edit ||
+							is_user_admin ($config["id_user"]) ||
+							$config['id_user'] == $report['id_user'];
 						break;
 					case 'group_edit':
-						$edit = check_acl($config['id_user'],
-							$report['id_group_edit'], "RW");
-						
-						if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) {
-							$delete = true; //owner can delete
-						} else {
-							$delete = check_acl($config['id_user'],
-								$report['id_group'], "RM");
-						}
+						$edit = check_acl($config['id_user'], $report['id_group_edit'], "RW");
+						$delete =
+							$edit ||
+							is_user_admin ($config["id_user"]) ||
+							$config['id_user'] == $report['id_user'];
 						break;
 					case 'user_edit':
 						if ($config['id_user'] == $report['id_user'] ||

From f1807246a143e13a33f72023fd0e5f6b8c86437b Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 30 May 2018 15:49:59 +0200
Subject: [PATCH 107/146] Changed MR to 16 and current_package_enterprise to
 723 for new and migrated installations

---
 pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 4 ++--
 pandora_console/pandoradb_data.sql                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 436081f2b1..5722b55833 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
@@ -1160,13 +1160,13 @@ ALTER TABLE titem MODIFY `source_data` int(10) unsigned;
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
-INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 13);
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 16);
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
 DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
-INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '720');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '723');
 
 -- ---------------------------------------------------------------------
 -- Table `tconfig_os`
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 9465b014ad..dd49cdddcf 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -109,7 +109,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('custom_report_front_logo', 'images/pandora_logo_white.jpg'),
 ('custom_report_front_header', ''),
 ('custom_report_front_footer', ''),
-('MR', 14),
+('MR', 16),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
 ('current_package_enterprise', '723'),

From a8b8f309e64706d484d287ba9dcce0547380bfeb Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 30 May 2018 17:45:17 +0200
Subject: [PATCH 108/146] fixed graphs

---
 .../ajax/visual_console_builder.ajax.php      |  23 ++--
 pandora_console/include/functions.php         |  30 +++--
 pandora_console/include/functions_api.php     |  26 ++---
 .../include/functions_forecast.php            |  97 ++++++++--------
 pandora_console/include/functions_graph.php   |  58 +++++++---
 .../include/functions_reporting.php           |  70 ++++--------
 .../include/functions_visual_map.php          | 104 +++++++-----------
 pandora_console/include/web2image.js          |   6 +-
 .../mobile/operation/module_graph.php         |  27 +----
 .../operation/agentes/stat_win.php            |  52 ++++-----
 10 files changed, 220 insertions(+), 273 deletions(-)

diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 461c20298a..52e77d2de2 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -251,20 +251,29 @@ switch ($action) {
 				continue;
 			}
 		}
-		
+
 		if ($id_custom_graph != 0) {
 			$img = custom_graphs_print(
 				$id_custom_graph, $height, $width, $period,
 				null, true, 0, true, $background_color);
 		}
 		else {
-			$img = grafico_modulo_sparse($id_agent_module,
-				$period, 0, $width, $height, '', null, false, 1,
-				0, 0, '', 0, 0, true, true, '', 1, false, '',
-				false, false, true, $background_color,
-				false, false, false, $config['type_module_charts']);
+			$params =array(
+				'agent_module_id'     => $id_agent_module,
+				'period'              => $period,
+				'show_events'         => false,
+				'width'               => $width,
+				'height'              => $height,
+				//'only_image'          => true,
+				//'homeurl'             => '',
+				'menu'                => false,
+				'backgroundColor'     => $background_color,
+				'vconsole'            => true,
+				'type_graph'          => $config['type_module_charts']
+			);
+			$img = grafico_modulo_sparse($params);
 		}
-		
+
 		//Restore db connection
 		if (!empty($id_metaconsole)) {
 			metaconsole_restore_db();
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 6e95fb00f1..a1aff0d960 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3104,6 +3104,10 @@ function series_type_graph_array($data, $show_elements_graph){
 												) . ' ' . $series_suffix_str;
 				}
 			}
+			elseif(strpos($key, 'projection') !== false){
+				$data_return['series_type'][$key] = 'area';
+				$data_return['legend'][$key] = __('Projection') . ' ' . $series_suffix_str;
+			}
 			else{
 				$data_return['series_type'][$key] = 'area';
 			}
@@ -3116,15 +3120,23 @@ function series_type_graph_array($data, $show_elements_graph){
 function generator_chart_to_pdf($params){
 	global $config;
 	$params_encode_json = urlencode(json_encode($params));
-	$file_js = "/var/www/html/pandora_console/include/web2image.js";
-	$url = "http://localhost/pandora_console/include/chart_generator.php";
-	$img_destination = "/var/www/html/pandora_console/attachment/imagen_". $params['agent_module_id'] .".png";
-	$width_img = 1048;
-	$height_img = 568;
-	html_debug_print("entra con: " . $params['agent_module_id'] ."  en el tiempo " . date("Y-m-d H:i:s"), true);
-	exec("phantomjs " . $file_js . " " . $url . "  '" . $params_encode_json . "' " . $img_destination . " " . $width_img . " " . $height_img);
-	html_debug_print("sale con:  " . $params['agent_module_id'] ."  en el tiempo " . date("Y-m-d H:i:s"), true);
-	return "<img src='/var/www/html/pandora_console/attachment/imagen_". $params['agent_module_id'] .".png' alt='la imagen bonica'>";
+	$file_js = $config["homedir"] . "/include/web2image.js";
+	$url = $config["homeurl"] . "/include/chart_generator.php";
+
+	$img_file = "img_". uniqid() . $params['agent_module_id'] .".png";
+	$img_path = $config["homedir"] . "/attachment/" . $img_file;
+	$img_url  = $config["homeurl"] . "/attachment/" . $img_file;
+
+	error_log($img_url);
+
+	$width_img  = 500;
+	$height_img = 450;
+	//html_debug_print('entrando en llamada a phantom.js.......', true);
+	$result = exec("phantomjs " . $file_js . " " . $url . "  '" . $params_encode_json . "' " . $img_path . " " . $width_img . " " . $height_img);
+	return '<img src="' . $img_url . '" />';
+	//header('Content-Type: image/png;');
+	//return '<img src="data:image/jpg;base64, '.$result.'" />';
+	//return "<img src='/var/www/html/pandora_console/attachment/imagen_". $params['agent_module_id'] .".png' alt='la imagen bonica'>";
 }
 
 /**
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index b65f17dbda..4a2168b58d 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -10041,25 +10041,13 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
 		// returnError('error_module_graph', __(''));
 		return;
 	}
-	
-	$id_module_type = modules_get_agentmodule_type ($id_module);
-	$module_type = modules_get_moduletype_name ($id_module_type);
-	
-	$string_type = strpos($module_type,'string');
-	// Get the html item
-	if ($string_type === false) {
-		$graph_html = grafico_modulo_sparse(
-			$id_module, $graph_seconds, false, 600, 300, '',
-			'', false, false, true, time(), '', 0, 0, true, true,
-			ui_get_full_url(false) . '/', 1, false, '', false, true,
-			true, 'white', null, false, false, $config['type_module_charts'], 
-			false, false);
-	} else {
-		$graph_html = grafico_modulo_string(
-			$id_module, $graph_seconds, false, 600, 300, '',
-			'', false, false, true, time(), true, ui_get_full_url(false) . '/', 
-			'', 1, true);
-	}
+
+	$graph_html = grafico_modulo_sparse(
+		$id_module, $graph_seconds, false, 600, 300, '',
+		'', false, false, true, time(), '', 0, 0, true, true,
+		ui_get_full_url(false) . '/', 1, false, '', false, true,
+		true, 'white', null, false, false, $config['type_module_charts'], 
+		false, false);
 
 	$graph_image_file_encoded = false;
 	if (preg_match("/<img src='(.+)'./", $graph_html, $matches)) {
diff --git a/pandora_console/include/functions_forecast.php b/pandora_console/include/functions_forecast.php
index ceafe817e2..f58e3592e7 100644
--- a/pandora_console/include/functions_forecast.php
+++ b/pandora_console/include/functions_forecast.php
@@ -46,12 +46,15 @@ function forecast_projection_graph($module_id,
 	}
 	
 	$begin_time = time();
-	
-	$module_data=grafico_modulo_sparse ($module_id, $period, 0,
-		300, 300 , '', null,
-		false, 0, false,
-		0, '', 0, 1, false,
-		true, '', 1, true);
+
+	$params =array(
+		'agent_module_id'     => $module_id,
+		'period'              => $period,
+		'return_data'         => 1,
+		'projection'          => true
+	);
+
+	$module_data = grafico_modulo_sparse ($params);
 	
 	if (empty($module_data)) {
 		return array();	
@@ -62,55 +65,57 @@ function forecast_projection_graph($module_id,
 	}
 	
 	// Data initialization
-	$sum_obs = 0;
-	$sum_xi = 0;
-	$sum_yi = 0;
-	$sum_xi_yi = 0;
-	$sum_xi2 = 0;
-	$sum_yi2 = 0;
+	$sum_obs        = 0;
+	$sum_xi         = 0;
+	$sum_yi         = 0;
+	$sum_xi_yi      = 0;
+	$sum_xi2        = 0;
+	$sum_yi2        = 0;
 	$sum_diff_dates = 0;
 	$last_timestamp = get_system_time();
 	$agent_interval = SECONDS_5MINUTES;
-	$cont = 1;
-	$data = array();
+	$cont           = 1;
+	$data           = array();
 	//$table->data = array();
 
 	// Creates data for calculation
 	if (is_array($module_data) || is_object($module_data)) {
-		foreach ($module_data as $utimestamp => $row) {
-			if ($utimestamp == '') {
+		foreach ($module_data['sum1']['data'] as $key => $row) {
+			if ($row[0] == '') {
 				continue;
 			}
-			
+
+			$row[0] = $row[0] / 1000;
+
 			$data[0] = '';
 			$data[1] = $cont;
-			$data[2] = date($config["date_format"], $utimestamp);
-			$data[3] = $utimestamp;
-			$data[4] = $row['sum'];
-			$data[5] = $utimestamp * $row['sum'];
-			$data[6] = $utimestamp * $utimestamp;
-			$data[7] = $row['sum'] * $row['sum'];
+			$data[2] = date($config["date_format"], $row[0]);
+			$data[3] = $row[0];
+			$data[4] = $row[1];
+			$data[5] = $row[0] * $row[1];
+			$data[6] = $row[0] * $row[0];
+			$data[7] = $row[1] * $row[1];
 			if ($cont == 1) {
 				$data[8] = 0;
 			}
 			else {
-				$data[8] = $utimestamp - $last_timestamp;
+				$data[8] = $row[0] - $last_timestamp;
 			}
-			
-			$sum_obs = $sum_obs + $cont;
-			$sum_xi = $sum_xi + $utimestamp;
-			$sum_yi = $sum_yi + $row['sum'];
-			$sum_xi_yi = $sum_xi_yi + $data[5];
-			$sum_xi2 = $sum_xi2 + $data[6];
-			$sum_yi2 = $sum_yi2 + $data[7];
+
+			$sum_obs        = $sum_obs + $cont;
+			$sum_xi         = $sum_xi + $row[0];
+			$sum_yi         = $sum_yi + $row[1];
+			$sum_xi_yi      = $sum_xi_yi + $data[5];
+			$sum_xi2        = $sum_xi2 + $data[6];
+			$sum_yi2        = $sum_yi2 + $data[7];
 			$sum_diff_dates = $sum_diff_dates + $data[8];
-			$last_timestamp = $utimestamp;	
+			$last_timestamp = $row[0];
 			$cont++;
 		}
 	}
-	
+
 	$cont--;
-	
+
 	// Calculation over data above:
 	// 1. Calculation of linear correlation coefficient...
 	
@@ -121,15 +126,6 @@ function forecast_projection_graph($module_id,
 	// 3.2 Standard deviation for Y: sqrt((Sum(Yi²)/Obs) - (avg Y)²) 
 	// Linear correlation coefficient:
 	
-	if ($sum_xi != 0) {
-		$avg_x = $cont/$sum_xi;
-	} else {
-		$avg_x = 0;
-	}
-	if ($sum_yi != 0)
-		$avg_y = $cont/$sum_yi;
-	else
-		$avg_y = 0;
 		
 /*
 	if ($cont != 0) {
@@ -229,18 +225,17 @@ function forecast_projection_graph($module_id,
 			}
 		}
 
-		$timestamp_f = date($time_format, $current_ts);
-		
-		//$timestamp_f = date($time_format, $current_ts);
-		$timestamp_f = graph_get_formatted_date($current_ts, $time_format, $time_format_2);
-		
+		$timestamp_f = $current_ts * 1000;
+
 		if ($csv) {
 			$output_data[$idx]['date'] = $current_ts;
 			$output_data[$idx]['data'] = ($a + ($b * $current_ts));
 		}
 		else {
-			$output_data[$timestamp_f] = ($a + ($b * $current_ts));
+			$output_data[$idx][0] = $timestamp_f;
+			$output_data[$idx][1] = ($a + ($b * $current_ts));
 		}
+
 		// Using this function for prediction_date
 		if ($prediction_period == false) {
 			// These statements stop the prediction when interval is greater than 2 years
@@ -249,7 +244,7 @@ function forecast_projection_graph($module_id,
 			}
 			
 			// Found it
-			if ($max_value >= $output_data[$timestamp_f] and $min_value <= $output_data[$timestamp_f]) {
+			if ($max_value >= $output_data[$idx][0] and $min_value <= $output_data[$idx][0]) {
 				return $current_ts;
 			}
 		}
@@ -259,7 +254,7 @@ function forecast_projection_graph($module_id,
 		$current_ts = $current_ts + $agent_interval;
 		$idx++;
 	}
-	
+
 	return $output_data;
 }
 
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 06048496b4..5c8ac0ecb9 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -234,16 +234,45 @@ function grafico_modulo_sparse_data_chart (
 
 	global $config;
 
-	$data = db_get_all_rows_filter (
-		'tagente_datos',
-		array ('id_agente_modulo' => (int)$agent_module_id,
-				"utimestamp > '". $date_array['start_date']. "'",
-				"utimestamp < '". $date_array['final_date'] . "'",
-				'order' => 'utimestamp ASC'),
-		array ('datos', 'utimestamp'),
-		'AND',
-		$data_module_graph['history_db']
-	);
+	if( $data_module_graph['id_module_type'] == 23 ||
+		$data_module_graph['id_module_type'] == 3 ||
+		$data_module_graph['id_module_type'] == 17 ||
+		$data_module_graph['id_module_type'] == 10 ||
+		$data_module_graph['id_module_type'] == 33 ){
+
+//XXXXXXXXXXX
+/*
+"SELECT count(*) as data, min(utimestamp) as utimestamp
+					FROM tagente_datos_string
+					WHERE id_agente_modulo = 227
+					AND utimestamp > 1527584831
+					AND utimestamp < 1527671231
+					GROUP by ROUND(utimestamp / 300);"
+*/
+		$data = db_get_all_rows_filter (
+			'tagente_datos_string',
+			array ('id_agente_modulo' => (int)$agent_module_id,
+					"utimestamp > '". $date_array['start_date']. "'",
+					"utimestamp < '". $date_array['final_date'] . "'",
+					'group' => "ROUND(utimestamp / 300)",
+					'order' => 'utimestamp ASC'),
+			array ('count(*) as datos', 'min(utimestamp) as utimestamp'),
+			'AND',
+			$data_module_graph['history_db']
+		);
+	}
+	else{
+		$data = db_get_all_rows_filter (
+			'tagente_datos',
+			array ('id_agente_modulo' => (int)$agent_module_id,
+					"utimestamp > '". $date_array['start_date']. "'",
+					"utimestamp < '". $date_array['final_date'] . "'",
+					'order' => 'utimestamp ASC'),
+			array ('datos', 'utimestamp'),
+			'AND',
+			$data_module_graph['history_db']
+		);
+	}
 
 	if($data === false){
 		$data = array();
@@ -665,7 +694,6 @@ function grafico_modulo_sparse_data(
 	);
  */
 function grafico_modulo_sparse ($params) {
-	html_debug_print('entra por este sitio', true);
 	global $config;
 
 	/*XXXXXXXXXXXX Documnetar
@@ -691,8 +719,6 @@ function grafico_modulo_sparse ($params) {
 		$params['show_events'] = false;
 	}
 
-	// ATTENTION: The min size is in constants.php
-	// It's not the same minsize for all graphs, but we are choosed a prudent minsize for all
 	if(!isset($params['width'])){
 		$params['width'] = '90%';
 	}
@@ -821,7 +847,7 @@ function grafico_modulo_sparse ($params) {
 
 	//XXXXXXXXXXXX se devuelve phantom.js
 	if($params['only_image']){
-		return	generator_chart_to_pdf($params);
+		return generator_chart_to_pdf($params);
 	}
 
 	global $graphic_type;
@@ -1251,6 +1277,10 @@ function graphic_combined_module (
 		$i++;
 	}
 
+	if($projection && is_array($projection)){
+		$array_data['projection']['data']= $projection;
+	}
+
 	//summatory and average series
 	if($stacked == CUSTOM_GRAPH_AREA  || $stacked == CUSTOM_GRAPH_LINE) {
 		if($summatory || $average) {
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index e6c3d1da8f..e37fcc03da 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -6478,10 +6478,6 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 		$fullscale = (bool) $content['style']['fullscale'];
 	}
 
-	$moduletype_name = modules_get_moduletype_name(
-		modules_get_agentmodule_type(
-			$content['id_agent_module']));
-
 	$return['chart'] = '';
 
 	// Get chart
@@ -6498,54 +6494,30 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 	switch ($type) {
 		case 'dinamic':
 		case 'static':
-			if (preg_match ("/string/", $moduletype_name)) {
-				$urlImage = ui_get_full_url(false, false, false, false);
-				/*
-				$return['chart'] = grafico_modulo_string(
-					$content['id_agent_module'],
-					$content['period'],
-					false,
-					$width,
-					$height,
-					$label,
-					'',
-					false,
-					$only_avg,
-					false,
-					$report["datetime"],
-					$only_image,
-					$urlImage,
-					"",
-					$ttl);
-				*/
-				$return['chart'] = 'arreglar la grafica de string de una vez por todassssssssss';
-
+			// HACK it is saved in show_graph field.
+			$time_compare_overlapped = false;
+			if ($content['show_graph']) {
+				$time_compare_overlapped = 'overlapped';
 			}
-			else {
-				// HACK it is saved in show_graph field.
-				$time_compare_overlapped = false;
-				if ($content['show_graph']) {
-					$time_compare_overlapped = 'overlapped';
-				}
 
-				$params =array(
-					'agent_module_id'     => $content['id_agent_module'],
-					'period'              => $content['period'],
-					'title'               => $label,
-					'avg_only'            => $only_avg,
-					'pure'                => false, //XXX
-					'date'                => $report["datetime"],
-					'only_image'          => $only_image,
-					'homeurl'             => ui_get_full_url(false, false, false, false),
-					'ttl'                 => $ttl,
-					'compare'             => $time_compare_overlapped,
-					'show_unknown'        => true,
-					'percentil'           => ($content['style']['percentil'] == 1) ? $config['percentil'] : null,
-					'fullscale'           => $fullscale
-				);
+			$params =array(
+				'agent_module_id'     => $content['id_agent_module'],
+				'period'              => $content['period'],
+				'title'               => $label,
+				'avg_only'            => $only_avg,
+				'pure'                => false, //XXX
+				'date'                => $report["datetime"],
+				'only_image'          => $only_image,
+				'homeurl'             => ui_get_full_url(false, false, false, false),
+				'ttl'                 => $ttl,
+				'compare'             => $time_compare_overlapped,
+				'show_unknown'        => true,
+				'percentil'           => ($content['style']['percentil'] == 1) ? $config['percentil'] : null,
+				'fullscale'           => $fullscale
+			);
+
+			$return['chart'] = grafico_modulo_sparse($params);
 
-				$return['chart'] = grafico_modulo_sparse($params);
-			}
 			break;
 		case 'data':
 			$data = modules_get_agentmodule_data(
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index f852f7af1a..496bff897c 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1034,85 +1034,61 @@ function visual_map_print_item($mode = "read", $layoutData,
 						else{
 							$img =  '<img src="images/console/signes/module_graph.png" style="width:'.$width.'px;height:'.	$height.'px;'.$imgpos.'">';
 						}
-					}				
-			 	}
-				else {
-					if ($width == 0 || $height == 0) {
-						
-						if ($layoutData['label_position']=='left') {
-							$img =  '<div style="z-index:'.$show_on_top_index.';float:right;height:'.$himg.'px;">'.
-							grafico_modulo_sparse($id_module, $period, 
-							0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 1, false, 0, 
-							modules_get_unit($id_module), 0, 0, true, $only_image, '', 1, false, '', 
-							false, false, false, $layoutData['image'], 
-							null, true, false, $type_graph) . '</div>';
-						}
-						elseif($layoutData['label_position']=='right') {
-							$img =  '<div style="z-index:'.$show_on_top_index.';float:left;height:'.$himg.'px;">' . 
-								grafico_modulo_sparse($id_module, 
-								$period, 0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 
-								1, false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
-								1, false, '', false, false, false, 
-								$layoutData['image'], null, true, 
-								false, $type_graph) . '</div>';
-						}
-						else {
-							$img =  grafico_modulo_sparse($id_module, 
-							$period, 0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 1, 
-							false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
-							1, false, '', false, false, false, 
-							$layoutData['image'], null, true, false, $type_graph);
-						}
-					}
-					else{
-						if ($layoutData['label_position']=='left') {
-							$img =  '<div style="z-index:'.$show_on_top_index.';float:right;height:'.$himg.'px;">' . 
-								grafico_modulo_sparse($id_module, $period, 
-							0, $width, $height, modules_get_agentmodule_name($id_module), null, false, 1, 
-							false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
-							1, false, '', false, false, false, 
-							$layoutData['image'], null, true, 
-							false, $type_graph) . '</div>';
-						}
-						elseif ($layoutData['label_position']=='right') {
-							$img =  '<div style="z-index:'.$show_on_top_index.';float:left;height:'.$himg.'px;">' . 
-								grafico_modulo_sparse($id_module, $period, 
-								0, $width, $height, modules_get_agentmodule_name($id_module), null, false, 1, 
-								false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, 
-								'', 1, false, modules_get_unit($id_module), false, false, false, 
-								$layoutData['image'], null, true, 
-								false, $type_graph) . '</div>';
-						}
-						else {
-							$img =  grafico_modulo_sparse($id_module, 
-								$period, 0, $width, $height, modules_get_agentmodule_name($id_module), null, 
-								false, 1, false, 0, modules_get_unit($id_module), 0, 0, true, 
-								$only_image, '', 1, false, '', false, 
-								false, false, $layoutData['image'], 
-								null, false, true, $type_graph);
-						}
 					}
 				}
-		    }
-			
+				else {
+
+					if ($width == 0 || $height == 0) {
+						$width = 300;
+						$height = 180;
+					}
+
+					$params =array(
+						'agent_module_id'     => $id_module,
+						'period'              => $period,
+						'show_events'         => false,
+						'width'               => $width,
+						'height'              => $height,
+						'title'               => modules_get_agentmodule_name($id_module),
+						'unit'                => modules_get_unit($id_module),
+						'only_image'          => $only_image,
+						'menu'                => false,
+						'backgroundColor'     => $layoutData['image'],
+						'type_graph'          => $type_graph
+					);
+
+					if ($layoutData['label_position']=='left') {
+						$img =  '<div style="z-index:'.$show_on_top_index.';float:right;height:'.$himg.'px;">'.
+						grafico_modulo_sparse($params) . '</div>';
+					}
+					elseif($layoutData['label_position']=='right') {
+
+						$img =  '<div style="z-index:'.$show_on_top_index.';float:left;height:'.$himg.'px;">' . 
+							grafico_modulo_sparse($params) . '</div>';
+					}
+					else {
+						$img =  grafico_modulo_sparse($params);
+					}
+
+				}
+			}
+
 			//Restore db connection
 			if ($layoutData['id_metaconsole'] != 0) {
 				metaconsole_restore_db();
 			}
-
 			break;
-		
+
 		case BARS_GRAPH:
-		
 			$imgpos = '';
-						
+
 			if($layoutData['label_position']=='left'){
 				$imgpos = 'float:right';
 			}
 			else if($layoutData['label_position']=='right'){
 				$imgpos = 'float:left';
 			}
-		
+
 			if (!empty($proportion)) {
 				$width =
 					((integer)($proportion['proportion_width'] * $width));
diff --git a/pandora_console/include/web2image.js b/pandora_console/include/web2image.js
index cfb36726f6..018be8db47 100644
--- a/pandora_console/include/web2image.js
+++ b/pandora_console/include/web2image.js
@@ -1,7 +1,6 @@
 var system = require('system');
 
 if (system.args.length < 2 || system.args.length > 6) {
-	//console.log('Usage web2image.js url url_parameters output_filename width height');
 	phantom.exit(1);
 }
 
@@ -22,12 +21,15 @@ if (!_height) {
 }
 
 page.viewportSize = { width: _width, height: _height };
+//page.zoomFactor = 1.75;
 
 //console.log("Pagina: " + url);
 //console.log("parametros: " + url_params);
 //console.log("Archivo salida: " + output_filename);
 page.open(url + "?" + "data=" + url_params, function start(status) {
-	page.render(output_filename, {format: 'png'}); //, 'quality': 100});
+	page.render(output_filename, {format: 'png'});
+	//var base64 = page.renderBase64('JPG');
+	//console.log(base64);
 	phantom.exit();
 });
 
diff --git a/pandora_console/mobile/operation/module_graph.php b/pandora_console/mobile/operation/module_graph.php
index 38841485aa..249a4e770e 100644
--- a/pandora_console/mobile/operation/module_graph.php
+++ b/pandora_console/mobile/operation/module_graph.php
@@ -136,6 +136,7 @@ class ModuleGraph {
 					switch ($this->graph_type) {
 						case 'boolean':
 						case 'sparse':
+						case 'string':
 							$params =array(
 								'agent_module_id'     => $this->id,
 								'period'              => $this->period,
@@ -164,32 +165,6 @@ class ModuleGraph {
 									$this->zoom, 'adapted_'.$this->graph_type, $date);
 							}
 							break;
-						case 'string':
-							$graph = grafico_modulo_string(
-								$this->id,
-								$this->period,
-								$this->draw_events,
-								$this->width,
-								$this->height,
-								false,
-								null,
-								$this->draw_alerts,
-								1,
-								false,
-								$date,
-								false,
-								$urlImage,
-								'adapter_' . $this->graph_type,
-								1,
-								false);
-							if ($this->draw_events) {
-								$graph .= '<br>';
-								$graph .= graphic_module_events($this->id,
-									$this->width, $this->height,
-									$this->period, $config['homeurl'],
-									$this->zoom, 'adapted_' . $this->graph_type, $date);
-							}
-							break;
 						default:
 							$graph .= fs_error_image ('../images');
 							break;
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 0fcc0c1fc9..d8a0bdd3f6 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -235,26 +235,26 @@ $alias    = db_get_value ("alias","tagente","id_agente",$id_agent);
 		switch ($graph_type) {
 			case 'boolean':
 			case 'sparse':
-			$params =array(
-				'agent_module_id'     => $id,
-				'period'              => $period,
-				'show_events'         => $draw_events,
-				'title'               => $label_graph,
-				'unit_name'           => $unit,
-				'show_alerts'         => $draw_alerts,
-				'avg_only'            => $avg_only,
-				'date'                => $date,
-				'unit'                => $unit,
-				'baseline'            => $baseline,
-				'homeurl'             => $urlImage,
-				'adapt_key'           => 'adapter_' . $graph_type,
-				'compare'             => $time_compare,
-				'show_unknown'        => $unknown_graph,
-				'percentil'           => (($show_percentil)? $config['percentil'] : null),
-				'type_graph'          => $config['type_module_charts'],
-				'fullscale'           => $fullscale
-			);
-
+			case 'string':
+				$params =array(
+					'agent_module_id'     => $id,
+					'period'              => $period,
+					'show_events'         => $draw_events,
+					'title'               => $label_graph,
+					'unit_name'           => $unit,
+					'show_alerts'         => $draw_alerts,
+					'avg_only'            => $avg_only,
+					'date'                => $date,
+					'unit'                => $unit,
+					'baseline'            => $baseline,
+					'homeurl'             => $urlImage,
+					'adapt_key'           => 'adapter_' . $graph_type,
+					'compare'             => $time_compare,
+					'show_unknown'        => $unknown_graph,
+					'percentil'           => (($show_percentil)? $config['percentil'] : null),
+					'type_graph'          => $config['type_module_charts'],
+					'fullscale'           => $fullscale
+				);
 				echo grafico_modulo_sparse ($params);
 				echo '<br>';
 				if ($show_events_graph){
@@ -264,18 +264,6 @@ $alias    = db_get_value ("alias","tagente","id_agente",$id_agent);
 						'adapted_' . $graph_type, $date, true);
 					}
 				break;
-			case 'string':
-				html_debug_print('entra x stats win hay que rehacer esta funcion');
-				echo grafico_modulo_string ($id, $period, $draw_events,
-					$width, $height, $label_graph, null, $draw_alerts, 1,
-					false, $date, false, $urlImage,
-					'adapter_' . $graph_type);
-				echo '<br>';
-				if ($show_events_graph)
-					echo graphic_module_events($id, $width, $height,
-						$period, $config['homeurl'], $zoom,
-						'adapted_' . $graph_type, $date, true);
-				break;
 			default:
 				echo fs_error_image ('../images');
 				break;

From e1cba85c6ea74c194d25e0390c3481028f9f8b08 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 31 May 2018 00:01:21 +0200
Subject: [PATCH 109/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 82567e4815..e76dda21f1 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180530
+Version: 7.0NG.723-180531
 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 492bd7e87e..cf96d5963f 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.723-180530"
+pandora_version="7.0NG.723-180531"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index 0ea0e01bd1..ff49373317 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180530';
+use constant AGENT_BUILD => '180531';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 6f080ae29c..84a754630d 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.723
-%define release     180530
+%define release     180531
 
 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 34bf115ae1..6b5cbacc33 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.723
-%define release     180530
+%define release     180531
 
 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 f58de6f228..98cb720c63 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180530"
+PI_BUILD="180531"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 029012417e..90879f1e40 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180530}
+{180531}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e40c5b3c58..ac80a61db1 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.723(Build 180530)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180531)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index d510659b2d..0ab2485a78 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.723(Build 180530))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180531))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index ae06bada2a..6aa3f0af90 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180530
+Version: 7.0NG.723-180531
 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 fc6b1872e3..bce104930e 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.723-180530"
+pandora_version="7.0NG.723-180531"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 8c16d861f6..bc67a2c671 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180530';
+$build_version = 'PC180531';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 44b3698da1..dbf7e0ef0d 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180530';
+$build = '180531';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 6775966f08..98b557f4cf 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.723
-%define release     180530
+%define release     180531
 
 # 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 26da243922..54f8af07be 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.723
-%define release     180530
+%define release     180531
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 2696e1a6b2..4e2aefbffa 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180530
+Version: 7.0NG.723-180531
 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 fc4b666a04..1f347421bf 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.723-180530"
+pandora_version="7.0NG.723-180531"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d9ce0e955d..84fc253bea 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.723";
-my $pandora_build = "180530";
+my $pandora_build = "180531";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 1371cf2c4e..56ac18cae7 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180530";
+my $pandora_build = "180531";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 95fcac8760..64723b76f2 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.723
-%define release     180530
+%define release     180531
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 72f35bf1f8..6d1c2f6cfd 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.723
-%define release     180530
+%define release     180531
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 160ffbc772..fc8a167ae8 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180530"
+PI_BUILD="180531"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d18ea02ab0..bcb9133840 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180530";
+my $version = "7.0NG.723 PS180531";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 78eafb2a50..c780d07972 100644
--- 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.723 PS180530";
+my $version = "7.0NG.723 PS180531";
 
 # save program name for logging
 my $progname = basename($0);

From 836cce115d78e22850df7d2619152ece266b82b2 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 31 May 2018 15:29:31 +0200
Subject: [PATCH 110/146] Fixed ACL in custom graphs

---
 pandora_console/godmode/reporting/graph_builder.main.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pandora_console/godmode/reporting/graph_builder.main.php b/pandora_console/godmode/reporting/graph_builder.main.php
index fcc654ab12..a66dc235cd 100644
--- a/pandora_console/godmode/reporting/graph_builder.main.php
+++ b/pandora_console/godmode/reporting/graph_builder.main.php
@@ -116,11 +116,8 @@ if ($edit_graph) {
 echo ">";
 
 $own_info = get_user_info ($config['id_user']);
-if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
-	$return_all_groups = true;
-else	
-	$return_all_groups = false;
-	
+$return_all_groups = $own_info['is_admin'] || users_can_manage_group_all("RR");
+
 echo "<td><b>".__('Group')."</b></td><td>";
 	if (check_acl ($config['id_user'], 0, "RW"))
 		echo html_print_select_groups($config['id_user'], 'RW', $return_all_groups, 'graph_id_group', $id_group, '', '', '', true);

From 0b0fe5ea6ca74df3512316ba542d38b1808c4379 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 31 May 2018 17:14:35 +0200
Subject: [PATCH 111/146] Fixed static graph links to another visual console in
 meta

---
 pandora_console/include/functions_visual_map.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index f852f7af1a..7f970b2e04 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -469,7 +469,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 					}
 				}
 				else if ($is_a_link_to_other_visualconsole) {
-					if (empty($layout_data['id_metaconsole'])) {
+					if (!is_metaconsole()) {
 						$url = $config['homeurl'] . "index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;pure=" . $config["pure"] . "&amp;id=" . $layoutData["id_layout_linked"];
 					}
 					else {

From 04f117523b6909a6b3459a200b353f90ebdb32e5 Mon Sep 17 00:00:00 2001
From: danielmaya <daniel.maya@artica.es>
Date: Thu, 31 May 2018 17:33:51 +0200
Subject: [PATCH 112/146] Fixed sources in log report

---
 .../reporting_builder.item_editor.php         | 39 +++++++++++++++----
 .../operation/agentes/ver_agente.php          | 24 ++++++++++++
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 4033e7616f..fa75a7b452 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -930,10 +930,10 @@ You can of course remove the warnings, that's why we include the source and do n
 					$agents = agents_get_group_agents($group);
 					if ((empty($agents)) || $agents == -1) $agents = array();
 
-					$sql_log = 'SELECT source
+					$sql_log = 'SELECT source AS k, source AS v
 							FROM tagente,tagent_module_log
-							WHERE tagente.id_agente = tagent_module_log.id_agent ';
-					
+							WHERE tagente.id_agente = tagent_module_log.id_agent AND tagente.disabled = 0';
+							
 					if (!empty($agents)) {
 						$index = 0;
 						foreach ($agents as $key => $a) {
@@ -947,7 +947,7 @@ You can of course remove the warnings, that's why we include the source and do n
 						}
 						$sql_log .= ")";
 					}
-					html_print_select_from_sql ($sql_log, 'source', $source, '', __('All'), '', false, false, false);
+					html_print_select_from_sql ($sql_log, 'source', $source, 'onselect=source_change_agents();', __('All'), '', false, false, false);
 				?>
 			</td>
 		</tr>
@@ -1066,9 +1066,15 @@ You can of course remove the warnings, that's why we include the source and do n
 			<td style="font-weight:bold;"><?php echo __('Agents'); ?></td>
 			<td>
 				<?php 
-					$sql_log_report = 'SELECT id_agente, alias
-						FROM tagente, tagent_module_log
-						WHERE tagente.id_agente = tagent_module_log.id_agent';
+					if ($source) {
+						$sql_log_report = 'SELECT id_agente, alias
+							FROM tagente, tagent_module_log
+							WHERE tagente.id_agente = tagent_module_log.id_agent AND tagente.disabled = 0 AND tagent_module_log.source like "'. $source.'"';
+					} else {
+						$sql_log_report = 'SELECT id_agente, alias
+							FROM tagente, tagent_module_log
+							WHERE tagente.id_agente = tagent_module_log.id_agent AND tagente.disabled = 0';
+					}
 					$all_agent_log = db_get_all_rows_sql($sql_log_report);
 					
 					foreach ($all_agent_log as $key => $value) {
@@ -1089,6 +1095,7 @@ You can of course remove the warnings, that's why we include the source and do n
 						}
 					}
 					html_print_select($agents2, 'id_agents2[]', $agents_select, $script = '', "", 0, false, true, true, '', false, "min-width: 180px");
+					echo "<span id='spinner_hack' style='display:none;'>" . html_print_image('images/spinner.gif', true) . "</span>";
 				?>
 			</td>
 		</tr>
@@ -3522,4 +3529,22 @@ function set_last_value_period() {
 		$("#row_period").show();
 	}
 }
+
+function source_change_agents() {
+	$("#id_agents2").empty();
+	$("#spinner_hack").show();
+	jQuery.post ("ajax.php",
+		{"page" : "operation/agentes/ver_agente",
+			"get_agents_source_json" : 1,
+			"source" : $("#source").val()
+		},
+		function (data, status) {
+			for (var clave in data) {
+				$("#id_agents2").append('<option value="'+clave+'">'+data[clave]+'</option>');
+			}
+			$("#spinner_hack").hide();
+		},
+		"json"
+	);
+}
 </script>
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 1fe124f841..e2f531017b 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -44,6 +44,7 @@ if (is_ajax ()) {
 	$get_agentmodule_status_tooltip = (bool) get_parameter ("get_agentmodule_status_tooltip");
 	$get_group_status_tooltip = (bool) get_parameter ("get_group_status_tooltip");
 	$get_agent_id = (bool) get_parameter ("get_agent_id");
+	$get_agents_source_json = (bool) get_parameter ("get_agents_source_json");
 	$cluster_mode = (bool) get_parameter ("cluster_mode",0);
 	$agent_alias = get_parameter('alias', '');
 	$agents_inserted = get_parameter('agents_inserted', array());
@@ -1001,6 +1002,29 @@ if (is_ajax ()) {
 		return;
 	}
 	
+	if ($get_agents_source_json) {
+		$source = get_parameter('source', '');
+		
+		if (empty($source)) {
+			$sql_report_log = 'SELECT id_agente, alias
+				FROM tagente, tagent_module_log
+				WHERE tagente.id_agente = tagent_module_log.id_agent AND tagente.disabled = 0';
+		} else {
+			$sql_report_log = 'SELECT id_agente, alias
+				FROM tagente, tagent_module_log
+				WHERE tagente.id_agente = tagent_module_log.id_agent AND tagente.disabled = 0 AND tagent_module_log.source like "'. $source.'"';
+		}
+		
+		$all_agent_log = db_get_all_rows_sql($sql_report_log);
+		
+		foreach ($all_agent_log as $key => $value) {
+			$agents2[$value['id_agente']] = $value['alias'];
+		}
+		
+		echo json_encode($agents2);
+		return;
+	}
+	
 	return;
 }
 

From 552f2ce14cb3240770b3899aac098f2a51e11bd4 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 31 May 2018 18:00:44 +0200
Subject: [PATCH 113/146] Fixed problems with strange names on SNMP realtime
 graphs

---
 pandora_console/include/functions_modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 8f52df21e2..53b249a64a 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -2714,7 +2714,7 @@ function get_module_realtime_link_graph ($module) {
 	$params = array(
 		'graph' => 'snmp_module',
 		'agent_alias' => modules_get_agentmodule_agent_alias($module['id_agente_modulo']),
-		'module_name' => $module['nombre'],
+		'module_name' => urlencode($module['nombre']),
 		'snmp_address' => $module['ip_target'],
 		'snmp_community' => $module['snmp_community'],
 		'snmp_oid' => $module['snmp_oid'],

From ad4b38d51080fabfd279d091c92b2808613439b6 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 31 May 2018 18:02:50 +0200
Subject: [PATCH 114/146] Fixed problems with strange agent name on SNMP
 realtime graphs

---
 pandora_console/include/functions_modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 53b249a64a..6c0811897f 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -2713,7 +2713,7 @@ function get_module_realtime_link_graph ($module) {
 
 	$params = array(
 		'graph' => 'snmp_module',
-		'agent_alias' => modules_get_agentmodule_agent_alias($module['id_agente_modulo']),
+		'agent_alias' => urlencode(modules_get_agentmodule_agent_alias($module['id_agente_modulo'])),
 		'module_name' => urlencode($module['nombre']),
 		'snmp_address' => $module['ip_target'],
 		'snmp_community' => $module['snmp_community'],

From 9561feaf5c6fe65b27f9b650f0cb3bbbe5124f52 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 31 May 2018 20:16:09 +0200
Subject: [PATCH 115/146] Fixed permissions in default log folders

---
 pandora_server/DEBIAN/make_deb_package.sh | 1 +
 pandora_server/pandora_server.redhat.spec | 4 +++-
 pandora_server/pandora_server_installer   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 1f347421bf..217be46758 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -82,6 +82,7 @@ then
 	mkdir -p temp_package/var/spool/pandora/data_in/trans
         chmod 770 temp_package/var/spool/pandora/data_in/trans
 	mkdir -p temp_package/var/log/pandora/
+	chmod 754 temp_package/var/log/pandora/
 	mkdir -p temp_package/usr/share/pandora_server/conf/
 	mkdir -p temp_package/usr/share/tentacle_server/conf/
 	mkdir -p temp_package/usr/lib/perl5/
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 64723b76f2..edc181dfac 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -176,10 +176,12 @@ exit 0
 %{_bindir}/pandora_exec
 %{_bindir}/pandora_server
 %{_bindir}/tentacle_server
-%dir %{_localstatedir}/log/pandora
 %dir %{_sysconfdir}/pandora
 %dir %{_localstatedir}/spool/pandora
 
+%defattr(-,pandora,root, 754)
+%dir %{_localstatedir}/log/pandora
+
 %defattr(600,root,root)
 /etc/pandora/pandora_server.conf.new
 
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index fc8a167ae8..d8ef2523ed 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -317,7 +317,7 @@ install () {
 	chmod 2770 $DESTDIR$PANDORA_SPOOL/data_in/trans
 	mkdir -p $DESTDIR$PANDORA_LOG 2> /dev/null	
 	chown -R pandora $DESTDIR$PANDORA_LOG 2> /dev/null
-	chmod 2770 $DESTDIR$PANDORA_LOG 2> /dev/null
+	chmod 2774 $DESTDIR$PANDORA_LOG 2> /dev/null
 
 	echo "Giving proper permission to /var/spool/pandora"
 	for group in "www-data" wwwrun www apache

From 6bd672fd38c31705c3102d494d889ee9a26e9fac Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 31 May 2018 20:32:04 +0200
Subject: [PATCH 116/146] Fixed free search in events view

---
 pandora_console/operation/events/events.build_query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/operation/events/events.build_query.php b/pandora_console/operation/events/events.build_query.php
index 5d373aa535..b0e6a0cd68 100755
--- a/pandora_console/operation/events/events.build_query.php
+++ b/pandora_console/operation/events/events.build_query.php
@@ -107,7 +107,7 @@ if($count_events == 0){
 
 if ($search != "") {
 	$filter_resume['free_search'] = $search;
-	$sql_post .= " AND (evento LIKE '%". io_safe_input($search) . "%' OR id_evento LIKE '%$search%' ".$events_wi_cdata_id.")";
+	$sql_post .= " AND (evento LIKE '%". $search . "%' OR id_evento LIKE '%$search%' ".$events_wi_cdata_id.")";
 }
 
 if ($event_type != "") {

From ec050ba606bc309a8ab61a02bdf174052c4e93c3 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 1 Jun 2018 00:01:21 +0200
Subject: [PATCH 117/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index e76dda21f1..09d8b826da 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180531
+Version: 7.0NG.723-180601
 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 cf96d5963f..447ae7ec0b 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.723-180531"
+pandora_version="7.0NG.723-180601"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index ff49373317..d03944ffc4 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180531';
+use constant AGENT_BUILD => '180601';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 84a754630d..0b9481be65 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.723
-%define release     180531
+%define release     180601
 
 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 6b5cbacc33..71480e4cb3 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.723
-%define release     180531
+%define release     180601
 
 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 98cb720c63..5bfbab027d 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180531"
+PI_BUILD="180601"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 90879f1e40..e3c2aab346 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180531}
+{180601}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index ac80a61db1..4f63b98034 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.723(Build 180531)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180601)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 0ab2485a78..745f1fd96c 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.723(Build 180531))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180601))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 6aa3f0af90..fe8de74269 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180531
+Version: 7.0NG.723-180601
 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 bce104930e..10831f425b 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.723-180531"
+pandora_version="7.0NG.723-180601"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index bc67a2c671..13034e369b 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180531';
+$build_version = 'PC180601';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index dbf7e0ef0d..73a535d763 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180531';
+$build = '180601';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 98b557f4cf..1f94fcbc51 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.723
-%define release     180531
+%define release     180601
 
 # 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 54f8af07be..0f2b0bab75 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.723
-%define release     180531
+%define release     180601
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 4e2aefbffa..6287000aa3 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180531
+Version: 7.0NG.723-180601
 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 1f347421bf..5665c948ad 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.723-180531"
+pandora_version="7.0NG.723-180601"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 84fc253bea..2f4f219416 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.723";
-my $pandora_build = "180531";
+my $pandora_build = "180601";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 56ac18cae7..7e5e871650 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180531";
+my $pandora_build = "180601";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 64723b76f2..61911bb36a 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.723
-%define release     180531
+%define release     180601
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6d1c2f6cfd..c5bf054d88 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.723
-%define release     180531
+%define release     180601
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index fc8a167ae8..f09cc988df 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180531"
+PI_BUILD="180601"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index bcb9133840..016b8fd8b2 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180531";
+my $version = "7.0NG.723 PS180601";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index c780d07972..6135f46c27 100644
--- 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.723 PS180531";
+my $version = "7.0NG.723 PS180601";
 
 # save program name for logging
 my $progname = basename($0);

From 0757d2ed56129cb575d3b5d3748e3071f5c7086c Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 1 Jun 2018 12:19:34 +0200
Subject: [PATCH 118/146] Fixed cached group view in node

---
 .../include/functions_groupview.php           | 275 +++++++-----------
 1 file changed, 105 insertions(+), 170 deletions(-)

diff --git a/pandora_console/include/functions_groupview.php b/pandora_console/include/functions_groupview.php
index 965e1f2560..96438f243e 100644
--- a/pandora_console/include/functions_groupview.php
+++ b/pandora_console/include/functions_groupview.php
@@ -393,10 +393,8 @@ function groupview_monitor_alerts ($group_array, $strict_user = false, $id_group
 function groupview_monitor_fired_alerts ($group_array, $strict_user = false, $id_group_strict = false) {
 
 	// If there are not groups to query, we jump to nextone
-
 	if (empty ($group_array)) {
 		return 0;
-
 	}
 	else if (!is_array ($group_array)) {
 		$group_array = array($group_array);
@@ -405,30 +403,12 @@ function groupview_monitor_fired_alerts ($group_array, $strict_user = false, $id
 	$group_clause = implode (",", $group_array);
 	$group_clause = "(" . $group_clause . ")";
 
-
-	if ($strict_user) {
-		$group_clause_strict = implode (",", $id_group_strict);
-		$group_clause_strict = "(" . $group_clause_strict . ")";
-		if ($group_clause_strict !== '()'){
-			$sql = "SELECT COUNT(talert_template_modules.id)
-			FROM talert_template_modules, tagente_modulo, tagente_estado, tagente
-			WHERE tagente.id_grupo IN $group_clause_strict AND tagente_modulo.id_agente = tagente.id_agente
-				AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
-				AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo
-				AND times_fired > 0 ";
-		}
-		$count = db_get_sql ($sql);
-		return $count;
-	} else {
-		//TODO REVIEW ORACLE AND POSTGRES
-		return db_get_sql ("SELECT COUNT(talert_template_modules.id)
-			FROM talert_template_modules, tagente_modulo, tagente_estado, tagente
-			WHERE tagente.id_grupo IN $group_clause AND tagente_modulo.id_agente = tagente.id_agente
-				AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
-				AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo
-				AND times_fired > 0");
-	}
-
+	return db_get_sql ("SELECT COUNT(talert_template_modules.id)
+		FROM talert_template_modules, tagente_modulo, tagente_estado, tagente
+		WHERE tagente.id_grupo IN $group_clause AND tagente_modulo.id_agente = tagente.id_agente
+			AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
+			AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo
+			AND times_fired > 0");
 }
 
 function groupview_get_groups_list($id_user = false, $user_strict = false, $access = 'AR', $force_group_and_tag = true, $returnAllGroup = false) {
@@ -630,150 +610,9 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
 		$list_groups = array();
 	}
 
-	if (is_metaconsole()) { // Agent cache
-		foreach ($list_groups as $group) {
-			// If id group is 0 get all accesses groups
-			$group_id = $group['id_grupo'] == 0
-				? $user_groups_ids
-				: $group['id_grupo'];
-			$group_agents = db_get_row_sql("SELECT SUM(warning_count) AS _monitors_warning_,
-														SUM(critical_count) AS _monitors_critical_,
-														SUM(normal_count) AS _monitors_ok_,
-														SUM(unknown_count) AS _monitors_unknown_,
-														SUM(notinit_count) AS _monitors_not_init_,
-														SUM(fired_count) AS _monitors_alerts_fired_,
-														COUNT(*) AS _total_agents_, id_grupo, intervalo,
-														ultimo_contacto, disabled
-									FROM tmetaconsole_agent ta
-									LEFT JOIN tmetaconsole_agent_secondary_group tasg
-										ON tasg.id_agent = ta.id_agente
-									WHERE (
-										ta.id_grupo IN (" . $group_id . ")
-										OR tasg.id_group IN (" . $group_id . ")
-									)
-									AND disabled = 0");
-
-			$list[$group['id_grupo']]['_monitors_critical_']     = (int)$group_agents['_monitors_critical_'];
-			$list[$group['id_grupo']]['_monitors_warning_']      = (int)$group_agents['_monitors_warning_'];
-			$list[$group['id_grupo']]['_monitors_unknown_']      = (int)$group_agents['_monitors_unknown_'];
-			$list[$group['id_grupo']]['_monitors_not_init_']     = (int)$group_agents['_monitors_not_init_'];
-			$list[$group['id_grupo']]['_monitors_ok_']           = (int)$group_agents['_monitors_ok_'];
-			$list[$group['id_grupo']]['_monitors_alerts_fired_'] = (int)$group_agents['_monitors_alerts_fired_'];
-			$list[$group['id_grupo']]['_total_agents_']          = (int)$group_agents['_total_agents_'];
-			$list[$group['id_grupo']]["_monitor_checks_"]        = $list[$group['id_grupo']]["_monitors_not_init_"]
-																	+ $list[$group['id_grupo']]["_monitors_unknown_"]
-																	+ $list[$group['id_grupo']]["_monitors_warning_"]
-																	+ $list[$group['id_grupo']]["_monitors_critical_"]
-																	+ $list[$group['id_grupo']]["_monitors_ok_"];
-
-			if ($group['icon'])
-				$list[$group['id_grupo']]["_iconImg_"] = html_print_image ("images/".$group['icon'].".png", true, array ("style" => 'vertical-align: middle;'));
-
-			// Calculate not_normal monitors
-			$list[$group['id_grupo']]["_monitor_not_normal_"] = $list["_monitor_checks_"] - $list["_monitors_ok_"];
-
-			$total_agents = $list[$group['id_grupo']]['_total_agents_'];
-
-			if ($total_agents > 0) {
-				$agents = db_get_all_rows_sql(sprintf ("SELECT warning_count,
-													critical_count,
-													normal_count,
-													unknown_count,
-													notinit_count,
-													fired_count,
-													disabled
-												FROM tmetaconsole_agent ta
-												LEFT JOIN tmetaconsole_agent_secondary_group tasg
-													ON ta.id_agente = tasg.id_agent
-												WHERE ta.id_grupo IN (%s) OR tasg.id_group IN (%s)",
-					$group_id, $group_id));
-				foreach ($agents as $agent) {
-					if ($agent['critical_count'] > 0) {
-						$list[$group['id_grupo']]['_agents_critical_'] += 1;
-					}
-					else {
-						if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) {
-							if ($agent['unknown_count'] > 0) {
-								$list[$group['id_grupo']]['_agents_unknown_'] += 1;
-							}
-						}
-						if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0) && ($agent['unknown_count'] == 0)) {
-							if ($agent['notinit_count'] > 0) {
-								$list[$group['id_grupo']]['_agents_not_init_'] += 1;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	else if (false) { //FIXME: The cached group view is wasted. Avoid to reach this code.
-
-		$group_stat = db_get_all_rows_sql ("SELECT
-			SUM(ta.normal_count) as normal, SUM(ta.critical_count) as critical,
-			SUM(ta.warning_count) as warning,SUM(ta.unknown_count) as unknown,
-			SUM(ta.notinit_count) as not_init, SUM(fired_count) as alerts_fired
-			FROM tagente ta
-			WHERE id_grupo IN ($user_groups_ids)");
-
-		$list['_agents_unknown_'] = $group_stat[0]["unknown"];
-		$list['_monitors_alerts_fired_'] = $group_stat[0]["alerts_fired"];
-
-		$list['_monitors_ok_'] = $group_stat[0]["normal"];
-		$list['_monitors_warning_'] = $group_stat[0]["warning"];
-		$list['_monitors_critical_'] = $group_stat[0]["critical"];
-		$list['_monitors_unknown_'] = $group_stat[0]["unknown"];
-		$list['_monitors_not_init_'] = $group_stat[0]["not_init"];
-		$total_agentes = agents_get_agents (false, array('count(*) as total_agents'), $access,false, false);
-		$list['_total_agents_'] = $total_agentes[0]['total_agents'];
-		$list["_monitor_alerts_fire_count_"] = $group_stat[0]["alerts_fired"];
-
-		$list['_monitors_alerts_'] = groupview_monitor_alerts (explode(',',$user_groups_ids), $user_strict,explode(',',$user_groups_ids));
-		// Get total count of monitors for this group, except disabled.
-		$list["_monitor_checks_"] = $list["_monitors_not_init_"] + $list["_monitors_unknown_"] + $list["_monitors_warning_"] + $list["_monitors_critical_"] + $list["_monitors_ok_"];
-
-		// Calculate not_normal monitors
-		$list["_monitor_not_normal_"] = $list["_monitor_checks_"] - $list["_monitors_ok_"];
-
-		if ($list["_monitor_not_normal_"] > 0 && $list["_monitor_checks_"] > 0) {
-			$list["_monitor_health_"] = format_numeric (100 - ($list["_monitor_not_normal_"] / ($list["_monitor_checks_"] / 100)), 1);
-		}
-		else {
-			$list["_monitor_health_"] = 100;
-		}
-
-		if ($list["_monitors_not_init_"] > 0 && $list["_monitor_checks_"] > 0) {
-			$list["_module_sanity_"] = format_numeric (100 - ($list["_monitors_not_init_"] / ($list["_monitor_checks_"] / 100)), 1);
-		}
-		else {
-			$list["_module_sanity_"] = 100;
-		}
-
-		if (isset($list["_alerts_"])) {
-			if ($list["_monitors_alerts_fired_"] > 0 && $list["_alerts_"] > 0) {
-				$list["_alert_level_"] = format_numeric (100 - ($list["_monitors_alerts_fired_"] / ($list["_alerts_"] / 100)), 1);
-			}
-			else {
-				$list["_alert_level_"] = 100;
-			}
-		}
-		else {
-			$list["_alert_level_"] = 100;
-			$list["_alerts_"] = 0;
-		}
-
-		$list["_monitor_bad_"] = $list["_monitors_critical_"] + $list["_monitors_warning_"];
-
-		if ($list["_monitor_bad_"] > 0 && $list["_monitor_checks_"] > 0) {
-			$list["_global_health_"] = format_numeric (100 - ($list["_monitor_bad_"] / ($list["_monitor_checks_"] / 100)), 1);
-		}
-		else {
-			$list["_global_health_"] = 100;
-		}
-
-		$list["_server_sanity_"] = format_numeric (100 - $list["_module_sanity_"], 1);
-	}
-	else {
+	if (is_metaconsole() || ($config["realtimestats"] == 0 && !enterprise_hook('agents_is_using_secondary_groups'))) { // Agent cache
+		$list = group_view_get_cache_stats ($list, $list_groups, $user_groups_ids);
+	} else {
 		foreach ($list_groups as $group) {
 			// If id group is 0 get all accesses groups
 			$group_id = $group['id_grupo'] == 0
@@ -954,4 +793,100 @@ function groupview_array_unique_multidim($groups, $key){
     return $temp_group;
 }
 
+/**
+ * Get the stats to group view using the cache
+ *
+ * @param array Skeleton to fill with the group information
+ * @param array Groups information
+ * @param string Groups that user has access separated by commas
+ */
+function group_view_get_cache_stats ($list, $list_groups, $user_groups_ids) {
+
+	$table_agent = 'tagente';
+	$table_secondary = 'tagent_secondary_group';
+	// Change the metaconsole tables
+	if (is_metaconsole()) {
+		$table_agent = 'tmetaconsole_agent';
+		$table_secondary = 'tmetaconsole_secondary_group';
+	}
+
+	// Walk for each group
+	foreach ($list_groups as $group) {
+		// If id group is 0 get all accesses groups
+		$group_id = $group['id_grupo'] == 0
+			? $user_groups_ids
+			: $group['id_grupo'];
+		$group_agents = db_get_row_sql("SELECT SUM(warning_count) AS _monitors_warning_,
+													SUM(critical_count) AS _monitors_critical_,
+													SUM(normal_count) AS _monitors_ok_,
+													SUM(unknown_count) AS _monitors_unknown_,
+													SUM(notinit_count) AS _monitors_not_init_,
+													SUM(fired_count) AS _monitors_alerts_fired_,
+													COUNT(*) AS _total_agents_, id_grupo, intervalo,
+													ultimo_contacto, disabled
+								FROM $table_agent ta
+								LEFT JOIN $table_secondary tasg
+									ON tasg.id_agent = ta.id_agente
+								WHERE (
+									ta.id_grupo IN (" . $group_id . ")
+									OR tasg.id_group IN (" . $group_id . ")
+								)
+								AND disabled = 0");
+
+		$list[$group['id_grupo']]['_monitors_critical_']     = (int)$group_agents['_monitors_critical_'];
+		$list[$group['id_grupo']]['_monitors_warning_']      = (int)$group_agents['_monitors_warning_'];
+		$list[$group['id_grupo']]['_monitors_unknown_']      = (int)$group_agents['_monitors_unknown_'];
+		$list[$group['id_grupo']]['_monitors_not_init_']     = (int)$group_agents['_monitors_not_init_'];
+		$list[$group['id_grupo']]['_monitors_ok_']           = (int)$group_agents['_monitors_ok_'];
+		$list[$group['id_grupo']]['_monitors_alerts_fired_'] = (int)$group_agents['_monitors_alerts_fired_'];
+		$list[$group['id_grupo']]['_total_agents_']          = (int)$group_agents['_total_agents_'];
+		$list[$group['id_grupo']]["_monitor_checks_"]        = $list[$group['id_grupo']]["_monitors_not_init_"]
+																+ $list[$group['id_grupo']]["_monitors_unknown_"]
+																+ $list[$group['id_grupo']]["_monitors_warning_"]
+																+ $list[$group['id_grupo']]["_monitors_critical_"]
+																+ $list[$group['id_grupo']]["_monitors_ok_"];
+
+		if ($group['icon'])
+			$list[$group['id_grupo']]["_iconImg_"] = html_print_image ("images/".$group['icon'].".png", true, array ("style" => 'vertical-align: middle;'));
+
+		// Calculate not_normal monitors
+		$list[$group['id_grupo']]["_monitor_not_normal_"] = $list["_monitor_checks_"] - $list["_monitors_ok_"];
+
+		$total_agents = $list[$group['id_grupo']]['_total_agents_'];
+
+		if ($total_agents > 0) {
+			$agents = db_get_all_rows_sql(sprintf ("SELECT warning_count,
+												critical_count,
+												normal_count,
+												unknown_count,
+												notinit_count,
+												fired_count,
+												disabled
+											FROM $table_agent ta
+											LEFT JOIN $table_secondary tasg
+												ON ta.id_agente = tasg.id_agent
+											WHERE ta.id_grupo IN (%s) OR tasg.id_group IN (%s)",
+				$group_id, $group_id));
+			foreach ($agents as $agent) {
+				if ($agent['critical_count'] > 0) {
+					$list[$group['id_grupo']]['_agents_critical_'] += 1;
+				}
+				else {
+					if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) {
+						if ($agent['unknown_count'] > 0) {
+							$list[$group['id_grupo']]['_agents_unknown_'] += 1;
+						}
+					}
+					if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0) && ($agent['unknown_count'] == 0)) {
+						if ($agent['notinit_count'] > 0) {
+							$list[$group['id_grupo']]['_agents_not_init_'] += 1;
+						}
+					}
+				}
+			}
+		}
+	}
+	return $list;
+}
+
 ?>

From 5c57ee34a7193ad11cf3a702d8c7184ae01a2215 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 1 Jun 2018 12:23:25 +0200
Subject: [PATCH 119/146] Fixed group view on metaconsole (typo)

---
 pandora_console/include/functions_groupview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_groupview.php b/pandora_console/include/functions_groupview.php
index 96438f243e..d99a7e3588 100644
--- a/pandora_console/include/functions_groupview.php
+++ b/pandora_console/include/functions_groupview.php
@@ -807,7 +807,7 @@ function group_view_get_cache_stats ($list, $list_groups, $user_groups_ids) {
 	// Change the metaconsole tables
 	if (is_metaconsole()) {
 		$table_agent = 'tmetaconsole_agent';
-		$table_secondary = 'tmetaconsole_secondary_group';
+		$table_secondary = 'tmetaconsole_agent_secondary_group';
 	}
 
 	// Walk for each group

From f0aacc4c3344634235e0b195d4131eea1ecd86ed Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 1 Jun 2018 12:25:20 +0200
Subject: [PATCH 120/146] Secondary groups are implemented in group view cache

---
 pandora_console/include/functions_groupview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_groupview.php b/pandora_console/include/functions_groupview.php
index d99a7e3588..db7eec8706 100644
--- a/pandora_console/include/functions_groupview.php
+++ b/pandora_console/include/functions_groupview.php
@@ -610,7 +610,7 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
 		$list_groups = array();
 	}
 
-	if (is_metaconsole() || ($config["realtimestats"] == 0 && !enterprise_hook('agents_is_using_secondary_groups'))) { // Agent cache
+	if (is_metaconsole() || ($config["realtimestats"] == 0)) { // Agent cache
 		$list = group_view_get_cache_stats ($list, $list_groups, $user_groups_ids);
 	} else {
 		foreach ($list_groups as $group) {

From a55b829aa108a91052fbe78cdc0de6b76536fe10 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 1 Jun 2018 12:36:34 +0200
Subject: [PATCH 121/146] Fixed a PHP warning

---
 pandora_console/godmode/agentes/agent_manager.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index d4a725a42c..791f09d2ab 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -106,6 +106,7 @@ if (is_ajax ()) {
 		$id_agent = get_parameter('id_agent');
 		$groups_to_add = get_parameter('groups');
 		if (enterprise_installed()) {
+			if (empty($groups_to_add)) return 0;
 			enterprise_include('include/functions_agents.php');
 			$ret = enterprise_hook(
 				'agents_update_secondary_groups',

From 47a287b6f6e1e7a923b7276945e270344224df5b Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 1 Jun 2018 13:58:29 +0200
Subject: [PATCH 122/146] fixed errors in graph

---
 pandora_console/include/ajax/graph.ajax.php   |  124 +-
 .../ajax/visual_console_builder.ajax.php      |   22 +-
 pandora_console/include/chart_generator.php   |   29 +-
 pandora_console/include/functions.php         |   27 +-
 .../include/functions_custom_graphs.php       |  176 +--
 pandora_console/include/functions_graph.php   | 1199 ++++++++++-------
 .../include/functions_reporting.php           |  354 ++---
 .../include/functions_visual_map.php          |  101 +-
 pandora_console/include/web2image.js          |   29 +-
 .../agentes/interface_traffic_graph_win.php   |   48 +-
 .../operation/reporting/graph_viewer.php      |   50 +-
 11 files changed, 1116 insertions(+), 1043 deletions(-)

diff --git a/pandora_console/include/ajax/graph.ajax.php b/pandora_console/include/ajax/graph.ajax.php
index 3449cb5cab..a4f5bc80a7 100644
--- a/pandora_console/include/ajax/graph.ajax.php
+++ b/pandora_console/include/ajax/graph.ajax.php
@@ -45,31 +45,37 @@ if ($save_custom_graph) {
 if ($print_custom_graph) {
 	ob_clean();
 
-	$id_graph = (int) get_parameter('id_graph');
-	$height = (int) get_parameter('height', CHART_DEFAULT_HEIGHT);
-	$width = (int) get_parameter('width', CHART_DEFAULT_WIDTH);
-	$period = (int) get_parameter('period', SECONDS_5MINUTES);
-	$stacked = (int) get_parameter('stacked', CUSTOM_GRAPH_LINE);
-	$date = (int) get_parameter('date', time());
-	$only_image = (bool) get_parameter('only_image');
-	$background_color = (string) get_parameter('background_color', 'white');
-	$modules_param = get_parameter('modules_param', array());
-	$homeurl = (string) get_parameter('homeurl');
-	$name_list = get_parameter('name_list', array());
-	$unit_list = get_parameter('unit_list', array());
-	$show_last = (bool) get_parameter('show_last', true);
-	$show_max = (bool) get_parameter('show_max', true);
-	$show_min = (bool) get_parameter('show_min', true);
-	$show_avg = (bool) get_parameter('show_avg', true);
-	$ttl = (int) get_parameter('ttl', 1);
-	$dashboard = (bool) get_parameter('dashboard');
-	$vconsole = (bool) get_parameter('vconsole');
-	$fullscale = (bool) get_parameter('fullscale');
+	$params =array(
+		'period'     => (int) get_parameter('period', SECONDS_5MINUTES),
+		'width'      => (int) get_parameter('width', CHART_DEFAULT_WIDTH),
+		'height'     => (int) get_parameter('height', CHART_DEFAULT_HEIGHT),
+		'unit_name'  => get_parameter('unit_list', array()),
+		'date'       => (int) get_parameter('date', time()),
+		'only_image' => (bool) get_parameter('only_image', false),
+		'homeurl'    => (string) get_parameter('homeurl', ''),
+		'ttl'        => (int) get_parameter('ttl', 1),
+		'dashboard'  => (bool) get_parameter('dashboard', false),
+		'vconsole'   => (bool) get_parameter('vconsole', false),
+		'fullscale'  => (bool) get_parameter('fullscale', false),
+		'backgroundColor' => (string) get_parameter('background_color', 'white'),
+		'show_alerts'     => (bool) get_parameter('show_alerts'),
+		'show_events'     => (bool) get_parameter('show_events'),
+		'type_graph'      => get_parameter('type_g', $config['type_module_charts']),
+	);
 
-	echo custom_graphs_print($id_graph, $height, $width, $period, $stacked,
-		true, $date, $only_image, $background_color, $modules_param,
-		$homeurl, $name_list, $unit_list, $show_last, $show_max,
-		$show_min, $show_avg, $ttl, $dashboard, $vconsole);
+	$params_combined = array(
+		'stacked'        => (int) get_parameter('stacked', CUSTOM_GRAPH_LINE),
+		'labels'         => get_parameter('name_list', array()),
+		'modules_series' => get_parameter('modules_param', array()),
+		'id_graph'       => (int) get_parameter('id_graph', 0),
+		'return'         => 1
+	);
+
+	echo graphic_combined_module(
+		get_parameter('modules_param', array()),
+		$params,
+		$params_combined
+	);
 	return;
 }
 
@@ -184,24 +190,6 @@ if ($get_graphs){
 					break;
 				case 'custom_graph':
 					if ($contador > 0) {
-						$graph = db_get_all_rows_field_filter('tgraph', 'id_graph',$value['id_graph']);
-
-						$sources = db_get_all_rows_field_filter('tgraph_source', 'id_graph',$value['id_graph']);
-						$modules = array ();
-						$weights = array ();
-						$labels = array ();
-						foreach ($sources as $source) {
-							array_push ($modules, $source['id_agent_module']);
-							array_push ($weights, $source['weight']);
-							if ($source['label'] != ''){
-									$item['type']            = 'custom_graph';
-									$item['id_agent']        = agents_get_module_id($source['id_agent_module']);
-									$item['id_agent_module'] = $source['id_agent_module'];
-									$labels[$source['id_agent_module']] = reporting_label_macro($item, $source['label']);
-							}
-						}
-
-						$homeurl = ui_get_full_url(false, false, false, false);
 						$graph_conf = db_get_row('tgraph', 'id_graph', $value['id_graph']);
 
 						if($graph_conf['stacked'] == 4 || $graph_conf['stacked'] == 9){
@@ -211,40 +199,28 @@ if ($get_graphs){
 						} else {
 							$height = 300;
 						}
+
 						$table .= "<div style='width: 90%'><h4>".$graph[0]['name']."</h4><hr></div>";
-						$table .= graphic_combined_module(
-							$modules,
-							$weights,
-							$value['time_lapse'],
-							1000,
-							$height,
-							'',
-							'',
-							0,
-							0,
-							0,
-							$graph_conf['stacked'],
-							0,
-							false,
-							$homeurl,
-							1,
-							false,
-							false,
-							'white',
-							array(),
-							array(),
-							1,
-							1,
-							1,
-							1,
-							$labels,
-							false,
-							false,
-							$graph_conf['percentil'] == 1,
-							false,
-							false,
-							$value['fullscale']
+
+						$params =array(
+							'period'    => $value['time_lapse'],
+							'width'     => 1000,
+							'height'    => $height,
+							'percentil' => $graph_conf['percentil'] == 1,
+							'fullscale' => $value['fullscale']
 						);
+
+						$params_combined = array(
+							'stacked'     => $graph_conf['stacked'],
+							'id_graph'    => $value['id_graph']
+						);
+
+						$table .= graphic_combined_module(
+							false,
+							$params,
+							$params_combined
+						);
+
 						$contador --;
 					}
 					break;
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 52e77d2de2..fab370763d 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -252,10 +252,24 @@ switch ($action) {
 			}
 		}
 
+		$params =array(
+			'period'         => $period,
+			'width'          => $width,
+			'height'         => $height,
+			'vconsole'       => true,
+			'backgroundColor'=> $background_color
+		);
+
+		$params_combined = array(
+			'id_graph'       => $id_custom_graph
+		);
+
 		if ($id_custom_graph != 0) {
-			$img = custom_graphs_print(
-				$id_custom_graph, $height, $width, $period,
-				null, true, 0, true, $background_color);
+			$img = graphic_combined_module(
+				false,
+				$params,
+				$params_combined
+			);
 		}
 		else {
 			$params =array(
@@ -264,8 +278,6 @@ switch ($action) {
 				'show_events'         => false,
 				'width'               => $width,
 				'height'              => $height,
-				//'only_image'          => true,
-				//'homeurl'             => '',
 				'menu'                => false,
 				'backgroundColor'     => $background_color,
 				'vconsole'            => true,
diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
index a99db1be2b..8cbe4e1e2f 100644
--- a/pandora_console/include/chart_generator.php
+++ b/pandora_console/include/chart_generator.php
@@ -94,15 +94,32 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
 	<body bgcolor="#ffffff" style='background:#ffffff;'>
 <?php
 
-        $params = json_decode($_GET['data'], true);
+		$params = json_decode($_GET['data'], true);
         //XXXXXX
         $params['only_image'] = false;
-        $params['width'] = '1048';
+		$params['width'] = '1048';
 
-        echo '<p> Grafica molona para ' .  $params['agent_module_id'] . '</p>';
-        echo '<div>';
-            echo grafico_modulo_sparse ($params);
-		echo '</div>';
+		//cominadasssss
+		$params_combined = json_decode($_GET['data_combined'], true);
+		$module_list     = json_decode($_GET['data_module_list'], true);
+		$type_graph_pdf  = $_GET['type_graph_pdf'];
+
+		if($type_graph_pdf == 'combined'){
+			echo '<p> Grafica molona para combinadaaaaaaaaaaaaa</p>';
+			echo '<div>';
+				echo graphic_combined_module(
+					$module_list,
+					$params,
+					$params_combined
+				);
+			echo '</div>';
+		}
+		elseif($type_graph_pdf == 'sparse'){
+			echo '<p> Grafica molona para ' .  $params['agent_module_id'] . '</p>';
+			echo '<div>';
+				echo grafico_modulo_sparse ($params);
+			echo '</div>';
+		}
 ?>
 	</body>
 </html>
\ No newline at end of file
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index a1aff0d960..694d8980e6 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3117,23 +3117,32 @@ function series_type_graph_array($data, $show_elements_graph){
 	return false;
 }
 
-function generator_chart_to_pdf($params){
+function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined = false, $module_list = false){
 	global $config;
-	$params_encode_json = urlencode(json_encode($params));
-	$file_js = $config["homedir"] . "/include/web2image.js";
-	$url = $config["homeurl"] . "/include/chart_generator.php";
 
-	$img_file = "img_". uniqid() . $params['agent_module_id'] .".png";
+	$file_js  = $config["homedir"] . "/include/web2image.js";
+	$url      = $config["homeurl"] . "/include/chart_generator.php";
+	$img_file = "img_". uniqid()  .".png";
 	$img_path = $config["homedir"] . "/attachment/" . $img_file;
 	$img_url  = $config["homeurl"] . "/attachment/" . $img_file;
 
-	error_log($img_url);
-
 	$width_img  = 500;
 	$height_img = 450;
-	//html_debug_print('entrando en llamada a phantom.js.......', true);
-	$result = exec("phantomjs " . $file_js . " " . $url . "  '" . $params_encode_json . "' " . $img_path . " " . $width_img . " " . $height_img);
+
+	$params_encode_json = urlencode(json_encode($params));
+
+	if($params_combined){
+		$params_combined = urlencode(json_encode($params_combined));
+	}
+
+	if($module_list){
+		$module_list = urlencode(json_encode($module_list));
+	}
+
+	$result = exec("phantomjs " . $file_js . " " . $url . "  '" . $type_graph_pdf . "' '" . $params_encode_json . "' '" . $params_combined . "' '" . $module_list . "' " . $img_path . " " . $width_img . " " . $height_img);
 	return '<img src="' . $img_url . '" />';
+
+	//html_debug_print('entrando en llamada a phantom.js.......', true);
 	//header('Content-Type: image/png;');
 	//return '<img src="data:image/jpg;base64, '.$result.'" />';
 	//return "<img src='/var/www/html/pandora_console/attachment/imagen_". $params['agent_module_id'] .".png' alt='la imagen bonica'>";
diff --git a/pandora_console/include/functions_custom_graphs.php b/pandora_console/include/functions_custom_graphs.php
index 9ca67f5ca2..11af22a7e8 100644
--- a/pandora_console/include/functions_custom_graphs.php
+++ b/pandora_console/include/functions_custom_graphs.php
@@ -21,7 +21,7 @@
 
 
 /**
- * @global array Contents all var configs for the local instalation. 
+ * @global array Contents all var configs for the local instalation.
  */ 
 global $config;
 
@@ -32,13 +32,13 @@ function custom_graphs_create($id_modules = array(), $name = "",
 	$description = "", $stacked = CUSTOM_GRAPH_AREA, $width = 0,
 	$height = 0, $events = 0 , $period = 0, $private = 0, $id_group = 0,
 	$user = false, $fullscale = 0) {
-	
+
 	global $config;
-	
+
 	if ($user === false) {
 		$user = $config['id_user'];
 	}
-	
+
 	$id_graph = db_process_sql_insert('tgraph',
 		array(
 			'id_user' => $user,
@@ -54,7 +54,7 @@ function custom_graphs_create($id_modules = array(), $name = "",
 			'id_graph_template' => 0,
 			'fullscale' => $fullscale,
 			));
-	
+
 	if (empty($id_graph)) {
 		return false;
 	}
@@ -67,22 +67,22 @@ function custom_graphs_create($id_modules = array(), $name = "",
 					'id_agent_module' => $id_module,
 					'weight' => 1
 					));
-			
+
 			if (empty($result))
 				break;
 		}
-		
+
 		if (empty($result)) {
 			//Not it is a complete insert the modules. Delete all
 			db_process_sql_delete('tgraph_source',
 				array('id_graph' => $id_graph));
-			
+
 			db_process_sql_delete('tgraph',
 				array('id_graph' => $id_graph));
-			
+
 			return false;
 		}
-		
+
 		return $id_graph;
 	}
 }
@@ -100,30 +100,30 @@ function custom_graphs_create($id_modules = array(), $name = "",
  */
 function custom_graphs_get_user ($id_user = 0, $only_names = false, $returnAllGroup = true, $privileges = 'RR') {
 	global $config;
-	
+
 	if (!$id_user) {
 		$id_user = $config['id_user'];
 	}
-	
+
 	$groups = users_get_groups ($id_user, $privileges, $returnAllGroup);
-	
+
 	$all_graphs = db_get_all_rows_in_table ('tgraph', 'name');
 	if ($all_graphs === false)
 		return array ();
-	
+
 	$graphs = array ();
 	foreach ($all_graphs as $graph) {
 		if (!in_array($graph['id_group'], array_keys($groups)))
 			continue;
-		
+
 		if ($graph["id_user"] != $id_user && $graph['private'])
 			continue;
-		
+
 		if ($graph["id_group"] > 0)
 			if (!isset($groups[$graph["id_group"]])) {
 				continue;
 			}
-		
+
 		if ($only_names) {
 			$graphs[$graph['id_graph']] = $graph['name'];
 		}
@@ -135,149 +135,7 @@ function custom_graphs_get_user ($id_user = 0, $only_names = false, $returnAllGr
 			$graphs[$graph['id_graph']]['graphs_count'] = $graphsCount;
 		}
 	}
-	
 	return $graphs;
 }
 
-/**
- * Print a custom graph image.
- *
- * @param $id_graph Graph id to print.
- * @param $height Height of the returning image.
- * @param $width Width of the returning image.
- * @param $period Period of time to get data in seconds.
- * @param $stacked Whether the graph is stacked or not.
- * @param $return Whether to return an output string or echo now (optional, echo by default).
- * @param $date Date to start printing the graph
- * @param bool Wether to show an image instead a interactive chart or not
- * @param string Background color
- * @param array List of names for the items. Should have the same size as the module list.
- * @param bool Show the last value of the item on the list.
- * @param bool Show the max value of the item on the list.
- * @param bool Show the min value of the item on the list.
- * @param bool Show the average value of the item on the list.
- *
- * @return Mixed 
- */
-
-function custom_graphs_print($id_graph, $height, $width, $period,
-	$stacked = null, $return = false, $date = 0, $only_image = false,
-	$background_color = 'white', $modules_param = array(), $homeurl = '',
-	$name_list = array(), $unit_list = array(), $show_last = true,
-	$show_max = true, $show_min = true, $show_avg = true, $ttl = 1,
-	$dashboard = false, $vconsole = false, $percentil = null, 
-	$from_interface = false,$id_widget_dashboard=false, $fullscale = false) {
-
-	global $config;
-
-	if ($from_interface) {
-		if ($config["type_interface_charts"] == 'line') {
-			$graph_conf['stacked'] = CUSTOM_GRAPH_LINE;
-		}
-		else {
-			$graph_conf['stacked'] = CUSTOM_GRAPH_AREA;
-		}
-	}
-	else {
-		if ($id_graph == 0) {
-			$graph_conf['stacked'] = CUSTOM_GRAPH_LINE;
-		}
-		else {
-			$graph_conf = db_get_row('tgraph', 'id_graph', $id_graph);
-		}
-	}
-
-	if ($stacked === null) {
-		$stacked = $graph_conf['stacked'];
-	}
-
-	$sources = false;
-	if ($id_graph == 0) {
-		$modules = $modules_param;
-		$count_modules = count($modules);
-		$weights = array_fill(0, $count_modules, 1);
-
-		if ($count_modules > 0)
-			$sources = true;
-	}
-	else {
-		$sources = db_get_all_rows_field_filter('tgraph_source', 'id_graph',
-			$id_graph);
-
-		$series = db_get_all_rows_sql('SELECT summatory_series,average_series,modules_series FROM tgraph WHERE id_graph = '.$id_graph);
-		$summatory = $series[0]['summatory_series'];
-		$average = $series[0]['average_series'];
-		$modules_series = $series[0]['modules_series'];
-
-		$modules = array ();
-		$weights = array ();
-		$labels = array ();
-		foreach ($sources as $source) {
-			array_push ($modules, $source['id_agent_module']);
-			array_push ($weights, $source['weight']);
-			if ($source['label'] != ''){
-					$item['type']            = 'custom_graph';
-					$item['id_agent']        = agents_get_module_id($source['id_agent_module']);
-					$item['id_agent_module'] = $source['id_agent_module'];
-					$labels[$source['id_agent_module']] = reporting_label_macro($item, $source['label']);
-			}
-		}
-	}
-
-	if ($sources === false) {
-		if ($return){
-			return false;
-		}
-		else{
-			ui_print_info_message ( array ( 'no_close' => true, 'message' =>  __('No items.') ) );
-			return;
-		}
-	}
-
-	if (empty($homeurl)) {
-		$homeurl = ui_get_full_url(false, false, false, false);
-	}
-
-	$output = graphic_combined_module(
-		$modules,
-		$weights,
-		$period,
-		$width,
-		$height,
-		'',
-		'',
-		0,
-		0,
-		0,
-		$stacked,
-		$date,
-		$only_image,
-		$homeurl,
-		$ttl,
-		false,
-		false,
-		$background_color,
-		$name_list,
-		array(),
-		$show_last,
-		$show_max,
-		$show_min,
-		$show_avg,
-		$labels,
-		$dashboard,
-		$vconsole,
-		$percentil,
-		$from_interface,
-		$id_widget_dashboard,
-		$fullscale,
-		$summatory,
-		$average,
-		$modules_series
-	);
-
-	if ($return)
-		return $output;
-	echo $output;
-}
-
 ?>
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 5c8ac0ecb9..16481848d6 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -666,8 +666,6 @@ function grafico_modulo_sparse_data(
 		'title'               => '',
 		'unit_name'           => null,
 		'show_alerts'         => false,
-		'avg_only'            => 0,
-		'pure'                => false,
 		'date'                => 0,
 		'unit'                => '',
 		'baseline'            => 0,
@@ -676,7 +674,6 @@ function grafico_modulo_sparse_data(
 		'only_image'          => false,
 		'homeurl'             => '',
 		'ttl'                 => 1,
-		'projection'          => false,
 		'adapt_key'           => '',
 		'compare'             => false,
 		'show_unknown'        => false,
@@ -739,14 +736,6 @@ function grafico_modulo_sparse ($params) {
 		$params['show_alerts'] = false;
 	}
 
-	if(!isset($params['avg_only'])){
-		$params['avg_only'] = 0;
-	}
-
-	if(!isset($params['pure'])){
-		$params['pure'] = false;
-	}
-
 	if(!isset($params['date']) || !$params['date']){
 		$params['date'] = get_system_time();
 	}
@@ -779,10 +768,6 @@ function grafico_modulo_sparse ($params) {
 		$params['ttl'] = 1;
 	}
 
-	if(!isset($params['projection'])){
-		$params['projection'] = false;
-	}
-
 	if(!isset($params['adapt_key'])){
 		$params['adapt_key'] = '';
 	}
@@ -811,7 +796,7 @@ function grafico_modulo_sparse ($params) {
 		$params['dashboard'] = false;
 	}
 
-	if(!isset($params['vconsole'])){
+	if(!isset($params['vconsole']) || $params['vconsole'] == false){
 		$params['vconsole'] = false;
 	}
 	else{
@@ -847,7 +832,7 @@ function grafico_modulo_sparse ($params) {
 
 	//XXXXXXXXXXXX se devuelve phantom.js
 	if($params['only_image']){
-		return generator_chart_to_pdf($params);
+		return generator_chart_to_pdf('sparse', $params);
 	}
 
 	global $graphic_type;
@@ -1087,57 +1072,191 @@ function graph_get_formatted_date($timestamp, $format1, $format2) {
  *
  * @return Mixed
  */
+
+
+/*
+	$params =array(
+		'period'              => $period,
+		'show_events'         => false,
+		'width'               => $width,
+		'height'              => $height,
+		'title'               => '',
+		'unit_name'           => null,
+		'show_alerts'         => false,
+		'date'                => 0,
+		'unit'                => '',
+		'only_image'          => false,
+		'homeurl'             => '',
+		'ttl'                 => 1,
+		'percentil'           => null,
+		'dashboard'           => false,
+		'vconsole'            => false,
+		'fullscale'           => false,
+		'id_widget_dashboard' => false,
+	);
+
+	$params_combined = array(
+		'weight_list'    => array(),
+		'stacked'        => 0,
+		'projection'     => false,
+		'labels'         => array(),
+		'from_interface' => false,
+		'summatory'      => 0,
+		'average'        => 0,
+		'modules_series' => 0,
+		'id_graph'       => 0,
+		'return'         => 1
+	);
+ */
+
 function graphic_combined_module (
 	$module_list,
-	$weight_list,
-	$period,
-	$width,
-	$height,
-	$title,
-	$unit_name,
-	$show_events = 0,
-	$show_alerts = 0,
-	$pure = 0,
-	$stacked = 0,
-	$date = 0,
-	$only_image = false,
-	$homeurl = '',
-	$ttl = 1,
-	$projection = false,
-	$prediction_period = false,
-	$background_color = 'white',
-	$name_list = array(),
-	$unit_list = array(),
-	$show_last = true,
-	$show_max = true,
-	$show_min = true,
-	$show_avg = true,
-	$labels = array(),
-	$dashboard = false,
-	$vconsole = false,
-	$percentil = null,
-	$from_interface = false,
-	$id_widget_dashboard=false,
-	$fullscale = false,
-	$summatory = 0,
-	$average = 0,
-	$modules_series = 0
+	$params,
+	$params_combined
 ) {
+	//XXX seteo todos los parametros
+	if(!isset($params_combined['from_interface'])){
+		$params_combined['from_interface'] = false;
+	}
+
+	if(!isset($params_combined['stacked'])){
+		if ($params_combined['from_interface']) {
+			if ($config["type_interface_charts"] == 'line') {
+				$params_combined['stacked'] = CUSTOM_GRAPH_LINE;
+			}
+			else {
+				$params_combined['stacked'] = CUSTOM_GRAPH_AREA;
+			}
+		}
+		else {
+			if ($id_graph == 0) {
+				$params_combined['stacked'] = CUSTOM_GRAPH_LINE;
+			}
+			else {
+				$params_combined['stacked'] = db_get_row('tgraph', 'id_graph', $id_graph);
+			}
+		}
+	}
+
+	$params['stacked'] = $params_combined['stacked'];
+
+	if(!isset($params_combined['projection'])){
+		$params_combined['projection'] = false;
+	}
+	else{
+		$params['stacked'] = 'area';
+	}
+
+	if(!isset($params_combined['labels'])){
+		$params_combined['labels'] = array();
+	}
+
+	if(!isset($params_combined['summatory'])){
+		$params_combined['summatory'] = 0;
+	}
+
+	if(!isset($params_combined['average'])){
+		$params_combined['average'] = 0;
+	}
+
+	if(!isset($params_combined['modules_series'])){
+		$params_combined['modules_series'] = 0;
+	}
+
+	if(!isset($params_combined['return'])){
+		$params_combined['return'] = 1;
+	}
+
+	if(!isset($params_combined['id_graph'])){
+		$params_combined['id_graph'] = 0;
+	}
+
+
+	//XXX seteo los parametros
+	if(!isset($params['period'])){
+		return false;
+	}
+
+	if(!isset($params['width'])){
+		$params['width'] = '90%';
+	}
+
+	if(!isset($params['height'])){
+		$params['height'] = 450;
+	}
+
+	if(!isset($params['title'])){
+		$params['title'] = '';
+	}
+
+	if(!isset($params['unit_name'])){
+		$params['unit_name'] = null;
+	}
+
+	if(!isset($params['show_alerts'])){
+		$params['show_alerts'] = false;
+	}
+
+	if(!isset($params['date']) || !$params['date']){
+		$params['date'] = get_system_time();
+	}
+
+	if(!isset($params['only_image'])){
+		$params['only_image'] = false;
+	}
+
+	if(!isset($params['ttl'])){
+		$params['ttl'] = 1;
+	}
+
+	if(!isset($params['backgroundColor'])){
+		$params['backgroundColor'] = 'white';
+	}
+
+	if(!isset($params['dashboard'])){
+		$params['dashboard'] = false;
+	}
+
+	if(!isset($params['menu']) || $params['only_image']){
+		$params['menu'] = true;
+	}
+	else{
+		$params['menu'] = false;
+	}
+
+	if(!isset($params['vconsole']) || $params['vconsole'] == false){
+		$params['vconsole'] = false;
+	}
+	else{
+		$params['menu'] = false;
+	}
+
+	if(!isset($params['percentil'])){
+		$params['percentil'] = null;
+	}
+
+	if(!isset($params['fullscale'])){
+		$params['fullscale'] = false;
+	}
+
+	if(!isset($params['id_widget_dashboard'])){
+		$params['id_widget_dashboard'] = false;
+	}
+
+	if(!isset($params['homeurl'])){
+		$params['homeurl'] = ui_get_full_url(false, false, false, false);
+	}
+
+	//XXXX
+	if($params['only_image']){
+		return generator_chart_to_pdf('combined', $params, $params_combined, $module_list);
+	}
 
 	global $config;
 	global $graphic_type;
 
-	$legend        = array();
-	$series_type   = array();
-
-	//date start final period
-	if($date == 0){
-		$date = get_system_time();
-	}
-
 	//XXX colocar
 /*
-	$prediction_period
 	$name_list
 	$unit_list
 	$show_last
@@ -1146,164 +1265,339 @@ function graphic_combined_module (
 	$show_avg
 */
 
-	$date_array = array();
-	$date_array["period"]     = $period;
-	$date_array["final_date"] = $date;
-	$date_array["start_date"] = $date - $period;
+	$sources = false;
+	if ($params_combined['id_graph'] == 0) {
+		$count_modules = count($module_list);
 
-	//show elements in the graph
-	$menu = true;
-	if ($vconsole){
-		$menu = false;
+		if(!$params_combined['weight_list']){
+			$weights = array_fill(0, $count_modules, 1);
+		}
+
+		if ($count_modules > 0){
+			$sources = true;
+		}
 	}
-
-	$params = array();
-	$params['show_events']    = $show_events;
-	$params['show_alerts']    = $show_alerts;
-	$params['show_unknown']   = false; // dont use
-	$params['avg_only']       = false; // dont use
-	$params['fullscale']      = $fullscale;
-	$params['show_title']     = ''; // dont use
-	$params['menu']           = $menu; // dont use
-	$params['adapt_key']      = ''; // dont use
-	$params['percentil']      = $percentil;
-	$params['projection']     = $projection;
-	$params['compare']        = false; //dont use
-	$params['dashboard']      = $dashboard;
-	$params['vconsole']       = $vconsole;
-	$params['pure']           = $pure;
-	$params['baseline']       = false; //dont use
-	$params['only_image']     = $only_image;
-	$params['return_data']    = false; //dont use
-	$params['id_widget']      = $id_widget_dashboard;
-	$params['labels']         = $labels;
-	$params['stacked']        = $stacked;
-	$params['combined']       = true;
-	$params['from_interface'] = $from_interface;
-	$params['font']           = $config['fontpath'];
-	$params['font-size']      = $config['font_size'];
-	$params['width']          ='90%';
-	$params['height']         = $height;
-	//for flash_charts
-	$user              = users_get_user_by_id($config['id_user']);
-	$user_flash_charts = $user['flash_chart'];
-
-	if ($user_flash_charts == 1)
-		$flash_charts = true;
-	elseif($user_flash_charts == -1)
-		$flash_charts = $config['flash_charts'];
-	elseif($user_flash_charts == 0)
-		$flash_charts = false;
-
-	if ($only_image) {
-		$flash_charts = false;
-	}
-
-	$i=0;
-	$array_data = array();
-	foreach ($module_list as $key => $agent_module_id) {
-		$module_data = db_get_row_sql (
-			'SELECT * FROM tagente_modulo
-			WHERE id_agente_modulo = ' .
-			$agent_module_id
+	else {
+		$sources = db_get_all_rows_field_filter(
+			'tgraph_source',
+			'id_graph',
+			$params_combined['id_graph']
 		);
 
-		$data_module_graph = array();
-		$data_module_graph['history_db']     = db_search_in_history_db($date_array["start_date"]);
-		$data_module_graph['agent_name']     = modules_get_agentmodule_agent_name ($agent_module_id);
-		$data_module_graph['agent_id']       = $module_data['id_agente'];
-		$data_module_graph['module_name']    = $module_data['nombre'];
-		$data_module_graph['id_module_type'] = $module_data['id_tipo_modulo'];
-		$data_module_graph['module_type']    = modules_get_moduletype_name ($data_module_graph['id_module_type']);
-		$data_module_graph['uncompressed']   = is_module_uncompressed ($data_module_graph['module_type']);
-		$data_module_graph['w_min']    		 = $module_data['min_warning'];
-		$data_module_graph['w_max']   		 = $module_data['max_warning'];
-		$data_module_graph['w_inv']    		 = $module_data['warning_inverse'];
-		$data_module_graph['c_min']    		 = $module_data['min_critical'];
-		$data_module_graph['c_max']    		 = $module_data['max_critical'];
-		$data_module_graph['c_inv']    		 = $module_data['critical_inverse'];
-		$data_module_graph['module_id']      = $agent_module_id;
-
-		//stract data
-		$array_data_module = grafico_modulo_sparse_data(
-			$agent_module_id,
-			$date_array,
-			$data_module_graph,
-			$param,
-			$i,
-			$data_module_graph['agent_name']
+		$series = db_get_all_rows_sql(
+			'SELECT summatory_series,average_series,modules_series 
+			FROM tgraph 
+			WHERE id_graph = '.
+			$params_combined['id_graph']
 		);
 
-		$series_suffix     = $i;
-		$series_suffix_str = '';
+		$summatory      = $series[0]['summatory_series'];
+		$average        = $series[0]['average_series'];
+		$modules_series = $series[0]['modules_series'];
 
-		//convert to array graph and weight
-		foreach ($array_data_module as $key => $value) {
-			$array_data[$key] = $value;
-			if($weight_list[$i] > 1){
-				foreach ($value['data'] as $k => $v) {
-					$array_data[$key]['data'][$k][1] = $v[1] * $weight_list[$i];
+		$weights = array ();
+		$labels  = array ();
+		$modules = array ();
+
+		if(isset($sources) && is_array($sources)){
+			foreach ($sources as $source) {
+				array_push ($modules, $source['id_agent_module']);
+				array_push ($weights, $source['weight']);
+				if ($source['label'] != ''){
+					$item['type']            = 'custom_graph';
+					$item['id_agent']        = agents_get_module_id($source['id_agent_module']);
+					$item['id_agent_module'] = $source['id_agent_module'];
+					$labels[$source['id_agent_module']] = reporting_label_macro($item, $source['label']);
 				}
 			}
 		}
+	}
 
-		$max = $array_data['sum' . $i]['max'];
-		$min = $array_data['sum' . $i]['min'];
-		$avg = $array_data['sum' . $i]['avg'];
+	if(isset($labels)){
+		$params_combined['labels'] = $labels;
+	}
 
-		$percentil_value = $array_data['percentil' . $i]['data'][0][1];
+	if(isset($weights)){
+		$params_combined['weight_list'] = $weights;
+	}
 
-		$color = color_graph_array(
-			$series_suffix,
-			$show_elements_graph['flag_overlapped']
-		);
+	if(!$module_list){
+		$module_list = $modules;
+	}
 
-		foreach ($color as $k => $v) {
-			if(is_array($array_data[$k])){
-				$array_data[$k]['color'] = $v['color'];
+	if ($sources === false) {
+		if ($params_combined['return']){
+			return false;
+		}
+		else{
+			ui_print_info_message (
+				array (
+					'no_close' => true,
+					'message' =>  __('No items.')
+				)
+			);
+			return;
+		}
+	}
+
+	$width            = $params['width'];
+	$height           = $params['height'];
+	$homeurl          = $params['homeurl'];
+	$ttl              = $params['ttl'];
+	$background_color = $params['backgroundColor'];
+	$datelimit        = $date_array["start_date"];
+	$flash_charts     = false;
+
+	//XXX no se que hacen
+	$fixed_font_size = '';
+	$water_mark      = '';
+	$long_index      = '';
+	$color           = array();
+
+	switch ($params_combined['stacked']) {
+		default:
+		case CUSTOM_GRAPH_STACKED_LINE:
+		case CUSTOM_GRAPH_STACKED_AREA:
+		case CUSTOM_GRAPH_AREA:
+		case CUSTOM_GRAPH_LINE:
+
+			$date_array = array();
+			$date_array["period"]     = $params['period'];
+			$date_array["final_date"] = $params['date'];
+			$date_array["start_date"] = $params['date'] - $params['period'];
+
+			$i=0;
+			$array_data = array();
+			foreach ($module_list as $key => $agent_module_id) {
+				$module_data = db_get_row_sql (
+					'SELECT * FROM tagente_modulo
+					WHERE id_agente_modulo = ' .
+					$agent_module_id
+				);
+
+				$data_module_graph = array();
+				$data_module_graph['history_db']     = db_search_in_history_db($date_array["start_date"]);
+				$data_module_graph['agent_name']     = modules_get_agentmodule_agent_name ($agent_module_id);
+				$data_module_graph['agent_id']       = $module_data['id_agente'];
+				$data_module_graph['module_name']    = $module_data['nombre'];
+				$data_module_graph['id_module_type'] = $module_data['id_tipo_modulo'];
+				$data_module_graph['module_type']    = modules_get_moduletype_name ($data_module_graph['id_module_type']);
+				$data_module_graph['uncompressed']   = is_module_uncompressed ($data_module_graph['module_type']);
+				$data_module_graph['w_min']    		 = $module_data['min_warning'];
+				$data_module_graph['w_max']   		 = $module_data['max_warning'];
+				$data_module_graph['w_inv']    		 = $module_data['warning_inverse'];
+				$data_module_graph['c_min']    		 = $module_data['min_critical'];
+				$data_module_graph['c_max']    		 = $module_data['max_critical'];
+				$data_module_graph['c_inv']    		 = $module_data['critical_inverse'];
+				$data_module_graph['module_id']      = $agent_module_id;
+
+				//stract data
+				$array_data_module = grafico_modulo_sparse_data(
+					$agent_module_id,
+					$date_array,
+					$data_module_graph,
+					$params,
+					$i,
+					$data_module_graph['agent_name']
+				);
+
+				$series_suffix     = $i;
+				$series_suffix_str = '';
+
+				//convert to array graph and weight
+				foreach ($array_data_module as $key => $value) {
+					$array_data[$key] = $value;
+					if($params_combined['weight_list'][$i] > 1){
+						foreach ($value['data'] as $k => $v) {
+							$array_data[$key]['data'][$k][1] = $v[1] * $params_combined['weight_list'][$i];
+						}
+					}
+				}
+
+				$max = $array_data['sum' . $i]['max'];
+				$min = $array_data['sum' . $i]['min'];
+				$avg = $array_data['sum' . $i]['avg'];
+
+				$percentil_value = $array_data['percentil' . $i]['data'][0][1];
+
+				$color = color_graph_array(
+					$series_suffix,
+					$show_elements_graph['flag_overlapped']
+				);
+
+				foreach ($color as $k => $v) {
+					if(is_array($array_data[$k])){
+						$array_data[$k]['color'] = $v['color'];
+					}
+				}
+
+				if($config["fixed_graph"] == false){
+					$water_mark = array(
+						'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
+						'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
+				}
+
+				//Work around for fixed the agents name with huge size chars.
+				$fixed_font_size = $config['font_size'];
+
+				//$array_events_alerts[$series_suffix] = $events;
+				$i++;
 			}
-		}
 
-		if($config["fixed_graph"] == false){
-			$water_mark = array(
-				'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
-				'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
-		}
+			if($params_combined['projection'] && is_array($params_combined['projection'])){
+				$array_data['projection']['data']= $params_combined['projection'];
+			}
 
-		//Work around for fixed the agents name with huge size chars.
-		$fixed_font_size = $config['font_size'];
+			//summatory and average series
+			if($params_combined['stacked'] == CUSTOM_GRAPH_AREA  || $params_combined['stacked'] == CUSTOM_GRAPH_LINE) {
+				if($params_combined['summatory'] || $params_combined['average']) {
+					$array_data = combined_graph_summatory_average (
+						$array_data,
+						$params_combined['average'],
+						$params_combined['summatory'],
+						$params_combined['modules_series']
+					);
+				}
+			}
 
-		//$array_events_alerts[$series_suffix] = $events;
-		$i++;
-	}
+			$series_type_array = series_type_graph_array(
+				$array_data,
+				$show_elements_graph
+			);
 
-	if($projection && is_array($projection)){
-		$array_data['projection']['data']= $projection;
-	}
+			$series_type = $series_type_array['series_type'];
+			$legend      = $series_type_array['legend'];
 
-	//summatory and average series
-	if($stacked == CUSTOM_GRAPH_AREA  || $stacked == CUSTOM_GRAPH_LINE) {
-		if($summatory || $average) {
-			$array_data = combined_graph_summatory_average ($array_data, $average, $summatory, $modules_series);
-		}
-	}
+			//XXXXXXREVISAR
+			$threshold_data = array();
+			if ($params_combined['from_interface']) {
+				$yellow_threshold = 0;
+				$red_threshold = 0;
 
-	$series_type_array = series_type_graph_array(
-		$array_data,
-		$show_elements_graph
-	);
+				$yellow_up = 0;
+				$red_up = 0;
 
-	$series_type = $series_type_array['series_type'];
-	$legend      = $series_type_array['legend'];
+				$yellow_inverse = 0;
+				$red_inverse = 0;
 
-	if ($flash_charts === false && $stacked == CUSTOM_GRAPH_GAUGE)
-		$stacked = CUSTOM_GRAPH_BULLET_CHART;
+				$compare_warning = false;
+				$compare_critical = false;
 
-	switch ($stacked) {
+				$do_it_warning_min = true;
+				$do_it_critical_min = true;
+
+				$do_it_warning_max = true;
+				$do_it_critical_max = true;
+
+				$do_it_warning_inverse = true;
+				$do_it_critical_inverse = true;
+
+				foreach ($module_list as $index => $id_module) {
+					// Get module warning_min and critical_min
+					$warning_min  = db_get_value('min_warning','tagente_modulo','id_agente_modulo',$id_module);
+					$critical_min = db_get_value('min_critical','tagente_modulo','id_agente_modulo',$id_module);
+
+					if ($index == 0) {
+						$compare_warning = $warning_min;
+					}
+					else {
+						if ($compare_warning != $warning_min) {
+							$do_it_warning_min = false;
+						}
+					}
+
+					if ($index == 0) {
+						$compare_critical = $critical_min;
+					}
+					else {
+						if ($compare_critical != $critical_min) {
+							$do_it_critical_min = false;
+						}
+					}
+				}
+
+				if ($do_it_warning_min || $do_it_critical_min) {
+					foreach ($module_list as $index => $id_module) {
+						$warning_max  = db_get_value('max_warning','tagente_modulo','id_agente_modulo',$id_module);
+						$critical_max = db_get_value('max_critical','tagente_modulo','id_agente_modulo',$id_module);
+
+						if ($index == 0) {
+							$yellow_up = $warning_max;
+						}
+						else {
+							if ($yellow_up != $warning_max) {
+								$do_it_warning_max = false;
+							}
+						}
+
+						if ($index == 0) {
+							$red_up = $critical_max;
+						}
+						else {
+							if ($red_up != $critical_max) {
+								$do_it_critical_max = false;
+							}
+						}
+					}
+				}
+
+				if ($do_it_warning_min || $do_it_critical_min) {
+					foreach ($module_list as $index => $id_module) {
+						$warning_inverse  = db_get_value('warning_inverse','tagente_modulo','id_agente_modulo',$id_module);
+						$critical_inverse = db_get_value('critical_inverse','tagente_modulo','id_agente_modulo',$id_module);
+
+						if ($index == 0) {
+							$yellow_inverse = $warning_inverse;
+						}
+						else {
+							if ($yellow_inverse != $warning_inverse) {
+								$do_it_warning_inverse = false;
+							}
+						}
+
+						if ($index == 0) {
+							$red_inverse = $critical_inverse;
+						}
+						else {
+							if ($red_inverse != $critical_inverse) {
+								$do_it_critical_inverse = false;
+							}
+						}
+					}
+				}
+
+				if ($do_it_warning_min && $do_it_warning_max && $do_it_warning_inverse) {
+					$yellow_threshold = $compare_warning;
+					$threshold_data['yellow_up']      = $yellow_up;
+					$threshold_data['yellow_inverse'] = (bool)$yellow_inverse;
+				}
+
+				if ($do_it_critical_min && $do_it_critical_max && $do_it_critical_inverse) {
+					$red_threshold = $compare_critical;
+					$threshold_data['red_up']      = $red_up;
+					$threshold_data['red_inverse'] = (bool)$red_inverse;
+				}
+
+				$show_elements_graph['threshold_data'] = $threshold_data;
+			}
+
+			$output = area_graph(
+				$agent_module_id,
+				$array_data,
+				$legend,
+				$series_type,
+				$date_array,
+				$data_module_graph,
+				$params,
+				$water_mark,
+				$series_suffix_str,
+				$array_events_alerts
+			);
+			break;
 		case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD:
 		case CUSTOM_GRAPH_BULLET_CHART:
-			$datelimit = $date - $period;
-			if($stacked == CUSTOM_GRAPH_BULLET_CHART_THRESHOLD){
+
+			if($params_combined['stacked'] == CUSTOM_GRAPH_BULLET_CHART_THRESHOLD){
 				$acumulador = 0;
 				foreach ($module_list as $module_item) {
 					$module = $module_item;
@@ -1313,13 +1607,14 @@ function graphic_combined_module (
 						WHERE id_agente_modulo = %d
 							AND utimestamp < %d
 							ORDER BY utimestamp DESC',
-						$module, $date);
+						$module, $params['date']);
 					$temp_data = db_get_value_sql($query_last_value);
 					if ($acumulador < $temp_data){
 						$acumulador = $temp_data;
 					}
 				}
 			}
+
 			foreach ($module_list as $module_item) {
 				$automatic_custom_graph_meta = false;
 				if ($config['metaconsole']) {
@@ -1345,7 +1640,7 @@ function graphic_combined_module (
 					WHERE id_agente_modulo = %d
 						AND utimestamp < %d
 						ORDER BY utimestamp DESC',
-					$module, $date);
+					$module, $params['date']);
 				$temp_data = db_get_value_sql($query_last_value);
 
 				if ($temp_data) {
@@ -1361,8 +1656,8 @@ function graphic_combined_module (
 						$value = false;
 				}
 
-				if ( !empty($labels) && isset($labels[$module]) ){
-					$label = io_safe_input($labels[$module]);
+				if ( !empty($params_combined['labels']) && isset($params_combined['labels'][$module]) ){
+					$label = io_safe_input($params_combined['labels'][$module]);
 				}else{
 					$alias = db_get_value ("alias","tagente","id_agente",$temp[$module]['id_agente']);
 					$label = $alias . ': ' . $temp[$module]['nombre'];
@@ -1370,7 +1665,7 @@ function graphic_combined_module (
 
 				$temp[$module]['label'] = $label;
 				$temp[$module]['value'] = $value;
-				$temp_max = reporting_get_agentmodule_data_max($module,$period,$date);
+				$temp_max = reporting_get_agentmodule_data_max($module, $params['period'], $params['date']);
 				if ($temp_max < 0)
 					$temp_max = 0;
 				if (isset($acumulador)){
@@ -1379,7 +1674,7 @@ function graphic_combined_module (
 					$temp[$module]['max'] = ($temp_max === false) ? 0 : $temp_max;
 				}
 
-				$temp_min = reporting_get_agentmodule_data_min($module,$period,$date);
+				$temp_min = reporting_get_agentmodule_data_min($module, $params['period'], $params['date']);
 				if ($temp_min < 0)
 					$temp_min = 0;
 				$temp[$module]['min'] = ($temp_min === false) ? 0 : $temp_min;
@@ -1390,14 +1685,123 @@ function graphic_combined_module (
 						metaconsole_restore_db();
 					}
 				}
-
 			}
 
+			//XXXX
+			$graph_values = $temp;
+
+			$output = stacked_bullet_chart(
+				$flash_charts,
+				$graph_values,
+				$width,
+				$height,
+				$color,
+				$module_name_list,
+				$long_index,
+				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
+				"",
+				"",
+				$water_mark,
+				$config['fontpath'],
+				($config['font_size']+1),
+				"",
+				$ttl,
+				$homeurl,
+				$background_color
+			);
+			break;
+
+		case CUSTOM_GRAPH_GAUGE:
+			$i = 0;
+			foreach ($module_list as $module_item) {
+				$automatic_custom_graph_meta = false;
+				if ($config['metaconsole']) {
+					// Automatic custom graph from the report template in metaconsole
+					if (is_array($module_list[$i])) {
+						$server = metaconsole_get_connection_by_id ($module_item['server']);
+						metaconsole_connect($server);
+						$automatic_custom_graph_meta = true;
+					}
+				}
+
+				if ($automatic_custom_graph_meta)
+					$module = $module_item['module'];
+				else
+					$module = $module_item;
+
+				$temp[$module] = modules_get_agentmodule($module);
+				$query_last_value = sprintf('
+					SELECT datos
+					FROM tagente_datos
+					WHERE id_agente_modulo = %d
+						AND utimestamp < %d
+						ORDER BY utimestamp DESC',
+					$module, $params['date']);
+				$temp_data = db_get_value_sql($query_last_value);
+				if ( $temp_data ) {
+					if (is_numeric($temp_data))
+						$value = $temp_data;
+					else
+						$value = count($value);
+				}
+				else {
+					$value = false;
+				}
+				$temp[$module]['label'] = ($params_combined['labels'][$module] != '') ? $params_combined['labels'][$module] : $temp[$module]['nombre'];
+
+				$temp[$module]['value'] = $value;
+				$temp[$module]['label'] = ui_print_truncate_text($temp[$module]['label'],"module_small",false,true,false,"..");
+
+				if ($temp[$module]['unit'] == '%') {
+					$temp[$module]['min'] =	0;
+					$temp[$module]['max'] = 100;
+				}
+				else {
+					$min = $temp[$module]['min'];
+					if ($temp[$module]['max'] == 0)
+						$max = reporting_get_agentmodule_data_max($module, $params['period'], $params['date']);
+					else
+						$max = $temp[$module]['max'];
+					$temp[$module]['min'] = ($min == 0 ) ? 0 : $min;
+					$temp[$module]['max'] = ($max == 0 ) ? 100 : $max;
+				}
+				$temp[$module]['gauge'] = uniqid('gauge_');
+
+				if ($config['metaconsole']) {
+					// Automatic custom graph from the report template in metaconsole
+					if (is_array($module_list[0])) {
+						metaconsole_restore_db();
+					}
+				}
+				$i++;
+			}
+
+			//XXXX
+			$graph_values = $temp;
+
+			$output = stacked_gauge(
+				$flash_charts,
+				$graph_values,
+				$width,
+				$height,
+				$color,
+				$module_name_list,
+				$long_index,
+				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
+				"",
+				"",
+				$water_mark,
+				$config['fontpath'],
+				$fixed_font_size,
+				"",
+				$ttl,
+				$homeurl,
+				$background_color
+			);
+
 			break;
 		case CUSTOM_GRAPH_HBARS:
 		case CUSTOM_GRAPH_VBARS:
-			$datelimit = $date - $period;
-
 			$label = '';
 			foreach ($module_list as $module_item) {
 				$automatic_custom_graph_meta = false;
@@ -1422,14 +1826,14 @@ function graphic_combined_module (
 					WHERE id_agente_modulo = %d
 						AND utimestamp < %d
 						ORDER BY utimestamp DESC',
-					$module, $date);
+					$module, $params['date']);
 				$temp_data = db_get_value_sql($query_last_value);
 
 				$agent_name = io_safe_output(
 					modules_get_agentmodule_agent_name ($module));
 
-				if (!empty($labels) && isset($labels[$module]) ){
-					$label = $labels[$module];
+				if (!empty($params_combined['labels']) && isset($params_combined['labels'][$module]) ){
+					$label = $params_combined['labels'][$module];
 				}else {
 					$alias = db_get_value ("alias","tagente","id_agente",$module_data['id_agente']);
 					$label = $alias . " - " .$module_data['nombre'];
@@ -1444,9 +1848,60 @@ function graphic_combined_module (
 					}
 				}
 			}
+
+			//XXXX
+			$graph_values = $temp;
+
+			if($params_combined['stacked'] == CUSTOM_GRAPH_HBARS){
+				$output = hbar_graph(
+					$flash_charts,
+					$graph_values,
+					$width,
+					$height,
+					$color,
+					$module_name_list,
+					$long_index,
+					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
+					"",
+					"",
+					$water_mark,
+					$config['fontpath'],
+					$fixed_font_size,
+					"",
+					$ttl,
+					$homeurl,
+					$background_color,
+					'black'
+				);
+			}
+
+			if($params_combined['stacked'] == CUSTOM_GRAPH_VBARS){
+				$output = vbar_graph(
+					$flash_charts,
+					$graph_values,
+					$width,
+					$height,
+					$color,
+					$module_name_list,
+					$long_index,
+					ui_get_full_url("images/image_problem_area_small.png", false, false, false),
+					"",
+					"",
+					$water_mark,
+					$config['fontpath'],
+					$fixed_font_size,
+					"",
+					$ttl,
+					$homeurl,
+					$background_color,
+					true,
+					false,
+					"black"
+				);
+			}
+
 			break;
 		case CUSTOM_GRAPH_PIE:
-			$datelimit = $date - $period;
 			$total_modules = 0;
 			foreach ($module_list as $module_item) {
 				$automatic_custom_graph_meta = false;
@@ -1472,7 +1927,7 @@ function graphic_combined_module (
 						AND utimestamp > %d
 						AND utimestamp < %d
 						ORDER BY utimestamp DESC',
-					$module, $datelimit, $date);
+					$module, $datelimit, $params['date']);
 				$temp_data = db_get_value_sql($query_last_value);
 
 				if ( $temp_data ){
@@ -1486,8 +1941,8 @@ function graphic_combined_module (
 				}
 				$total_modules += $value;
 
-				if ( !empty($labels) && isset($labels[$module]) ){
-					$label = io_safe_output($labels[$module]);
+				if ( !empty($params_combined['labels']) && isset($params_combined['labels'][$module]) ){
+					$label = io_safe_output($params_combined['labels'][$module]);
 				}else {
 					$alias = db_get_value ("alias","tagente","id_agente",$data_module['id_agente']);
 					$label = io_safe_output($alias . ": " . $data_module['nombre']);
@@ -1502,323 +1957,37 @@ function graphic_combined_module (
 					}
 				}
 			}
+
 			$temp['total_modules'] = $total_modules;
 
-			break;
-		case CUSTOM_GRAPH_GAUGE:
-			$datelimit = $date - $period;
-			$i = 0;
-			foreach ($module_list as $module_item) {
-				$automatic_custom_graph_meta = false;
-				if ($config['metaconsole']) {
-					// Automatic custom graph from the report template in metaconsole
-					if (is_array($module_list[$i])) {
-						$server = metaconsole_get_connection_by_id ($module_item['server']);
-						metaconsole_connect($server);
-						$automatic_custom_graph_meta = true;
-					}
-				}
+			//XXXX
+			$graph_values = $temp;
 
-				if ($automatic_custom_graph_meta)
-					$module = $module_item['module'];
-				else
-					$module = $module_item;
+			$output = ring_graph(
+				$flash_charts,
+				$graph_values,
+				$width,
+				$height,
+				$others_str,
+				$homeurl,
+				$water_mark,
+				$config['fontpath'],
+				($config['font_size']+1),
+				$ttl,
+				false,
+				$color,
+				false,
+				$background_color
+			);
 
-				$temp[$module] = modules_get_agentmodule($module);
-				$query_last_value = sprintf('
-					SELECT datos
-					FROM tagente_datos
-					WHERE id_agente_modulo = %d
-						AND utimestamp < %d
-						ORDER BY utimestamp DESC',
-					$module, $date);
-				$temp_data = db_get_value_sql($query_last_value);
-				if ( $temp_data ) {
-					if (is_numeric($temp_data))
-						$value = $temp_data;
-					else
-						$value = count($value);
-				}
-				else {
-					$value = false;
-				}
-				$temp[$module]['label'] = ($labels[$module] != '') ? $labels[$module] : $temp[$module]['nombre'];
-
-				$temp[$module]['value'] = $value;
-				$temp[$module]['label'] = ui_print_truncate_text($temp[$module]['label'],"module_small",false,true,false,"..");
-
-				if ($temp[$module]['unit'] == '%') {
-					$temp[$module]['min'] =	0;
-					$temp[$module]['max'] = 100;
-				}
-				else {
-					$min = $temp[$module]['min'];
-					if ($temp[$module]['max'] == 0)
-						$max = reporting_get_agentmodule_data_max($module,$period,$date);
-					else
-						$max = $temp[$module]['max'];
-					$temp[$module]['min'] = ($min == 0 ) ? 0 : $min;
-					$temp[$module]['max'] = ($max == 0 ) ? 100 : $max;
-				}
-				$temp[$module]['gauge'] = uniqid('gauge_');
-
-				if ($config['metaconsole']) {
-					// Automatic custom graph from the report template in metaconsole
-					if (is_array($module_list[0])) {
-						metaconsole_restore_db();
-					}
-				}
-				$i++;
-			}
-			break;
-		default:
 			break;
 	}
 
-
-
-
-///XXXXXXX esto lo que hay de aki para abajo
-
-/*
-		// If projection graph, fill with zero previous data to projection interval
-		if ($projection != false) {
-			$j = $datelimit;
-			$in_range = true;
-			while ($in_range) {
-				$timestamp_f = graph_get_formatted_date($j, $time_format, $time_format_2);
-
-				$before_projection[$timestamp_f] = 0;
-
-				if ($j > $date) {
-					$in_range = false;
-				}
-				$j = $j + $interval;
-			}
-		}
-
-		// Added support for projection graphs (normal_module + 1(prediction data))
-		if ($projection !== false) {
-			$module_number = count ($module_list) + 1;
-		}
-		else {
-			$module_number = count ($module_list);
-		}
-
-		$names_number = count($name_list);
-		$units_number = count($unit_list);
-
-		$aux_array = array();
-		// Set data containers
-		for ($i = 0; $i < $resolution; $i++) {
-			$timestamp = $datelimit + ($interval * $i);/*
-			$timestamp_short = date($time_format, $timestamp);
-			$long_index[$timestamp_short] = date(
-			html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
-			$timestamp = $timestamp_short;*
-			$graph[$timestamp]['count'] = 0;
-			$graph[$timestamp]['timestamp_bottom'] = $timestamp;
-			$graph[$timestamp]['timestamp_top'] = $timestamp + $interval;
-			$graph[$timestamp]['min'] = 0;
-			$graph[$timestamp]['max'] = 0;
-			$graph[$timestamp]['event'] = 0;
-			$graph[$timestamp]['alert'] = 0;
-		}
-
-		$long_index        = array();
-		$graph_values      = array();
-		$module_name_list  = array();
-		$collector         = 0;
-
-				// Added to support projection graphs
-				if ($projection != false and $i != 0) {
-					$projection_data = array();
-					$projection_data = array_merge($before_projection, $projection);
-					$graph_values[$i] = $projection_data;
-				}
-				else {
-					$graph_values[$i] = $temp_graph_values;
-				}
-
-			$graph_stats = get_graph_statistics($graph_values[$i]);
-
-			if (!isset($config["short_module_graph_data"]))
-				$config["short_module_graph_data"] = true;
-
-			if (!empty($unit_list) && $units_number == $module_number && isset($unit_list[$i])) {
-				$unit = $unit_list[$i];
-			}else{
-				$unit = $unit_list_aux[$i];
-			}
-
-			if ($weight_list[$i] != 1) {
-				//$module_name_list[$i] .= " (x". format_numeric ($weight_list[$i], 1).")";
-				$module_name_list[$i] .= " (x". format_numeric ($weight_list[$i], 1).")";
-			}
-*/
-
-
-	$graph_values = $temp;
-
-	$threshold_data = array();
-
-	if ($from_interface) {
-		$yellow_threshold = 0;
-		$red_threshold = 0;
-
-		$yellow_up = 0;
-		$red_up = 0;
-
-		$yellow_inverse = 0;
-		$red_inverse = 0;
-
-		$compare_warning = false;
-		$compare_critical = false;
-
-		$do_it_warning_min = true;
-		$do_it_critical_min = true;
-
-		$do_it_warning_max = true;
-		$do_it_critical_max = true;
-
-		$do_it_warning_inverse = true;
-		$do_it_critical_inverse = true;
-
-		foreach ($module_list as $index => $id_module) {
-			// Get module warning_min and critical_min
-			$warning_min  = db_get_value('min_warning','tagente_modulo','id_agente_modulo',$id_module);
-			$critical_min = db_get_value('min_critical','tagente_modulo','id_agente_modulo',$id_module);
-
-			if ($index == 0) {
-				$compare_warning = $warning_min;
-			}
-			else {
-				if ($compare_warning != $warning_min) {
-					$do_it_warning_min = false;
-				}
-			}
-
-			if ($index == 0) {
-				$compare_critical = $critical_min;
-			}
-			else {
-				if ($compare_critical != $critical_min) {
-					$do_it_critical_min = false;
-				}
-			}
-		}
-
-		if ($do_it_warning_min || $do_it_critical_min) {
-			foreach ($module_list as $index => $id_module) {
-				$warning_max  = db_get_value('max_warning','tagente_modulo','id_agente_modulo',$id_module);
-				$critical_max = db_get_value('max_critical','tagente_modulo','id_agente_modulo',$id_module);
-
-				if ($index == 0) {
-					$yellow_up = $warning_max;
-				}
-				else {
-					if ($yellow_up != $warning_max) {
-						$do_it_warning_max = false;
-					}
-				}
-
-				if ($index == 0) {
-					$red_up = $critical_max;
-				}
-				else {
-					if ($red_up != $critical_max) {
-						$do_it_critical_max = false;
-					}
-				}
-			}
-		}
-
-		if ($do_it_warning_min || $do_it_critical_min) {
-			foreach ($module_list as $index => $id_module) {
-				$warning_inverse  = db_get_value('warning_inverse','tagente_modulo','id_agente_modulo',$id_module);
-				$critical_inverse = db_get_value('critical_inverse','tagente_modulo','id_agente_modulo',$id_module);
-
-				if ($index == 0) {
-					$yellow_inverse = $warning_inverse;
-				}
-				else {
-					if ($yellow_inverse != $warning_inverse) {
-						$do_it_warning_inverse = false;
-					}
-				}
-
-				if ($index == 0) {
-					$red_inverse = $critical_inverse;
-				}
-				else {
-					if ($red_inverse != $critical_inverse) {
-						$do_it_critical_inverse = false;
-					}
-				}
-			}
-		}
-
-		if ($do_it_warning_min && $do_it_warning_max && $do_it_warning_inverse) {
-			$yellow_threshold = $compare_warning;
-			$threshold_data['yellow_up']      = $yellow_up;
-			$threshold_data['yellow_inverse'] = (bool)$yellow_inverse;
-		}
-
-		if ($do_it_critical_min && $do_it_critical_max && $do_it_critical_inverse) {
-			$red_threshold = $compare_critical;
-			$threshold_data['red_up']      = $red_up;
-			$threshold_data['red_inverse'] = (bool)$red_inverse;
-		}
-
-		$show_elements_graph['threshold_data'] = $threshold_data;
+	if ($params_combined['return']){
+		return $output;
 	}
 
-	switch ($stacked) {
-		default:
-		case CUSTOM_GRAPH_STACKED_LINE:
-		case CUSTOM_GRAPH_STACKED_AREA:
-		case CUSTOM_GRAPH_AREA:
-		case CUSTOM_GRAPH_LINE:
-			return area_graph($agent_module_id, $array_data,
-				$legend, $series_type, $date_array, $data_module_graph,
-				$params, $water_mark, $series_suffix_str,
-				$array_events_alerts);
-			break;
-		case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD:
-		case CUSTOM_GRAPH_BULLET_CHART:
-			return stacked_bullet_chart($flash_charts, $graph_values,
-				$width, $height, $color, $module_name_list, $long_index,
-				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				"", "", $water_mark, $config['fontpath'], ($config['font_size']+1),
-				"", $ttl, $homeurl, $background_color);
-			break;
-		case CUSTOM_GRAPH_GAUGE:
-			return stacked_gauge($flash_charts, $graph_values,
-				$width, $height, $color, $module_name_list, $long_index,
-				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				"", "", $water_mark, $config['fontpath'], $fixed_font_size,
-				"", $ttl, $homeurl, $background_color);
-			break;
-		case CUSTOM_GRAPH_HBARS:
-			return hbar_graph($flash_charts, $graph_values,
-				$width, $height, $color, $module_name_list, $long_index,
-				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				"", "", $water_mark, $config['fontpath'], $fixed_font_size,
-				"", $ttl, $homeurl, $background_color, 'black');
-			break;
-		case CUSTOM_GRAPH_VBARS:
-			return vbar_graph($flash_charts, $graph_values,
-				$width, $height, $color, $module_name_list, $long_index,
-				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				"", "", $water_mark, $config['fontpath'], $fixed_font_size,
-				"", $ttl, $homeurl, $background_color, true, false, "black");
-			break;
-		case CUSTOM_GRAPH_PIE:
-			return ring_graph($flash_charts, $graph_values, $width, $height,
-				$others_str, $homeurl, $water_mark, $config['fontpath'],
-				($config['font_size']+1), $ttl, false, $color, false,$background_color);
-			break;
-	}
+	echo $output;
 }
 
 function combined_graph_summatory_average ($array_data, $average = false, $summatory = false, $modules_series = false, $baseline = false){
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index e37fcc03da..df60e548ab 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -288,7 +288,10 @@ function reporting_make_reporting_data($report = null, $id_report,
 						$content,
 						$type,
 						$force_width_chart,
-						$force_height_chart, 'custom_graph');
+						$force_height_chart,
+						'custom_graph',
+						$pdf
+					);
 				break;
 			case 'automatic_graph':
 				$report['contents'][] =
@@ -297,7 +300,10 @@ function reporting_make_reporting_data($report = null, $id_report,
 						$content,
 						$type,
 						$force_width_chart,
-						$force_height_chart, 'automatic_graph');
+						$force_height_chart,
+						'automatic_graph',
+						$pdf
+					);
 				break;
 			case 'text':
 				$report['contents'][] = reporting_text(
@@ -374,7 +380,9 @@ function reporting_make_reporting_data($report = null, $id_report,
 					$content,
 					$type,
 					$force_width_chart,
-					$force_height_chart);
+					$force_height_chart,
+					$pdf
+				);
 				break;
 			case 'prediction_date':
 				$report['contents'][] = reporting_prediction_date(
@@ -490,7 +498,9 @@ function reporting_make_reporting_data($report = null, $id_report,
 				$report['contents'][] = reporting_network_interfaces_report(
 					$report,
 					$content,
-					$type);
+					$type,
+					$pdf
+				);
 				break;
 			case 'group_configuration':
 				$report['contents'][] = reporting_group_configuration(
@@ -2702,13 +2712,12 @@ function reporting_group_configuration($report, $content) {
 	return reporting_check_structure_content($return);
 }
 
-function reporting_network_interfaces_report($report, $content, $type = 'dinamic') {
-	
+function reporting_network_interfaces_report($report, $content, $type = 'dinamic', $pdf = 0) {
+
 	global $config;
-	
 
 	$return['type'] = 'network_interfaces_report';
-	
+
 	if (empty($content['name'])) {
 		$content['name'] = __('Network interfaces report');
 	}
@@ -2716,16 +2725,16 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic
 	if (isset($content['style']['fullscale'])) {
 		$fullscale = (bool) $content['style']['fullscale'];
 	}
-	
+
 	$group_name = groups_get_name($content['id_group']);
-	
+
 	$return['title'] = $content['name'];
 	$return['subtitle'] = $group_name;
 	$return["description"] = $content["description"];
 	$return["date"] = reporting_get_date_text($report, $content);
-	
+
 	include_once($config['homedir'] . "/include/functions_custom_graphs.php");
-	
+
 	$filter = array(
 		'id_grupo' => $content['id_group'],
 		'disabled' => 0);
@@ -2744,7 +2753,15 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic
 				}
 				else{
 					$network_interfaces_by_agents = agents_get_network_interfaces(false, $filter);
-					$return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale);
+					$return = agents_get_network_interfaces_array(
+						$network_interfaces_by_agents,
+						$return,
+						$type,
+						$content,
+						$report,
+						$fullscale,
+						$pdf
+					);
 					metaconsole_restore_db();
 				}
 			}
@@ -2752,13 +2769,24 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic
 	}
 	else{
 		$network_interfaces_by_agents = agents_get_network_interfaces(false, $filter);
-		$return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale);
+		$return = agents_get_network_interfaces_array(
+			$network_interfaces_by_agents,
+			$return,
+			$type,
+			$content,
+			$report,
+			$fullscale,
+			$pdf
+		);
 	}
 
 	return reporting_check_structure_content($return);
 }
 
-function agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale){
+function agents_get_network_interfaces_array(
+	$network_interfaces_by_agents, $return,
+	$type, $content, $report, $fullscale, $pdf
+){
 	if (empty($network_interfaces_by_agents)) {
 		$return['failed'] =
 			__('The group has no agents or none of the agents has any network interface');
@@ -2777,7 +2805,9 @@ function agents_get_network_interfaces_array($network_interfaces_by_agents, $ret
 				$row_interface['status'] = $interface['status_image'];
 				$row_interface['chart'] = null;
 
+				//XXXX ancho y largo
 				// Get chart
+				/*
 				reporting_set_conf_charts($width, $height, $only_image,
 					$type, $content, $ttl);
 
@@ -2788,64 +2818,47 @@ function agents_get_network_interfaces_array($network_interfaces_by_agents, $ret
 				if (!empty($force_height_chart)) {
 					$height = $force_height_chart;
 				}
+				*/
+
+				$width = null;
+				$height = null;
+
+				$params =array(
+					'period'    => $content['period'],
+					'width'     => $width,
+					'height'    => $height,
+					'unit_name' => array_fill(0, count($interface['traffic']), __("bytes/s")),
+					'date'      => $report["datetime"],
+					'only_image'=> $pdf,
+					'homeurl'   => $config['homeurl'],
+					'fullscale' => $fullscale
+				);
+
+				$params_combined = array(
+					'labels'         => array_keys($interface['traffic']),
+					'modules_series' => array_values($interface['traffic'])
+				);
 
 				switch ($type) {
 					case 'dinamic':
-						if (!empty($interface['traffic'])) {
-							$row_interface['chart'] = custom_graphs_print(0,
-								$height,
-								$width,
-								$content['period'],
-								null,
-								true,
-								$report["datetime"],
-								$only_image,
-								'white',
-								array_values($interface['traffic']),
-								$config['homeurl'],
-								array_keys($interface['traffic']),
-								array_fill(0, count($interface['traffic']), __("bytes/s")),
-								false,
-								true,
-								true,
-								true,
-								1,
-								false,
-								false,
-								null,
-								false,
-								false,
-								$fullscale);
-							}
-						break;
-					case 'data':
 					case 'static':
 						if (!empty($interface['traffic'])) {
-							$row_interface['chart'] = custom_graphs_print(0,
-								$height,
-								$width,
-								$content['period'],
-								null,
-								true,
-								$report["datetime"],
-								true,
-								'white',
+							$row_interface['chart'] = graphic_combined_module(
 								array_values($interface['traffic']),
-								$config['homeurl'],
-								array_keys($interface['traffic']),
-								array_fill(0, count($interface['traffic']), __("bytes/s")),
-								false,
-								true,
-								true,
-								true,
-								2,
-								false,
-								false,
-								null,
-								false,
-								false,
-								$fullscale);
-							}
+								$params,
+								$params_combined
+							);
+						}
+						break;
+					case 'data':
+						if (!empty($interface['traffic'])) {
+							$params['return_data'] = true;
+							$row_interface['chart'] = graphic_combined_module(
+								array_values($interface['traffic']),
+								$params,
+								$params_combined
+							);
+						}
 						break;
 				}
 				$row_data['interfaces'][] = $row_interface;
@@ -3589,85 +3602,75 @@ function reporting_prediction_date($report, $content) {
 
 function reporting_projection_graph($report, $content,
 	$type = 'dinamic', $force_width_chart = null,
-	$force_height_chart = null) {
+	$force_height_chart = null, $pdf = false) {
 
 	global $config;
-	
+
 	if ($config['metaconsole']) {
 		$id_meta = metaconsole_get_id_server($content["server_name"]);
-		
-		
-		$server = metaconsole_get_connection_by_id ($id_meta);
+		$server  = metaconsole_get_connection_by_id ($id_meta);
 		metaconsole_connect($server);
 	}
-	
+
 	$return['type'] = 'projection_graph';
-	
+
 	if (empty($content['name'])) {
 		$content['name'] = __('Projection Graph');
 	}
-	
-	$module_name = io_safe_output(
-		modules_get_agentmodule_name($content['id_agent_module']));
-	$agent_name = io_safe_output(
-		modules_get_agentmodule_agent_alias ($content['id_agent_module']));
-	
-	$return['title'] = $content['name'];
-	$return['subtitle'] = $agent_name . " - " . $module_name;
+
+	$module_name = io_safe_output(modules_get_agentmodule_name($content['id_agent_module']));
+	$agent_name = io_safe_output(modules_get_agentmodule_agent_alias ($content['id_agent_module']));
+
+	$return['title']       = $content['name'];
+	$return['subtitle']    = $agent_name . " - " . $module_name;
 	$return["description"] = $content["description"];
-	$return["date"] = reporting_get_date_text($report, $content);
-	$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
-			
-	$return['agent_name'] = $agent_name;
+	$return["date"]        = reporting_get_date_text($report, $content);
+	$return['label']       = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+	$return['agent_name']  = $agent_name;
 	$return['module_name'] = $module_name;
-	
-	
-	
+
 	set_time_limit(500);
-	
-	$output_projection = forecast_projection_graph(
-		$content['id_agent_module'], $content['period'], $content['top_n_value']);
-	
-	// If projection doesn't have data then don't draw graph
-	if ($output_projection ==  NULL) {
-		$output_projection = false;
-	}
-	
+
 	// Get chart
-	reporting_set_conf_charts($width, $height, $only_image, $type,
-		$content, $ttl);
-	
-	if (!empty($force_width_chart)) {
-		$width = $force_width_chart;
-	}
-	
-	if (!empty($force_height_chart)) {
-		$height = $force_height_chart;
-	}
-	
+	//reporting_set_conf_charts($width, $height, $only_image, $type,
+	//	$content, $ttl);
+
+	//XXXX width y height
 	switch ($type) {
 		case 'dinamic':
 		case 'static':
+			$output_projection = forecast_projection_graph(
+				$content['id_agent_module'],
+				$content['period'],
+				$content['top_n_value']
+			);
+
+			// If projection doesn't have data then don't draw graph
+			if ($output_projection ==  NULL) {
+				$output_projection = false;
+			}
+
+			$params =array(
+				'period'     => $content['period'],
+				'width'      => $width,
+				'height'     => $height,
+				'date'       => $report["datetime"],
+				'unit'       => '',
+				'only_image' => $pdf,
+				'homeurl'    => ui_get_full_url(false, false, false, false) . '/',
+				'ttl'        => $ttl
+			);
+
+			$params_combined = array(
+				'projection' => $output_projection
+			);
+
 			$return['chart'] = graphic_combined_module(
 				array($content['id_agent_module']),
-				array(),
-				$content['period'],
-				$width,
-				$height,
-				'',
-				'',
-				0,
-				0,
-				0,
-				0,
-				$report["datetime"],
-				$only_image,
-				ui_get_full_url(false, false, false, false) . '/',
-				$ttl,
-				// Important parameter, this tell to graphic_combined_module function that is a projection graph
-				$output_projection,
-				$content['top_n_value']
-				);
+				$params,
+				$params_combined
+			);
+
 			break;
 		case 'data':
 			$return['data'] = forecast_projection_graph(
@@ -3677,11 +3680,11 @@ function reporting_projection_graph($report, $content,
 				false, false, true);
 			break;
 	}
-	
+
 	if ($config['metaconsole']) {
 		metaconsole_restore_db();
 	}
-	
+
 	return reporting_check_structure_content($return);
 }
 
@@ -6285,16 +6288,17 @@ function reporting_general($report, $content) {
 }
 
 function reporting_custom_graph($report, $content, $type = 'dinamic',
-	$force_width_chart = null, $force_height_chart = null, $type_report = "custom_graph") {
+	$force_width_chart = null, $force_height_chart = null,
+	$type_report = "custom_graph", $pdf = false) {
 
 	global $config;
-	
+
 	require_once ($config["homedir"] . '/include/functions_graph.php');
-	
+
 	$graph = db_get_row ("tgraph", "id_graph", $content['id_gs']);
 	$return = array();
 	$return['type'] = 'custom_graph';
-	
+
 	if (empty($content['name'])) {
 		if ($type_report == "custom_graph") {
 			$content['name'] = __('Custom graph');
@@ -6303,21 +6307,21 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 			$content['name'] = __('Simple graph');
 		}
 	}
-	
+
 	$return['title'] = $content['name'];
 	$return['subtitle'] = io_safe_output($graph['name']);
 	$return["description"] = $content["description"];
 	$return["date"] = reporting_get_date_text(
 		$report,
 		$content);
-	
+
 	$graphs = db_get_all_rows_field_filter ("tgraph_source",
 		"id_graph", $content['id_gs']);
 	$modules = array ();
 	$weights = array ();
 	if ($graphs === false)
 		$graphs = array();
-	
+
 	$labels = array();
 	foreach ($graphs as $graph_item) {
 		if ($type_report == 'automatic_graph') {
@@ -6328,7 +6332,7 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 		else {
 			array_push ($modules, $graph_item['id_agent_module']);
 		}
-		
+
 		if (in_array('label',$content['style'])) {
 			if (defined('METACONSOLE')) {
 				$server_name = $content['server_name'];
@@ -6346,7 +6350,7 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 						'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']),
 						'id_agent_module'=>$graph_item['id_agent_module']);
 			}
-			
+
 			$label = reporting_label_macro($item, $content['style']['label']);
 
 			$labels[$graph_item['id_agent_module']] = $label;
@@ -6358,19 +6362,21 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 
 		array_push ($weights, $graph_item["weight"]);
 	}
-	
+
 	if ($config['metaconsole'] && $type_report != 'automatic_graph') {
-		$id_meta = metaconsole_get_id_server($content["server_name"]);	
+		$id_meta = metaconsole_get_id_server($content["server_name"]);
 		$server = metaconsole_get_connection_by_id ($id_meta);
 		metaconsole_connect($server);
 	}
 
 	$return['chart'] = '';
 	// Get chart
-	reporting_set_conf_charts($width, $height, $only_image, $type,
-		$content, $ttl);
-	
+	//reporting_set_conf_charts($width, $height, $only_image, $type,
+	//	$content, $ttl);
+$width =null;
+$height =null;
 	//height for bullet chart
+	/*
 	if($graph['stacked'] != 4){
 		$height += count($modules) * REPORTING_CUSTOM_GRAPH_LEGEND_EACH_MODULE_VERTICAL_SIZE;
 	}
@@ -6379,50 +6385,44 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 			$height = 50;
 		}
 	}
-	
+*/
+
 	switch ($type) {
 		case 'dinamic':
 		case 'static':
+
+			$params =array(
+				'period'              => $content['period'],
+				'width'               => $width,
+				'height'              => $height,
+				'date'                => $report["datetime"],
+				'only_image'          => $pdf,
+				'homeurl'             => ui_get_full_url(false, false, false, false),
+				'ttl'                 => $ttl,
+				'percentil'           => $graph["percentil"],
+				'fullscale'           => $graph["fullscale"],
+			);
+
+			$params_combined = array(
+				'weight_list'    => $weights,
+				'stacked'        => $graph["stacked"],
+				'labels'         => $labels,
+				'summatory'      => $graph["summatory_series"],
+				'average'        => $graph["average_series"],
+				'modules_series' => $graph["modules_series"]
+			);
+
 			$return['chart'] = graphic_combined_module(
 				$modules,
-				$weights,
-				$content['period'],
-				$width, $height,
-				'',
-				'',
-				0,
-				0,
-				0,
-				$graph["stacked"],
-				$report["datetime"],
-				$only_image,
-				ui_get_full_url(false, false, false, false),
-				$ttl,
-				false,
-				false,
-				'white',
-				array(),
-				array(),
-				true,
-				true,
-				true,
-				true,
-				$labels,
-				false,
-				false,
-				$graph["percentil"],
-				false,
-				false,
-				$graph["fullscale"],
-				$graph["summatory_series"],
-				$graph["average_series"],
-				$graph["modules_series"]
+				$params,
+				$params_combined
 			);
+
 			break;
 		case 'data':
 			break;
 	}
-	
+
 	if ($config['metaconsole'] && $type_report != 'automatic_graph') {
 		metaconsole_restore_db();
 	}
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 496bff897c..26d0f380ac 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -944,9 +944,9 @@ function visual_map_print_item($mode = "read", $layoutData,
 					continue;
 				}
 			}
-			
+
 			$only_image = !$graph_javascript && $isExternalLink;
-			
+
 			if ($layoutData['id_custom_graph'] != 0) {
 				// Show only avg on the visual console
 				if (get_parameter('action') == 'edit') {
@@ -955,59 +955,54 @@ function visual_map_print_item($mode = "read", $layoutData,
 					}
 					else {
 						$img =  '<img src="images/console/signes/custom_graph.png" style="width:'.$width.'px;height:'.$height.'px;'.$imgpos.'">';
-					}				
-			 	}
+					}
+				}
 				else {
-					if ($width == 0 || $height == 0) {
-						if ($layoutData['label_position']=='left') {
-							$img = '<div style="z-index:'.$show_on_top_index.';float:right;height:'.$himg.'px;">'.custom_graphs_print(
-							$layoutData['id_custom_graph'], 180, 480,
-							$period, null, true, 0, $only_image, $layoutData['image'],
-							array(), '', array(), array(), true,
-							false, false, true, 1, false, true).'</div>';
-						}
-						elseif ($layoutData['label_position']=='right') {
-						$img = '<div style="z-index:'.$show_on_top_index.';float:left;height:'.$himg.'px;">'.custom_graphs_print(
-							$layoutData['id_custom_graph'], 180, 480,
-							$period, null, true, 0, $only_image, $layoutData['image'],
-							array(), '', array(), array(), true,
-							false, false, true, 1, false, true).'</div>';
-						}
-						else {
-							$img = custom_graphs_print(
-							$layoutData['id_custom_graph'], 180, 480,
-							$period, null, true, 0, $only_image, $layoutData['image'],
-							array(), '', array(), array(), true,
-							false, false, true, 1, false, true);
-						}
+					if ($width == 0 ) {
+						$width  = 180;
+					}
+					if($height == 0) {
+						$height = 480;
+					}
+
+					$params =array(
+						'period'              => $period,
+						'width'               => $width,
+						'height'              => $height,
+						'title'               => '',
+						'unit_name'           => null,
+						'show_alerts'         => false,
+						'only_image'          => $only_image,
+						'vconsole'            => true,
+						'backgroundColor' => $layoutData['image']
+					);
+
+					$params_combined = array(
+						'id_graph'       => $layoutData['id_custom_graph']
+					);
+
+					if ($layoutData['label_position']=='left') {
+						$img = '<div style="z-index:'.$show_on_top_index.';float:right;height:'.$himg.'px;">'.
+						graphic_combined_module(
+							false,
+							$params,
+							$params_combined
+						).'</div>';
+					}
+					elseif ($layoutData['label_position']=='right') {
+						$img = '<div style="z-index:'.$show_on_top_index.';float:left;height:'.$himg.'px;">'.
+						graphic_combined_module(
+							false,
+							$params,
+							$params_combined
+						).'</div>';
 					}
 					else {
-						if ($width < 480){
-							$img = '<div class="error">'._("Could not draw pie with labels contained inside canvas. Resize widget to 500px width minimum").'</div>';
-						}
-						else {
-							if ($layoutData['label_position']=='left') {
-								$img = '<div style="z-index:'.$show_on_top_index.';float:right;height:'.$himg.'px;">'.custom_graphs_print(
-								$layoutData['id_custom_graph'], $height, $width,
-								$period, null, true, 0, $only_image, $layoutData['image'],
-								array(), '', array(), array(), true,
-								false, false, true, 1, false, true).'</div>';
-							}
-							elseif($layoutData['label_position']=='right') {
-								$img = '<div style="z-index:'.$show_on_top_index.';float:left;height:'.$himg.'px;">'.custom_graphs_print(
-								$layoutData['id_custom_graph'], $height, $width,
-								$period, null, true, 0, $only_image, $layoutData['image'],
-								array(), '', array(), array(), true,
-								false, false, true, 1, false, true).'</div>';
-							}
-							else {
-								$img = custom_graphs_print(
-								$layoutData['id_custom_graph'], $height, $width,
-								$period, null, true, 0, $only_image, $layoutData['image'],
-								array(), '', array(), array(), true,
-								false, false, true, 1, false, true);
-							}
-						}
+						$img = graphic_combined_module(
+							false,
+							$params,
+							$params_combined
+						);
 					}
 				}
 			}
@@ -1016,7 +1011,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 					$homeurl = $config['homeurl'];
 				else
 					$homeurl = '';
-				
+
 				if ( (get_parameter('action') == 'edit') || (get_parameter('operation') == 'edit_visualmap') ) {
 					if($width == 0 || $height == 0){
 						if ($layoutData['id_metaconsole'] != 0) {
diff --git a/pandora_console/include/web2image.js b/pandora_console/include/web2image.js
index 018be8db47..87ff234e01 100644
--- a/pandora_console/include/web2image.js
+++ b/pandora_console/include/web2image.js
@@ -1,16 +1,19 @@
 var system = require('system');
 
-if (system.args.length < 2 || system.args.length > 6) {
+if (system.args.length < 3 || system.args.length > 9) {
 	phantom.exit(1);
 }
 
 var webPage	        = require('webpage');
 var page            = webPage.create();
 var url             = system.args[1];
-var url_params      = system.args[2];
-var output_filename = system.args[3];
-var _width          = system.args[4];
-var _height         = system.args[5];
+var type_graph_pdf  = system.args[2];
+var url_params      = system.args[3];
+var url_params_comb = system.args[4];
+var url_module_list = system.args[5];
+var output_filename = system.args[6];
+var _width          = system.args[7];
+var _height         = system.args[8];
 
 if (!_width) {
 	_width = 750;
@@ -20,13 +23,21 @@ if (!_height) {
 	_height = 350;
 }
 
+if(type_graph_pdf == 'combined'){
+	finish_url = url + "?" + "data=" + url_params +
+				"&data_combined=" + url_params_comb +
+				"&data_module_list=" + url_module_list +
+				"&type_graph_pdf=" + type_graph_pdf;
+}
+else{
+	finish_url = url + "?" + "data=" + url_params +
+				"&type_graph_pdf=" + type_graph_pdf;
+}
+
 page.viewportSize = { width: _width, height: _height };
 //page.zoomFactor = 1.75;
 
-//console.log("Pagina: " + url);
-//console.log("parametros: " + url_params);
-//console.log("Archivo salida: " + output_filename);
-page.open(url + "?" + "data=" + url_params, function start(status) {
+page.open(finish_url, function start(status) {
 	page.render(output_filename, {format: 'png'});
 	//var base64 = page.renderBase64('JPG');
 	//console.log(base64);
diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php
index db3835cfa5..7b36546fd9 100644
--- a/pandora_console/operation/agentes/interface_traffic_graph_win.php
+++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php
@@ -192,34 +192,34 @@ $interface_traffic_modules = array(
 		else
 			echo '<div style="margin-left: 50px; padding-top: 10px;">';
 
+		//XXXXXXX width and height
 		$height = 400;
 		$width  = '90%';
 
-		custom_graphs_print(
-			0,
-			$height,
-			$width,
-			$period,
-			null,
-			false,
-			$date,
-			false,
-			'white',
+		$params =array(
+			'period'    => $period,
+			'width'     => $width,
+			'height'    => $height,
+			'unit_name' => array_fill(0, count($interface_traffic_modules), $config["interface_unit"]),
+			'date'      => $date,
+			'homeurl'   => $config['homeurl'],
+			'percentil' => (($show_percentil)? $config['percentil'] : null),
+			'fullscale' => $fullscale
+		);
+
+		$params_combined = array(
+			'weight_list'    => array(),
+			'projection'     => false,
+			'labels'         => array_keys($interface_traffic_modules),
+			'from_interface' => true,
+			'modules_series' => array_values($interface_traffic_modules),
+			'return'         => 0
+		);
+
+		graphic_combined_module(
 			array_values($interface_traffic_modules),
-			$config['homeurl'],
-			array_keys($interface_traffic_modules),
-			array_fill(0, count($interface_traffic_modules), $config["interface_unit"]),
-			false,
-			true,
-			true,
-			true,
-			1,
-			false,
-			false,
-			(($show_percentil)? $config['percentil'] : null),
-			true,
-			false,
-			$fullscale
+			$params,
+			$params_combined
 		);
 
 		echo '</div>';
diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php
index e2b4fee3bb..45943d6e74 100644
--- a/pandora_console/operation/reporting/graph_viewer.php
+++ b/pandora_console/operation/reporting/graph_viewer.php
@@ -63,7 +63,7 @@ if ($delete_graph) {
 if ($view_graph) {
 	$sql="SELECT * FROM tgraph_source WHERE id_graph = $id_graph";
 	$sources = db_get_all_rows_sql($sql);
-	
+
 	$sql="SELECT * FROM tgraph WHERE id_graph = $id_graph";
 	$graph = db_get_row_sql($sql);
 
@@ -71,7 +71,7 @@ if ($view_graph) {
 	$private = $graph["private"];
 	$width = $graph["width"];
 	$height = $graph["height"] + count($sources) * 10;
-	
+
 	$zoom = (int) get_parameter ('zoom', 0);
 	//Increase the height to fix the leyend rise
 	if ($zoom > 0) {
@@ -154,12 +154,12 @@ if ($view_graph) {
 					html_print_image("images/builder.png", true, array ("title" => __('Graph editor'))) .'</a>')
 			);
 	}
-	
+
 	$options['view']['text'] = '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id=' . $id_graph . '">' . 
 		html_print_image("images/operation.png", true,
 			array ("title" => __('View graph'))) .'</a>';
 	$options['view']['active'] = true;
-	
+
 	if ($config["pure"] == 0) {
 		$options['screen']['text'] = "<a href='$url&pure=1'>"
 			. html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode')))
@@ -169,18 +169,44 @@ if ($view_graph) {
 		$options['screen']['text'] = "<a href='$url&pure=0'>"
 			. html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode')))
 			. "</a>";
-		
+
 		// In full screen, the manage options are not available
 		$options = array('view' => $options['view'], 'screen' => $options['screen']);
 	}
-	
+
 	// Header
-	
-		ui_print_page_header ($graph['name'],
-			"images/chart.png", false, "", false, $options);
-		
-	$graph_return = custom_graphs_print($id_graph, $height, $width, $period, $stacked, true, $unixdate, false, 'white', 
-		array(), '', array(), array(), true, true, true, true, 1, false, false, $percentil, false, false, $fullscale);
+	ui_print_page_header (
+		$graph['name'],
+		"images/chart.png",
+		false,
+		"",
+		false,
+		$options
+	);
+
+
+	//XXXX el width y height
+	$width = null;
+	$height = null;
+	$params =array(
+		'period'    => $period,
+		'width'     => $width,
+		'height'    => $height,
+		'date'      => $unixdate,
+		'percentil' => $percentil,
+		'fullscale' => $fullscale
+	);
+
+	$params_combined = array(
+		'stacked'  => $stacked,
+		'id_graph' => $id_graph
+	);
+
+	$graph_return = graphic_combined_module(
+		false,
+		$params,
+		$params_combined
+	);
 
 	if ($graph_return){
 		echo "<table class='databox filters' cellpadding='0' cellspacing='0' width='100%'>";

From 57ef53490932dcf9fcd66c0ef77f528787fed03b Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 2 Jun 2018 00:01:26 +0200
Subject: [PATCH 123/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 09d8b826da..087c156a92 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180601
+Version: 7.0NG.723-180602
 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 447ae7ec0b..418ef0c3f2 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.723-180601"
+pandora_version="7.0NG.723-180602"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index d03944ffc4..764512af75 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180601';
+use constant AGENT_BUILD => '180602';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 0b9481be65..dea12a87a2 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.723
-%define release     180601
+%define release     180602
 
 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 71480e4cb3..d237dd2f83 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.723
-%define release     180601
+%define release     180602
 
 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 5bfbab027d..3779385d02 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180601"
+PI_BUILD="180602"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index e3c2aab346..6fd2d36199 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180601}
+{180602}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 4f63b98034..c00e5bed90 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.723(Build 180601)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180602)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 745f1fd96c..6b7408c672 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.723(Build 180601))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180602))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index fe8de74269..5879f94db8 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180601
+Version: 7.0NG.723-180602
 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 10831f425b..5df4b85fbf 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.723-180601"
+pandora_version="7.0NG.723-180602"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 13034e369b..88a8ac290e 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180601';
+$build_version = 'PC180602';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 73a535d763..0705f89779 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180601';
+$build = '180602';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 1f94fcbc51..18025fe92a 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.723
-%define release     180601
+%define release     180602
 
 # 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 0f2b0bab75..639f1efea2 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.723
-%define release     180601
+%define release     180602
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 6287000aa3..b2a759dab5 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180601
+Version: 7.0NG.723-180602
 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 5665c948ad..197065bfa7 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.723-180601"
+pandora_version="7.0NG.723-180602"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 2f4f219416..10ae16063e 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.723";
-my $pandora_build = "180601";
+my $pandora_build = "180602";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 7e5e871650..19a8c8a01f 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180601";
+my $pandora_build = "180602";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 61911bb36a..8e66f07e3e 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.723
-%define release     180601
+%define release     180602
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c5bf054d88..866e3d4b4b 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.723
-%define release     180601
+%define release     180602
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index f09cc988df..d794a2cb97 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180601"
+PI_BUILD="180602"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 016b8fd8b2..80971281b0 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180601";
+my $version = "7.0NG.723 PS180602";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 6135f46c27..f46cae940d 100644
--- 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.723 PS180601";
+my $version = "7.0NG.723 PS180602";
 
 # save program name for logging
 my $progname = basename($0);

From 8138c2f8ae6364846b947e71dc00b366a1f1bbf6 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 3 Jun 2018 00:01:19 +0200
Subject: [PATCH 124/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 087c156a92..a459ef5100 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180602
+Version: 7.0NG.723-180603
 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 418ef0c3f2..b47c012998 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.723-180602"
+pandora_version="7.0NG.723-180603"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index 764512af75..62715fcde2 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180602';
+use constant AGENT_BUILD => '180603';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index dea12a87a2..b70d2ff7cd 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.723
-%define release     180602
+%define release     180603
 
 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 d237dd2f83..87bd5b4981 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.723
-%define release     180602
+%define release     180603
 
 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 3779385d02..f2c48b508d 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180602"
+PI_BUILD="180603"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 6fd2d36199..9274b3c305 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180602}
+{180603}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index c00e5bed90..ec3e568455 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.723(Build 180602)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180603)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 6b7408c672..597ca99e4a 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.723(Build 180602))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180603))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 5879f94db8..3144640ad6 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180602
+Version: 7.0NG.723-180603
 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 5df4b85fbf..65d7de9bf2 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.723-180602"
+pandora_version="7.0NG.723-180603"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 88a8ac290e..b2d9c7cabf 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180602';
+$build_version = 'PC180603';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 0705f89779..920c94a679 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180602';
+$build = '180603';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 18025fe92a..9439c00092 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.723
-%define release     180602
+%define release     180603
 
 # 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 639f1efea2..938778b3d5 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.723
-%define release     180602
+%define release     180603
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index b2a759dab5..63823e0dac 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180602
+Version: 7.0NG.723-180603
 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 197065bfa7..0a05efd892 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.723-180602"
+pandora_version="7.0NG.723-180603"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 10ae16063e..14ffac320e 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.723";
-my $pandora_build = "180602";
+my $pandora_build = "180603";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 19a8c8a01f..533c5c4474 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180602";
+my $pandora_build = "180603";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 8e66f07e3e..cf5d6d9236 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.723
-%define release     180602
+%define release     180603
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 866e3d4b4b..7befa5ff10 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.723
-%define release     180602
+%define release     180603
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index d794a2cb97..f0fdca82d1 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180602"
+PI_BUILD="180603"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 80971281b0..c229234590 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180602";
+my $version = "7.0NG.723 PS180603";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f46cae940d..5e40462b75 100644
--- 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.723 PS180602";
+my $version = "7.0NG.723 PS180603";
 
 # save program name for logging
 my $progname = basename($0);

From 77ccbe46a9e5810a16b6b89b2ce1c2e6033fa628 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 4 Jun 2018 00:01:20 +0200
Subject: [PATCH 125/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index a459ef5100..5fd477334d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180603
+Version: 7.0NG.723-180604
 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 b47c012998..0c8b854693 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.723-180603"
+pandora_version="7.0NG.723-180604"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index 62715fcde2..7c9deee5d4 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180603';
+use constant AGENT_BUILD => '180604';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index b70d2ff7cd..d192c49cc8 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.723
-%define release     180603
+%define release     180604
 
 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 87bd5b4981..b7f4f3ff50 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.723
-%define release     180603
+%define release     180604
 
 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 f2c48b508d..c7f698c67d 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180603"
+PI_BUILD="180604"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 9274b3c305..60866a415e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180603}
+{180604}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index ec3e568455..c8098d82f9 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.723(Build 180603)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180604)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 597ca99e4a..ac5dab5f52 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.723(Build 180603))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180604))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 3144640ad6..b5d60fed7a 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180603
+Version: 7.0NG.723-180604
 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 65d7de9bf2..ea7077ffb5 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.723-180603"
+pandora_version="7.0NG.723-180604"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index b2d9c7cabf..a69dc47aff 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180603';
+$build_version = 'PC180604';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 920c94a679..90f25f0c20 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180603';
+$build = '180604';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 9439c00092..11565af501 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.723
-%define release     180603
+%define release     180604
 
 # 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 938778b3d5..fca03ff188 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.723
-%define release     180603
+%define release     180604
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 63823e0dac..3499874351 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180603
+Version: 7.0NG.723-180604
 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 0a05efd892..cc487a942d 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.723-180603"
+pandora_version="7.0NG.723-180604"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 14ffac320e..be717fd174 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.723";
-my $pandora_build = "180603";
+my $pandora_build = "180604";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 533c5c4474..38239e8805 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180603";
+my $pandora_build = "180604";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index cf5d6d9236..896db0f678 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.723
-%define release     180603
+%define release     180604
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7befa5ff10..cc176c6a12 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.723
-%define release     180603
+%define release     180604
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index f0fdca82d1..ab941565e9 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180603"
+PI_BUILD="180604"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index c229234590..4d2fe8d11b 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180603";
+my $version = "7.0NG.723 PS180604";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 5e40462b75..7a8c18181f 100644
--- 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.723 PS180603";
+my $version = "7.0NG.723 PS180604";
 
 # save program name for logging
 my $progname = basename($0);

From 89aa85626cf33225a37ad60879f885c2c3ba91a3 Mon Sep 17 00:00:00 2001
From: danielmaya <daniel.maya@artica.es>
Date: Mon, 4 Jun 2018 15:56:17 +0200
Subject: [PATCH 126/146] Fixed export and import visual consoles

---
 .../extensions/resource_exportation.php          | 12 +++++++-----
 .../extensions/resource_registration.php         | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
index 3e6ba7f540..0c293e374f 100755
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@@ -247,12 +247,10 @@ function output_xml_visual_console($id) {
 		echo "<other_id>" . $item['id'] . "</other_id>\n"; //OLD ID USE FOR parent item 
 		$agent = '';
 		if ($item['id_agent'] != 0) {
-			$agent = db_get_value ("alias","tagente","id_agente",$item['id_agent']);
+			$agent = db_get_value ("nombre","tagente","id_agente",$item['id_agent']);
 		}
 		if (!empty($item['label'])) {
-			$aux = explode("-",$item['label']);
-			$label = $agent .' -'. $aux[1];
-			echo "<label><![CDATA[" . io_safe_output($label) . "]]></label>\n";
+			echo "<label><![CDATA[" . io_safe_output($item['label']) . "]]></label>\n";
 		}
 		echo "<x>" . $item['pos_x'] . "</x>\n";
 		echo "<y>" . $item['pos_y'] . "</y>\n";
@@ -273,7 +271,7 @@ function output_xml_visual_console($id) {
 			if ($item['id_agente_modulo'] != 0) {
 				$module = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $item['id_agente_modulo']);
 				$id_agent = db_get_value('id_agente', 'tagente_modulo', 'id_agente_modulo', $item['id_agente_modulo']);
-				$agent = db_get_value ("alias","tagente","id_agente",$id_agent);
+				$agent = db_get_value ("nombre","tagente","id_agente",$id_agent);
 				
 				echo "<module><![CDATA[" . io_safe_output($module) . "]]></module>\n";
 			}
@@ -287,6 +285,10 @@ function output_xml_visual_console($id) {
 		if ($item['parent_item'] != 0) {
 			echo "<parent_item>" . $item['parent_item'] . "</parent_item>\n";
 		}
+		if ($item['type'] == 19) {
+			echo "<clock_animation>" . $item['clock_animation'] . "</clock_animation>\n";
+			echo "<fill_color>" . $item['fill_color'] . "</fill_color>\n";
+		}
 		echo "</item>\n";
 	}
 	echo "</visual_map>\n";
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index 9158876901..3b2b8c06d0 100755
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -455,13 +455,13 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
 				$agents_in_item = array();
 				foreach ($agents as $id => $agent) {
 					if ($regular_expresion) {
-						if ((bool)preg_match("/" . $agent_clean . "/", io_safe_input($agent))) {
+						if ((bool)preg_match("/" . $agent_clean . "/", io_safe_output($agent))) {
 							$agents_in_item[$id]['name'] = $agent;
 							$no_agents = false;
 						}
 					}
 					else {
-						if ($agent_clean == io_safe_input($agent)) {
+						if ($agent_clean == io_safe_output($agent)) {
 							$agents_in_item[$id]['name'] = $agent;
 							$no_agents = false;
 							break;
@@ -482,13 +482,13 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
 					$modules_in_item = array();
 					foreach ($modules as $module) {
 						if ($regular_expresion) {
-							if ((bool)preg_match("/" . $module_clean . "/", io_safe_input($module['nombre']))) {
+							if ((bool)preg_match("/" . $module_clean . "/", io_safe_output($module['nombre']))) {
 								$modules_in_item[$module['id_agente_modulo']] = $module['nombre'];
 								$no_modules = false;
 							}
 						}
 						else {
-							if ($module_clean == io_safe_input($module['nombre'])) {
+							if ($module_clean == io_safe_output($module['nombre'])) {
 								$modules_in_item[$module['id_agente_modulo']] = $module['nombre'];
 								$no_modules = false;
 								break;
@@ -527,6 +527,14 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
 				$values['id_layout_linked'] = (string)$item->map_linked;
 			if (isset($item->type))
 				$values['type'] = (string)$item->type;
+				
+			if (isset($item->clock_animation)) {
+				$values['clock_animation'] = (string)$item->clock_animation;
+			}
+			
+			if (isset($item->fill_color)) {
+				$values['fill_color'] = (string)$item->fill_color;
+			}
 			
 			if ($no_agents) {
 				$id_item = db_process_sql_insert('tlayout_data', $values);

From db4ce743116dfdc967b6dadd5ca75a42f8512c01 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 5 Jun 2018 00:01:23 +0200
Subject: [PATCH 127/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 5fd477334d..a445edb1cc 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180604
+Version: 7.0NG.723-180605
 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 0c8b854693..fb6d2fd7b5 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.723-180604"
+pandora_version="7.0NG.723-180605"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index 7c9deee5d4..491844673e 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180604';
+use constant AGENT_BUILD => '180605';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index d192c49cc8..0592ea7a0b 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.723
-%define release     180604
+%define release     180605
 
 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 b7f4f3ff50..4b8e0e7c92 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.723
-%define release     180604
+%define release     180605
 
 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 c7f698c67d..088ea1bc54 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180604"
+PI_BUILD="180605"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 60866a415e..458b0f0397 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180604}
+{180605}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index c8098d82f9..129e364826 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.723(Build 180604)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180605)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index ac5dab5f52..3dc0e4e864 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.723(Build 180604))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180605))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b5d60fed7a..cbb4c019eb 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180604
+Version: 7.0NG.723-180605
 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 ea7077ffb5..9b14e0f870 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.723-180604"
+pandora_version="7.0NG.723-180605"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a69dc47aff..1a66dfa8f2 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180604';
+$build_version = 'PC180605';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 90f25f0c20..f7e5b5ac72 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180604';
+$build = '180605';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 11565af501..09c28a4256 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.723
-%define release     180604
+%define release     180605
 
 # 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 fca03ff188..736dc2012b 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.723
-%define release     180604
+%define release     180605
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 3499874351..e3ea7bb072 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180604
+Version: 7.0NG.723-180605
 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 2acd8857b1..9823ed2784 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.723-180604"
+pandora_version="7.0NG.723-180605"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index be717fd174..b50deeeed5 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.723";
-my $pandora_build = "180604";
+my $pandora_build = "180605";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index a1d47f4f08..3876cc9f0f 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180604";
+my $pandora_build = "180605";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 634dc4b5e2..7037800fb7 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.723
-%define release     180604
+%define release     180605
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index cc176c6a12..7f3d23a19a 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.723
-%define release     180604
+%define release     180605
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 1f4af100a5..db1061b047 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180604"
+PI_BUILD="180605"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 4d2fe8d11b..70488ad340 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180604";
+my $version = "7.0NG.723 PS180605";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7a8c18181f..d5d94a1001 100644
--- 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.723 PS180604";
+my $version = "7.0NG.723 PS180605";
 
 # save program name for logging
 my $progname = basename($0);

From 5142112ae535981d16ac702164a10d5d5470b07a Mon Sep 17 00:00:00 2001
From: Junichi Satoh <junichi@rworks.jp>
Date: Tue, 5 Jun 2018 11:34:19 +0900
Subject: [PATCH 128/146] Fixed error and white screen with php7.2.

---
 pandora_console/include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 34072be403..10f64bc07e 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2434,7 +2434,7 @@ function clear_pandora_error_for_header() {
 	global $config;
 	
 	$config["alert_cnt"] = 0;
-	$_SESSION["alert_msg"] = "";
+	$_SESSION["alert_msg"] = array();
 }
 
 function set_pandora_error_for_header($message, $title = null) {

From f8aa351987adaea669f448021e7d703e1603c213 Mon Sep 17 00:00:00 2001
From: danielmaya <daniel.maya@artica.es>
Date: Tue, 5 Jun 2018 15:14:27 +0200
Subject: [PATCH 129/146] Fixed line graph and box item when exporting visual
 consoles

---
 .../extensions/resource_exportation.php       | 19 +++++++++++++++++-
 .../extensions/resource_registration.php      | 20 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
index 0c293e374f..9c67bbec1c 100755
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@@ -285,10 +285,27 @@ function output_xml_visual_console($id) {
 		if ($item['parent_item'] != 0) {
 			echo "<parent_item>" . $item['parent_item'] . "</parent_item>\n";
 		}
-		if ($item['type'] == 19) {
+		if (!empty($item['clock_animation'])) {
 			echo "<clock_animation>" . $item['clock_animation'] . "</clock_animation>\n";
+		}
+		if (!empty($item['fill_color'])) {
 			echo "<fill_color>" . $item['fill_color'] . "</fill_color>\n";
 		}
+		if (!empty($item['type_graph'])) {
+			echo "<type_graph>" . $item['type_graph'] . "</type_graph>\n";
+		}
+		if (!empty($item['time_format'])) {
+			echo "<time_format>" . $item['time_format'] . "</time_format>\n";
+		}
+		if (!empty($item['timezone'])) {
+			echo "<timezone>" . $item['timezone'] . "</timezone>\n";
+		}
+		if (!empty($item['border_width'])) {
+			echo "<border_width>" . $item['border_width'] . "</border_width>\n";
+		}
+		if (!empty($item['border_color'])) {
+			echo "<border_color>" . $item['border_color'] . "</border_color>\n";
+		}
 		echo "</item>\n";
 	}
 	echo "</visual_map>\n";
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index 3b2b8c06d0..61542dee66 100755
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -536,6 +536,26 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
 				$values['fill_color'] = (string)$item->fill_color;
 			}
 			
+			if (isset($item->type_graph)) {
+				$values['type_graph'] = (string)$item->type_graph;
+			}
+			
+			if (isset($item->time_format)) {
+				$values['time_format'] = (string)$item->time_format;
+			}
+			
+			if (isset($item->timezone)) {
+				$values['timezone'] = (string)$item->timezone;
+			}
+			
+			if (isset($item->border_width)) {
+				$values['border_width'] = (string)$item->border_width;
+			}
+			
+			if (isset($item->border_color)) {
+				$values['border_color'] = (string)$item->border_color;
+			}
+			
 			if ($no_agents) {
 				$id_item = db_process_sql_insert('tlayout_data', $values);
 				

From 42818245555637e6ae3052e18e90668a515e800f Mon Sep 17 00:00:00 2001
From: "manuel.montes" <manuel.montes@support.artica.es>
Date: Tue, 5 Jun 2018 16:23:30 +0200
Subject: [PATCH 130/146] Fixed jquery in pandora_console/general/main_menu.php

---
 pandora_console/general/main_menu.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 687bd4a5ed..2c4ca1e6cb 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -119,6 +119,17 @@ $(document).ready( function() {
 		$('div#menu')
 			.css('position', 'fixed')
 			.css('z-index', '9000')
+			.css('top','80px')
+	}else{
+		$('div#menu')
+			.css('z-index', '9000')
+	}
+	if (fixed_header) {
+		$('div#menu')
+			.css('position', 'fixed')
+			.css('z-index', '9000')
+			.css('top','80px')
+		$('#menu_tab_frame_view').css('margin-top','20px')
 	}
 	//Daniel maya 02/06/2016 Fixed menu position--END
 	/*

From 3fbdd3d026b8a412a69a4cbadd0582ce661db960 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 6 Jun 2018 00:01:25 +0200
Subject: [PATCH 131/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index a445edb1cc..1e9d2406aa 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180605
+Version: 7.0NG.723-180606
 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 fb6d2fd7b5..4fa597240a 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.723-180605"
+pandora_version="7.0NG.723-180606"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index 491844673e..f032d2a50a 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180605';
+use constant AGENT_BUILD => '180606';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 0592ea7a0b..43dcb985e4 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.723
-%define release     180605
+%define release     180606
 
 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 4b8e0e7c92..578cd78be3 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.723
-%define release     180605
+%define release     180606
 
 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 088ea1bc54..7b55c70a81 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180605"
+PI_BUILD="180606"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 458b0f0397..d2a5b668e2 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180605}
+{180606}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 129e364826..b016153392 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.723(Build 180605)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180606)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 3dc0e4e864..cfb2d2132b 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.723(Build 180605))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180606))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index cbb4c019eb..a3efdcb53d 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180605
+Version: 7.0NG.723-180606
 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 9b14e0f870..e60fc01b8f 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.723-180605"
+pandora_version="7.0NG.723-180606"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 1a66dfa8f2..8133327ee9 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180605';
+$build_version = 'PC180606';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index f7e5b5ac72..7439813a5b 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180605';
+$build = '180606';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 09c28a4256..39dd420ef9 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.723
-%define release     180605
+%define release     180606
 
 # 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 736dc2012b..2ffdb761bb 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.723
-%define release     180605
+%define release     180606
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index e3ea7bb072..2409966ed2 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180605
+Version: 7.0NG.723-180606
 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 9823ed2784..d84ce9451e 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.723-180605"
+pandora_version="7.0NG.723-180606"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index b50deeeed5..bead656698 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.723";
-my $pandora_build = "180605";
+my $pandora_build = "180606";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 3876cc9f0f..d8579b2b5a 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180605";
+my $pandora_build = "180606";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 7037800fb7..a6ab0517e7 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.723
-%define release     180605
+%define release     180606
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7f3d23a19a..b86f45e005 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.723
-%define release     180605
+%define release     180606
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index db1061b047..7e26828ce8 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180605"
+PI_BUILD="180606"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 70488ad340..5ed2f36f36 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180605";
+my $version = "7.0NG.723 PS180606";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index d5d94a1001..60c2c5fdb2 100644
--- 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.723 PS180605";
+my $version = "7.0NG.723 PS180606";
 
 # save program name for logging
 my $progname = basename($0);

From 89a481c452a8c713c6767e23c21ab39b10855d30 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 6 Jun 2018 11:18:39 +0200
Subject: [PATCH 132/146] fixed errors in graphs

---
 .../extensions/realtime_graphs.php            |  56 +-
 pandora_console/include/chart_generator.php   |   8 +-
 pandora_console/include/functions.php         |  31 +-
 pandora_console/include/functions_graph.php   | 546 +++++++++---------
 .../include/functions_treeview.php            |   9 +-
 .../include/functions_visual_map.php          |   3 +-
 pandora_console/include/graphs/fgraph.php     |  87 +--
 .../include/graphs/flot/pandora.flot.js       | 102 ++--
 .../include/graphs/functions_flot.php         |  72 +--
 .../include/graphs/functions_pchart.php       |   5 -
 pandora_console/include/graphs/pandora.d3.js  |  37 +-
 pandora_console/include/javascript/pandora.js |  30 +-
 pandora_console/include/web2image.js          |   6 +-
 .../mobile/operation/module_graph.php         |   3 +-
 .../agentes/estado_generalagente.php          |  10 +-
 15 files changed, 491 insertions(+), 514 deletions(-)

diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php
index e8cac701bb..a723844d40 100644
--- a/pandora_console/extensions/realtime_graphs.php
+++ b/pandora_console/extensions/realtime_graphs.php
@@ -39,14 +39,40 @@ function pandora_realtime_graphs () {
 	$legend = '';
 	$long_index = array();
 	$no_data_image = '';
-	
+
 	$canvas = '<div id="graph_container">';
 	$canvas .= '<div id="chartLegend"></div>';
-	$canvas .= area_graph($interactive_graph, $chart, 800, 300, $color, $legend, $long_index, $no_data_image, "", "", "",
-	"", '', '', '', 1, array(),	array(), 0, 0, '', false, '', false);
+
+	$width = 800;
+	$height = 300;
+
+	$data_array['realtime']['data'][0][0] = time() - 10;
+	$data_array['realtime']['data'][0][1] = 0;
+	$data_array['realtime']['data'][1][0] = time();
+	$data_array['realtime']['data'][1][1] = 0;
+	$data_array['realtime']['color'] = 'green';
+
+	$params =array(
+		'agent_module_id'     => false,
+		'period'              => 300,
+		'width'               => $width,
+		'height'              => $height,
+		'unit'                => $unit,
+		'only_image'          => $only_image,
+		'homeurl'             => $homeurl,
+		'type_graph'          => 'area',
+		'font'                => $config['fontpath'],
+		'font-size'           => $config['font_size'],
+		'array_data_create'   => $data_array,
+		'show_legend'         => false,
+		'show_menu'           => false
+	);
+
+	$canvas .= grafico_modulo_sparse($params);
+
 	$canvas .= '</div>';
 	echo $canvas;
-	
+
 	$table->width = '100%';
 	$table->id = 'table-form';
 	$table->class = 'databox filters';
@@ -62,7 +88,7 @@ function pandora_realtime_graphs () {
 	$table->style['snmp_oid'] = 'font-weight: bold;';
 	$table->style['snmp_oid'] = 'font-weight: bold;';
 	$table->data = array ();
-	
+
 	$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());
@@ -70,19 +96,19 @@ function pandora_realtime_graphs () {
 	$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);
 	}
 
-	$refresh_fields[1000] = human_time_description_raw(1, true, 'large');
-	$refresh_fields[5000] = human_time_description_raw(5, true, 'large');
+	$refresh_fields[1000]  = human_time_description_raw(1, true, 'large');
+	$refresh_fields[5000]  = human_time_description_raw(5, true, 'large');
 	$refresh_fields[10000] = human_time_description_raw(10, true, 'large');
 	$refresh_fields[30000] = human_time_description_raw(30, true, 'large');
-	
+
 	if ($graph == 'snmp_module') {
 		$agent_alias = get_parameter('agent_alias', '');
 		$module_name = get_parameter('module_name', '');
@@ -109,7 +135,7 @@ function pandora_realtime_graphs () {
 		$snmp_ver = get_parameter('snmp_ver', '');
 
 		$data = array();
-		
+
 		$data['snmp_address'] = __('Target IP') . '&nbsp;&nbsp;' . html_print_input_text ('ip_target', $snmp_address, '', 50, 255, true);
 		$table->colspan[1]['snmp_address'] = 2;
 
@@ -122,7 +148,7 @@ function pandora_realtime_graphs () {
 		$snmp_versions['1'] = '1';
 		$snmp_versions['2'] = '2';
 		$snmp_versions['2c'] = '2c';
-		
+
 		$data = array();
 		$data['snmp_oid'] = __('OID') . '&nbsp;&nbsp;' . html_print_input_text ('snmp_oid', $snmp_oid, '', 100, 255, true);
 		$table->colspan[2]['snmp_oid'] = 2;
@@ -140,7 +166,7 @@ function pandora_realtime_graphs () {
 		}
 		snmp_browser_print_container (false, '100%', '60%', 'none');
 	}
-	
+
 	// Print the relative path to AJAX calls:
 	html_print_input_hidden('rel_path', get_parameter('rel_path', ''));
 
@@ -148,7 +174,7 @@ function pandora_realtime_graphs () {
 	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: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');
@@ -156,7 +182,7 @@ function pandora_realtime_graphs () {
 	echo '<script type="text/javascript" src="'.ui_get_full_url("extensions/realtime_graphs/realtime_graphs.js").'"></script>';
 	echo '<script type="text/javascript" src="'.ui_get_full_url("include/javascript/pandora_snmp_browser.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
 	set_js_value('timezone_offset', date('Z', time()));
 }
diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
index 8cbe4e1e2f..463d1e2570 100644
--- a/pandora_console/include/chart_generator.php
+++ b/pandora_console/include/chart_generator.php
@@ -68,11 +68,13 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
 		<title>Pandora FMS Graph (<?php echo agents_get_alias($agent_id) . ' - ' . $interface_name; ?>)</title>
+
         <link rel="stylesheet" href="styles/pandora.css" type="text/css" />
 		<link rel="stylesheet" href="styles/pandora_minimal.css" type="text/css" />
 		<link rel="stylesheet" href="styles/jquery-ui-1.10.0.custom.css" type="text/css" />
-        <script language="javascript" type='text/javascript' src='javascript/pandora.js'></script>
+		<script language="javascript" type='text/javascript' src='javascript/pandora.js'></script>
 		<script language="javascript" type='text/javascript' src='javascript/jquery-1.9.0.js'></script>
 		<script language="javascript" type='text/javascript' src='javascript/jquery.pandora.js'></script>
 		<script language="javascript" type='text/javascript' src='javascript/jquery.jquery-ui-1.10.0.custom.js'></script>
@@ -97,7 +99,8 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
 		$params = json_decode($_GET['data'], true);
         //XXXXXX
         $params['only_image'] = false;
-		$params['width'] = '1048';
+		$params['width']      = '1048';
+		$params['menu']       = false;
 
 		//cominadasssss
 		$params_combined = json_decode($_GET['data_combined'], true);
@@ -122,4 +125,5 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
 		}
 ?>
 	</body>
+	
 </html>
\ No newline at end of file
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 694d8980e6..8fc1dac697 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3005,15 +3005,22 @@ function color_graph_array($series_suffix, $compare = false){
 
 function series_type_graph_array($data, $show_elements_graph){
 	global $config;
+
 	if(isset($data) && is_array($data)){
 		foreach ($data as $key => $value) {
+			if($show_elements_graph['compare'] == 'overlapped'){
+				if($key == 'sum2'){
+					$str = ' (' . __('Previous') . ')';
+				}
+			}
+
 			if(strpos($key, 'summatory') !== false){
 				$data_return['series_type'][$key] = 'area';
-				$data_return['legend'][$key] = __('Summatory series') . ' ' . $series_suffix_str;
+				$data_return['legend'][$key] = __('Summatory series') . ' ' . $str;
 			}
 			elseif(strpos($key, 'average') !== false){
 				$data_return['series_type'][$key] = 'area';
-				$data_return['legend'][$key] = __('Average series') . ' ' . $series_suffix_str;
+				$data_return['legend'][$key] = __('Average series') . ' ' . $str;
 			}
 			elseif(strpos($key, 'sum') !== false || strpos($key, 'baseline') !== false){
 				switch ($value['id_module_type']) {
@@ -3029,7 +3036,7 @@ function series_type_graph_array($data, $show_elements_graph){
 				if (isset($show_elements_graph['labels']) &&
 					is_array($show_elements_graph['labels']) &&
 					(count($show_elements_graph['labels']) > 0)){
-					$data_return['legend'][$key] = $show_elements_graph['labels'][$value['id_module_type']] . ' ' ;
+					$data_return['legend'][$key] = $show_elements_graph['labels'][$value['agent_module_id']] . ' ' ;
 				}
 				else{
 					if(strpos($key, 'baseline') !== false){
@@ -3061,25 +3068,25 @@ function series_type_graph_array($data, $show_elements_graph){
 								$value['avg'],
 								$config['graph_precision']
 							)
-						) . ' ' . $series_suffix_str;
+						) . ' ' . $str;
 				}
 			}
 			elseif(strpos($key, 'event') !== false){
 				$data_return['series_type'][$key] = 'points';
 				if($show_elements_graph['show_events']){
-					$data_return['legend'][$key] = __('Events') . ' ' . $series_suffix_str;
+					$data_return['legend'][$key] = __('Events') . ' ' . $str;
 				}
 			}
 			elseif(strpos($key, 'alert') !== false){
 				$data_return['series_type'][$key] = 'points';
 				if($show_elements_graph['show_alerts']){
-					$data_return['legend'][$key] = __('Alert') . ' ' . $series_suffix_str;
+					$data_return['legend'][$key] = __('Alert') . ' ' . $str;
 				}
 			}
 			elseif(strpos($key, 'unknown') !== false){
 				$data_return['series_type'][$key] = 'unknown';
 				if($show_elements_graph['show_unknown']){
-					$data_return['legend'][$key] = __('Unknown') . ' ' . $series_suffix_str;
+					$data_return['legend'][$key] = __('Unknown') . ' ' . $str;
 				}
 			}
 			elseif(strpos($key, 'percentil') !== false){
@@ -3090,7 +3097,7 @@ function series_type_graph_array($data, $show_elements_graph){
 						$config['percentil']  .
 						'º ' . __('of module') . ' ';
 					if (isset($show_elements_graph['labels']) && is_array($show_elements_graph['labels'])){
-						$data_return['legend'][$key] .= $show_elements_graph['labels'][$value['id_module_type']] . ' ' ;
+						$data_return['legend'][$key] .= $show_elements_graph['labels'][$value['agent_module_id']] . ' ' ;
 					}
 					else{
 						$data_return['legend'][$key] .= $value['agent_name']  . ' / ' .
@@ -3101,15 +3108,16 @@ function series_type_graph_array($data, $show_elements_graph){
 														$value['data'][0][1],
 														$config['graph_precision']
 													)
-												) . ' ' . $series_suffix_str;
+												) . ' ' . $str;
 				}
 			}
 			elseif(strpos($key, 'projection') !== false){
 				$data_return['series_type'][$key] = 'area';
-				$data_return['legend'][$key] = __('Projection') . ' ' . $series_suffix_str;
+				$data_return['legend'][$key] = __('Projection') . ' ' . $str;
 			}
 			else{
 				$data_return['series_type'][$key] = 'area';
+				$data_return['legend'][$key] = $key;
 			}
 		}
 		return $data_return;
@@ -3138,8 +3146,9 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined = fal
 	if($module_list){
 		$module_list = urlencode(json_encode($module_list));
 	}
-
+html_debug_print("phantomjs " . $file_js . " " . $url . "  '" . $type_graph_pdf . "' '" . $params_encode_json . "' '" . $params_combined . "' '" . $module_list . "' " . $img_path . " " . $width_img . " " . $height_img, true);
 	$result = exec("phantomjs " . $file_js . " " . $url . "  '" . $type_graph_pdf . "' '" . $params_encode_json . "' '" . $params_combined . "' '" . $module_list . "' " . $img_path . " " . $width_img . " " . $height_img);
+	html_debug_print($result, true);
 	return '<img src="' . $img_url . '" />';
 
 	//html_debug_print('entrando en llamada a phantom.js.......', true);
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 16481848d6..4cc9a6c507 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -355,12 +355,13 @@ function grafico_modulo_sparse_data_chart (
 		}
 	}
 
-	$array_data["sum" . $series_suffix]['min']           = $min_value;
-	$array_data["sum" . $series_suffix]['max']           = $max_value;
-	$array_data["sum" . $series_suffix]['avg']           = $sum_data/$count_data;
-	$array_data["sum" . $series_suffix]['id_module_type']= $data_module_graph['id_module_type'];
-	$array_data["sum" . $series_suffix]['agent_name']    = $data_module_graph['agent_name'];
-	$array_data["sum" . $series_suffix]['module_name']   = $data_module_graph['module_name'];
+	$array_data["sum" . $series_suffix]['min']            = $min_value;
+	$array_data["sum" . $series_suffix]['max']            = $max_value;
+	$array_data["sum" . $series_suffix]['avg']            = $sum_data/$count_data;
+	$array_data["sum" . $series_suffix]['agent_module_id']= $agent_module_id;
+	$array_data["sum" . $series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
+	$array_data["sum" . $series_suffix]['agent_name']     = $data_module_graph['agent_name'];
+	$array_data["sum" . $series_suffix]['module_name']    = $data_module_graph['module_name'];
 
 	if (!is_null($params['percentil']) &&
 		$params['percentil'] &&
@@ -374,6 +375,7 @@ function grafico_modulo_sparse_data_chart (
 			$date_array['final_date'] * 1000,
 			$percentil_result
 		);
+		$array_data["percentil" . $series_suffix]['agent_module_id'] = $agent_module_id;
 	}
 	return $array_data;
 }
@@ -381,7 +383,7 @@ function grafico_modulo_sparse_data_chart (
 function grafico_modulo_sparse_data(
 	$agent_module_id, $date_array,
 	$data_module_graph, $params,
-	$series_suffix, $str_series_suffix) {
+	$series_suffix) {
 
 	global $config;
 	global $array_events_alerts;
@@ -393,9 +395,13 @@ function grafico_modulo_sparse_data(
 			$params['show_unknown'],
 			$params['percentil'],
 			$series_suffix,
-			$str_series_suffix,
 			$params['flag_overlapped']
 		);
+
+		$array_data["sum" . $series_suffix]['agent_module_id']= $agent_module_id;
+		$array_data["sum" . $series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
+		$array_data["sum" . $series_suffix]['agent_name']     = $data_module_graph['agent_name'];
+		$array_data["sum" . $series_suffix]['module_name']    = $data_module_graph['module_name'];
 	}
 	else{
 		$array_data = grafico_modulo_sparse_data_chart (
@@ -672,7 +678,7 @@ function grafico_modulo_sparse_data(
 		'return_data'         => 0,
 		'show_title'          => true,
 		'only_image'          => false,
-		'homeurl'             => '',
+		'homeurl'             => $config['homeurl'],
 		'ttl'                 => 1,
 		'adapt_key'           => '',
 		'compare'             => false,
@@ -687,7 +693,9 @@ function grafico_modulo_sparse_data(
 		'id_widget_dashboard' => false,
 		'force_interval'      => '',
 		'time_interval'       => 300,
-		'array_data_create'   => 0
+		'array_data_create'   => 0,
+		'show_legend'         => true,
+		'show_overview'       => true
 	);
  */
 function grafico_modulo_sparse ($params) {
@@ -761,7 +769,7 @@ function grafico_modulo_sparse ($params) {
 	}
 
 	if(!isset($params['homeurl'])){
-		$params['homeurl'] = '';
+		$params['homeurl'] = $config['homeurl'];
 	}
 
 	if(!isset($params['ttl'])){
@@ -784,6 +792,18 @@ function grafico_modulo_sparse ($params) {
 		$params['menu'] = true;
 	}
 
+	if(!isset($params['show_legend'])){
+		$params['show_legend'] = true;
+	}
+
+	if(!isset($params['show_overview'])){
+		$params['show_overview'] = true;
+	}
+
+	if(!isset($params['show_export_csv'])){
+		$params['show_export_csv'] = true;
+	}
+
 	if(!isset($params['backgroundColor'])){
 		$params['backgroundColor'] = 'white';
 	}
@@ -848,26 +868,31 @@ function grafico_modulo_sparse ($params) {
 	$date_array["final_date"] = $params['date'];
 	$date_array["start_date"] = $params['date'] - $params['period'];
 
-	$module_data = db_get_row_sql (
-		'SELECT * FROM tagente_modulo
-		WHERE id_agente_modulo = ' .
-		$agent_module_id
-	);
+	if($agent_module_id){
+		$module_data = db_get_row_sql (
+			'SELECT * FROM tagente_modulo
+			WHERE id_agente_modulo = ' .
+			$agent_module_id
+		);
 
-	$data_module_graph = array();
-	$data_module_graph['history_db']     = db_search_in_history_db($date_array["start_date"]);
-	$data_module_graph['agent_name']     = modules_get_agentmodule_agent_name ($agent_module_id);
-	$data_module_graph['agent_id']       = $module_data['id_agente'];
-	$data_module_graph['module_name']    = $module_data['nombre'];
-	$data_module_graph['id_module_type'] = $module_data['id_tipo_modulo'];
-	$data_module_graph['module_type']    = modules_get_moduletype_name ($data_module_graph['id_module_type']);
-	$data_module_graph['uncompressed']   = is_module_uncompressed ($data_module_graph['module_type']);
-	$data_module_graph['w_min']    		 = $module_data['min_warning'];
-	$data_module_graph['w_max']   		 = $module_data['max_warning'];
-	$data_module_graph['w_inv']    		 = $module_data['warning_inverse'];
-	$data_module_graph['c_min']    		 = $module_data['min_critical'];
-	$data_module_graph['c_max']    		 = $module_data['max_critical'];
-	$data_module_graph['c_inv']    		 = $module_data['critical_inverse'];
+		$data_module_graph = array();
+		$data_module_graph['history_db']     = db_search_in_history_db($date_array["start_date"]);
+		$data_module_graph['agent_name']     = modules_get_agentmodule_agent_name ($agent_module_id);
+		$data_module_graph['agent_id']       = $module_data['id_agente'];
+		$data_module_graph['module_name']    = $module_data['nombre'];
+		$data_module_graph['id_module_type'] = $module_data['id_tipo_modulo'];
+		$data_module_graph['module_type']    = modules_get_moduletype_name ($data_module_graph['id_module_type']);
+		$data_module_graph['uncompressed']   = is_module_uncompressed ($data_module_graph['module_type']);
+		$data_module_graph['w_min']    		 = $module_data['min_warning'];
+		$data_module_graph['w_max']   		 = $module_data['max_warning'];
+		$data_module_graph['w_inv']    		 = $module_data['warning_inverse'];
+		$data_module_graph['c_min']    		 = $module_data['min_critical'];
+		$data_module_graph['c_max']    		 = $module_data['max_critical'];
+		$data_module_graph['c_inv']    		 = $module_data['critical_inverse'];
+	}
+	else{
+		$data_module_graph = false;
+	}
 
 	//format of the graph
 	if (empty($params['unit'])) {
@@ -880,7 +905,6 @@ function grafico_modulo_sparse ($params) {
 	if(!$params['array_data_create']){
 		if ($params['compare'] !== false) {
 			$series_suffix = 2;
-			$series_suffix_str = ' (' . __('Previous') . ')';
 
 			$date_array_prev['final_date'] = $date_array['start_date'];
 			$date_array_prev['start_date'] = $date_array['start_date'] - $date_array['period'];
@@ -894,9 +918,11 @@ function grafico_modulo_sparse ($params) {
 			}
 
 			$array_data = grafico_modulo_sparse_data(
-				$agent_module_id, $date_array_prev,
-				$data_module_graph, $params,
-				$series_suffix, $series_suffix_str
+				$agent_module_id,
+				$date_array_prev,
+				$data_module_graph,
+				$params,
+				$series_suffix
 			);
 
 			switch ($params['compare']) {
@@ -910,13 +936,14 @@ function grafico_modulo_sparse ($params) {
 		}
 
 		$series_suffix = 1;
-		$series_suffix_str = '';
 		$params['flag_overlapped'] = 0;
 
 		$array_data = grafico_modulo_sparse_data(
-			$agent_module_id, $date_array,
-			$data_module_graph, $params,
-			$series_suffix, $str_series_suffix
+			$agent_module_id,
+			$date_array,
+			$data_module_graph,
+			$params,
+			$series_suffix
 		);
 
 		if($params['compare']){
@@ -971,7 +998,6 @@ function grafico_modulo_sparse ($params) {
 				$data_module_graph,
 				$params,
 				$water_mark,
-				$series_suffix_str,
 				$array_events_alerts
 			);
 		}
@@ -998,7 +1024,6 @@ function grafico_modulo_sparse ($params) {
 				$data_module_graph,
 				$params,
 				$water_mark,
-				$series_suffix_str,
 				$array_events_alerts
 			);
 		}
@@ -1017,20 +1042,20 @@ function grafico_modulo_sparse ($params) {
 				$data_module_graph,
 				$params,
 				$water_mark,
-				$series_suffix_str,
 				$array_events_alerts
 			);
 		}
 		else{
-			$return = graph_nodata_image($params['width'], $params['height']);
+			$return = graph_nodata_image(
+				$params['width'],
+				$params['height']
+			);
 		}
 	}
 
 return $return;
 }
 
-
-
 function graph_get_formatted_date($timestamp, $format1, $format2) {
 	global $config;
 
@@ -1171,6 +1196,13 @@ function graphic_combined_module (
 		$params_combined['id_graph'] = 0;
 	}
 
+	if(!isset($params['percentil'])){
+		$params_combined['percentil'] = null;
+	}
+	else{
+		$params_combined['percentil'] = $params['percentil'];
+	}
+
 
 	//XXX seteo los parametros
 	if(!isset($params['period'])){
@@ -1247,6 +1279,18 @@ function graphic_combined_module (
 		$params['homeurl'] = ui_get_full_url(false, false, false, false);
 	}
 
+	if(!isset($params['show_legend'])){
+		$params['show_legend'] = true;
+	}
+
+	if(!isset($params['show_overview'])){
+		$params['show_overview'] = true;
+	}
+
+	if(!isset($params['show_export_csv'])){
+		$params['show_export_csv'] = true;
+	}
+
 	//XXXX
 	if($params['only_image']){
 		return generator_chart_to_pdf('combined', $params, $params_combined, $module_list);
@@ -1255,16 +1299,6 @@ function graphic_combined_module (
 	global $config;
 	global $graphic_type;
 
-	//XXX colocar
-/*
-	$name_list
-	$unit_list
-	$show_last
-	$show_max
-	$show_min
-	$show_avg
-*/
-
 	$sources = false;
 	if ($params_combined['id_graph'] == 0) {
 		$count_modules = count($module_list);
@@ -1313,6 +1347,18 @@ function graphic_combined_module (
 		}
 	}
 
+	if(isset($summatory)){
+		$params_combined['summatory'] = $summatory;
+	}
+
+	if(isset($average)){
+		$params_combined['average'] = $average;
+	}
+
+	if(isset($modules_series)){
+		$params_combined['modules_series'] = $modules_series;
+	}
+
 	if(isset($labels)){
 		$params_combined['labels'] = $labels;
 	}
@@ -1349,7 +1395,7 @@ function graphic_combined_module (
 	$flash_charts     = false;
 
 	//XXX no se que hacen
-	$fixed_font_size = '';
+	$fixed_font_size = $config['font_size'];
 	$water_mark      = '';
 	$long_index      = '';
 	$color           = array();
@@ -1397,12 +1443,10 @@ function graphic_combined_module (
 					$date_array,
 					$data_module_graph,
 					$params,
-					$i,
-					$data_module_graph['agent_name']
+					$i
 				);
 
 				$series_suffix     = $i;
-				$series_suffix_str = '';
 
 				//convert to array graph and weight
 				foreach ($array_data_module as $key => $value) {
@@ -1422,7 +1466,7 @@ function graphic_combined_module (
 
 				$color = color_graph_array(
 					$series_suffix,
-					$show_elements_graph['flag_overlapped']
+					$params['flag_overlapped']
 				);
 
 				foreach ($color as $k => $v) {
@@ -1462,7 +1506,7 @@ function graphic_combined_module (
 
 			$series_type_array = series_type_graph_array(
 				$array_data,
-				$show_elements_graph
+				$params_combined
 			);
 
 			$series_type = $series_type_array['series_type'];
@@ -1590,9 +1634,9 @@ function graphic_combined_module (
 				$data_module_graph,
 				$params,
 				$water_mark,
-				$series_suffix_str,
 				$array_events_alerts
 			);
+
 			break;
 		case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD:
 		case CUSTOM_GRAPH_BULLET_CHART:
@@ -1650,10 +1694,7 @@ function graphic_combined_module (
 						$value = count($value);
 				}
 				else {
-					if ($flash_charts === false)
-						$value = 0;
-					else
-						$value = false;
+					$value = false;
 				}
 
 				if ( !empty($params_combined['labels']) && isset($params_combined['labels'][$module]) ){
@@ -1690,8 +1731,10 @@ function graphic_combined_module (
 			//XXXX
 			$graph_values = $temp;
 
+			$width = 1024;
+			$height = 50;
+
 			$output = stacked_bullet_chart(
-				$flash_charts,
 				$graph_values,
 				$width,
 				$height,
@@ -1709,6 +1752,7 @@ function graphic_combined_module (
 				$homeurl,
 				$background_color
 			);
+
 			break;
 
 		case CUSTOM_GRAPH_GAUGE:
@@ -1779,24 +1823,20 @@ function graphic_combined_module (
 			//XXXX
 			$graph_values = $temp;
 
+			$width = 200;
+			$height = 200;
+
 			$output = stacked_gauge(
-				$flash_charts,
 				$graph_values,
 				$width,
 				$height,
 				$color,
 				$module_name_list,
-				$long_index,
 				ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-				"",
-				"",
-				$water_mark,
 				$config['fontpath'],
 				$fixed_font_size,
 				"",
-				$ttl,
-				$homeurl,
-				$background_color
+				$homeurl
 			);
 
 			break;
@@ -1852,9 +1892,13 @@ function graphic_combined_module (
 			//XXXX
 			$graph_values = $temp;
 
+			$width = 1024;
+			$height = 500;
+			$flash_charts = true;
+
 			if($params_combined['stacked'] == CUSTOM_GRAPH_HBARS){
 				$output = hbar_graph(
-					$flash_charts,
+					true,
 					$graph_values,
 					$width,
 					$height,
@@ -1877,7 +1921,7 @@ function graphic_combined_module (
 
 			if($params_combined['stacked'] == CUSTOM_GRAPH_VBARS){
 				$output = vbar_graph(
-					$flash_charts,
+					true,
 					$graph_values,
 					$width,
 					$height,
@@ -1963,8 +2007,11 @@ function graphic_combined_module (
 			//XXXX
 			$graph_values = $temp;
 
+			$width = 1024;
+			$height = 500;
+
 			$output = ring_graph(
-				$flash_charts,
+				true,
 				$graph_values,
 				$width,
 				$height,
@@ -2114,66 +2161,70 @@ function combined_graph_summatory_average ($array_data, $average = false, $summa
  * @param integer period time period
  * @param bool return or echo the result flag
  */
-function graphic_agentaccess ($id_agent, $width, $height, $period = 0, $return = false) {
+function graphic_agentaccess ($id_agent, $width, $height, $period = 0, $return = false, $tree = false) {
 	global $config;
 	global $graphic_type;
 
-	$data = array ();
+	$date       = get_system_time();
+	$datelimit  = $date - $period;
+	$data_array = array ();
 
-	$resolution = $config["graph_res"] * ($period * 2 / $width); // Number of "slices" we want in graph
+	$data = db_get_all_rows_sql(
+		"SELECT count(*) as data, min(utimestamp) as utimestamp
+		FROM tagent_access
+		WHERE id_agent = $id_agent
+		AND utimestamp > $datelimit
+		AND utimestamp < $date
+		GROUP by ROUND(utimestamp / 300)"
+	);
 
-	$interval = (int) ($period / $resolution);
-	$date = get_system_time();
-	$datelimit = $date - $period;
-	$periodtime = floor ($period / $interval);
-	$time = array ();
-	$data = array ();
-
-	$empty_data = true;
-	for ($i = 0; $i < $interval; $i++) {
-		$bottom = $datelimit + ($periodtime * $i);
-		if (! $graphic_type) {
-			$name = date('G:i', $bottom);
+	if(isset($data) && is_array($data)){
+		foreach ($data as $key => $value) {
+			$data_array['Agent access']['data'][$key][0] = $value['utimestamp'] * 1000;
+			$data_array['Agent access']['data'][$key][1] = $value['data'];
 		}
-		else {
-			$name = $bottom;
+		$data_array['Agent access']['color'] = 'green';
+	}
+	else{
+		if ($return) {
+			return graph_nodata_image($width, $height);
 		}
-
-		$top = $datelimit + ($periodtime * ($i + 1));
-
-		$data[$name]['data'] = (int) db_get_value_filter ('COUNT(*)',
-			'tagent_access',
-			array ('id_agent' => $id_agent,
-				'utimestamp > '.$bottom,
-				'utimestamp < '.$top));
-
-		if ($data[$name]['data'] != 0) {
-			$empty_data = false;
+		else{
+			echo graph_nodata_image($width, $height);
 		}
 	}
 
+	//XXXXX
 	if($config["fixed_graph"] == false){
 		$water_mark = array('file' =>
 			$config['homedir'] . "/images/logo_vertical_water.png",
 			'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
 	}
 
-	if ($empty_data) {
-		$out = graph_nodata_image($width, $height);
-	}
-	else {
-		$out = area_graph(
-			$config['flash_charts'], $data, $width, $height, null, null, null,
-			ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-			"", "", ui_get_full_url(false, false, false, false), $water_mark,
-			$config['fontpath'], $config['font_size'], "", 1, array(), array(), 0, 0, '', false, '', false);
-	}
+	$params =array(
+		'agent_module_id'     => false,
+		'period'              => $period,
+		'width'               => $width,
+		'height'              => $height,
+		'unit'                => $unit,
+		'only_image'          => $only_image,
+		'homeurl'             => $homeurl,
+		'menu'                => true,
+		'backgroundColor'     => 'white',
+		'type_graph'          => 'area',
+		'font'                => $config['fontpath'],
+		'font-size'           => $config['font_size'],
+		'array_data_create'   => $data_array,
+		'show_overview'       => false,
+		'show_export_csv'     => false,
+		'vconsole'            => $tree
+	);
 
 	if ($return) {
-		return $out;
+		return grafico_modulo_sparse($params);
 	}
 	else {
-		echo $out;
+		echo grafico_modulo_sparse($params);
 	}
 }
 
@@ -3746,9 +3797,9 @@ function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $ho
 function graph_graphic_moduleevents ($id_agent, $id_module, $width, $height, $period = 0, $homeurl, $return = false) {
 	global $config;
 	global $graphic_type;
-	
+
 	$data = array ();
-	
+
 	$resolution = $config['graph_res'] * ($period * 2 / $width); // Number of "slices" we want in graph
 	$interval = (int) ($period / $resolution);
 	$date = get_system_time ();
@@ -3758,7 +3809,7 @@ function graph_graphic_moduleevents ($id_agent, $id_module, $width, $height, $pe
 	$data = array ();
 	$legend = array();
 	$full_legend = array();
-	
+
 	$cont = 0;
 	for ($i = 0; $i < $interval; $i++) {
 		$bottom = $datelimit + ($periodtime * $i);
@@ -3773,13 +3824,13 @@ function graph_graphic_moduleevents ($id_agent, $id_module, $width, $height, $pe
 		else {
 			$name = $bottom;
 		}
-		
+
 		// Show less values in legend
 		if ($cont == 0 or $cont % 2)
 			$legend[$cont] = $name;
-		
+
 		$full_legend[$cont] = $name;
-		
+
 		$top = $datelimit + ($periodtime * ($i + 1));
 
 		$event_filter = array ('id_agente' => $id_agent,
@@ -3810,16 +3861,16 @@ function graph_graphic_moduleevents ($id_agent, $id_module, $width, $height, $pe
 		}
 		$cont++;
 	}
-	
+
 	$colors = array(1 => COL_NORMAL, 2 => COL_WARNING, 3 => COL_CRITICAL, 4 => COL_UNKNOWN);
-	
+
 	// Draw slicebar graph
 	if ($config['flash_charts']) {
 		$out = flot_slicesbar_graph($data, $period, $width, $height, $full_legend, $colors, $config['fontpath'], $config['round_corner'], $homeurl, '', '', false, $id_agent);
 	}
 	else {
 		$out = slicesbar_graph($data, $period, $width, $height, $colors, $config['fontpath'], $config['round_corner'], $homeurl);
-		
+
 		// Draw legend
 		$out .=  "<br>";
 		$out .=  "&nbsp;";
@@ -3846,7 +3897,7 @@ function fs_error_image ($width = 300, $height = 110) {
 function fullscale_data (
 	$agent_module_id, $date_array,
 	$show_unknown = 0, $show_percentil = 0,
-	$series_suffix, $str_series_suffix = '',
+	$series_suffix,
 	$compare = false){
 
 	global $config;
@@ -3981,118 +4032,55 @@ function graph_netflow_aggregate_area ($data, $period, $width, $height, $unit =
 		return;
 	}
 
-	if ($period <= SECONDS_6HOURS) {
-		$chart_time_format = 'H:i:s';
-	}
-	elseif ($period < SECONDS_1DAY) {
-		$chart_time_format = 'H:i';
-	}
-	elseif ($period < SECONDS_15DAYS) {
-		$chart_time_format = 'M d H:i';
-	}
-	elseif ($period < SECONDS_1MONTH) {
-		$chart_time_format = 'M d H\h';
-	}
-	elseif ($period < SECONDS_6MONTHS) {
-		$chart_time_format = "M d H\h";
-	}
-	else {
-		$chart_time_format = "Y M d H\h";
-	}
-	
 	// Calculate source indexes
-	$i = 0;
-	$sources = array ();
-	foreach ($data['sources'] as $source => $value) {
-		$source_indexes[$source] = $i;
-		$sources[$i] = $source;
-		$i++;
-	}
-	
-	// Add sources to chart
-	$chart = array ();
-	foreach ($data['data'] as $timestamp => $data) {
-		$chart_date = date ($chart_time_format, $timestamp);
-		$chart[$chart_date] = array ();
-		foreach ($source_indexes as $source => $index) {
-			$chart[$chart_date][$index] = 0;
-		}
-		foreach ($data as $source => $value) {
-			$chart[$chart_date][$source_indexes[$source]] = $value;
+	foreach ($data['sources'] as $key => $value) {
+		$i = 0;
+		foreach($data['data'] as $k => $v){
+			$chart['netflow_' . $key]['data'][$i][0] = $k * 1000;
+			$chart['netflow_' . $key]['data'][$i][1] = $v[$key];
+			$i++;
 		}
 	}
-	
-	
-	$flash_chart = $config['flash_charts'];
-	if ($only_image) {
-		$flash_chart = false;
-	}
-	
+
 	if ($config['homeurl'] != '') {
 		$homeurl = $config['homeurl'];
 	}
 	else {
 		$homeurl = '';
 	}
-	
+
 	if($config["fixed_graph"] == false){
 		$water_mark = array('file' =>
 			$config['homedir'] . "/images/logo_vertical_water.png",
 			'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
-	}
-	
-	$color = array();
-	$color[0] = array('border' => '#000000',
-		'color' => $config['graph_color1'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[1] = array('border' => '#000000',
-		'color' => $config['graph_color2'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[2] = array('border' => '#000000',
-		'color' => $config['graph_color3'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[3] = array('border' => '#000000',
-		'color' => $config['graph_color4'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[4] = array('border' => '#000000',
-		'color' => $config['graph_color5'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[5] = array('border' => '#000000',
-		'color' => $config['graph_color6'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[6] = array('border' => '#000000',
-		'color' => $config['graph_color7'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[7] = array('border' => '#000000',
-		'color' => $config['graph_color8'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[8] = array('border' => '#000000',
-		'color' => $config['graph_color9'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[9] = array('border' => '#000000',
-		'color' => $config['graph_color10'],
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[11] = array('border' => '#000000',
-		'color' => COL_GRAPH9,
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[12] = array('border' => '#000000',
-		'color' => COL_GRAPH10,
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[13] = array('border' => '#000000',
-		'color' => COL_GRAPH11,
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[14] = array('border' => '#000000',
-		'color' => COL_GRAPH12,
-		'alpha' => CHART_DEFAULT_ALPHA);
-	$color[15] = array('border' => '#000000',
-		'color' => COL_GRAPH13,
-		'alpha' => CHART_DEFAULT_ALPHA);
 
-	return area_graph($flash_chart, $chart, $width, $height, $color,
-		$sources, array (), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-		"", $unit, $homeurl,
-		$config['homedir'] .  "/images/logo_vertical_water.png",
-		$config['fontpath'], $config['font_size'], $unit, $ttl);
+			$water_mark = 	$config['homedir'] .  "/images/logo_vertical_water.png";
+	}
+
+	if($ttl >= 2){
+		$only_image = true;
+	}
+	else{
+		$only_image = false;
+	}
+
+	$params =array(
+		'agent_module_id'     => false,
+		'period'              => $period,
+		'width'               =>'90%',
+		'height'              => 450,
+		'unit'                => $unit,
+		'only_image'          => $only_image,
+		'homeurl'             => $homeurl,
+		'menu'                => true,
+		'backgroundColor'     => 'white',
+		'type_graph'          => 'area',
+		'font'                => $config['fontpath'],
+		'font-size'           => $config['font_size'],
+		'array_data_create'   => $chart
+	);
+
+	return grafico_modulo_sparse($params);
 }
 
 /**
@@ -4101,80 +4089,59 @@ function graph_netflow_aggregate_area ($data, $period, $width, $height, $unit =
 function graph_netflow_total_area ($data, $period, $width, $height, $unit = '', $ttl = 1, $only_image = false) {
 	global $config;
 	global $graphic_type;
-	
+
 	if (empty ($data)) {
 		echo fs_error_image ();
 		return;
 	}
-	
-	if ($period <= SECONDS_6HOURS) {
-		$chart_time_format = 'H:i:s';
-	}
-	elseif ($period < SECONDS_1DAY) {
-		$chart_time_format = 'H:i';
-	}
-	elseif ($period < SECONDS_15DAYS) {
-		$chart_time_format = 'M d H:i';
-	}
-	elseif ($period < SECONDS_1MONTH) {
-		$chart_time_format = 'M d H\h';
-	}
-	elseif ($period < SECONDS_6MONTHS) {
-		$chart_time_format = "M d H\h";
-	}
-	else {
-		$chart_time_format = "Y M d H\h";
+
+	// Calculate source indexes
+	$i=0;
+	foreach ($data as $key => $value) {
+		$chart['netflow']['data'][$i][0] = $key * 1000;
+		$chart['netflow']['data'][$i][1] = $value['data'];
+		$i++;
 	}
 
-	// Calculate min, max and avg values
-	$avg = 0;
-	foreach ($data as $timestamp => $value) {
-		$max = $value['data'];
-		$min = $value['data'];
-		break;
-	}
-	
-	// Populate chart
-	$count = 0;
-	$chart = array ();
-	foreach ($data as $timestamp => $value) {
-		$chart[date ($chart_time_format, $timestamp)] = $value;
-		if ($value['data'] > $max) {
-			$max = $value['data'];
-		}
-		if ($value['data'] < $min) {
-			$min = $value['data'];
-		}
-		$avg += $value['data'];
-		$count++;
-	}
-	if ($count > 0) {
-		$avg /= $count;
-	}
-
-	$flash_chart = $config['flash_charts'];
-	if ($only_image) {
-		$flash_chart = false;
-	}
-	
 	if ($config['homeurl'] != '') {
 		$homeurl = $config['homeurl'];
 	}
 	else {
 		$homeurl = '';
 	}
-	
+
 	if($config["fixed_graph"] == false){
 		$water_mark = array('file' =>
 			$config['homedir'] . "/images/logo_vertical_water.png",
 			'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
+
+			$water_mark = 	$config['homedir'] .  "/images/logo_vertical_water.png";
 	}
-	
-	$legend = array (__('Max.') . ' ' . format_numeric($max) . ' ' . __('Min.') . ' ' . format_numeric($min) . ' ' . __('Avg.') . ' ' . format_numeric ($avg));
-	return area_graph($flash_chart, $chart, $width, $height, array (), $legend,
-		array (), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
-		"", "", $homeurl, $water_mark,
-		$config['fontpath'], $config['font_size'], $unit, $ttl);
+
+	if($ttl >= 2){
+		$only_image = true;
+	}
+	else{
+		$only_image = false;
+	}
+
+	$params =array(
+		'agent_module_id'     => false,
+		'period'              => $period,
+		'width'               =>'90%',
+		'height'              => 450,
+		'unit'                => $unit,
+		'only_image'          => $only_image,
+		'homeurl'             => $homeurl,
+		'menu'                => true,
+		'backgroundColor'     => 'white',
+		'type_graph'          => 'area',
+		'font'                => $config['fontpath'],
+		'font-size'           => $config['font_size'],
+		'array_data_create'   => $chart
+	);
+
+	return grafico_modulo_sparse($params);
 }
 
 /**
@@ -4183,11 +4150,16 @@ function graph_netflow_total_area ($data, $period, $width, $height, $unit = '',
 function graph_netflow_aggregate_pie ($data, $aggregate, $ttl = 1, $only_image = false) {
 	global $config;
 	global $graphic_type;
-	
+
 	if (empty ($data)) {
 		return fs_error_image ();
 	}
-	
+
+	$date_array = array();
+	$date_array["period"]     = 300;
+	$date_array["final_date"] = time();
+	$date_array["start_date"] = time() - 300;
+
 	$i = 0;
 	$values = array();
 	$agg = '';
@@ -4201,18 +4173,18 @@ function graph_netflow_aggregate_pie ($data, $aggregate, $ttl = 1, $only_image =
 		}
 		$i++;
 	}
-	
+
 	$flash_chart = $config['flash_charts'];
 	if ($only_image) {
 		$flash_chart = false;
 	}
-	
+
 	if($config["fixed_graph"] == false){
 		$water_mark = array('file' =>
 			$config['homedir'] . "/images/logo_vertical_water.png",
 			'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
 	}
-	
+
 	return pie3d_graph($flash_chart, $values, 370, 200,
 		__('Other'), $config['homeurl'], $water_mark,
 		$config['fontpath'], $config['font_size'], $ttl);
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index cde01c68dd..fda921a44a 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -727,11 +727,10 @@ function treeview_printTable($id_agente, $server_data = array(), $no_head = fals
 	//echo '<div id="id_div" style="height: 10px">&nbsp;</div>';
 
 	if ($config["agentaccess"]) {
-		$access_graph = '<div style="margin-left: 10px;">';
-		$access_graph .= graphic_agentaccess($id_agente, 290, 110,
-			SECONDS_1DAY, true);
-		$access_graph .= '</div><br>';
-
+		$access_graph = '<div>hjhhjhhj</div>';
+		$access_graph = '<div style="width:100%; heigth:200px;">';
+		$access_graph .= graphic_agentaccess($id_agente, 380, 180, SECONDS_1DAY, true, true);
+		$access_graph .= '</div><br><br>';
 		ui_toggle($access_graph, __('Agent access rate (24h)'));
 	}
 
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 26d0f380ac..cff29e32e8 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1049,7 +1049,8 @@ function visual_map_print_item($mode = "read", $layoutData,
 						'only_image'          => $only_image,
 						'menu'                => false,
 						'backgroundColor'     => $layoutData['image'],
-						'type_graph'          => $type_graph
+						'type_graph'          => $type_graph,
+						'vconsole'            => true
 					);
 
 					if ($layoutData['label_position']=='left') {
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index f0da8a2b95..b5463a3a3f 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -223,7 +223,7 @@ function vbar_graph(
 function area_graph(
 	$agent_module_id, $array_data,
 	$legend, $series_type, $date_array,
-	$data_module_graph, $params, $water_mark, $series_suffix_str,
+	$data_module_graph, $params, $water_mark,
 	$array_events_alerts
 ) {
 	global $config;
@@ -239,12 +239,11 @@ function area_graph(
 		$data_module_graph,
 		$params,
 		$water_mark,
-		$series_suffix_str,
 		$array_events_alerts
 	);
 }
 
-function stacked_bullet_chart($flash_chart, $chart_data, $width, $height,
+function stacked_bullet_chart($chart_data, $width, $height,
 	$color, $legend, $long_index, $no_data_image, $xaxisname = "",
 	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
 	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white') {
@@ -256,75 +255,43 @@ function stacked_bullet_chart($flash_chart, $chart_data, $width, $height,
 	if (empty($chart_data)) {
 		return '<img src="' . $no_data_image . '" />';
 	}
-	if ($flash_chart) {
-		return d3_bullet_chart(
-				$chart_data,
-				$width,
-				$height,
-				$color,
-				$legend,
-				$homeurl,
-				$unit,
-				$font,
-				$font_size
-				);
-	}
-	else {
-		$legend = array();
-		$new_data = array();
-		foreach($chart_data as $key => $data) {
-			$temp[] = ($data['min'] != false) ? $data['min'] : 0;
-			$temp[] = ($data['value'] != false) ? $data['value'] : 0;
-			$temp[] = ($data['max'] != false) ? $data['max'] : 0;
 
-			$legend[] = $data['label'];
-			array_push($new_data, $temp);
-			$temp = array();
-		}
-		$graph = array();
-		$graph['data'] = $new_data;
-		$graph['width'] = $width;
-		$graph['height'] = $height;
-		$graph['color'] = $color;
-		$graph['legend'] = $legend;
-		$graph['xaxisname'] = $xaxisname;
-		$graph['yaxisname'] = $yaxisname;
-		$graph['water_mark'] = $water_mark_file;
-		$graph['font'] = $font;
-		$graph['font_size'] = $font_size;
-		$graph['backgroundColor'] = $backgroundColor;
+	return d3_bullet_chart(
+		$chart_data,
+		$width,
+		$height,
+		$color,
+		$legend,
+		$homeurl,
+		$unit,
+		$font,
+		$font_size
+	);
 
-		$id_graph = serialize_in_temp($graph, null, $ttl);
-
-		return "<img src='" . $homeurl . "include/graphs/functions_pchart.php?static_graph=1&graph_type=bullet_chart&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
-	}
 }
 
-function stacked_gauge($flash_chart, $chart_data, $width, $height,
-	$color, $legend, $long_index, $no_data_image, $xaxisname = "",
-	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
-	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white') {
+function stacked_gauge($chart_data, $width, $height,
+	$color, $legend, $no_data_image, $font = '', $font_size = '',
+	$unit = '', $homeurl = '') {
 
 	include_once('functions_d3.php');
 
-	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-
 	if (empty($chart_data)) {
 		return '<img src="' . $no_data_image . '" />';
 	}
 
 	return d3_gauges(
-			$chart_data,
-			$width,
-			$height,
-			$color,
-			$legend,
-			$homeurl,
-			$unit,
-			$font,
-			$font_size + 2,
-			$no_data_image
-			);
+		$chart_data,
+		$width,
+		$height,
+		$color,
+		$legend,
+		$homeurl,
+		$unit,
+		$font,
+		$font_size + 2,
+		$no_data_image
+	);
 }
 
 function kiviat_graph($graph_type, $flash_chart, $chart_data, $width,
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 4570ba91ca..9822b561fd 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -859,24 +859,25 @@ function pandoraFlotArea(
 	graph_id, values, legend, agent_module_id,
 	series_type, watermark, date_array,
 	data_module_graph, params,
-	force_integer, series_suffix_str,
+	force_integer,
 	background_color, legend_color, short_data,
 	events_array
 ) {
 
 	//diferents vars
-	var unit      = params.unit ? params.unit : '';
-	var homeurl   = params.homeurl;
-	var font_size = params.font_size;
-	var font      = params.font;
-	var width     = params.width;
-	var height    = params.height;
-	var vconsole  = params.vconsole;
-	var dashboard = params.dashboard;
-	var menu      = params.menu;
-	var min_x     = date_array['start_date'] *1000;
-	var max_x     = date_array['final_date'] *1000;
-	var type      = params.stacked;
+	var unit       = params.unit ? params.unit : '';
+	var homeurl    = params.homeurl;
+	var font_size  = params.font_size;
+	var font       = params.font;
+	var width      = params.width;
+	var height     = params.height;
+	var vconsole   = params.vconsole;
+	var dashboard  = params.dashboard;
+	var menu       = params.menu;
+	var min_x      = date_array['start_date'] *1000;
+	var max_x      = date_array['final_date'] *1000;
+	var type       = params.stacked;
+	var show_legend= params.show_legend;
 
 	if(typeof type === 'undefined' || type == ''){
 		type = params.type_graph;
@@ -1564,7 +1565,7 @@ function pandoraFlotArea(
 				data_base.push({
 					id: 'serie_' + i,
 					data: value.data,
-					label: index + series_suffix_str,
+					label: index,
 					color: value.color,
 					lines: {
 						show: line_show,
@@ -1583,15 +1584,22 @@ function pandoraFlotArea(
 		}
 		i++;
 	});
-console.log(legend);
+
 	// The first execution, the graph data is the base data
 	datas = data_base;
 	font_size = 8;
 	// minTickSize
 	var count_data = datas[0].data.length;
-	var min_tick_pixels = 80;
+	var min_tick = datas[0].data[0][0];
+	var max_tick = datas[0].data[count_data - 1][0];
+
+	var number_ticks = 8;
+	if(vconsole){
+		number_ticks = 5;
+	}
+
+	var maxticks = date_array['period'] / 3600 / number_ticks;
 
-	var maxticks = date_array['period'] / 3600 /6;
 	var options = {
 			series: {
 				stack: stacked,
@@ -1622,9 +1630,8 @@ console.log(legend);
 			xaxes: [{
 				axisLabelFontSizePixels: font_size,
 				mode: "time",
-				tickFormatter: xFormatter,
-				tickSize: [maxticks, 'hour'],
-				labelWidth: 70
+				//tickFormatter: xFormatter,
+				tickSize: [maxticks, 'hour']
 			}],
 			yaxes: [{
 				tickFormatter: yFormatter,
@@ -1633,7 +1640,7 @@ console.log(legend);
 				labelWidth: 30,
 				position: 'left',
 				font: font,
-				reserveSpace: true,
+				reserveSpace: true
 			}],
 			legend: {
 				position: 'se',
@@ -1641,6 +1648,7 @@ console.log(legend);
 				labelFormatter: lFormatter
 			}
 		};
+
 	if (vconsole) {
 		options.grid['hoverable'] = false;
 		options.grid['clickable'] = false;
@@ -1664,15 +1672,16 @@ console.log(legend);
 			$('#'+graph_id).css('height', hDiff);
 		}
 	}
-
-	if (vconsole) {
+console.log(vconsole);
+/*	
+if (vconsole) {
 		var myCanvas = plot.getCanvas();
 		plot.setupGrid(); // redraw plot to new size
 		plot.draw();
 		var image = myCanvas.toDataURL("image/png");
 		return;
 	}
-
+*/
 	// Adjust the overview plot to the width and position of the main plot
 	adjust_left_width_canvas(graph_id, 'overview_'+graph_id);
 	update_left_width_canvas(graph_id);
@@ -1714,9 +1723,8 @@ console.log(legend);
 			xaxes: [{
 				axisLabelFontSizePixels: font_size,
 				mode: "time",
-				tickFormatter: xFormatter,
+				//tickFormatter: xFormatter,
 				tickSize: [maxticks, 'hour'],
-				labelWidth: 70
 			}],
 			yaxes: [{
 				tickFormatter: yFormatter,
@@ -1777,7 +1785,7 @@ console.log(legend);
 					},
 					xaxes: [{
 						mode: "time",
-						tickFormatter: xFormatter,
+						//tickFormatter: xFormatter,
 						tickSize: [maxticks_zoom, 'hour']
 					}],
 					yaxis:{
@@ -1812,7 +1820,7 @@ console.log(legend);
 					},
 					xaxes: [{
 						mode: "time",
-						tickFormatter: xFormatter,
+						//tickFormatter: xFormatter,
 						tickSize: [maxticks_zoom, 'hour']
 					}],
 					yaxis:{
@@ -1833,9 +1841,8 @@ console.log(legend);
 					}
 			}));
 		}
-
-		$('#menu_cancelzoom_' + graph_id)
-			.attr('src', homeurl + '/images/zoom_cross_grey.png');
+console.log(homeurl);
+		$('#menu_cancelzoom_' + graph_id).attr('src', homeurl + '/images/zoom_cross_grey.png');
 
 	//	currentRanges = ranges;
 		// don't fire event on the overview to prevent eternal loop
@@ -1939,7 +1946,7 @@ console.log(legend);
 				y = y / 1000;
 			}
 
-			var label_aux = legend[series.label] + series_suffix_str;
+			var label_aux = legend[series.label];
 
 			// The graphs of points type and unknown graphs will dont be updated
 			if (series_type[dataset[k]["label"]] != 'points' &&
@@ -2070,21 +2077,26 @@ console.log(legend);
 		}
 	});
 
-	$('#'+graph_id).bind('mouseout',resetInteractivity);
-	$('#overview_'+graph_id).bind('mouseout',resetInteractivity);
+	$('#'+graph_id).bind('mouseout',resetInteractivity(vconsole));
+	
+	if(!vconsole){
+		$('#overview_'+graph_id).bind('mouseout',resetInteractivity);
+	}
 
 	// Reset interactivity styles
-	function resetInteractivity() {
+	function resetInteractivity(vconsole) {
 		$('#timestamp_'+graph_id).hide();
 		dataset = plot.getData();
 		for (i = 0; i < dataset.length; ++i) {
 			var series = dataset[i];
-			var label_aux = legend[series.label] + ' ' + series_suffix_str;
+			var label_aux = legend[series.label];
 			$('#legend_' + graph_id + ' .legendLabel')
 				.eq(i).html(label_aux);
 		}
 		plot.clearCrosshair();
-		overview.clearCrosshair();
+		if(!vconsole){
+			overview.clearCrosshair();
+		}
 	}
 
 	// Format functions
@@ -2124,8 +2136,7 @@ console.log(legend);
 		}
 
 		// Get only two decimals
-		//XXXXXXXXXX
-		//formatted = round_with_decimals(formatted, 100);
+		formatted = round_with_decimals(formatted, 100);
 		return '<div class='+font+' style="font-size:'+font_size+'pt;">'+formatted+'</div>';
 	}
 
@@ -2247,17 +2258,17 @@ console.log(legend);
 		$('#legend_'+graph_id).css('margin-bottom').split('px')[0]);
 		$('#legend_'+graph_id).css('margin-bottom', '10px');
 		parent_height = parseInt($('#menu_'+graph_id).parent().css('height').split('px')[0]);
-		adjust_menu(graph_id, plot, parent_height, width);
+		adjust_menu(graph_id, plot, parent_height, width, show_legend);
 	}
 
 	if (!dashboard) {
 		if (water_mark)
 			set_watermark(graph_id, plot, $('#watermark_image_'+graph_id).attr('src'));
-		adjust_menu(graph_id, plot, parent_height, width);
+		adjust_menu(graph_id, plot, parent_height, width, show_legend);
 	}
 }
 
-function adjust_menu(graph_id, plot, parent_height, width) {
+function adjust_menu(graph_id, plot, parent_height, width, show_legend) {
 	if ($('#'+graph_id+' .xAxis .tickLabel').eq(0).css('width') != undefined) {
 		left_ticks_width = $('#'+graph_id+' .xAxis .tickLabel').eq(0).css('width').split('px')[0];
 	}
@@ -2267,7 +2278,12 @@ function adjust_menu(graph_id, plot, parent_height, width) {
 
 	var parent_height_new = 0;
 
-	var legend_height = parseInt($('#legend_'+graph_id).css('height').split('px')[0]) + parseInt($('#legend_'+graph_id).css('margin-top').split('px')[0]);
+	if(show_legend){
+		var legend_height = parseInt($('#legend_'+graph_id).css('height').split('px')[0]) + parseInt($('#legend_'+graph_id).css('margin-top').split('px')[0]);
+	}
+	else{
+		var legend_height = 0;
+	}
 
 	var menu_height = '25';
 
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index fc47e6d7c6..c96dfc3d17 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -103,7 +103,7 @@ function include_javascript_dependencies_flot_graph($return = false) {
 function flot_area_graph (
 	$agent_module_id, $array_data,
 	$legend, $series_type, $date_array,
-	$data_module_graph, $params, $water_mark, $series_suffix_str,
+	$data_module_graph, $params, $water_mark,
 	$array_events_alerts ) {
 
 	global $config;
@@ -114,8 +114,7 @@ function flot_area_graph (
 	$graph_id = uniqid('graph_');
 
 	$background_style = '';
-	switch ($params['background']) {
-		default:
+	switch ($params['backgroundColor']) {
 		case 'white':
 			$background_style = ' background: #fff; ';
 			break;
@@ -125,13 +124,19 @@ function flot_area_graph (
 		case 'transparent':
 			$background_style = '';
 			break;
+		default:
+			$background_style = 'background-color: ' . $params['backgroundColor'];
+			break;
 	}
 
 	///XXXXXXX los px caca
 	// Parent layer
-	$return = "<div class='parent_graph' style='width: " . ($params['width']) . "; " . $background_style . "'>";
+	$return = "<div class='parent_graph' style='width: " . ($params['width']) . "; height:" . ($params['height'] + 30) . "px; " . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
-	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:" . $params['font_size'] ."pt !important;'></p>";
+	if($params['show_legend']){
+		$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:" . $params['font_size'] ."pt !important;'></p>";
+	}
+
 	if(!isset($params['combined']) || !$params['combined']){
 		$yellow_threshold = $data_module_graph['w_min'];
 		$red_threshold    = $data_module_graph['c_min'];
@@ -171,12 +176,14 @@ function flot_area_graph (
 
 	if ($params['menu']) {
 		$return .= menu_graph(
-			$yellow_threshold, $red_threshold,
-			$yellow_up, $red_up, $yellow_inverse,
-			$red_inverse, $params['dashboard'],
-			$params['vconsole'],
-			$graph_id, $params['width'],
-			$params['homeurl']
+			$yellow_threshold,
+			$red_threshold,
+			$yellow_up,
+			$red_up,
+			$yellow_inverse,
+			$red_inverse,
+			$graph_id,
+			$params
 		);
 	}
 
@@ -281,7 +288,6 @@ function flot_area_graph (
 		"JSON.parse('$data_module_graph'), \n" .
 		"JSON.parse('$params'), \n" .
 		"$force_integer, \n" .
-		"'$series_suffix_str', \n" .
 		"'$background_color', \n" .
 		"'$legend_color', \n" .
 		"'$short_data', \n" .
@@ -299,8 +305,7 @@ function flot_area_graph (
 function menu_graph(
 	$yellow_threshold, $red_threshold,
 	$yellow_up, $red_up, $yellow_inverse,
-	$red_inverse, $dashboard, $vconsole,
-	$graph_id, $width, $homeurl
+	$red_inverse, $graph_id, $params
 ){
 	$return = '';
 	$threshold = false;
@@ -308,34 +313,31 @@ function menu_graph(
 		$threshold = true;
 	}
 
-	$nbuttons = 3;
-
-	if ($threshold) {
-		$nbuttons++;
-	}
-	$menu_width = 25 * $nbuttons + 15;
-	if ( $dashboard == false AND $vconsole == false) {
-		$return .= "<div id='geneal_menu_$graph_id' class='menu_graph' style='
-						width: 30px;
-						height: 250px;
+	if ( $params['dashboard'] == false AND $params['vconsole'] == false) {
+		$return .= "<div id='general_menu_$graph_id' class='menu_graph' style='
+						width: 20px;
+						height: 150px;
 						left:100%;
 						position: absolute;
 						top: 0px;
-						background-color: white;'>";
+						background-color: tranparent;'>";
 		$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='".$homeurl."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
+			<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) {
-			$return .= " <a href='javascript:'><img id='menu_threshold_$graph_id' src='".$homeurl."images/chart_curve_threshold.png' alt='".__('Warning and Critical thresholds')."' title='".__('Warning and Critical thresholds')."'></a>";
+			$return .= " <a href='javascript:'><img id='menu_threshold_$graph_id' src='".$params['homeurl']."images/chart_curve_threshold.png' alt='".__('Warning and Critical thresholds')."' title='".__('Warning and Critical thresholds')."'></a>";
+		}
+		if($params['show_overview']){
+			$return .= " <a href='javascript:'>
+				<img id='menu_overview_$graph_id' class='menu_overview' src='" . $params['homeurl'] . "images/chart_curve_overview.png' alt='" . __('Overview graph') . "' title='".__('Overview graph')."'></a>";
 		}
-		$return .= " <a href='javascript:'>
-			<img id='menu_overview_$graph_id' class='menu_overview' src='" . $homeurl . "images/chart_curve_overview.png' alt='" . __('Overview graph') . "' title='".__('Overview graph')."'></a>";
-
 		// Export buttons
-		$return .= " <a href='javascript:'><img id='menu_export_csv_$graph_id' src='".$homeurl."images/csv_grey.png' alt='".__('Export to CSV')."' title='".__('Export to CSV')."'></a>";
+		if($params['show_export_csv']){
+			$return .= " <a href='javascript:'><img id='menu_export_csv_$graph_id' src='".$params['homeurl']."images/csv_grey.png' alt='".__('Export to CSV')."' title='".__('Export to CSV')."'></a>";
+		}
 		// Button disabled. This feature works, but seems that is not useful enough to the final users.
 		//$return .= " <a href='javascript:'><img id='menu_export_json_$graph_id' src='".$homeurl."images/json.png' alt='".__('Export to JSON')."' title='".__('Export to JSON')."'></a>";
 
@@ -343,11 +345,11 @@ function menu_graph(
 		$return .= "</div>";
 	}
 
-	if ($dashboard) {
-		$return .= "<div id='geneal_menu_$graph_id' class='menu_graph' style='
+	if ($params['dashboard']) {
+		$return .= "<div id='general_menu_$graph_id' class='menu_graph' style='
 						width: 30px;
 						height: 250px;
-						left: " . $width . "px;
+						left: " . $params['width'] . "px;
 						position: absolute;
 						top: 0px;
 						background-color: white;'>";
@@ -357,7 +359,7 @@ function menu_graph(
 				"text-align: center;" .
 				"position: relative;".
 				"border-bottom: 0px;'>
-			<a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$homeurl."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
+			<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>";
 
 		$return .= "</div>";
 		$return .= "</div>";
diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php
index dd66d9173d..e987e5ab5b 100644
--- a/pandora_console/include/graphs/functions_pchart.php
+++ b/pandora_console/include/graphs/functions_pchart.php
@@ -883,11 +883,6 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 
 	global $config;
 
-	html_debug_print($graph_type, true);
-	html_debug_print($index, true);
-	html_debug_print($data, true);
-
-
 	/* Create and populate the pData object */
 	$MyData = new pData();
 	$MyData->addPoints(array(20,22,25,5,12,8,30,8),"Probe 1");
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 6f4a59cab1..6113caacf3 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1024,41 +1024,40 @@ function createGauge(name, etiqueta, value, min, max, min_warning,max_warning,wa
 function createGauges(data, width, height, font_size, no_data_image, font) {
 	var nombre,label,minimun_warning,maximun_warning,minimun_critical,maximun_critical,
 		mininum,maxinum,valor;
-	
+
 	for (key in data) {
 		nombre = data[key].gauge;
-		
+
 		label = data[key].label;
-		
+
 		label = label.replace(/&#x20;/g,' ');
 		label = label.replace(/\(/g,'\(');
 		label = label.replace(/\)/g,'\)');
-		
+
 		label = label.replace(/&#40;/g,'\(');
 		label = label.replace(/&#41;/g,'\)');
-		
-		minimun_warning 	= round_with_decimals(parseFloat( data[key].min_warning ));
-		maximun_warning 	= round_with_decimals(parseFloat( data[key].max_warning ));
-		minimun_critical	= round_with_decimals(parseFloat( data[key].min_critical ));
-		maximun_critical 	= round_with_decimals(parseFloat( data[key].max_critical ));
+
+		minimun_warning = round_with_decimals(parseFloat( data[key].min_warning ));
+		maximun_warning = round_with_decimals(parseFloat( data[key].max_warning ));
+		minimun_critical = round_with_decimals(parseFloat( data[key].min_critical ));
+		maximun_critical = round_with_decimals(parseFloat( data[key].max_critical ));
 
 		mininum = round_with_decimals(parseFloat(data[key].min));
 		maxinum = round_with_decimals(parseFloat(data[key].max));
-	
+
 		critical_inverse = parseInt(data[key].critical_inverse);
 		warning_inverse  = parseInt(data[key].warning_inverse);
 
 		valor = round_with_decimals(data[key].value);
 
+
 		if (isNaN(valor)) 
 			valor = null;
-		createGauge(nombre, label, valor, mininum, maxinum, 
+		createGauge(nombre, label, valor, mininum, maxinum,
 				minimun_warning, maximun_warning, warning_inverse, minimun_critical,
 					maximun_critical, critical_inverse, font_size, height, font);
 
-
 	}
-	
 }
 
 
@@ -1265,8 +1264,10 @@ function Gauge(placeholderName, configuration, font)
 	
 	this.drawBand = function(start, end, color)
 	{
+		if (start === undefined) return;
+		if (end === undefined) return;
 		if (0 >= end - start) return;
-		
+
 		this.body.append("svg:path")
 					.style("fill", color)
 					.attr("d", d3.svg.arc()
@@ -1276,13 +1277,13 @@ function Gauge(placeholderName, configuration, font)
 						.outerRadius(Math.round(0.85 * this.config.raduis)))
 					.attr("transform", function() { return "translate(" + self.config.cx + ", " + self.config.cy + ") rotate(270)" });
 	}
-	
+
 	this.redraw = function(value, transitionDuration)
 	{
 		var pointerContainer = this.body.select(".pointerContainer");
-		
+
 		pointerContainer.selectAll("text").text(round_with_decimals(value));
-		
+
 		var pointer = pointerContainer.selectAll("path");
 		pointer.transition()
 					.duration(undefined != transitionDuration ? transitionDuration : this.config.transitionDuration)
@@ -1297,7 +1298,7 @@ function Gauge(placeholderName, configuration, font)
 						var targetRotation = (self.valueToDegrees(pointerValue) - 90);
 						var currentRotation = self._currentRotation || targetRotation;
 						self._currentRotation = targetRotation;
-						
+
 						return function(step) 
 						{
 							var rotation = currentRotation + (targetRotation-currentRotation)*step;
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 0cdb3e44b3..af4373bbab 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -1553,7 +1553,10 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
 	}
 }
 
-function round_with_decimals (value, multiplier = 1) {
+function round_with_decimals(value, multiplier) {
+	// Default values
+	if (typeof(multiplier) === "undefined") multiplier = 1;
+
 	// Return non numeric types without modification
 	if (typeof(value) !== "number") return value;
 
@@ -1564,24 +1567,6 @@ function round_with_decimals (value, multiplier = 1) {
 	return round_with_decimals (value, multiplier * 10);
 }
 
-/*
-
-		$("body").append('<div id="event_delete_confirm_dialog"><h4>' + '<?php echo __('Are you sure?'); ?>' + '</h4></div>');
-		$("#event_delete_confirm_dialog").dialog({
-			resizable: false,
-			draggable: false,
-			modal: true,
-			height: 280,
-			width: 330,
-			overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-			closeOnEscape: false,
-			open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-		});
-*/
-
 /**
  * Display a confirm dialog box
  *
@@ -1590,12 +1575,7 @@ function round_with_decimals (value, multiplier = 1) {
  * @param string Cancel button text
  * @param function Callback to action when ok button is pressed
 */
-function display_confirm_dialog (
-	message = '',
-	ok_text = '',
-	cancel_text = '',
-	ok_function = function () {}
-) {
+function display_confirm_dialog (message, ok_text, cancel_text, ok_function) {
 	// Clean function to close the dialog
 	var clean_function = function () {
 		$("#pandora_confirm_dialog_text").hide();
diff --git a/pandora_console/include/web2image.js b/pandora_console/include/web2image.js
index 87ff234e01..85ae6ac37a 100644
--- a/pandora_console/include/web2image.js
+++ b/pandora_console/include/web2image.js
@@ -38,10 +38,14 @@ page.viewportSize = { width: _width, height: _height };
 //page.zoomFactor = 1.75;
 
 page.open(finish_url, function start(status) {
+	page.includeJs('./javascript/pandora.js');
+});
+
+page.onLoadFinished = function (status) {
 	page.render(output_filename, {format: 'png'});
 	//var base64 = page.renderBase64('JPG');
 	//console.log(base64);
 	phantom.exit();
-});
+}
 
 
diff --git a/pandora_console/mobile/operation/module_graph.php b/pandora_console/mobile/operation/module_graph.php
index 249a4e770e..31be54c7f8 100644
--- a/pandora_console/mobile/operation/module_graph.php
+++ b/pandora_console/mobile/operation/module_graph.php
@@ -153,7 +153,8 @@ class ModuleGraph {
 								'compare'             => $time_compare,
 								'show_unknown'        => $this->unknown_graph,
 								'menu'                => false,
-								'type_graph'          => $config['type_module_charts']
+								'type_graph'          => $config['type_module_charts'],
+								'vconsole'            => true
 							);
 
 							$graph = grafico_modulo_sparse($params);
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 57b87cb6eb..57a50e6c9a 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -280,13 +280,15 @@ $access_agent = db_get_value_sql("SELECT COUNT(id_agent)
 	WHERE id_agent = " . $id_agente);
 if ($config["agentaccess"] && $access_agent > 0) {
 	$data[2] =
-		'<fieldset width=90% class="databox agente" style="">
+		'<fieldset width=99% class="databox agente" style="">
 		<legend>' .
 				__('Agent access rate (24h)') .
 		'</legend>' .
-			graphic_agentaccess($id_agente, 300, 100, SECONDS_1DAY, true) .
+			graphic_agentaccess($id_agente, '90%', 150, SECONDS_1DAY, true) .
 	'</fieldset>';
-	$table_data->style[1] = 'width: 40%;';
+	$table_data->style[0] = 'width: 20%;';
+	$table_data->style[1] = 'width: 30%;';
+	$table_data->style[2] = 'width: 50%;';
 	$table_data->rowspan[0][2] = 5;
 }
 
@@ -298,8 +300,6 @@ if (!empty($addresses)) {
 	$data[1] = '<div style="max-height: 45px; overflow-y: scroll; height:45px;">' .
 		implode('<br>',$addresses) .
 		'</div>';
-	//~ $table_data->data[] = '<div style="max-height: 200px; overflow: hidden;>' .
-		//~ $data . '</div>';
 	$table_data->data[] = $data;
 }
 

From d7da0098040a688a0b6abcdeb5a701b824e164c3 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 6 Jun 2018 17:23:32 +0200
Subject: [PATCH 133/146] fixed errors in graphs

---
 pandora_console/include/chart_generator.php   |   8 +-
 pandora_console/include/functions.php         |  52 ++++--
 pandora_console/include/functions_api.php     | 157 +++++++-----------
 pandora_console/include/functions_graph.php   |  66 ++++++--
 .../include/graphs/flot/pandora.flot.js       |  82 +++++++--
 .../include/graphs/functions_flot.php         |  12 +-
 pandora_console/include/web2image.js          |  15 +-
 7 files changed, 241 insertions(+), 151 deletions(-)

diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
index 463d1e2570..bec06cfada 100644
--- a/pandora_console/include/chart_generator.php
+++ b/pandora_console/include/chart_generator.php
@@ -68,9 +68,7 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
 		<title>Pandora FMS Graph (<?php echo agents_get_alias($agent_id) . ' - ' . $interface_name; ?>)</title>
-
         <link rel="stylesheet" href="styles/pandora.css" type="text/css" />
 		<link rel="stylesheet" href="styles/pandora_minimal.css" type="text/css" />
 		<link rel="stylesheet" href="styles/jquery-ui-1.10.0.custom.css" type="text/css" />
@@ -108,7 +106,6 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
 		$type_graph_pdf  = $_GET['type_graph_pdf'];
 
 		if($type_graph_pdf == 'combined'){
-			echo '<p> Grafica molona para combinadaaaaaaaaaaaaa</p>';
 			echo '<div>';
 				echo graphic_combined_module(
 					$module_list,
@@ -118,12 +115,11 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
 			echo '</div>';
 		}
 		elseif($type_graph_pdf == 'sparse'){
-			echo '<p> Grafica molona para ' .  $params['agent_module_id'] . '</p>';
 			echo '<div>';
-				echo grafico_modulo_sparse ($params);
+				echo grafico_modulo_sparse($params);
 			echo '</div>';
 		}
 ?>
 	</body>
-	
+
 </html>
\ No newline at end of file
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index f84cb8e291..5eb22d313b 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3006,6 +3006,21 @@ function color_graph_array($series_suffix, $compare = false){
 function series_type_graph_array($data, $show_elements_graph){
 	global $config;
 
+	if(isset($show_elements_graph['stacked'])){
+		switch ($show_elements_graph['stacked']) {
+			case 2:
+			case 4:
+				$type_graph = 'line';
+				break;
+			default:
+				$type_graph = 'area';
+				break;
+		}
+	}
+	else{
+		$type_graph = $show_elements_graph['type_graph'];
+	}
+
 	if(isset($data) && is_array($data)){
 		foreach ($data as $key => $value) {
 			if($show_elements_graph['compare'] == 'overlapped'){
@@ -3015,11 +3030,11 @@ function series_type_graph_array($data, $show_elements_graph){
 			}
 
 			if(strpos($key, 'summatory') !== false){
-				$data_return['series_type'][$key] = 'area';
+				$data_return['series_type'][$key] = $type_graph;
 				$data_return['legend'][$key] = __('Summatory series') . ' ' . $str;
 			}
 			elseif(strpos($key, 'average') !== false){
-				$data_return['series_type'][$key] = 'area';
+				$data_return['series_type'][$key] = $type_graph;
 				$data_return['legend'][$key] = __('Average series') . ' ' . $str;
 			}
 			elseif(strpos($key, 'sum') !== false || strpos($key, 'baseline') !== false){
@@ -3029,7 +3044,7 @@ function series_type_graph_array($data, $show_elements_graph){
 						$data_return['series_type'][$key] = 'boolean';
 						break;
 					default:
-						$data_return['series_type'][$key] = 'area';
+						$data_return['series_type'][$key] = $type_graph;
 						break;
 				}
 
@@ -3112,11 +3127,11 @@ function series_type_graph_array($data, $show_elements_graph){
 				}
 			}
 			elseif(strpos($key, 'projection') !== false){
-				$data_return['series_type'][$key] = 'area';
+				$data_return['series_type'][$key] = $type_graph;
 				$data_return['legend'][$key] = __('Projection') . ' ' . $str;
 			}
 			else{
-				$data_return['series_type'][$key] = 'area';
+				$data_return['series_type'][$key] = $type_graph;
 				$data_return['legend'][$key] = $key;
 			}
 		}
@@ -3146,15 +3161,26 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined = fal
 	if($module_list){
 		$module_list = urlencode(json_encode($module_list));
 	}
-html_debug_print("phantomjs " . $file_js . " " . $url . "  '" . $type_graph_pdf . "' '" . $params_encode_json . "' '" . $params_combined . "' '" . $module_list . "' " . $img_path . " " . $width_img . " " . $height_img, true);
-	$result = exec("phantomjs " . $file_js . " " . $url . "  '" . $type_graph_pdf . "' '" . $params_encode_json . "' '" . $params_combined . "' '" . $module_list . "' " . $img_path . " " . $width_img . " " . $height_img);
-	html_debug_print($result, true);
-	return '<img src="' . $img_url . '" />';
 
-	//html_debug_print('entrando en llamada a phantom.js.......', true);
-	//header('Content-Type: image/png;');
-	//return '<img src="data:image/jpg;base64, '.$result.'" />';
-	//return "<img src='/var/www/html/pandora_console/attachment/imagen_". $params['agent_module_id'] .".png' alt='la imagen bonica'>";
+	$result = exec(
+		"phantomjs " . $file_js . " " .
+		$url . "  '" .
+		$type_graph_pdf . "' '" .
+		$params_encode_json . "' '" .
+		$params_combined . "' '" .
+		$module_list . "' " .
+		$img_path . " " .
+		$width_img . " " .
+		$height_img . " " .
+		$params['return_img_base_64']
+	);
+
+	if($params['return_img_base_64']){
+		return $result;
+	}
+	else{
+		return '<img src="' . $img_url . '" />';
+	}
 }
 
 /**
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 0515160238..64f878a2ce 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -6655,7 +6655,7 @@ function api_get_graph_module_data($id, $thrash1, $other, $thrash2) {
 	if (defined ('METACONSOLE')) {
 		return;
 	}
-	
+
 	$period = $other['data'][0];
 	$width = $other['data'][1];
 	$height = $other['data'][2];
@@ -6667,38 +6667,40 @@ function api_get_graph_module_data($id, $thrash1, $other, $thrash2) {
 	$avg_only = 0;
 	$start_date = $other['data'][4];
 	$date = strtotime($start_date);
-	
-	
+
 	$homeurl = '../';
 	$ttl = 1;
-	
+
 	global $config;
 	$config['flash_charts'] = 0;
-	
-	$image = grafico_modulo_sparse ($id, $period, $draw_events,
-		$width, $height , $label, null,
-		$draw_alerts, $avg_only, false,
-		$date, '', 0, 0,true,
-		false, $homeurl, $ttl);
-	
-	preg_match("/<div class=\"nodata_text\">/",
-		$image, $match);
-	
-	if (!empty($match[0])) {
-		echo "Error no data";
-	}
-	else {
-		// Extract url of the image from img tag
-		preg_match("/src='([^']*)'/i", $image, $match);
-		
-		if (empty($match[1])) {
-			echo "Error getting graph";
-		}
-		else {
-			header('Content-type: image/png');
-			header('Location: ' . $match[1]);
-		}
-	}
+
+	$params =array(
+		'agent_module_id'     => $id,
+		'period'              => $period,
+		'show_events'         => $draw_events,
+		'width'               => $width,
+		'height'              => $height,
+		'show_alerts'         => $draw_alerts,
+		'date'                => $date,
+		'unit'                => '',
+		'baseline'            => 0,
+		'return_data'         => 0,
+		'show_title'          => true,
+		'only_image'          => true,
+		'homeurl'             => $homeurl,
+		'compare'             => false,
+		'show_unknown'        => true,
+		'backgroundColor'     => 'white',
+		'percentil'           => null,
+		'type_graph'          => $config['type_module_charts'],
+		'fullscale'           => false,
+		'return_img_base_64'  => true
+	);
+
+	$image = grafico_modulo_sparse($params);
+
+	header('Content-type: text/html');
+	returnData('string', array('type' => 'string', 'data' => '<img src="data:image/jpeg;base64,' . $image . '">'));
 }
 
 /**
@@ -10039,25 +10041,24 @@ function api_set_delete_special_day($id_special_day, $thrash2, $thrash3, $thrash
  *
  */
 function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
-	
 	global $config;
 
 	if (defined ('METACONSOLE')) {
 		return;
 	}
-	
+
 	if (is_nan($id_module) || $id_module <= 0) {
 		returnError('error_module_graph', __(''));
 		return;
 	}
-	
+
 	$id_exist = (bool) db_get_value ('id_agente_modulo', 'tagente_modulo', 'id_agente_modulo', $id_module);
-	
+
 	if (!$id_exist) {
 		// returnError('id_not_found');
 		return;
 	}
-	
+
 	$graph_seconds =
 		(!empty($other) && isset($other['data'][0]))
 		?
@@ -10077,67 +10078,37 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
 		return;
 	}
 
-	$graph_html = grafico_modulo_sparse(
-		$id_module, $graph_seconds, false, 600, 300, '',
-		'', false, false, true, time(), '', 0, 0, true, true,
-		ui_get_full_url(false) . '/', 1, false, '', false, true,
-		true, 'white', null, false, false, $config['type_module_charts'], 
-		false, false);
+	$params =array(
+		'agent_module_id'     => $id_module,
+		'period'              => $graph_seconds,
+		'show_events'         => false,
+		'width'               => $width,
+		'height'              => $height,
+		'show_alerts'         => false,
+		'date'                => time(),
+		'unit'                => '',
+		'baseline'            => 0,
+		'return_data'         => 0,
+		'show_title'          => true,
+		'only_image'          => true,
+		'homeurl'             => ui_get_full_url(false) . '/',
+		'compare'             => false,
+		'show_unknown'        => true,
+		'backgroundColor'     => 'white',
+		'percentil'           => null,
+		'type_graph'          => $config['type_module_charts'],
+		'fullscale'           => false,
+		'return_img_base_64'  => true,
+		'image_treshold'      => $graph_threshold
+	);
 
-	$graph_image_file_encoded = false;
-	if (preg_match("/<img src='(.+)'./", $graph_html, $matches)) {
-		$file_url = $matches[1];
+	$graph_html = grafico_modulo_sparse($params);
 
-		if (preg_match("/\?(.+)&(.+)&(.+)&(.+)/", $file_url,$parameters)) {
-			array_shift ($parameters);
-			foreach ($parameters as $parameter){
-				$value = explode ("=",$parameter);
-				
-				if (strcmp($value[0], "static_graph") == 0){
-					$static_graph = $value[1];
-				}
-				elseif (strcmp($value[0], "graph_type") == 0){
-					$graph_type = $value[1];
-				}
-				elseif (strcmp($value[0], "ttl") == 0){
-					$ttl = $value[1];
-				}
-				elseif (strcmp($value[0], "id_graph") == 0){
-					$id_graph = $value[1];
-				}
-			}
-		}
-	}
-
-	// Check values are OK
-	if ( (isset ($graph_type))
-	&& (isset ($ttl))
-	&& (isset ($id_graph))) {
-		$_GET["ttl"]             = $ttl;
-		$_GET["id_graph"]        = $id_graph;
-		$_GET["graph_type"]      = $graph_type;
-		$_GET["static_graph"]    = $static_graph;
-		$_GET["graph_threshold"] = $graph_threshold;
-		$_GET["id_module"]       = $id_module;
-	}
-
-	ob_start();
-	include (__DIR__ . "/graphs/functions_pchart.php");
-	$output =  ob_get_clean();
-
-	$graph_image_file_encoded = base64_encode($output);
-	if (empty($graph_image_file_encoded)) {
-		// returnError('error_module_graph', __(''));
-	}
-	else {
-		if($other['data'][1]){
-			header('Content-type: text/html');
-			returnData('string', array('type' => 'string', 'data' => '<img src="data:image/jpeg;base64,' . $graph_image_file_encoded . '">'));
-		} else {
-			returnData('string', array('type' => 'string', 'data' => $graph_image_file_encoded));	
-		}
-		// To show only the base64 code, call returnData as:
-		// returnData('string', array('type' => 'string', 'data' => $graph_image_file_encoded));
+	if($other['data'][1]){
+		header('Content-type: text/html');
+		returnData('string', array('type' => 'string', 'data' => '<img src="data:image/jpeg;base64,' . $graph_html . '">'));
+	} else {
+		returnData('string', array('type' => 'string', 'data' => $graph_html));
 	}
 }
 
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index aaf4abfbcd..722854e481 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -695,7 +695,10 @@ function grafico_modulo_sparse_data(
 		'time_interval'       => 300,
 		'array_data_create'   => 0,
 		'show_legend'         => true,
-		'show_overview'       => true
+		'show_overview'       => true,
+		'return_img_base_64'  => false,
+		'image_treshold'      => false,
+		'graph_combined'      => false
 	);
  */
 function grafico_modulo_sparse ($params) {
@@ -847,6 +850,18 @@ function grafico_modulo_sparse ($params) {
 		$params['array_data_create'] = 0;
 	}
 
+	if(!isset($params['return_img_base_64'])){
+		$params['return_img_base_64'] = false;
+	}
+
+	if(!isset($params['image_treshold'])){
+		$params['image_treshold'] = false;
+	}
+
+	if(!isset($params['graph_combined'])){
+		$params['graph_combined'] = false;
+	}
+
 	$params['font']       = $config['fontpath'];
 	$params['font-size']  = $config['font_size'];
 
@@ -1155,7 +1170,7 @@ function graphic_combined_module (
 		}
 		else {
 			if ($id_graph == 0) {
-				$params_combined['stacked'] = CUSTOM_GRAPH_LINE;
+				$params_combined['stacked'] = CUSTOM_GRAPH_AREA;
 			}
 			else {
 				$params_combined['stacked'] = db_get_row('tgraph', 'id_graph', $id_graph);
@@ -1263,6 +1278,10 @@ function graphic_combined_module (
 		$params['menu'] = false;
 	}
 
+	if(!isset($params['type_graph'])){
+		$params['type_graph'] = $config['type_module_charts'];
+	}
+
 	if(!isset($params['percentil'])){
 		$params['percentil'] = null;
 	}
@@ -1291,6 +1310,20 @@ function graphic_combined_module (
 		$params['show_export_csv'] = true;
 	}
 
+	if(!isset($params['return_img_base_64'])){
+		$params['return_img_base_64'] = false;
+	}
+
+	if(!isset($params['image_treshold'])){
+		$params['image_treshold'] = false;
+	}
+
+	$params['graph_combined'] = true;
+
+	if(!isset($params['show_unknown'])){
+		$params['show_unknown'] = false;
+	}
+
 	//XXXX
 	if($params['only_image']){
 		return generator_chart_to_pdf('combined', $params, $params_combined, $module_list);
@@ -1437,6 +1470,7 @@ function graphic_combined_module (
 				$data_module_graph['c_inv']    		 = $module_data['critical_inverse'];
 				$data_module_graph['module_id']      = $agent_module_id;
 
+
 				//stract data
 				$array_data_module = grafico_modulo_sparse_data(
 					$agent_module_id,
@@ -4016,14 +4050,16 @@ function fullscale_data (
 
 			if ($v["datos"] === NULL) {
 				// Unknown
-				if(!$compare){
-					if($flag_unknown){
-						$data["unknown" . $series_suffix]['data'][] = array($real_date , 1);
-					}
-					else{
-						$data["unknown" . $series_suffix]['data'][] = array( ($real_date - 1) , 0);
-						$data["unknown" . $series_suffix]['data'][] = array($real_date , 1);
-						$flag_unknown = 1;
+				if($show_unknown){
+					if(!$compare){
+						if($flag_unknown){
+							$data["unknown" . $series_suffix]['data'][] = array($real_date , 1);
+						}
+						else{
+							$data["unknown" . $series_suffix]['data'][] = array( ($real_date - 1) , 0);
+							$data["unknown" . $series_suffix]['data'][] = array($real_date , 1);
+							$flag_unknown = 1;
+						}
 					}
 				}
 
@@ -4033,10 +4069,12 @@ function fullscale_data (
 				//normal
 				$previous_data = $v["datos"];
 				$data["sum" . $series_suffix]['data'][] = array($real_date , $v["datos"]);
-				if(!$compare){
-					if($flag_unknown){
-						$data["unknown" . $series_suffix]['data'][] = array($real_date , 0);
-						$flag_unknown = 0;
+				if($show_unknown){
+					if(!$compare){
+						if($flag_unknown){
+							$data["unknown" . $series_suffix]['data'][] = array($real_date , 0);
+							$flag_unknown = 0;
+						}
 					}
 				}
 			}
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 9822b561fd..febf57da6a 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -865,19 +865,20 @@ function pandoraFlotArea(
 ) {
 
 	//diferents vars
-	var unit       = params.unit ? params.unit : '';
-	var homeurl    = params.homeurl;
-	var font_size  = params.font_size;
-	var font       = params.font;
-	var width      = params.width;
-	var height     = params.height;
-	var vconsole   = params.vconsole;
-	var dashboard  = params.dashboard;
-	var menu       = params.menu;
-	var min_x      = date_array['start_date'] *1000;
-	var max_x      = date_array['final_date'] *1000;
-	var type       = params.stacked;
-	var show_legend= params.show_legend;
+	var unit           = params.unit ? params.unit : '';
+	var homeurl        = params.homeurl;
+	var font_size      = params.font_size;
+	var font           = params.font;
+	var width          = params.width;
+	var height         = params.height;
+	var vconsole       = params.vconsole;
+	var dashboard      = params.dashboard;
+	var menu           = params.menu;
+	var min_x          = date_array['start_date'] *1000;
+	var max_x          = date_array['final_date'] *1000;
+	var type           = params.stacked;
+	var show_legend    = params.show_legend;
+	var image_treshold = params.image_treshold;
 
 	if(typeof type === 'undefined' || type == ''){
 		type = params.type_graph;
@@ -1481,7 +1482,7 @@ function pandoraFlotArea(
 			}
 		}
 	}
-
+console.log(type);
 	switch (type) {
 		case 'line':
 		case 2:
@@ -1841,7 +1842,7 @@ if (vconsole) {
 					}
 			}));
 		}
-console.log(homeurl);
+
 		$('#menu_cancelzoom_' + graph_id).attr('src', homeurl + '/images/zoom_cross_grey.png');
 
 	//	currentRanges = ranges;
@@ -2083,6 +2084,46 @@ console.log(homeurl);
 		$('#overview_'+graph_id).bind('mouseout',resetInteractivity);
 	}
 
+	if(image_treshold){
+		if(!thresholded){
+			// Recalculate the y axis
+			var y_recal = axis_thresholded(
+				threshold_data,
+				plot.getAxes().yaxis.min,
+				plot.getAxes().yaxis.max,
+				red_threshold, extremes,
+				red_up
+			);
+		}
+		else{
+			var y_recal = plot.getAxes().yaxis.max
+		}
+
+		datas_treshold = add_threshold (
+			data_base,
+			threshold_data,
+			plot.getAxes().yaxis.min,
+			plot.getAxes().yaxis.max,
+			red_threshold,
+			extremes,
+			red_up,
+			markins_graph
+		);
+
+		plot = $.plot($('#' + graph_id), datas_treshold,
+				$.extend(true, {}, options, {
+					yaxis: {
+						max: y_recal.max,
+					},
+					xaxis: {
+						min: plot.getAxes().xaxis.min,
+						max: plot.getAxes().xaxis.max
+					}
+				}));
+
+		thresholded = true;
+	}
+
 	// Reset interactivity styles
 	function resetInteractivity(vconsole) {
 		$('#timestamp_'+graph_id).hide();
@@ -2546,7 +2587,14 @@ function add_threshold (data_base, threshold_data, y_min, y_max,
 				threshold_array[index]['max']   = end;
 				threshold_array[index]['color'] = "red";
 			} else {
-				end = extremes[this.id + '_1'];
+				var first = extremes[this.id + '_1'];
+				var second = extremes[this.id + '_2'];
+				if(first > second){
+					end = first;
+				}
+				else{
+					end = second;
+				}
 				threshold_array[index]['min']   = this.data[0][1];
 				threshold_array[index]['max']   = end;
 				threshold_array[index]['color'] = "yellow";
@@ -2596,7 +2644,7 @@ function add_threshold (data_base, threshold_data, y_min, y_max,
 	var extreme_treshold_array = [];
 	var i = 0;
 	var flag = true;
-console.log(threshold_array);
+
 	$.each(threshold_array, function(index, value) {
 		flag = true;
 		extreme_treshold_array[i] = {
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index c96dfc3d17..6b02ab3859 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -131,13 +131,19 @@ function flot_area_graph (
 
 	///XXXXXXX los px caca
 	// Parent layer
-	$return = "<div class='parent_graph' style='width: " . ($params['width']) . "; height:" . ($params['height'] + 30) . "px; " . $background_style . "'>";
+	$return = "<div class='parent_graph' style='width: " . ($params['width']) . ";" . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
 	if($params['show_legend']){
 		$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:" . $params['font_size'] ."pt !important;'></p>";
 	}
-
-	if(!isset($params['combined']) || !$params['combined']){
+	if(isset($params['graph_combined']) && $params['graph_combined'] &&
+		(!isset($params['from_interface']) || !$params['from_interface']) ){
+		$yellow_up      = 0;
+		$red_up         = 0;
+		$yellow_inverse = false;
+		$red_inverse    = false;
+	}
+	elseif(!isset($params['combined']) || !$params['combined']){
 		$yellow_threshold = $data_module_graph['w_min'];
 		$red_threshold    = $data_module_graph['c_min'];
 		// Get other required module datas to draw warning and critical
diff --git a/pandora_console/include/web2image.js b/pandora_console/include/web2image.js
index 85ae6ac37a..a57dd8376d 100644
--- a/pandora_console/include/web2image.js
+++ b/pandora_console/include/web2image.js
@@ -1,6 +1,6 @@
 var system = require('system');
 
-if (system.args.length < 3 || system.args.length > 9) {
+if (system.args.length < 3 || system.args.length > 10) {
 	phantom.exit(1);
 }
 
@@ -14,6 +14,7 @@ var url_module_list = system.args[5];
 var output_filename = system.args[6];
 var _width          = system.args[7];
 var _height         = system.args[8];
+var base_64         = system.args[9];
 
 if (!_width) {
 	_width = 750;
@@ -38,13 +39,17 @@ page.viewportSize = { width: _width, height: _height };
 //page.zoomFactor = 1.75;
 
 page.open(finish_url, function start(status) {
-	page.includeJs('./javascript/pandora.js');
+
 });
 
 page.onLoadFinished = function (status) {
-	page.render(output_filename, {format: 'png'});
-	//var base64 = page.renderBase64('JPG');
-	//console.log(base64);
+	if(!base_64){
+		page.render(output_filename, {format: 'png'});
+	}
+	else{
+		var base64 = page.renderBase64('png');
+		console.log(base64);
+	}
 	phantom.exit();
 }
 

From ea6f96e96b6f13f387353efdf900559a1e02aeb5 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 6 Jun 2018 17:53:52 +0200
Subject: [PATCH 134/146] fixed minor error api

---
 pandora_console/include/functions_api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 64f878a2ce..141cc2d499 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -10067,7 +10067,7 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
 		SECONDS_1HOUR; // 1 hour by default
 
 	$graph_threshold =
-		(!empty($other) && isset($other['data'][2]))
+		(!empty($other) && isset($other['data'][2]) && !$other['data'][2])
 		?
 		$other['data'][2]
 		:

From 867e00c50d3031c53fe9bf70f2ebc1b5ed642374 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 6 Jun 2018 18:00:44 +0200
Subject: [PATCH 135/146] fixed minor error

---
 pandora_console/include/functions_api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 141cc2d499..13716a6051 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -10067,7 +10067,7 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
 		SECONDS_1HOUR; // 1 hour by default
 
 	$graph_threshold =
-		(!empty($other) && isset($other['data'][2]) && !$other['data'][2])
+		(!empty($other) && isset($other['data'][2]) && $other['data'][2])
 		?
 		$other['data'][2]
 		:

From 18e047d25e8bb30f0c29c7680231a2914e84bd30 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 7 Jun 2018 00:01:25 +0200
Subject: [PATCH 136/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 1e9d2406aa..2d08284af1 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180606
+Version: 7.0NG.723-180607
 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 4fa597240a..a0c723fba1 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.723-180606"
+pandora_version="7.0NG.723-180607"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index f032d2a50a..e246c32c1b 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180606';
+use constant AGENT_BUILD => '180607';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 43dcb985e4..74adcd09b1 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.723
-%define release     180606
+%define release     180607
 
 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 578cd78be3..9e91de83b6 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.723
-%define release     180606
+%define release     180607
 
 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 7b55c70a81..c0908fa0af 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180606"
+PI_BUILD="180607"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index d2a5b668e2..a9e50f9b90 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180606}
+{180607}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index b016153392..00104d9bef 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.723(Build 180606)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180607)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index cfb2d2132b..7b394527da 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.723(Build 180606))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180607))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index a3efdcb53d..b409c17fc4 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180606
+Version: 7.0NG.723-180607
 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 e60fc01b8f..847bf8c362 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.723-180606"
+pandora_version="7.0NG.723-180607"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 8133327ee9..8292f8dea4 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180606';
+$build_version = 'PC180607';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 7439813a5b..2d0de691a3 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180606';
+$build = '180607';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 39dd420ef9..075442a981 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.723
-%define release     180606
+%define release     180607
 
 # 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 2ffdb761bb..0308ecbbb2 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.723
-%define release     180606
+%define release     180607
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 2409966ed2..9e961131f7 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180606
+Version: 7.0NG.723-180607
 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 d84ce9451e..120be92dd4 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.723-180606"
+pandora_version="7.0NG.723-180607"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index bead656698..b5afbc905c 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.723";
-my $pandora_build = "180606";
+my $pandora_build = "180607";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index d8579b2b5a..2f0abfffd8 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180606";
+my $pandora_build = "180607";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index a6ab0517e7..0975ba265a 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.723
-%define release     180606
+%define release     180607
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index b86f45e005..47852b76b3 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.723
-%define release     180606
+%define release     180607
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7e26828ce8..6f331da8ab 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180606"
+PI_BUILD="180607"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 5ed2f36f36..006eb9bbb2 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180606";
+my $version = "7.0NG.723 PS180607";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 60c2c5fdb2..792562bd68 100644
--- 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.723 PS180606";
+my $version = "7.0NG.723 PS180607";
 
 # save program name for logging
 my $progname = basename($0);

From 78348699779c6d23cdd2e2d1534515137ef4ab4e Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 7 Jun 2018 09:15:45 +0200
Subject: [PATCH 137/146] fixed water mark in graphs

---
 pandora_console/include/functions.php         |  1 +
 pandora_console/include/functions_graph.php   | 49 ++++++++++---------
 pandora_console/include/graphs/fgraph.php     |  2 +
 .../include/graphs/flot/pandora.flot.js       | 19 +++----
 .../include/graphs/functions_flot.php         |  4 +-
 .../include/graphs/functions_utils.php        |  5 +-
 6 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 5eb22d313b..622fbdba99 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3179,6 +3179,7 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined = fal
 		return $result;
 	}
 	else{
+		$config["temp_images"][] = $img_url;
 		return '<img src="' . $img_url . '" />';
 	}
 }
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 722854e481..48bab6cfdb 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -976,18 +976,6 @@ function grafico_modulo_sparse ($params) {
 		return $array_data;
 	}
 
-	//XXX
-	//esto lo tenia la bool
-	$water_mark = array(
-		'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
-		'url' => ui_get_full_url(
-			"/images/logo_vertical_water.png",
-			false,
-			false,
-			false
-		)
-	);
-
 	$series_type_array = series_type_graph_array(
 		$array_data,
 		$params
@@ -996,8 +984,17 @@ function grafico_modulo_sparse ($params) {
 	$series_type = $series_type_array['series_type'];
 	$legend = $series_type_array['legend'];
 
-	//esto la sparse
-	//setup_watermark($water_mark, $water_mark_file, $water_mark_url);
+	if($config["fixed_graph"] == false){
+		$water_mark = array(
+			'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
+			'url' => ui_get_full_url(
+				"/images/logo_vertical_water.png",
+				false,
+				false,
+				false
+			)
+		);
+	}
 
 	$data_module_graph['series_suffix'] = $series_suffix;
 
@@ -1318,12 +1315,11 @@ function graphic_combined_module (
 		$params['image_treshold'] = false;
 	}
 
-	$params['graph_combined'] = true;
-
 	if(!isset($params['show_unknown'])){
 		$params['show_unknown'] = false;
 	}
 
+	$params['graph_combined'] = true;
 	//XXXX
 	if($params['only_image']){
 		return generator_chart_to_pdf('combined', $params, $params_combined, $module_list);
@@ -1425,11 +1421,22 @@ function graphic_combined_module (
 	$ttl              = $params['ttl'];
 	$background_color = $params['backgroundColor'];
 	$datelimit        = $date_array["start_date"];
+	$fixed_font_size  = $config['font_size'];
 	$flash_charts     = false;
 
+	if($config["fixed_graph"] == false){
+		$water_mark = array(
+			'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
+			'url' => ui_get_full_url(
+				"/images/logo_vertical_water.png",
+				false,
+				false,
+				false
+			)
+		);
+	}
+
 	//XXX no se que hacen
-	$fixed_font_size = $config['font_size'];
-	$water_mark      = '';
 	$long_index      = '';
 	$color           = array();
 
@@ -1439,7 +1446,6 @@ function graphic_combined_module (
 		case CUSTOM_GRAPH_STACKED_AREA:
 		case CUSTOM_GRAPH_AREA:
 		case CUSTOM_GRAPH_LINE:
-
 			$date_array = array();
 			$date_array["period"]     = $params['period'];
 			$date_array["final_date"] = $params['date'];
@@ -1470,7 +1476,6 @@ function graphic_combined_module (
 				$data_module_graph['c_inv']    		 = $module_data['critical_inverse'];
 				$data_module_graph['module_id']      = $agent_module_id;
 
-
 				//stract data
 				$array_data_module = grafico_modulo_sparse_data(
 					$agent_module_id,
@@ -1546,7 +1551,6 @@ function graphic_combined_module (
 			$series_type = $series_type_array['series_type'];
 			$legend      = $series_type_array['legend'];
 
-			//XXXXXXREVISAR
 			$threshold_data = array();
 			if ($params_combined['from_interface']) {
 				$yellow_threshold = 0;
@@ -1656,7 +1660,7 @@ function graphic_combined_module (
 					$threshold_data['red_inverse'] = (bool)$red_inverse;
 				}
 
-				$show_elements_graph['threshold_data'] = $threshold_data;
+				$params['threshold_data'] = $threshold_data;
 			}
 
 			$output = area_graph(
@@ -1674,7 +1678,6 @@ function graphic_combined_module (
 			break;
 		case CUSTOM_GRAPH_BULLET_CHART_THRESHOLD:
 		case CUSTOM_GRAPH_BULLET_CHART:
-
 			if($params_combined['stacked'] == CUSTOM_GRAPH_BULLET_CHART_THRESHOLD){
 				$acumulador = 0;
 				foreach ($module_list as $module_item) {
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 3b717a8e02..3d48567e6a 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -230,6 +230,8 @@ function area_graph(
 
 	include_once('functions_flot.php');
 
+	//setup_watermark($water_mark, $water_mark_file, $water_mark_url);
+
 	return flot_area_graph(
 		$agent_module_id,
 		$array_data,
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index febf57da6a..cd95fe957b 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -857,7 +857,7 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 
 function pandoraFlotArea(
 	graph_id, values, legend, agent_module_id,
-	series_type, watermark, date_array,
+	series_type, water_mark, date_array,
 	data_module_graph, params,
 	force_integer,
 	background_color, legend_color, short_data,
@@ -900,7 +900,7 @@ function pandoraFlotArea(
 	//XXXX ver que hay que hacer
 	var labels_long   = '';
 	var min_check     = 0;
-	var water_mark    = '';
+
 	var legend_events = null;
 	var legend_alerts = null;
 
@@ -2303,9 +2303,11 @@ if (vconsole) {
 	}
 
 	if (!dashboard) {
-		if (water_mark)
+		if (water_mark){
+			console.log($('#watermark_image_'+graph_id));
 			set_watermark(graph_id, plot, $('#watermark_image_'+graph_id).attr('src'));
-		adjust_menu(graph_id, plot, parent_height, width, show_legend);
+		}
+		//adjust_menu(graph_id, plot, parent_height, width, show_legend);
 	}
 }
 
@@ -2340,22 +2342,21 @@ function adjust_menu(graph_id, plot, parent_height, width, show_legend) {
 }
 
 function set_watermark(graph_id, plot, watermark_src) {
-	console.log('entra por la watermark');
 	var img = new Image();
+
 	img.src = watermark_src;
 	var context = plot.getCanvas().getContext('2d');
 
 	// Once it's loaded draw the image on the canvas.
 	img.addEventListener('load', function () {
-		//~ // Now resize the image: x, y, w, h.
-
+		// Now resize the image: x, y, w, h.
 		var down_ticks_height = 0;
 		if ($('#'+graph_id+' .yAxis .tickLabel').eq(0).css('height') != undefined) {
 			down_ticks_height = $('#'+graph_id+' .yAxis .tickLabel').eq(0).css('height').split('px')[0];
 		}
 
-		var left_pos = parseInt(context.canvas.width - 3) - $('#watermark_image_'+graph_id)[0].width;
-		var top_pos  = 6;
+		var left_pos = parseInt(context.canvas.width) - $('#watermark_image_'+graph_id)[0].width - 30;
+		var top_pos  = 7;
 		//var top_pos = parseInt(context.canvas.height - down_ticks_height - 10) - $('#watermark_image_'+graph_id)[0].height;
 		//var left_pos = 380;
 		context.drawImage(this, left_pos, top_pos);
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 6b02ab3859..d4dff7d964 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -222,10 +222,8 @@ function flot_area_graph (
 						style='margin:0px; margin-top:30px; margin-bottom:50px; display:none; width: ".$params['width']."; height: 200px;'></div>";
 	}
 
-	//XXXXTODO
-	$water_mark = '';
 	if ($water_mark != '') {
-		$return .= "<div id='watermark_$graph_id' style='display:none; position:absolute;'><img id='watermark_image_$graph_id' src='$water_mark'></div>";
+		$return .= "<div id='watermark_$graph_id' style='display:none; position:absolute;'><img id='watermark_image_$graph_id' src='" . $water_mark['url'] . "'></div>";
 		$watermark = 'true';
 	}
 	else {
diff --git a/pandora_console/include/graphs/functions_utils.php b/pandora_console/include/graphs/functions_utils.php
index 983a785dc4..affb826857 100644
--- a/pandora_console/include/graphs/functions_utils.php
+++ b/pandora_console/include/graphs/functions_utils.php
@@ -136,17 +136,16 @@ function setup_watermark($water_mark, &$water_mark_file, &$water_mark_url) {
 	if (!is_array($water_mark)) {
 		$water_mark_file = $water_mark;
 		$water_mark_url = '';
-		
 		return;
 	}
-	
+
 	if (isset($water_mark['file'])) {
 		$water_mark_file = $water_mark['file'];
 	}
 	else {
 		$water_mark_file = '';
 	}
-	
+
 	if (isset($water_mark['url'])) {
 		$water_mark_url = $water_mark['url'];
 	}

From 2a9a7b931a3f1cd2a9ee25210d7535005bbb244d Mon Sep 17 00:00:00 2001
From: Fermin <mferminhh@gmail.com>
Date: Thu, 7 Jun 2018 10:03:27 +0200
Subject: [PATCH 138/146] Fixed visualconsole status modules and agents in
 metaconsole

---
 .../include/functions_visual_map.php          | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 7f970b2e04..7585002e76 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -3684,7 +3684,8 @@ function visual_map_get_layout_status ($id_layout = 0, $depth = 0, $elements_in_
 			'id_layout_linked_weight',
 			'id',
 			'id_layout',
-			'element_group'));
+			'element_group',
+			'id_metaconsole'));
 	if ($result === false)
 		return VISUAL_MAP_STATUS_NORMAL;
 		
@@ -3781,10 +3782,24 @@ function visual_map_get_layout_status ($id_layout = 0, $depth = 0, $elements_in_
 				}
 				// Module
 				elseif ($data["id_agente_modulo"] != 0) {
+					//Metaconsole db connection
+					if ($data['id_metaconsole'] != 0) {
+						$connection = db_get_row_filter ('tmetaconsole_setup',
+							array('id' => $data['id_metaconsole']));
+						if (metaconsole_load_external_db($connection) != NOERR) {
+							continue;
+						}
+					}
+
 					$status = modules_get_agentmodule_status($data["id_agente_modulo"]);
 					if ($status == 4){
 						$status = 3;
 					}
+
+					//Restore db connection
+					if ($data['id_metaconsole'] != 0) {
+						metaconsole_restore_db();
+					}
 				}
 				// Agent
 				else {
@@ -3792,8 +3807,20 @@ function visual_map_get_layout_status ($id_layout = 0, $depth = 0, $elements_in_
 					// ADDED NO CHECK ACL FOR AVOID CHECK TAGS THAT
 					// MAKE VERY SLOW THE VISUALMAPS WITH ACL TAGS
 					//--------------------------------------------------
-					
+					//Metaconsole db connection
+					if ($data['id_metaconsole'] != 0) {
+						$connection = db_get_row_filter ('tmetaconsole_setup',
+							array('id' => $data['id_metaconsole']));
+						if (metaconsole_load_external_db($connection) != NOERR) {
+							continue;
+						}
+					}
 					$status = agents_get_status($data["id_agent"], true);
+
+					//Restore db connection
+					if ($data['id_metaconsole'] != 0) {
+						metaconsole_restore_db();
+					}
 				}
 				break;
 		}

From 937cfb7d1e6db5dc0deb7b377eb5d331d421d5c0 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 8 Jun 2018 00:01:27 +0200
Subject: [PATCH 139/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 2d08284af1..5d8958f948 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180607
+Version: 7.0NG.723-180608
 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 a0c723fba1..5e2febe706 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.723-180607"
+pandora_version="7.0NG.723-180608"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index e246c32c1b..dcadefa2ba 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180607';
+use constant AGENT_BUILD => '180608';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 74adcd09b1..c59f875cfe 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.723
-%define release     180607
+%define release     180608
 
 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 9e91de83b6..4a20061599 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.723
-%define release     180607
+%define release     180608
 
 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 c0908fa0af..67ca387980 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180607"
+PI_BUILD="180608"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index a9e50f9b90..4557f54a8c 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180607}
+{180608}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 00104d9bef..7dd1399e83 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.723(Build 180607)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180608)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 7b394527da..644b66e72c 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.723(Build 180607))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180608))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b409c17fc4..9961a1695b 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180607
+Version: 7.0NG.723-180608
 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 847bf8c362..5d7bd7b7e0 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.723-180607"
+pandora_version="7.0NG.723-180608"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 8292f8dea4..f478bc5d84 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180607';
+$build_version = 'PC180608';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 2d0de691a3..29a7c144c8 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180607';
+$build = '180608';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 075442a981..5046b19198 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.723
-%define release     180607
+%define release     180608
 
 # 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 0308ecbbb2..958462e50b 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.723
-%define release     180607
+%define release     180608
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 9e961131f7..aa2422d032 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180607
+Version: 7.0NG.723-180608
 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 120be92dd4..265f518f8c 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.723-180607"
+pandora_version="7.0NG.723-180608"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index b5afbc905c..5352052b3e 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.723";
-my $pandora_build = "180607";
+my $pandora_build = "180608";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 2f0abfffd8..7097d31306 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180607";
+my $pandora_build = "180608";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 0975ba265a..18a0b8b9dd 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.723
-%define release     180607
+%define release     180608
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 47852b76b3..fb0f3d0903 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.723
-%define release     180607
+%define release     180608
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 6f331da8ab..a6acad3c8e 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180607"
+PI_BUILD="180608"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 006eb9bbb2..70fbba4362 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180607";
+my $version = "7.0NG.723 PS180608";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 792562bd68..72b903c9e2 100644
--- 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.723 PS180607";
+my $version = "7.0NG.723 PS180608";
 
 # save program name for logging
 my $progname = basename($0);

From eb7cdc7c907efb01c7ae862f565a2f25fa64c138 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 8 Jun 2018 08:58:18 +0200
Subject: [PATCH 140/146] fixed errors in graph delete to image pdf

---
 pandora_console/include/chart_generator.php   | 23 +++++--------
 pandora_console/include/functions.php         |  9 +++--
 pandora_console/include/functions_graph.php   | 16 +++------
 .../include/functions_reporting.php           | 22 +------------
 pandora_console/include/graphs/fgraph.php     | 33 ++++---------------
 .../include/graphs/flot/pandora.flot.js       |  9 ++---
 .../include/graphs/functions_flot.php         |  4 +--
 .../include/graphs/functions_utils.php        |  5 +--
 pandora_console/include/web2image.js          | 12 ++++---
 .../agentes/interface_traffic_graph_win.php   |  1 -
 .../operation/agentes/stat_win.php            |  7 ----
 .../operation/reporting/graph_viewer.php      |  2 --
 12 files changed, 41 insertions(+), 102 deletions(-)

diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
index bec06cfada..fef8d1abeb 100644
--- a/pandora_console/include/chart_generator.php
+++ b/pandora_console/include/chart_generator.php
@@ -12,15 +12,11 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// XXX
-/*
-if (! isset($_SESSION['id_usuario'])) {
-	session_start();
-	session_write_close();
-}
-*/
-
 // Global & session manageme
+session_id($_GET["session_id"]);
+session_start();
+session_write_close();
+
 require_once ('config.php');
 require_once ($config['homedir'] . '/include/auth/mysql.php');
 require_once ($config['homedir'] . '/include/functions.php');
@@ -32,8 +28,9 @@ require_once ($config['homedir'] . '/include/functions_modules.php');
 require_once ($config['homedir'] . '/include/functions_agents.php');
 require_once ($config['homedir'] . '/include/functions_tags.php');
 
-// XXX
-//check_login();
+check_login();
+
+global $config;
 
 /*
 $params_json = base64_decode((string) get_parameter('params'));
@@ -55,14 +52,14 @@ if ($config["metaconsole"] && !empty($server_id)) {
 		exit;
 	}
 }
-
+*/
 
 $user_language = get_user_language($config['id_user']);
 if (file_exists ('languages/'.$user_language.'.mo')) {
 	$l10n = new gettext_reader (new CachedFileReader ('languages/'.$user_language.'.mo'));
 	$l10n->load_tables();
 }
-*/
+
 ?>
 <!DOCTYPE>
 <html>
@@ -95,12 +92,10 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
 <?php
 
 		$params = json_decode($_GET['data'], true);
-        //XXXXXX
         $params['only_image'] = false;
 		$params['width']      = '1048';
 		$params['menu']       = false;
 
-		//cominadasssss
 		$params_combined = json_decode($_GET['data_combined'], true);
 		$module_list     = json_decode($_GET['data_module_list'], true);
 		$type_graph_pdf  = $_GET['type_graph_pdf'];
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 622fbdba99..c8a60c5a6d 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3147,7 +3147,7 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined = fal
 	$url      = $config["homeurl"] . "/include/chart_generator.php";
 	$img_file = "img_". uniqid()  .".png";
 	$img_path = $config["homedir"] . "/attachment/" . $img_file;
-	$img_url  = $config["homeurl"] . "/attachment/" . $img_file;
+	$img_url  = $config["homeurl"] . "attachment/" . $img_file;
 
 	$width_img  = 500;
 	$height_img = 450;
@@ -3162,6 +3162,8 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined = fal
 		$module_list = urlencode(json_encode($module_list));
 	}
 
+	$session_id = session_id();
+
 	$result = exec(
 		"phantomjs " . $file_js . " " .
 		$url . "  '" .
@@ -3171,7 +3173,8 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined = fal
 		$module_list . "' " .
 		$img_path . " " .
 		$width_img . " " .
-		$height_img . " " .
+		$height_img . " '" .
+		$session_id . "' " .
 		$params['return_img_base_64']
 	);
 
@@ -3179,7 +3182,7 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined = fal
 		return $result;
 	}
 	else{
-		$config["temp_images"][] = $img_url;
+		$config["temp_images"][] = $img_path;
 		return '<img src="' . $img_url . '" />';
 	}
 }
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 48bab6cfdb..d25fc71b09 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -240,7 +240,7 @@ function grafico_modulo_sparse_data_chart (
 		$data_module_graph['id_module_type'] == 10 ||
 		$data_module_graph['id_module_type'] == 33 ){
 
-//XXXXXXXXXXX
+//XXXXXXXXXXX SLICES
 /*
 "SELECT count(*) as data, min(utimestamp) as utimestamp
 					FROM tagente_datos_string
@@ -865,7 +865,6 @@ function grafico_modulo_sparse ($params) {
 	$params['font']       = $config['fontpath'];
 	$params['font-size']  = $config['font_size'];
 
-	//XXXXXXXXXXXX se devuelve phantom.js
 	if($params['only_image']){
 		return generator_chart_to_pdf('sparse', $params);
 	}
@@ -1151,7 +1150,7 @@ function graphic_combined_module (
 	$params,
 	$params_combined
 ) {
-	//XXX seteo todos los parametros
+
 	if(!isset($params_combined['from_interface'])){
 		$params_combined['from_interface'] = false;
 	}
@@ -1216,7 +1215,6 @@ function graphic_combined_module (
 	}
 
 
-	//XXX seteo los parametros
 	if(!isset($params['period'])){
 		return false;
 	}
@@ -1320,7 +1318,7 @@ function graphic_combined_module (
 	}
 
 	$params['graph_combined'] = true;
-	//XXXX
+
 	if($params['only_image']){
 		return generator_chart_to_pdf('combined', $params, $params_combined, $module_list);
 	}
@@ -1436,7 +1434,7 @@ function graphic_combined_module (
 		);
 	}
 
-	//XXX no se que hacen
+	//XXX arreglar estas
 	$long_index      = '';
 	$color           = array();
 
@@ -1765,7 +1763,6 @@ function graphic_combined_module (
 				}
 			}
 
-			//XXXX
 			$graph_values = $temp;
 
 			$width = 1024;
@@ -1857,7 +1854,6 @@ function graphic_combined_module (
 				$i++;
 			}
 
-			//XXXX
 			$graph_values = $temp;
 
 			$width = 200;
@@ -1926,7 +1922,6 @@ function graphic_combined_module (
 				}
 			}
 
-			//XXXX
 			$graph_values = $temp;
 
 			$width = 1024;
@@ -2046,7 +2041,6 @@ function graphic_combined_module (
 				}
 				$i++;
 
-				//XXXX
 				$graph_values = $temp;
 
 				return stacked_thermometers(
@@ -2129,7 +2123,6 @@ function graphic_combined_module (
 
 			$temp['total_modules'] = $total_modules;
 
-			//XXXX
 			$graph_values = $temp;
 
 			$width = 1024;
@@ -2319,7 +2312,6 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0, $return =
 		}
 	}
 
-	//XXXXX
 	if($config["fixed_graph"] == false){
 		$water_mark = array('file' =>
 			$config['homedir'] . "/images/logo_vertical_water.png",
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index df60e548ab..c17b4650af 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2805,21 +2805,6 @@ function agents_get_network_interfaces_array(
 				$row_interface['status'] = $interface['status_image'];
 				$row_interface['chart'] = null;
 
-				//XXXX ancho y largo
-				// Get chart
-				/*
-				reporting_set_conf_charts($width, $height, $only_image,
-					$type, $content, $ttl);
-
-				if (!empty($force_width_chart)) {
-					$width = $force_width_chart;
-				}
-
-				if (!empty($force_height_chart)) {
-					$height = $force_height_chart;
-				}
-				*/
-
 				$width = null;
 				$height = null;
 
@@ -3631,11 +3616,6 @@ function reporting_projection_graph($report, $content,
 
 	set_time_limit(500);
 
-	// Get chart
-	//reporting_set_conf_charts($width, $height, $only_image, $type,
-	//	$content, $ttl);
-
-	//XXXX width y height
 	switch ($type) {
 		case 'dinamic':
 		case 'static':
@@ -6505,7 +6485,7 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
 				'period'              => $content['period'],
 				'title'               => $label,
 				'avg_only'            => $only_avg,
-				'pure'                => false, //XXX
+				'pure'                => false,
 				'date'                => $report["datetime"],
 				'only_image'          => $only_image,
 				'homeurl'             => ui_get_full_url(false, false, false, false),
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 3d48567e6a..7ddd651830 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -172,8 +172,7 @@ function vbar_graph(
 	$backgroundColor = 'white',
 	$from_ux = false,
 	$from_wux = false,
-	$tick_color = 'white'
-) {
+	$tick_color = 'white') {
 
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
 
@@ -224,13 +223,12 @@ function area_graph(
 	$agent_module_id, $array_data,
 	$legend, $series_type, $date_array,
 	$data_module_graph, $params, $water_mark,
-	$array_events_alerts
-) {
+	$array_events_alerts) {
 	global $config;
 
 	include_once('functions_flot.php');
 
-	//setup_watermark($water_mark, $water_mark_file, $water_mark_url);
+	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
 
 	return flot_area_graph(
 		$agent_module_id,
@@ -276,15 +274,15 @@ function stacked_thermometers($flash_chart, $chart_data, $width, $height,
 	$color, $legend, $long_index, $no_data_image, $xaxisname = "",
 	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
 	$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white') {
-	
+
 	include_once('functions_d3.php');
-	
+
 	setup_watermark($water_mark, $water_mark_file, $water_mark_url);
-	
+
 	if (empty($chart_data)) {
 		return '<img src="' . $no_data_image . '" />';
 	}
-	
+
 	return d3_thermometers(
 			$chart_data,
 			$width,
@@ -323,23 +321,6 @@ function stacked_gauge($chart_data, $width, $height,
 	);
 }
 
-function kiviat_graph($graph_type, $flash_chart, $chart_data, $width,
-	$height, $no_data_image, $ttl = 1, $homedir="") {
-
-	if (empty($chart_data)) {
-		return '<img src="' . $no_data_image . '" />';
-	}
-
-	$graph = array();
-	$graph['data'] = $chart_data;
-	$graph['width'] = $width;
-	$graph['height'] = $height;
-
-	$id_graph = serialize_in_temp($graph, null, $ttl);
-
-	return "<img src='".$homedir."include/graphs/functions_pchart.php?static_graph=1&graph_type=".$graph_type."&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
-}
-
 function hbar_graph($flash_chart, $chart_data, $width, $height,
 	$color, $legend, $long_index, $no_data_image, $xaxisname = "",
 	$yaxisname = "", $water_mark = "", $font = '', $font_size = '',
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index cd95fe957b..e5fe88e073 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -859,9 +859,8 @@ function pandoraFlotArea(
 	graph_id, values, legend, agent_module_id,
 	series_type, water_mark, date_array,
 	data_module_graph, params,
-	force_integer,
-	background_color, legend_color, short_data,
-	events_array
+	force_integer, background_color,
+	legend_color, short_data, events_array
 ) {
 
 	//diferents vars
@@ -2397,8 +2396,6 @@ function get_event_details (event_ids) {
 	return table;
 }
 
-
-//XXXXXXXXXX
 //Ajusta la grafica pequenña con el desplazamiento del eje y
 function adjust_left_width_canvas(adapter_id, adapted_id) {
 	var adapter_left_margin = $('#'+adapter_id+' .yAxis .tickLabel').width();
@@ -2408,8 +2405,6 @@ function adjust_left_width_canvas(adapter_id, adapted_id) {
 	$('#'+adapted_id).css('margin-left', adapter_left_margin);
 }
 
-
-//XXXXXXXXXXX
 //Ajusta el ancho de la grafica pequeña con respecto a la grande
 function update_left_width_canvas(graph_id) {
 	$('#overview_'+graph_id).width($('#'+graph_id).width());
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index d4dff7d964..558078f05c 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -129,7 +129,6 @@ function flot_area_graph (
 			break;
 	}
 
-	///XXXXXXX los px caca
 	// Parent layer
 	$return = "<div class='parent_graph' style='width: " . ($params['width']) . ";" . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
@@ -205,7 +204,7 @@ function flot_area_graph (
 	if($params['type'] == 'area_simple'){
 		$return .= "noresizevc ";
 	}
-//XXXXXX  height: ".$params['height']."px;'
+
 	$return .= "graph" .$params['adapt_key'] ."'
 				style='	width: ".$params['width']."px;
 				height: ".$params['height']."px;'></div>";
@@ -257,7 +256,6 @@ function flot_area_graph (
 		$legend_color = "#A4A4A4";
 	}
 
-	//XXXX force_integer TODO
 	$force_integer = 0;
 
 	// Trick to get translated string from javascript
diff --git a/pandora_console/include/graphs/functions_utils.php b/pandora_console/include/graphs/functions_utils.php
index affb826857..983a785dc4 100644
--- a/pandora_console/include/graphs/functions_utils.php
+++ b/pandora_console/include/graphs/functions_utils.php
@@ -136,16 +136,17 @@ function setup_watermark($water_mark, &$water_mark_file, &$water_mark_url) {
 	if (!is_array($water_mark)) {
 		$water_mark_file = $water_mark;
 		$water_mark_url = '';
+		
 		return;
 	}
-
+	
 	if (isset($water_mark['file'])) {
 		$water_mark_file = $water_mark['file'];
 	}
 	else {
 		$water_mark_file = '';
 	}
-
+	
 	if (isset($water_mark['url'])) {
 		$water_mark_url = $water_mark['url'];
 	}
diff --git a/pandora_console/include/web2image.js b/pandora_console/include/web2image.js
index a57dd8376d..1dab3be266 100644
--- a/pandora_console/include/web2image.js
+++ b/pandora_console/include/web2image.js
@@ -1,6 +1,6 @@
 var system = require('system');
 
-if (system.args.length < 3 || system.args.length > 10) {
+if (system.args.length < 3 || system.args.length > 11) {
 	phantom.exit(1);
 }
 
@@ -14,7 +14,9 @@ var url_module_list = system.args[5];
 var output_filename = system.args[6];
 var _width          = system.args[7];
 var _height         = system.args[8];
-var base_64         = system.args[9];
+var session_id      = system.args[9];
+var base_64         = system.args[10];
+
 
 if (!_width) {
 	_width = 750;
@@ -28,11 +30,13 @@ if(type_graph_pdf == 'combined'){
 	finish_url = url + "?" + "data=" + url_params +
 				"&data_combined=" + url_params_comb +
 				"&data_module_list=" + url_module_list +
-				"&type_graph_pdf=" + type_graph_pdf;
+				"&type_graph_pdf=" + type_graph_pdf +
+				"&session_id=" + session_id;
 }
 else{
 	finish_url = url + "?" + "data=" + url_params +
-				"&type_graph_pdf=" + type_graph_pdf;
+				"&type_graph_pdf=" + type_graph_pdf +
+				"&session_id=" + session_id;
 }
 
 page.viewportSize = { width: _width, height: _height };
diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php
index 7b36546fd9..04a0316355 100644
--- a/pandora_console/operation/agentes/interface_traffic_graph_win.php
+++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php
@@ -192,7 +192,6 @@ $interface_traffic_modules = array(
 		else
 			echo '<div style="margin-left: 50px; padding-top: 10px;">';
 
-		//XXXXXXX width and height
 		$height = 400;
 		$width  = '90%';
 
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index d8a0bdd3f6..f433fb626a 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -154,13 +154,6 @@ $alias    = db_get_value ("alias","tagente","id_agente",$id_agent);
 
 		$period = get_parameter ("period");
 		$id     = get_parameter ("id", 0);
-
-//XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-		/*
-		$width = get_parameter ("width", STATWIN_DEFAULT_CHART_WIDTH);
-		$height = get_parameter ("height", STATWIN_DEFAULT_CHART_HEIGHT);
-		*/
-
 		$label = get_parameter ("label", "");
 		$label_graph = base64_decode(get_parameter ("label", ""));
 		$start_date = get_parameter ("start_date", date("Y/m/d"));
diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php
index f4973eec8f..970d36c994 100644
--- a/pandora_console/operation/reporting/graph_viewer.php
+++ b/pandora_console/operation/reporting/graph_viewer.php
@@ -190,8 +190,6 @@ if ($view_graph) {
 		$options
 	);
 
-
-	//XXXX el width y height
 	$width = null;
 	$height = null;
 	$params =array(

From f85a8b513ad0917e6f91d2794bade1faf8301cd1 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 8 Jun 2018 14:30:15 +0200
Subject: [PATCH 141/146] fixed errors

---
 pandora_console/include/functions.php         | 239 +++----
 pandora_console/include/functions_db.php      |   2 -
 pandora_console/include/functions_graph.php   |  48 +-
 pandora_console/include/graphs/fgraph.php     |   3 +-
 .../flot/jquery.flot.exportdata.pandora.js    |   8 +-
 .../include/graphs/flot/pandora.flot.js       |  25 +-
 .../include/graphs/functions_flot.php         |   4 +-
 .../include/graphs/functions_pchart.php       | 588 +-----------------
 pandora_console/include/javascript/pandora.js |   1 -
 .../operation/reporting/graph_viewer.php      |   1 -
 10 files changed, 161 insertions(+), 758 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index c8a60c5a6d..efa5e49263 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2824,183 +2824,165 @@ function validate_address($address){
 	return true;
 }
 
-function color_graph_array($series_suffix, $compare = false){
+function color_graph_array(){
 	global $config;
 
-	//////////////////////////////////////////////////
-	// Color commented not to restrict serie colors //
-	//////////////////////////////////////////////////
 	$color_series = array();
+
 	$color_series[0] = array(
 		'border' => '#000000',
 		'color' => $config['graph_color1'],
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
+
+	//XXX Hablar con Sancho del tema de los slices
+	/*
+		$color_series[1] = array(
+			'border' => '#000000',
+			'color' => $config['graph_color2'],
+			'alpha' => CHART_DEFAULT_ALPHA
+		);
+		$color_series[2] = array(
+			'border' => '#000000',
+			'color' => $config['graph_color3'],
+			'alpha' => CHART_DEFAULT_ALPHA
+		);
+	*/
+
 	$color_series[1] = array(
-		'border' => '#000000',
-		'color' => $config['graph_color2'],
-		'alpha' => CHART_DEFAULT_ALPHA
-	);
-	$color_series[2] = array(
-		'border' => '#000000',
-		'color' => $config['graph_color3'],
-		'alpha' => CHART_DEFAULT_ALPHA
-	);
-	$color_series[3] = array(
 		'border' => '#000000',
 		'color' => $config['graph_color4'],
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
-	$color_series[4] = array(
+	$color_series[2] = array(
 		'border' => '#000000',
 		'color' => $config['graph_color5'],
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
-	$color_series[5] = array(
+	$color_series[3] = array(
 		'border' => '#000000',
 		'color' => $config['graph_color6'],
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
-	$color_series[6] = array(
+	$color_series[4] = array(
 		'border' => '#000000',
 		'color' => $config['graph_color7'],
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
-	$color_series[7] = array(
+	$color_series[5] = array(
 		'border' => '#000000',
 		'color' => $config['graph_color8'],
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
-	$color_series[8] = array(
+	$color_series[6] = array(
 		'border' => '#000000',
 		'color' => $config['graph_color9'],
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
-	$color_series[9] = array(
+	$color_series[7] = array(
 		'border' => '#000000',
 		'color' => $config['graph_color10'],
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
-	$color_series[11] = array(
+	$color_series[8] = array(
 		'border' => '#000000',
 		'color' => COL_GRAPH9,
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
-	$color_series[12] = array(
+	$color_series[9] = array(
 		'border' => '#000000',
 		'color' => COL_GRAPH10,
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
-	$color_series[13] = array(
+	$color_series[10] = array(
 		'border' => '#000000',
 		'color' => COL_GRAPH11,
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
-	$color_series[14] = array(
+	$color_series[11] = array(
 		'border' => '#000000',
 		'color' => COL_GRAPH12,
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
-	$color_series[15] = array(
+	$color_series[12] = array(
 		'border' => '#000000',
 		'color' => COL_GRAPH13,
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
 
+	//XXX Colores fijos para eventos, alertas, desconocidos, percentil, overlapped, summatory, average, projection
+	$color_series['event'] = array(
+		'border' => '#ff0000',
+		'color' => '#ff66cc',
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
 
-/*
-	if($id_widget_dashboard){
-		$opcion = unserialize(db_get_value_filter('options','twidget_dashboard',array('id' => $id_widget_dashboard)));
-		foreach ($module_list as $key => $value) {
-			if(!empty($opcion[$value])){
-				$color[$key]['color'] = $opcion[$value];
+	$color_series['alert'] = array(
+		'border' => '#ffff00',
+		'color' => '#ffff00',
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+
+	$color_series['unknown'] = array(
+		'border' => '#999999',
+		'color' => '#E1E1E1',
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+
+	$color_series['percentil'] = array(
+		'border' => '#000000',
+		'color' => '#003333',
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+
+	$color_series['projection'] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color8'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+
+	$color_series['overlapped'] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color9'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+
+	$color_series['summatory'] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color7'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+
+	$color_series['average'] = array(
+		'border' => '#000000',
+		'color' => $config['graph_color10'],
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+
+	$color_series['no_data'] = array(
+		'border' => '#000000',
+		'color' => '#f2c40e',
+		'alpha' => CHART_DEFAULT_ALPHA
+	);
+
+	$color_series['unit'] = array(
+		'border' => null,
+		'color' => '#0097BC',
+		'alpha' => 10
+	);
+	//XXXXXXXX
+	/*
+		if($id_widget_dashboard){
+			$opcion = unserialize(db_get_value_filter('options','twidget_dashboard',array('id' => $id_widget_dashboard)));
+			foreach ($module_list as $key => $value) {
+				if(!empty($opcion[$value])){
+					$color[$key]['color'] = $opcion[$value];
+				}
 			}
 		}
-	}
-*/
+	*/
 
-	if(!$compare) {
-		$color['event' . $series_suffix] =
-			array(	'border' => '#ff0000',
-					'color' => '#ff0000',
-					'alpha' => CHART_DEFAULT_ALPHA
-			);
-
-		$color['alert' . $series_suffix] =
-			array(	'border' => '#ff7f00',
-					'color' => '#ff7f00',
-					'alpha' => CHART_DEFAULT_ALPHA
-			);
-
-		$color['unknown' . $series_suffix] =
-			array(	'border' => '#999999',
-					'color' => '#999999',
-					'alpha' => CHART_DEFAULT_ALPHA
-			);
-
-		$color['no_data'.$series_suffix] =
-			array(	'border' => '#000000',
-					'color' => '#f2c40e',
-					'alpha' => CHART_DEFAULT_ALPHA
-				);
-
-		$color['sum'.$series_suffix] =
-			$color_series[$series_suffix];
-
-		$color['unit'.$series_suffix] =
-			array(	'border' => null,
-					'color' => '#0097BC',
-					'alpha' => 10
-				);
-
-		$color['percentil'.$series_suffix] =
-			array(	'border' => '#000000',
-					'color' => '#0097BC',
-					'alpha' => CHART_DEFAULT_ALPHA
-				);
-	}
-	else{
-		$color['event' . $series_suffix] =
-			array(	'border' => '#ff0000',
-					'color' => '#ff66cc',
-					'alpha' => CHART_DEFAULT_ALPHA
-			);
-
-		$color['alert' . $series_suffix] =
-			array(	'border' => '#ffff00',
-					'color' => '#ffff00',
-					'alpha' => CHART_DEFAULT_ALPHA
-			);
-
-		$color['unknown' . $series_suffix] =
-			array(	'border' => '#999999',
-					'color' => '#E1E1E1',
-					'alpha' => CHART_DEFAULT_ALPHA
-			);
-
-		$color['no_data'.$series_suffix] =
-			array(	'border' => '#000000',
-					'color' => '#f2c40e',
-					'alpha' => CHART_DEFAULT_ALPHA
-				);
-
-		$color['sum'.$series_suffix] =
-			$color_series[$series_suffix];
-
-		$color['unit'.$series_suffix] =
-			array(	'border' => null,
-					'color' => '#0097BC',
-					'alpha' => 10
-				);
-
-		$color['percentil'.$series_suffix] =
-			array(	'border' => '#000000',
-					'color' => '#003333',
-					'alpha' => CHART_DEFAULT_ALPHA
-				);
-	}
-
-	return $color;
+	return $color_series;
 }
 
 function series_type_graph_array($data, $show_elements_graph){
@@ -3021,6 +3003,8 @@ function series_type_graph_array($data, $show_elements_graph){
 		$type_graph = $show_elements_graph['type_graph'];
 	}
 
+	$color_series = color_graph_array();
+	$i = 0;
 	if(isset($data) && is_array($data)){
 		foreach ($data as $key => $value) {
 			if($show_elements_graph['compare'] == 'overlapped'){
@@ -3031,11 +3015,13 @@ function series_type_graph_array($data, $show_elements_graph){
 
 			if(strpos($key, 'summatory') !== false){
 				$data_return['series_type'][$key] = $type_graph;
-				$data_return['legend'][$key] = __('Summatory series') . ' ' . $str;
+				$data_return['legend'][$key]      = __('Summatory series') . ' ' . $str;
+				$data_return['color'][$key]       = $color_series['summatory'];
 			}
 			elseif(strpos($key, 'average') !== false){
 				$data_return['series_type'][$key] = $type_graph;
-				$data_return['legend'][$key] = __('Average series') . ' ' . $str;
+				$data_return['legend'][$key]      = __('Average series') . ' ' . $str;
+				$data_return['color'][$key]       = $color_series['average'];
 			}
 			elseif(strpos($key, 'sum') !== false || strpos($key, 'baseline') !== false){
 				switch ($value['id_module_type']) {
@@ -3085,24 +3071,37 @@ function series_type_graph_array($data, $show_elements_graph){
 							)
 						) . ' ' . $str;
 				}
+
+				if($show_elements_graph['compare'] == 'overlapped'){
+					$data_return['color'][$key] = $color_series['overlapped'];
+				}
+				else{
+					$data_return['color'][$key] = $color_series[$i];
+					$i++;
+				}
 			}
 			elseif(strpos($key, 'event') !== false){
 				$data_return['series_type'][$key] = 'points';
 				if($show_elements_graph['show_events']){
 					$data_return['legend'][$key] = __('Events') . ' ' . $str;
 				}
+
+				$data_return['color'][$key] = $color_series['event'];
 			}
 			elseif(strpos($key, 'alert') !== false){
 				$data_return['series_type'][$key] = 'points';
 				if($show_elements_graph['show_alerts']){
 					$data_return['legend'][$key] = __('Alert') . ' ' . $str;
 				}
+
+				$data_return['color'][$key] = $color_series['alert'];
 			}
 			elseif(strpos($key, 'unknown') !== false){
 				$data_return['series_type'][$key] = 'unknown';
 				if($show_elements_graph['show_unknown']){
 					$data_return['legend'][$key] = __('Unknown') . ' ' . $str;
 				}
+				$data_return['color'][$key] =$color_series['unknown'];
 			}
 			elseif(strpos($key, 'percentil') !== false){
 				$data_return['series_type'][$key] = 'percentil';
@@ -3125,14 +3124,18 @@ function series_type_graph_array($data, $show_elements_graph){
 													)
 												) . ' ' . $str;
 				}
+				$data_return['color'][$key] =$color_series['percentil'];
 			}
 			elseif(strpos($key, 'projection') !== false){
 				$data_return['series_type'][$key] = $type_graph;
-				$data_return['legend'][$key] = __('Projection') . ' ' . $str;
+				$data_return['legend'][$key]      = __('Projection') . ' ' . $str;
+				$data_return['color'][$key]       = $color_series['projection'];
 			}
 			else{
 				$data_return['series_type'][$key] = $type_graph;
 				$data_return['legend'][$key] = $key;
+				$data_return['color'][$key] = $color_series[$i];
+				$i++;
 			}
 		}
 		return $data_return;
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 06bab4adb7..95541218ae 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -918,8 +918,6 @@ function db_uncompress_module_data($id_agente_modulo, $tstart = false, $tend = f
 		array_push($return, $end_array);
 	}
 
-	// html_debug_print($return);
-
 	return $return;
 }
 
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index d25fc71b09..0c1a45caad 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -417,7 +417,7 @@ function grafico_modulo_sparse_data(
 		return false;
 	}
 
-	//XXX Para un tipo de reports en concreto habria que optimizar que la tabla que crea coincida con los datos documentar
+	//XXX Esto es para un tipo especifico de report que consiste en pasarle un intervalo y hacer suma media y avg.
 	if($params['force_interval'] != ''){
 		$period_time_interval = $date_array['period'] * 1000;
 		$start_period = $date_array['start_date'] * 1000;
@@ -646,17 +646,6 @@ function grafico_modulo_sparse_data(
 		return $array_data;
 	}
 
-	$color = color_graph_array(
-		$series_suffix,
-		$params['flag_overlapped']
-	);
-
-	foreach ($color as $k => $v) {
-		if(is_array($array_data[$k])){
-			$array_data[$k]['color'] = $v['color'];
-		}
-	}
-
 	$array_events_alerts[$series_suffix] = $events;
 
 	return $array_data;
@@ -981,7 +970,8 @@ function grafico_modulo_sparse ($params) {
 	);
 
 	$series_type = $series_type_array['series_type'];
-	$legend = $series_type_array['legend'];
+	$legend      = $series_type_array['legend'];
+	$color       = $series_type_array['color'];
 
 	if($config["fixed_graph"] == false){
 		$water_mark = array(
@@ -1005,6 +995,7 @@ function grafico_modulo_sparse ($params) {
 				$array_data,
 				$legend,
 				$series_type,
+				$color,
 				$date_array,
 				$data_module_graph,
 				$params,
@@ -1024,13 +1015,15 @@ function grafico_modulo_sparse ($params) {
 			);
 
 			$series_type = $series_type_array['series_type'];
-			$legend = $series_type_array['legend'];
+			$legend      = $series_type_array['legend'];
+			$color       = $series_type_array['color'];
 
 			$return .= area_graph(
 				$agent_module_id,
 				$array_data_prev,
 				$legend,
 				$series_type,
+				$color,
 				$date_array,
 				$data_module_graph,
 				$params,
@@ -1049,6 +1042,7 @@ function grafico_modulo_sparse ($params) {
 				$array_data,
 				$legend,
 				$series_type,
+				$color,
 				$date_array,
 				$data_module_graph,
 				$params,
@@ -1436,7 +1430,6 @@ function graphic_combined_module (
 
 	//XXX arreglar estas
 	$long_index      = '';
-	$color           = array();
 
 	switch ($params_combined['stacked']) {
 		default:
@@ -1501,17 +1494,6 @@ function graphic_combined_module (
 
 				$percentil_value = $array_data['percentil' . $i]['data'][0][1];
 
-				$color = color_graph_array(
-					$series_suffix,
-					$params['flag_overlapped']
-				);
-
-				foreach ($color as $k => $v) {
-					if(is_array($array_data[$k])){
-						$array_data[$k]['color'] = $v['color'];
-					}
-				}
-
 				if($config["fixed_graph"] == false){
 					$water_mark = array(
 						'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
@@ -1548,6 +1530,7 @@ function graphic_combined_module (
 
 			$series_type = $series_type_array['series_type'];
 			$legend      = $series_type_array['legend'];
+			$color       = $series_type_array['color'];
 
 			$threshold_data = array();
 			if ($params_combined['from_interface']) {
@@ -1666,6 +1649,7 @@ function graphic_combined_module (
 				$array_data,
 				$legend,
 				$series_type,
+				$color,
 				$date_array,
 				$data_module_graph,
 				$params,
@@ -1768,6 +1752,8 @@ function graphic_combined_module (
 			$width = 1024;
 			$height = 50;
 
+			$color = color_graph_array();
+
 			$output = stacked_bullet_chart(
 				$graph_values,
 				$width,
@@ -1856,6 +1842,8 @@ function graphic_combined_module (
 
 			$graph_values = $temp;
 
+			$color = color_graph_array();
+
 			$width = 200;
 			$height = 200;
 
@@ -1922,6 +1910,8 @@ function graphic_combined_module (
 				}
 			}
 
+			$color = color_graph_array();
+
 			$graph_values = $temp;
 
 			$width = 1024;
@@ -2041,6 +2031,8 @@ function graphic_combined_module (
 				}
 				$i++;
 
+				$color = color_graph_array();
+
 				$graph_values = $temp;
 
 				return stacked_thermometers(
@@ -2125,9 +2117,11 @@ function graphic_combined_module (
 
 			$graph_values = $temp;
 
-			$width = 1024;
+			$width  = 1024;
 			$height = 500;
 
+			$color  = color_graph_array();
+
 			$output = ring_graph(
 				true,
 				$graph_values,
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 7ddd651830..9639ac210d 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -221,7 +221,7 @@ function vbar_graph(
 
 function area_graph(
 	$agent_module_id, $array_data,
-	$legend, $series_type, $date_array,
+	$legend, $series_type, $color, $date_array,
 	$data_module_graph, $params, $water_mark,
 	$array_events_alerts) {
 	global $config;
@@ -235,6 +235,7 @@ function area_graph(
 		$array_data,
 		$legend,
 		$series_type,
+		$color,
 		$date_array,
 		$data_module_graph,
 		$params,
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 3150dce94d..d5ad78cf05 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
@@ -213,10 +213,9 @@
 			}
 			catch (e) {
 				alert('There was an error exporting the data');
-				console.log(e);
 			}
 		}
-		
+
 		plot.exportDataJSON = function (args) {
 			//amount = plot.getOptions().export.type,
 			//options = options || {};
@@ -261,7 +260,7 @@
 			// Throw errors
 			var processDataObject = function (dataObject) {
 				var result;
-console.log(dataObject);
+
 				if (typeof dataObject === 'undefined')
 					throw new Error('Empty parameter');
 
@@ -404,11 +403,10 @@ console.log(dataObject);
 			}
 			catch (e) {
 				alert('There was an error exporting the data');
-				console.log(e);
 			}
 		}
 	}
-    
+
     $.plot.plugins.push({
         init: init,
         options: options,
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index e5fe88e073..62fa929de7 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -302,15 +302,14 @@ function pandoraFlotPieCustom(graph_id, values, labels, width,
 			$(this).text(legend[j]);
 			j++;
 		});
-		
+
 		if ($('input[name="custom_graph"]').val()) {
 			$('.legend>div').css('right',($('.legend>div').height()*-1));
 			$('.legend>table').css('right',($('.legend>div').height()*-1));
 		}
 		//$('.legend>table').css('border',"1px solid #E2E2E2");
 		$('.legend>table').css('background-color',"transparent");
-		
-		
+
 		var pielegends = $('#'+graph_id+' .pieLabelBackground');
 		pielegends.each(function () {
 			$(this).css('transform', "rotate(-35deg)").css('color', 'black');
@@ -324,7 +323,8 @@ function pandoraFlotPieCustom(graph_id, values, labels, width,
 }
 
 function pandoraFlotHBars(graph_id, values, labels, water_mark,
-	maxvalue, water_mark, separator, separator2, font, font_size, background_color, tick_color, min, max) {
+	maxvalue, water_mark, separator, separator2, font, font_size,
+	background_color, tick_color, min, max) {
 
 	var colors_data = ['#FC4444','#FFA631','#FAD403','#5BB6E5','#F2919D','#80BA27'];
 	values = values.split(separator2);
@@ -857,7 +857,7 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 
 function pandoraFlotArea(
 	graph_id, values, legend, agent_module_id,
-	series_type, water_mark, date_array,
+	series_type, color, water_mark, date_array,
 	data_module_graph, params,
 	force_integer, background_color,
 	legend_color, short_data, events_array
@@ -896,14 +896,9 @@ function pandoraFlotArea(
 	//XXXXX
 	var markins_graph    = true;
 
-	//XXXX ver que hay que hacer
-	var labels_long   = '';
-	var min_check     = 0;
-
 	var legend_events = null;
 	var legend_alerts = null;
 
-
 	// If threshold and up are the same, that critical or warning is disabled
 	if (yellow_threshold == yellow_up){
 		yellow_inverse = false;
@@ -1481,7 +1476,7 @@ function pandoraFlotArea(
 			}
 		}
 	}
-console.log(type);
+
 	switch (type) {
 		case 'line':
 		case 2:
@@ -1510,6 +1505,7 @@ console.log(type);
 
 	i=0;
 	$.each(values, function (index, value) {
+		
 		if (typeof value.data !== "undefined") {
 			if(index.search("alert") >= 0){
 				fill_color = '#ff7f00';
@@ -1562,11 +1558,11 @@ console.log(type);
 			//in graph stacked unset percentil
 			if(	! ( (type == 1) && ( /percentil/.test(index) ) == true ) &&
 				! ( (type == 3) && ( /percentil/.test(index) ) == true )   ){
-				data_base.push({
+					data_base.push({
 					id: 'serie_' + i,
 					data: value.data,
 					label: index,
-					color: value.color,
+					color: color[index]['color'],
 					lines: {
 						show: line_show,
 						fill: filled,
@@ -1672,7 +1668,7 @@ console.log(type);
 			$('#'+graph_id).css('height', hDiff);
 		}
 	}
-console.log(vconsole);
+
 /*	
 if (vconsole) {
 		var myCanvas = plot.getCanvas();
@@ -2303,7 +2299,6 @@ if (vconsole) {
 
 	if (!dashboard) {
 		if (water_mark){
-			console.log($('#watermark_image_'+graph_id));
 			set_watermark(graph_id, plot, $('#watermark_image_'+graph_id).attr('src'));
 		}
 		//adjust_menu(graph_id, plot, parent_height, width, show_legend);
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 558078f05c..0621de88cd 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -102,7 +102,7 @@ function include_javascript_dependencies_flot_graph($return = false) {
 ///////////////////////////////
 function flot_area_graph (
 	$agent_module_id, $array_data,
-	$legend, $series_type, $date_array,
+	$legend, $series_type, $color, $date_array,
 	$data_module_graph, $params, $water_mark,
 	$array_events_alerts ) {
 
@@ -270,6 +270,7 @@ function flot_area_graph (
 	$values              = json_encode($array_data);
 	$legend              = json_encode($legend);
 	$series_type         = json_encode($series_type);
+	$color               = json_encode($color);
 	$date_array          = json_encode($date_array);
 	$data_module_graph   = json_encode($data_module_graph);
 	$params 			 = json_encode($params);
@@ -285,6 +286,7 @@ function flot_area_graph (
 		"JSON.parse('$legend'), \n" .
 		"'$agent_module_id', \n" .
 		"JSON.parse('$series_type'), \n" .
+		"JSON.parse('$color'), \n" .
 		"'$watermark', \n" .
 		"JSON.parse('$date_array'), \n" .
 		"JSON.parse('$data_module_graph'), \n" .
diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php
index e987e5ab5b..8ce6faeaa5 100644
--- a/pandora_console/include/graphs/functions_pchart.php
+++ b/pandora_console/include/graphs/functions_pchart.php
@@ -382,14 +382,7 @@ switch ($graph_type) {
 			$font, $antialiasing, $rgb_color, $xaxisname, $yaxisname, false,
 			$legend, $fine_colors, $water_mark, $font_size);
 		break;
-	case 'stacked_area':
-	case 'area':
-	case 'line':
-		pch_vertical_graph($graph_type, $data_keys, $data_values, $width,
-			$height, $rgb_color, $xaxisname, $yaxisname, false, $legend,
-			$font, $antialiasing, $water_mark, $font_size,
-			$backgroundColor, $unit, $series_type, $graph_threshold, $id_module);
-		break;
+	default:
 	case 'threshold':
 		pch_threshold_graph($graph_type, $data_keys, $data_values, $width,
 			$height, $font, $antialiasing, $xaxisname, $yaxisname, $title,
@@ -875,585 +868,6 @@ function pch_bar_graph ($graph_type, $index, $data, $width, $height, $font,
 	$myPicture->stroke(); 
 }
 
-function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
-	$rgb_color = false, $xaxisname = "", $yaxisname = "", $show_values = false,
-	$legend = array(), $font, $antialiasing, $water_mark = '', $font_size,
-	$backgroundColor = 'white', $unit = '', $series_type = array(),
-	$graph_threshold = false, $id_module) {
-
-	global $config;
-
-	/* Create and populate the pData object */
-	$MyData = new pData();
-	$MyData->addPoints(array(20,22,25,5,12,8,30,8),"Probe 1");
-	//$MyData->addPoints(array(3,12,15,8,8,5,-5),"Probe 2");
-	$MyData->setSerieTicks("Probe 2",4);
-	$MyData->setAxisName(0,"Temperatures");
-	$MyData->addPoints(array(1296299019,1296302903,1296307001,1296308071,1296309901,1296318931, 1296318941, 1296318942,1296338941),"Labels");
-	$MyData->setSerieDescription("Labels","Timestamp");
-	$MyData->setXAxisDisplay(AXIS_FORMAT_DATE,"H:i");
-	$MyData->setAbscissa("Labels");
-
-	/* Create the pChart object */
-	$myPicture = new pImage(700,230,$MyData);
-
-	/* Draw the background */
-	$Settings = array("R"=>170, "G"=>183, "B"=>87);
-	$myPicture->drawFilledRectangle(0,0,700,230,$Settings);
-
-	/* Overlay with a gradient */
-	$Settings = array("StartR"=>219, "StartG"=>231, "StartB"=>139, "EndR"=>1, "EndG"=>138, "EndB"=>68, "Alpha"=>50);
-	$myPicture->drawGradientArea(0,0,700,230,DIRECTION_VERTICAL,$Settings);
-	$myPicture->drawGradientArea(0,0,700,20,DIRECTION_VERTICAL,array("StartR"=>0,"StartG"=>0,"StartB"=>0,"EndR"=>50,"EndG"=>50,"EndB"=>50,"Alpha"=>80));
-
-	/* Add a border to the picture */
-	$myPicture->drawRectangle(0,0,699,229,array("R"=>0,"G"=>0,"B"=>0));
-
-	/* Write the picture title */
-	$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
-	$myPicture->drawText(10,13,"drawStepChart() - draw a step chart",array("R"=>255,"G"=>255,"B"=>255));
-
-	/* Write the chart title */
-	$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
-	$myPicture->drawText(250,55,"Average temperature",array("FontSize"=>20,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-
-	/* Draw the scale and the 1st chart */
-	$myPicture->setGraphArea(60,60,450,190);
-	$myPicture->drawFilledRectangle(60,60,450,190,array("R"=>255,"G"=>255,"B"=>255,"Surrounding"=>-200,"Alpha"=>10));
-	$myPicture->drawScale(array("DrawSubTicks"=>TRUE,"LabelShowBoundaries"=>TRUE,"ScaleModeAuto"=>TRUE));
-	$myPicture->setShadow(TRUE,array("X"=>1,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
-	$myPicture->setFontProperties(array("FontName" =>$font, "FontSize" => $font_size));
-	$myPicture->drawAreaChart(array("BreakVoid"=>FALSE, "BreakR"=>234, "BreakG"=>55, "BreakB"=>26, "DisplayValues"=>FALSE,"DisplayColor"=>DISPLAY_AUTO,"ScaleModeAuto"=>TRUE));
-	$myPicture->setShadow(FALSE);
-
-	/* Write the chart legend */
-	$myPicture->drawLegend(510,205,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL));
-
-	$myPicture->stroke();
-
-
-
-
-/*
-	// CAT:Vertical Charts
-	if (!is_array($legend) || empty($legend)) {
-		unset($legend);
-	}
-	if (is_array(reset($data))) {
-		$data2 = array();
-		foreach ($data as $i =>$values) {
-			$c = 0;
-			foreach ($values as $i2 => $value) {
-				$data2[$i2][$i] = $value;
-				$c++;
-			}
-		}
-		$data = $data2;
-	}
-	else {
-		$data = array($data);
-	}
-
-	// Create and populate the pData object
-	$MyData = new pData();
-
-	foreach ($data as $i => $values) {
-		if (isset($legend)) {
-			$point_id = $legend[$i];
-			// Translate the id of serie to legend of id
-			if (!empty($series_type)) {
-				if (!isset($series_type[$point_id])) {
-					$series_type[$point_id] = $series_type[$i];
-					unset($series_type[$i]);
-				}
-			}
-		}
-		else {
-			$point_id = $i;
-		}
-
-		$MyData->addPoints($values, $point_id);
-
-		if (!empty($rgb_color)) {
-			$MyData->setPalette($point_id,
-				array(
-					"R" => $rgb_color[$i]['color']["R"],
-					"G" => $rgb_color[$i]['color']["G"],
-					"B" => $rgb_color[$i]['color']["B"],
-					"BorderR" => $rgb_color[$i]['border']["R"],
-					"BorderG" => $rgb_color[$i]['border']["G"],
-					"BorderB" => $rgb_color[$i]['border']["B"],
-					"Alpha" => $rgb_color[$i]['alpha']));
-			$palette_color = array();
-			if (isset($rgb_color[$i]['color'])) {
-				$palette_color["R"] = $rgb_color[$i]['color']["R"];
-				$palette_color["G"] = $rgb_color[$i]['color']["G"];
-				$palette_color["B"] = $rgb_color[$i]['color']["B"];
-			}
-			if (isset($rgb_color[$i]['color'])) {
-				$palette_color["BorderR"] = $rgb_color[$i]['border']["R"];
-				$palette_color["BorderG"] = $rgb_color[$i]['border']["G"];
-				$palette_color["BorderB"] = $rgb_color[$i]['border']["B"];
-			}
-			if (isset($rgb_color[$i]['color'])) {
-				$palette_color["Alpha"] = $rgb_color[$i]['Alpha'];
-			}
-
-			$MyData->setPalette($point_id, $palette_color);
-		}
-		// The weight of the line is not calculated in pixels, so it needs to be transformed
-		$reduction_coefficient = 0.31;
-		$MyData->setSerieWeight($point_id, $config['custom_graph_width'] * $reduction_coefficient);
-	}
-	$MyData->setAxisName(0,$unit);
-	$MyData->addPoints($index,"Xaxis");
-	$MyData->setSerieDescription("Xaxis", $xaxisname);
-	$MyData->setAbscissa("Xaxis");
-	$MyData->setAxisDisplay(0, AXIS_FORMAT_TWO_SIGNIFICANT, 0);
-
-	switch ($backgroundColor) {
-		case 'white':
-			$transparent = false;
-			$fontColor = array('R' => 0, 'G' => 0, 'B' => 0);
-			break;
-		case 'black':
-			$transparent = false;
-			$fontColor = array('R' => 200, 'G' => 200, 'B' => 200);
-			break;
-		case 'transparent':
-			$transparent = true;
-			// $fontColor = array('R' => 0, 'G' => 0, 'B' => 0);
-			// Now the color of the text will be grey
-			$fontColor = array('R' => 200, 'G' => 200, 'B' => 200);
-			break;
-	}
-	//Create the pChart object
-	$myPicture = new pImage($width, $height + $font_size, $MyData, $transparent,
-		$backgroundColor, $fontColor);
-
-	// Turn of Antialiasing
-	$myPicture->Antialias = $antialiasing;
-
-	// Add a border to the picture
-	//$myPicture->drawRectangle(0,0,$width,$height,array("R"=>0,"G"=>0,"B"=>0));
-
-	//Set the default font
-	$myPicture->setFontProperties(
-		array("FontName" =>$font, "FontSize" => $font_size));
-
-	// By default, set a top margin of 5 px
-	$top_margin = 5;
-	if (isset($legend)) {
-		//Set horizontal legend if is posible
-		$legend_mode = LEGEND_HORIZONTAL;
-		$size = $myPicture->getLegendSize(
-			array("Style" => LEGEND_NOBORDER,"Mode" => $legend_mode));
-		if ($size['Width'] > ($width - 5)) {
-			$legend_mode = LEGEND_VERTICAL;
-			$size = $myPicture->getLegendSize(array("Style"=>LEGEND_NOBORDER,"Mode"=>$legend_mode));
-		}
-
-		// Update the top margin to add the legend Height
-		$top_margin = $size['Height'];
-
-		//Write the chart legend
-		$myPicture->drawLegend($width - $size['Width'], 8,
-			array("Style" => LEGEND_NOBORDER, "Mode" => $legend_mode));
-	}
-
-	//Calculate the bottom margin from the size of string in each index
-	$max_chars = graph_get_max_index($index);
-	$margin_bottom = $font_size * $max_chars;
-
-	$water_mark_height = 0;
-	$water_mark_width = 0;
-	if (!empty($water_mark)) {
-		$size_water_mark = getimagesize($water_mark);
-		$water_mark_height = $size_water_mark[1];
-		$water_mark_width = $size_water_mark[0];
-
-		$myPicture->drawFromPNG(
-			($width - $water_mark_width),
-			$top_margin,
-			$water_mark);
-	}
-
-	// Get the max number of scale
-	$max_all = 0;
-
-	$serie_ne_zero = false;
-	foreach ($data as $serie) {
-		$max_this_serie = max($serie);
-		if ($max_this_serie > $max_all) {
-			$max_all = $max_this_serie;
-		}
-		// Detect if all serie is equal to zero or not
-		if ($serie != 0)
-			$serie_ne_zero = true;
-	}
-
-	// Get the number of digits of the scale
-	$digits_left = 0;
-	while ($max_all > 1) {
-		$digits_left ++;
-		$max_all /= 10;
-	}
-
-	// If the number is less than 1 we count the decimals
-	// Also check if the serie is not all equal to zero (!$serie_ne_zero)
-	if ($digits_left == 0 and !$serie_ne_zero) {
-		while($max_all < 1) {
-			$digits_left ++;
-			$max_all *= 10;
-		}
-	}
-
-	$chart_size = ($digits_left * $font_size) + 20;
-
-	$min_data = 0;
-	$max_data = 0;
-	foreach ($data as $k => $v) {
-		if(min($v) < $min_data){
-			$min_data = min($v);
-		}
-		if(max($v) > $max_data){
-			$max_data = max($v);
-		}
-	}
-	$chart_margin = 36;
-
-	//Area depends on yaxisname
-	if ($yaxisname != '') {
-		$chart_margin += $chart_size;
-	}
-
-	$myPicture->setGraphArea($chart_margin, $top_margin,
-		$width,
-		($height - $margin_bottom));
-
-	if($graph_threshold){
-		$sql_treshold = 'select min_critical, max_critical, min_warning, max_warning, critical_inverse, warning_inverse from tagente_modulo where id_agente_modulo =' . $id_module;
-		$treshold_position = db_get_all_rows_sql($sql_treshold);
-
-		//min, max and inverse critical and warning
-		$p_min_crit = $treshold_position[0]['min_critical'];
-		$p_max_crit = $treshold_position[0]['max_critical'];
-		$p_inv_crit = $treshold_position[0]['critical_inverse'];
-		$p_min_warn = $treshold_position[0]['min_warning'];
-		$p_max_warn = $treshold_position[0]['max_warning'];
-		$p_inv_warn = $treshold_position[0]['warning_inverse'];
-
-		//interval warning
-		$print_rectangle_warning = 1;
-		if($p_min_warn == "0.00" && $p_max_warn == "0.00" && $p_inv_warn == 0){
-			$print_rectangle_warning = 0;
-		}
-		if($print_rectangle_warning){
-			if($p_inv_warn){
-				if($p_max_warn == 0){
-					$p_max_warn = $p_min_warn;
-					$p_min_warn = "none";
-				}
-				else{
-					$p_max_warn_inv = $p_min_warn;
-					$p_min_warn_inv = $min_data + 2;
-
-					$p_min_warn = $p_max_warn;
-					if($p_max_warn > $max_data){
-						$p_max_warn = $p_max_warn + 21;
-					}
-					else{
-						$p_max_warn = $max_data + 21;
-					}
-				}
-			}
-			else{
-				if($p_max_warn == 0){
-					if($max_data > $p_min_warn){
-						$p_max_warn = $max_data + 21;
-					}
-					else{
-						$p_max_warn = $p_min_warn + 21;
-					}
-				}
-			}
-		}
-
-		//interval critical
-		$print_rectangle_critical = 1;
-		if($p_min_crit == "0.00" && $p_max_crit == "0.00" && $p_inv_crit == 0){
-			$print_rectangle_critical = 0;
-		}
-
-		if($print_rectangle_critical){
-			if($p_inv_crit){
-				if($p_max_crit == 0){
-					$p_max_crit = $p_min_crit;
-					$p_min_crit = "none";
-				}
-				else{
-					$p_max_crit_inv = $p_min_crit;
-					$p_min_crit_inv = $min_data + 2;
-
-					$p_min_crit = $p_max_crit;
-					if($p_inv_warn){
-						if($p_max_crit < $p_max_warn){
-							$p_max_crit = $p_max_warn;
-						}
-					}
-					else{
-						if($p_max_crit > $max_data){
-							$p_max_crit = $p_max_crit + 21;
-						}
-						else{
-							$p_max_crit = $max_data + 21;
-						}
-					}
-				}
-			}
-			else{
-				if($p_max_crit == 0){
-					if($p_max_warn > $p_min_crit){
-						$p_max_crit = $p_max_warn;
-					}
-					else{
-						if($max_data > $p_min_crit){
-							$p_max_crit = $max_data + 21;
-						}
-						else{
-							$p_max_crit = $p_min_crit + 21;
-						}
-					} 
-				}
-			}
-		}
-
-		//Check size scale
-		//Which of the thresholds is higher?
-		if($p_max_crit > $p_max_warn){
-			$check_scale = $p_max_crit;
-		}
-		else{
-			$check_scale = $p_max_warn;
-		}
-
-		if($p_min_crit < $p_min_warn){
-			$check_scale_min = $p_min_crit;
-		}
-		else{
-			$check_scale_min = $p_min_warn;
-		}
-
-		//Is the threshold higher than our maximum?
-		if($max_data > $check_scale){
-			$check_scale = $max_data;
-		}
-
-		if($min_data < $check_scale_min){
-			$check_scale_min = $min_data;
-		}
-
-		$ManualScale = array( 0 => array("Min" => $check_scale_min, "Max" => $check_scale) );
-		$mode = SCALE_MODE_MANUAL;
-
-		// Draw the scale
-		$scaleSettings = array(
-			"GridR" => 200,
-			"GridG" => 200,
-			"GridB" => 200,
-			"GridAlpha" => 30,
-			"DrawSubTicks" => true,
-			"CycleBackground" => true,
-			"BackgroundAlpha1" => 35,
-			"BackgroundAlpha2" => 35,
-			"Mode" => $mode,
-			"ManualScale" => $ManualScale,
-			"LabelRotation" => 40,
-			"XMargin" => 0,
-			"MinDivHeight" => 15,
-			"TicksFontSize" => $font_size - 1);
-
-		$scaleSettings['AxisR'] = '200';
-		$scaleSettings['AxisG'] = '200';
-		$scaleSettings['AxisB'] = '200';
-		$scaleSettings['TickR'] = '200';
-		$scaleSettings['TickG'] = '200';
-		$scaleSettings['TickB'] = '200';
-
-		$myPicture->drawScale($scaleSettings);
-
-
-		//values
-		$scale_max   = $myPicture->DataSet->Data["Axis"][0]["ScaleMax"];
-		$scale_min   = $myPicture->DataSet->Data["Axis"][0]["ScaleMin"];
-
-		$position_y1 = $myPicture->GraphAreaY1;
-		$position_y2 = $myPicture->GraphAreaY2;
-
-		$position1   = $myPicture->GraphAreaX1;
-		$position3   = $myPicture->GraphAreaX2;
-
-		$cte = ($position_y2 - $position_y1) / ($scale_max - $scale_min);
-
-		//warning
-		if($print_rectangle_warning){
-			$RectangleSettings = array("R"=>255,"G"=>255,"B"=>000,"Dash"=>TRUE,"DashR"=>170,"DashG"=>220,"DashB"=>190);
-			if($p_min_warn == "none"){
-				$p_min_warn = $scale_min;
-			}
-
-			$position2 = ($scale_max - $p_min_warn)*$cte + $position_y1;
-			$position4 = ($scale_max - $p_max_warn)*$cte + $position_y1;
-
-			$myPicture->drawFilledRectangle($position1, floor($position2),
-											$position3, floor($position4),
-											$RectangleSettings);
-			if($p_inv_warn){
-				$position2 = ($scale_max - $p_min_warn_inv)*$cte + $position_y1;
-				$position4 = ($scale_max - $p_max_warn_inv)*$cte + $position_y1;
-				$myPicture->drawFilledRectangle($position1, floor($position2),
-												$position3, floor($position4),
-												$RectangleSettings);
-			}
-		}
-
-		//critical
-		if($print_rectangle_critical){
-			$RectangleSettings = array("R"=>248,"G"=>000,"B"=>000,"Dash"=>TRUE,"DashR"=>170,"DashG"=>220,"DashB"=>190);
-
-			if($p_min_crit == "none"){
-				$p_min_crit = $scale_min;
-			}
-
-			$position2 = ($scale_max - $p_min_crit)*$cte + $position_y1;
-			$position4 = ($scale_max - $p_max_crit)*$cte + $position_y1;
-			$myPicture->drawFilledRectangle($position1, $position2,
-											$position3, $position4,
-											$RectangleSettings);
-
-			if($p_inv_crit){
-				$position2 = ($scale_max - $p_min_crit_inv)*$cte + $position_y1;
-				$position4 = ($scale_max - $p_max_crit_inv)*$cte + $position_y1;
-				$myPicture->drawFilledRectangle($position1, $position2,
-												$position3, $position4,
-												$RectangleSettings);
-			}
-		}
-
-	}
-	else{
-
-		$ManualScale = array( 0 => array(
-			"Min" => $min_data,
-			"Max" => $max_data
-		));
-		//html_debug("MAX: $max_data, ROUND: $max_round", true);
-		$mode = SCALE_MODE_MANUAL;
-
-		//Draw the scale
-		$scaleSettings = array(
-			"GridR" => 200,
-			"GridG" => 200,
-			"GridB" => 200,
-			"GridAlpha" => 30,
-			"DrawSubTicks" => true,
-			"CycleBackground" => true,
-			"BackgroundAlpha1" => 35,
-			"BackgroundAlpha2" => 35,
-			"Mode" => $mode,
-			"ManualScale" => $ManualScale,
-			"LabelRotation" => 40,
-			"XMargin" => 0,
-			"MinDivHeight" => 15,
-			"TicksFontSize" => $font_size - 1);
-
-		$scaleSettings['AxisR'] = '200';
-		$scaleSettings['AxisG'] = '200';
-		$scaleSettings['AxisB'] = '200';
-		$scaleSettings['TickR'] = '200';
-		$scaleSettings['TickG'] = '200';
-		$scaleSettings['TickB'] = '200';
-
-		$myPicture->drawScale($scaleSettings);
-	}
-
-	//Turn on shadow computing
-	//$myPicture->setShadow(TRUE,array("X"=>0,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
-
-	switch ($graph_type) {
-		case 'stacked_area':
-			$ForceTransparency = "-1";
-			break;
-		default:
-			$ForceTransparency = "100";
-			break;
-	}
-
-	//Draw the chart
-	$settings = array(
-		"ForceTransparency" => 20,
-		"Gradient" => TRUE,
-		"GradientMode" => GRADIENT_EFFECT_CAN,
-		"DisplayValues" => $show_values,
-		"DisplayZeroValues" => FALSE,
-		"DisplayR" => 100,
-		"DisplayZeros" => FALSE,
-		"DisplayG" => 100,
-		"DisplayB" => 100,
-		"DisplayShadow" => TRUE,
-		"Surrounding" => 5,
-		"AroundZero" => TRUE);
-
-	if (empty($series_type)) {
-		switch($graph_type) {
-			case "stacked_area":
-			case "area":
-				$myPicture->drawAreaChart($settings);
-				break;
-			case "line":
-				$myPicture->drawLineChart($settings);
-				break;
-		}
-	}
-	else {
-		// Hiden all series for to show each serie as type
-		foreach ($series_type as $id => $type) {
-			$MyData->setSerieDrawable($id, false);
-		}
-		foreach ($series_type as $id => $type) {
-			$MyData->setSerieDrawable($id, true); //Enable the serie to paint
-			switch ($type) {
-				default:
-				case 'area':
-					$myPicture->drawAreaChart($settings);
-					break;
-				//~ case "points":
-					//~ $myPicture->drawPlotChart($settings);
-					//~ break;
-				case "line":
-					$myPicture->drawLineChart($settings);
-					break;
-				case 'boolean':
-					switch($graph_type) {
-						case "stacked_area":
-						case "area":
-							$myPicture->drawFilledStepChart($settings);
-							break;
-						case "line":
-							$myPicture->drawStepChart($settings);
-							break;
-					}
-					break;
-			}
-			$MyData->setSerieDrawable($id, false); //Disable the serie to paint the rest
-		}
-	}
-
-	//Render the picture
-	$myPicture->stroke();
-*/
-}
-
 function pch_threshold_graph ($graph_type, $index, $data, $width, $height, $font,
 	$antialiasing, $xaxisname = "", $yaxisname = "", $title = "",
 	$show_values = false, $show_legend = false, $font_size) {
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index af4373bbab..3ad835115d 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -637,7 +637,6 @@ function post_process_select_init_unit(name,selected) {
 	$('#' + name + '_select').change(function() {
 		var value = $('#' + name + '_select').val();
 		$('#' + name + '_select option[value='+ value +']').attr("selected",true);
-		console.log(value);
 	});
 	
 }
diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php
index 970d36c994..eb08db35e3 100644
--- a/pandora_console/operation/reporting/graph_viewer.php
+++ b/pandora_console/operation/reporting/graph_viewer.php
@@ -334,7 +334,6 @@ if ($view_graph) {
 
 	$("#stacked").change(function(){
 		if ($(this).val() == '4') {
-			console.log($(this).val());
 			$("#thresholdDiv").show();
 			$(".stacked").show();
 		} else {

From 14dd0e222b3f82036cfa5709085e5efd55118b0d Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 9 Jun 2018 00:01:27 +0200
Subject: [PATCH 142/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 5d8958f948..a3161afa06 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180608
+Version: 7.0NG.723-180609
 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 5e2febe706..11829c65cc 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.723-180608"
+pandora_version="7.0NG.723-180609"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index dcadefa2ba..2c72a1188b 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180608';
+use constant AGENT_BUILD => '180609';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index c59f875cfe..d2a4b53fea 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.723
-%define release     180608
+%define release     180609
 
 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 4a20061599..1625489051 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.723
-%define release     180608
+%define release     180609
 
 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 67ca387980..350d107aec 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180608"
+PI_BUILD="180609"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 4557f54a8c..035ef5da42 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180608}
+{180609}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 7dd1399e83..1e1fd60404 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.723(Build 180608)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180609)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 644b66e72c..a0c155435b 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.723(Build 180608))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180609))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 9961a1695b..a645133fc2 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180608
+Version: 7.0NG.723-180609
 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 5d7bd7b7e0..4a73228db5 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.723-180608"
+pandora_version="7.0NG.723-180609"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index f478bc5d84..0643714047 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180608';
+$build_version = 'PC180609';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 29a7c144c8..158085b15b 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180608';
+$build = '180609';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 5046b19198..8c79f90d18 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.723
-%define release     180608
+%define release     180609
 
 # 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 958462e50b..7dede613a9 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.723
-%define release     180608
+%define release     180609
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index aa2422d032..cdb108c163 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180608
+Version: 7.0NG.723-180609
 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 265f518f8c..5d64ba65fa 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.723-180608"
+pandora_version="7.0NG.723-180609"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 5352052b3e..f9b33bd4b6 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.723";
-my $pandora_build = "180608";
+my $pandora_build = "180609";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 7097d31306..00d4801aba 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180608";
+my $pandora_build = "180609";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 18a0b8b9dd..7ddd00a4b0 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.723
-%define release     180608
+%define release     180609
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index fb0f3d0903..b5e6b52fa6 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.723
-%define release     180608
+%define release     180609
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index a6acad3c8e..c9cb2a6723 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180608"
+PI_BUILD="180609"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 70fbba4362..79d388d1ee 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180608";
+my $version = "7.0NG.723 PS180609";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 72b903c9e2..e66729035c 100644
--- 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.723 PS180608";
+my $version = "7.0NG.723 PS180609";
 
 # save program name for logging
 my $progname = basename($0);

From 10e95bf4476748b4250fab8719fa411c158650c4 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 10 Jun 2018 00:01:23 +0200
Subject: [PATCH 143/146] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index a3161afa06..6d4217a368 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.723-180609
+Version: 7.0NG.723-180610
 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 11829c65cc..63cc81da53 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.723-180609"
+pandora_version="7.0NG.723-180610"
 
 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/pandora_agent b/pandora_agents/unix/pandora_agent
index 2c72a1188b..2abd6bf5b9 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.723';
-use constant AGENT_BUILD => '180609';
+use constant AGENT_BUILD => '180610';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index d2a4b53fea..10211d1acf 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.723
-%define release     180609
+%define release     180610
 
 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 1625489051..c258129bcc 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.723
-%define release     180609
+%define release     180610
 
 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 350d107aec..dd1c31f324 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180609"
+PI_BUILD="180610"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 035ef5da42..057730abde 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180609}
+{180610}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 1e1fd60404..844b3e7ed7 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.723(Build 180609)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180610)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index a0c155435b..3a12cc8e1c 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.723(Build 180609))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180610))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index a645133fc2..d1e1ddab89 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.723-180609
+Version: 7.0NG.723-180610
 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 4a73228db5..f6dce85044 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.723-180609"
+pandora_version="7.0NG.723-180610"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 0643714047..ecf7370ac7 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180609';
+$build_version = 'PC180610';
 $pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 158085b15b..db842e141e 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.723';
-$build = '180609';
+$build = '180610';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 8c79f90d18..704bd9855b 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.723
-%define release     180609
+%define release     180610
 
 # 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 7dede613a9..fd430be9b8 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.723
-%define release     180609
+%define release     180610
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index cdb108c163..0d067878df 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.723-180609
+Version: 7.0NG.723-180610
 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 5d64ba65fa..aa4ff0e903 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.723-180609"
+pandora_version="7.0NG.723-180610"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index f9b33bd4b6..0f336f9504 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.723";
-my $pandora_build = "180609";
+my $pandora_build = "180610";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 00d4801aba..a89c04cc6b 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.723";
-my $pandora_build = "180609";
+my $pandora_build = "180610";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 7ddd00a4b0..e2a2549b17 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.723
-%define release     180609
+%define release     180610
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index b5e6b52fa6..ba9cfeb2e2 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.723
-%define release     180609
+%define release     180610
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index c9cb2a6723..a7dc5911a3 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.723"
-PI_BUILD="180609"
+PI_BUILD="180610"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 79d388d1ee..c6ac32e295 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.723 PS180609";
+my $version = "7.0NG.723 PS180610";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index e66729035c..7f9ef047de 100644
--- 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.723 PS180609";
+my $version = "7.0NG.723 PS180610";
 
 # save program name for logging
 my $progname = basename($0);

From 5d727a1e8f091f78bb287899d58b10e45ec98cb1 Mon Sep 17 00:00:00 2001
From: Junichi Satoh <junichi@rworks.jp>
Date: Mon, 11 Jun 2018 15:02:42 +0900
Subject: [PATCH 144/146] Updated Japanese translation.

---
 pandora_console/include/languages/ja.mo |   Bin 557034 -> 584522 bytes
 pandora_console/include/languages/ja.po | 28961 ++++++++++++----------
 2 files changed, 16189 insertions(+), 12772 deletions(-)

diff --git a/pandora_console/include/languages/ja.mo b/pandora_console/include/languages/ja.mo
index 3bc25c7f1d21f3634f2a4d66c80e68fa31def75c..d9d18d600ed3cea6e8ef4d21828ff360d12f7f67 100644
GIT binary patch
delta 172400
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

delta 149583
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
E2g$d)UH||9

diff --git a/pandora_console/include/languages/ja.po b/pandora_console/include/languages/ja.po
index ff869226f6..ef9f55463a 100644
--- a/pandora_console/include/languages/ja.po
+++ b/pandora_console/include/languages/ja.po
@@ -7,47 +7,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pandora-fms\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-04-26 08:46+0200\n"
-"PO-Revision-Date: 2017-05-26 07:35+0000\n"
+"POT-Creation-Date: 2018-03-14 10:58+0100\n"
+"PO-Revision-Date: 2018-06-10 08:00+0000\n"
 "Last-Translator: Junichi Satoh <junichi@rworks.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-05-26 07:42+0000\n"
-"X-Generator: Launchpad (build 18391)\n"
+"X-Launchpad-Export-Date: 2018-06-11 05:48+0000\n"
+"X-Generator: Launchpad (build 18684)\n"
 
 #: ../../extensions/agents_alerts.php:55
-#: ../../extensions/agents_modules.php:57
+#: ../../extensions/agents_modules.php:55
 #: ../../operation/agentes/group_view.php:61
 #: ../../operation/agentes/tactical.php:46
 #: ../../enterprise/extensions/ipam/ipam_list.php:188
+#: ../../enterprise/godmode/reporting/cluster_view.php:254
 #: ../../enterprise/operation/services/services.list.php:345
 #: ../../enterprise/operation/services/services.service.php:144
 msgid "Last update"
 msgstr "最終更新"
 
-#: ../../extensions/agents_alerts.php:74
-#: ../../extensions/agents_modules.php:113 ../../general/ui/agents_list.php:69
+#: ../../extensions/agents_alerts.php:95
+#: ../../extensions/agents_modules.php:138 ../../general/ui/agents_list.php:69
 #: ../../godmode/agentes/agent_incidents.php:89
-#: ../../godmode/agentes/agent_manager.php:270
-#: ../../godmode/agentes/configurar_agente.php:363
-#: ../../godmode/agentes/modificar_agente.php:145
-#: ../../godmode/agentes/modificar_agente.php:489
-#: ../../godmode/agentes/planned_downtime.editor.php:480
-#: ../../godmode/agentes/planned_downtime.editor.php:754
+#: ../../godmode/agentes/agent_manager.php:254
+#: ../../godmode/agentes/configurar_agente.php:386
+#: ../../godmode/agentes/modificar_agente.php:156
+#: ../../godmode/agentes/modificar_agente.php:473
+#: ../../godmode/agentes/planned_downtime.editor.php:495
+#: ../../godmode/agentes/planned_downtime.editor.php:780
 #: ../../godmode/agentes/planned_downtime.list.php:393
 #: ../../godmode/alerts/alert_actions.php:341
 #: ../../godmode/alerts/alert_special_days.php:246
-#: ../../godmode/alerts/alert_templates.php:299
+#: ../../godmode/alerts/alert_templates.php:300
 #: ../../godmode/alerts/configure_alert_action.php:116
 #: ../../godmode/alerts/configure_alert_special_days.php:69
-#: ../../godmode/alerts/configure_alert_template.php:751
+#: ../../godmode/alerts/configure_alert_template.php:754
 #: ../../godmode/events/custom_events.php:80
 #: ../../godmode/events/custom_events.php:156
 #: ../../godmode/events/event_edit_filter.php:226
 #: ../../godmode/events/event_filter.php:109
-#: ../../godmode/events/event_responses.editor.php:81
+#: ../../godmode/events/event_responses.editor.php:82
 #: ../../godmode/events/event_responses.list.php:56
 #: ../../godmode/gis_maps/configure_gis_map.php:366
 #: ../../godmode/massive/massive_add_action_alerts.php:151
@@ -55,13 +56,13 @@ msgstr "最終更新"
 #: ../../godmode/massive/massive_add_profiles.php:89
 #: ../../godmode/massive/massive_add_tags.php:124
 #: ../../godmode/massive/massive_copy_modules.php:71
-#: ../../godmode/massive/massive_copy_modules.php:182
+#: ../../godmode/massive/massive_copy_modules.php:187
 #: ../../godmode/massive/massive_delete_action_alerts.php:151
 #: ../../godmode/massive/massive_delete_agents.php:105
 #: ../../godmode/massive/massive_delete_alerts.php:212
 #: ../../godmode/massive/massive_delete_profiles.php:103
-#: ../../godmode/massive/massive_edit_agents.php:207
-#: ../../godmode/massive/massive_edit_agents.php:298
+#: ../../godmode/massive/massive_edit_agents.php:260
+#: ../../godmode/massive/massive_edit_agents.php:353
 #: ../../godmode/massive/massive_enable_disable_alerts.php:136
 #: ../../godmode/massive/massive_standby_alerts.php:136
 #: ../../godmode/modules/manage_network_components.php:479
@@ -70,46 +71,51 @@ msgstr "最終更新"
 #: ../../godmode/modules/manage_network_templates_form.php:202
 #: ../../godmode/modules/manage_network_templates_form.php:269
 #: ../../godmode/modules/manage_network_templates_form.php:302
-#: ../../godmode/netflow/nf_edit.php:119
+#: ../../godmode/netflow/nf_edit.php:120
 #: ../../godmode/netflow/nf_edit_form.php:193
-#: ../../godmode/reporting/graph_builder.main.php:116
-#: ../../godmode/reporting/graphs.php:155
-#: ../../godmode/reporting/map_builder.php:208
-#: ../../godmode/reporting/reporting_builder.item_editor.php:868
+#: ../../godmode/reporting/create_container.php:228
+#: ../../godmode/reporting/create_container.php:478
+#: ../../godmode/reporting/create_container.php:559
+#: ../../godmode/reporting/graph_builder.main.php:127
+#: ../../godmode/reporting/graphs.php:158
+#: ../../godmode/reporting/map_builder.php:235
+#: ../../godmode/reporting/map_builder.php:259
+#: ../../godmode/reporting/reporting_builder.item_editor.php:907
 #: ../../godmode/reporting/reporting_builder.main.php:69
-#: ../../godmode/reporting/reporting_builder.php:431
-#: ../../godmode/reporting/reporting_builder.php:561
+#: ../../godmode/reporting/reporting_builder.php:465
+#: ../../godmode/reporting/reporting_builder.php:595
 #: ../../godmode/reporting/visual_console_builder.elements.php:77
-#: ../../godmode/reporting/visual_console_builder.elements.php:193
+#: ../../godmode/reporting/visual_console_builder.elements.php:198
+#: ../../godmode/reporting/visual_console_favorite.php:58
 #: ../../godmode/servers/manage_recontask.php:296
 #: ../../godmode/servers/manage_recontask_form.php:312
 #: ../../godmode/setup/gis.php:63 ../../godmode/setup/gis_step_2.php:153
 #: ../../godmode/setup/news.php:164
 #: ../../godmode/snmpconsole/snmp_alert.php:657
-#: ../../godmode/users/configure_user.php:624
-#: ../../godmode/users/user_list.php:227
-#: ../../include/functions_visual_map.php:2761
+#: ../../godmode/users/configure_user.php:738
+#: ../../godmode/users/user_list.php:225
+#: ../../include/functions_pandora_networkmap.php:1636
+#: ../../include/functions_pandora_networkmap.php:1822
+#: ../../include/functions_container.php:132
 #: ../../include/functions_events.php:38
-#: ../../include/functions_events.php:2437
-#: ../../include/functions_events.php:3557
-#: ../../include/functions_visual_map_editor.php:61
-#: ../../include/functions_visual_map_editor.php:336
-#: ../../include/functions_visual_map_editor.php:656
-#: ../../include/functions_graph.php:5546
-#: ../../include/functions_groups.php:745
-#: ../../include/functions_networkmap.php:1721
-#: ../../include/functions_pandora_networkmap.php:1389
-#: ../../include/functions_pandora_networkmap.php:1575
-#: ../../include/functions_reporting_html.php:2079
-#: ../../include/functions_reporting_html.php:2114
-#: ../../mobile/operation/agents.php:75 ../../mobile/operation/agents.php:120
-#: ../../mobile/operation/agents.php:124 ../../mobile/operation/agents.php:175
-#: ../../mobile/operation/agents.php:176 ../../mobile/operation/agents.php:317
-#: ../../mobile/operation/alerts.php:84 ../../mobile/operation/alerts.php:88
-#: ../../mobile/operation/alerts.php:178 ../../mobile/operation/alerts.php:179
-#: ../../mobile/operation/events.php:361 ../../mobile/operation/events.php:365
-#: ../../mobile/operation/events.php:501 ../../mobile/operation/events.php:604
-#: ../../mobile/operation/events.php:605
+#: ../../include/functions_events.php:2536
+#: ../../include/functions_events.php:3656
+#: ../../include/functions_visual_map.php:3943
+#: ../../include/functions_visual_map_editor.php:63
+#: ../../include/functions_visual_map_editor.php:450
+#: ../../include/functions_visual_map_editor.php:874
+#: ../../include/functions_graph.php:6423
+#: ../../include/functions_groups.php:739
+#: ../../include/functions_networkmap.php:1758
+#: ../../include/functions_reporting_html.php:2082
+#: ../../include/functions_reporting_html.php:2117
+#: ../../mobile/operation/agents.php:75 ../../mobile/operation/agents.php:139
+#: ../../mobile/operation/agents.php:196 ../../mobile/operation/agents.php:197
+#: ../../mobile/operation/agents.php:340 ../../mobile/operation/alerts.php:84
+#: ../../mobile/operation/alerts.php:88 ../../mobile/operation/alerts.php:178
+#: ../../mobile/operation/alerts.php:179 ../../mobile/operation/events.php:361
+#: ../../mobile/operation/events.php:365 ../../mobile/operation/events.php:501
+#: ../../mobile/operation/events.php:604 ../../mobile/operation/events.php:605
 #: ../../mobile/operation/modules.php:128
 #: ../../mobile/operation/modules.php:132
 #: ../../mobile/operation/modules.php:203
@@ -123,63 +129,71 @@ msgstr "最終更新"
 #: ../../mobile/operation/visualmaps.php:53
 #: ../../mobile/operation/visualmaps.php:141
 #: ../../operation/agentes/alerts_status.functions.php:68
-#: ../../operation/agentes/estado_agente.php:167
-#: ../../operation/agentes/estado_agente.php:517
-#: ../../operation/agentes/estado_generalagente.php:245
+#: ../../operation/agentes/estado_agente.php:195
+#: ../../operation/agentes/estado_agente.php:562
+#: ../../operation/agentes/estado_generalagente.php:274
 #: ../../operation/agentes/exportdata.php:235
 #: ../../operation/agentes/group_view.php:164
-#: ../../operation/agentes/pandora_networkmap.editor.php:183
-#: ../../operation/agentes/pandora_networkmap.editor.php:196
-#: ../../operation/agentes/status_monitor.php:292
-#: ../../operation/agentes/ver_agente.php:687
+#: ../../operation/agentes/pandora_networkmap.editor.php:224
+#: ../../operation/agentes/pandora_networkmap.editor.php:248
+#: ../../operation/agentes/status_monitor.php:290
+#: ../../operation/agentes/ver_agente.php:762
 #: ../../operation/events/events.build_table.php:185
-#: ../../operation/events/events_list.php:550
-#: ../../operation/events/sound_events.php:78
+#: ../../operation/events/events_list.php:615
+#: ../../operation/events/sound_events.php:79
 #: ../../operation/gis_maps/ajax.php:309
 #: ../../operation/gis_maps/gis_map.php:90
 #: ../../operation/incidents/incident.php:339
 #: ../../operation/incidents/incident_detail.php:308
 #: ../../operation/netflow/nf_live_view.php:309
 #: ../../operation/search_agents.php:47 ../../operation/search_agents.php:59
-#: ../../operation/search_maps.php:32 ../../operation/users/user_edit.php:505
-#: ../../enterprise/dashboard/dashboards.php:84
-#: ../../enterprise/dashboard/main_dashboard.php:303
-#: ../../enterprise/dashboard/main_dashboard.php:332
+#: ../../operation/search_maps.php:32 ../../operation/users/user_edit.php:516
+#: ../../enterprise/dashboard/dashboards.php:88
+#: ../../enterprise/dashboard/main_dashboard.php:319
+#: ../../enterprise/dashboard/main_dashboard.php:357
 #: ../../enterprise/dashboard/widgets/agent_module.php:41
 #: ../../enterprise/dashboard/widgets/alerts_fired.php:28
 #: ../../enterprise/dashboard/widgets/top_n.php:306
-#: ../../enterprise/dashboard/widgets/tree_view.php:44
+#: ../../enterprise/dashboard/widgets/tree_view.php:46
 #: ../../enterprise/extensions/cron/functions.php:40
-#: ../../enterprise/extensions/cron/main.php:248
+#: ../../enterprise/extensions/cron/main.php:317
+#: ../../enterprise/extensions/vmware/ajax.php:95
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:168
 #: ../../enterprise/godmode/agentes/collections.php:232
 #: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:88
+#: ../../enterprise/godmode/agentes/pandora_networkmap_empty.editor.php:101
 #: ../../enterprise/godmode/alerts/alert_events.php:491
 #: ../../enterprise/godmode/alerts/alert_events_list.php:361
 #: ../../enterprise/godmode/alerts/alert_events_list.php:423
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:409
 #: ../../enterprise/godmode/alerts/configure_alert_rule.php:155
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:78
 #: ../../enterprise/godmode/modules/configure_local_component.php:217
 #: ../../enterprise/godmode/modules/local_components.php:401
 #: ../../enterprise/godmode/modules/local_components.php:483
 #: ../../enterprise/godmode/policies/configure_policy.php:68
 #: ../../enterprise/godmode/policies/policies.php:229
 #: ../../enterprise/godmode/policies/policies.php:258
-#: ../../enterprise/godmode/policies/policy_agents.php:359
+#: ../../enterprise/godmode/policies/policy_agents.php:554
+#: ../../enterprise/godmode/policies/policy_agents.php:577
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:158
-#: ../../enterprise/godmode/reporting/graph_template_list.php:126
+#: ../../enterprise/godmode/reporting/graph_template_list.php:129
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:288
-#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:114
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1416
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:307
+#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:115
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1486
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:308
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:83
-#: ../../enterprise/godmode/services/services.service.php:250
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:276
+#: ../../enterprise/godmode/reporting/cluster_list.php:90
+#: ../../enterprise/godmode/reporting/cluster_list.php:162
+#: ../../enterprise/godmode/services/services.service.php:290
+#: ../../enterprise/include/ajax/clustermap.php:46
 #: ../../enterprise/include/functions_alert_event.php:926
 #: ../../enterprise/include/functions_events.php:76
-#: ../../enterprise/include/functions_reporting_pdf.php:2315
-#: ../../enterprise/include/functions_reporting_pdf.php:2365
-#: ../../enterprise/meta/advanced/synchronizing.user.php:562
-#: ../../enterprise/meta/agentsearch.php:96
+#: ../../enterprise/include/functions_reporting_pdf.php:2396
+#: ../../enterprise/include/functions_reporting_pdf.php:2446
+#: ../../enterprise/meta/advanced/synchronizing.user.php:576
+#: ../../enterprise/meta/agentsearch.php:105
 #: ../../enterprise/meta/include/functions_events_meta.php:67
 #: ../../enterprise/meta/include/functions_wizard_meta.php:153
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1633
@@ -190,11 +204,15 @@ msgstr "最終更新"
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:587
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:271
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:360
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:72
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:105
+#: ../../enterprise/operation/agentes/tag_view.php:75
+#: ../../enterprise/operation/agentes/tag_view.php:467
 #: ../../enterprise/operation/agentes/transactional_map.php:150
 #: ../../enterprise/operation/agentes/ver_agente.php:50
 #: ../../enterprise/operation/agentes/ver_agente.php:71
-#: ../../enterprise/operation/inventory/inventory.php:164
-#: ../../enterprise/operation/log/log_viewer.php:197
+#: ../../enterprise/operation/inventory/inventory.php:165
+#: ../../enterprise/operation/log/log_viewer.php:215
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:196
 #: ../../enterprise/operation/services/services.list.php:183
 #: ../../enterprise/operation/services/services.list.php:335
@@ -203,142 +221,149 @@ msgstr "最終更新"
 msgid "Group"
 msgstr "グループ"
 
-#: ../../extensions/agents_alerts.php:79
-#: ../../extensions/agents_modules.php:186 ../../general/login_page.php:53
-#: ../../general/login_page.php:204 ../../include/ajax/module.php:807
-#: ../../include/functions_pandora_networkmap.php:765
-#: ../../operation/events/events.php:464
-#: ../../operation/reporting/graph_viewer.php:257
-#: ../../operation/servers/recon_view.php:49
+#: ../../extensions/agents_alerts.php:98
+msgid "Show modules without alerts"
+msgstr "アラート無しでモジュールを表示"
+
+#: ../../extensions/agents_alerts.php:103
+#: ../../extensions/agents_modules.php:225 ../../general/login_page.php:71
+#: ../../general/login_page.php:229 ../../include/ajax/module.php:844
+#: ../../include/functions_pandora_networkmap.php:1009
+#: ../../operation/events/events.php:490
+#: ../../operation/reporting/graph_viewer.php:259
+#: ../../operation/servers/recon_view.php:52
 #: ../../operation/visual_console/public_console.php:112
 #: ../../operation/visual_console/render_view.php:176
-#: ../../enterprise/dashboard/main_dashboard.php:187
+#: ../../enterprise/dashboard/main_dashboard.php:201
 #: ../../enterprise/dashboard/widgets/top_n.php:286
 #: ../../enterprise/extensions/ipam/ipam_network.php:159
-#: ../../enterprise/godmode/policies/policy_queue.php:470
+#: ../../enterprise/godmode/policies/policy_queue.php:490
 #: ../../enterprise/meta/advanced/policymanager.queue.php:236
 msgid "Refresh"
 msgstr "リフレッシュ"
 
-#: ../../extensions/agents_alerts.php:81
+#: ../../extensions/agents_alerts.php:105
+#: ../../extensions/agents_alerts.php:251
 #: ../../godmode/alerts/alert_list.builder.php:136
 #: ../../godmode/alerts/configure_alert_action.php:144
-#: ../../godmode/setup/setup_visuals.php:737
+#: ../../godmode/setup/setup_visuals.php:803
 #: ../../godmode/snmpconsole/snmp_alert.php:938
 #: ../../include/functions.php:430 ../../include/functions.php:564
-#: ../../include/functions_html.php:728
+#: ../../include/functions_html.php:831
 #: ../../include/functions_netflow.php:1134
 #: ../../include/functions_netflow.php:1144
 #: ../../include/functions_netflow.php:1161
 #: ../../include/functions_netflow.php:1169
 #: ../../include/functions_netflow.php:1193
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:275
-#: ../../enterprise/meta/advanced/metasetup.visual.php:140
+#: ../../enterprise/meta/advanced/metasetup.visual.php:162
 msgid "seconds"
 msgstr "秒"
 
-#: ../../extensions/agents_alerts.php:82 ../../include/functions.php:2587
+#: ../../extensions/agents_alerts.php:106 ../../include/functions.php:2611
 #: ../../operation/gis_maps/render_view.php:138
 msgid "1 minute"
 msgstr "1 分"
 
-#: ../../extensions/agents_alerts.php:83 ../../include/functions.php:2588
+#: ../../extensions/agents_alerts.php:107 ../../include/functions.php:2612
 #: ../../operation/gis_maps/render_view.php:139
 msgid "2 minutes"
 msgstr "2 分"
 
-#: ../../extensions/agents_alerts.php:84 ../../include/ajax/module.php:132
-#: ../../include/functions.php:2589
+#: ../../extensions/agents_alerts.php:108 ../../include/ajax/module.php:137
+#: ../../include/functions.php:2613
 #: ../../operation/gis_maps/render_view.php:140
 msgid "5 minutes"
 msgstr "5 分"
 
-#: ../../extensions/agents_alerts.php:85
+#: ../../extensions/agents_alerts.php:109
 #: ../../operation/gis_maps/render_view.php:141
 msgid "10 minutes"
 msgstr "10 分"
 
-#: ../../extensions/agents_alerts.php:91
-#: ../../extensions/agents_modules.php:103
+#: ../../extensions/agents_alerts.php:115
+#: ../../extensions/agents_modules.php:113
+#: ../../extensions/agents_modules.php:124
+#: ../../extensions/agents_modules.php:130
 #: ../../extensions/disabled/matrix_events.php:31
 #: ../../operation/gis_maps/render_view.php:111
-#: ../../operation/reporting/graph_viewer.php:164
+#: ../../operation/reporting/graph_viewer.php:165
 #: ../../operation/reporting/reporting_viewer.php:103
 #: ../../operation/visual_console/pure_ajax.php:136
 #: ../../operation/visual_console/render_view.php:139
-#: ../../enterprise/dashboard/main_dashboard.php:143
+#: ../../enterprise/dashboard/main_dashboard.php:151
 #: ../../enterprise/operation/agentes/manage_transmap.php:92
 msgid "Full screen mode"
 msgstr "フルスクリーンモード"
 
-#: ../../extensions/agents_alerts.php:96
-#: ../../extensions/agents_modules.php:177
-#: ../../operation/events/events.php:455
+#: ../../extensions/agents_alerts.php:120
+#: ../../extensions/agents_modules.php:216
+#: ../../operation/events/events.php:481
 #: ../../operation/gis_maps/render_view.php:115
-#: ../../operation/reporting/graph_viewer.php:169
+#: ../../operation/reporting/graph_viewer.php:170
 #: ../../operation/reporting/reporting_viewer.php:108
 #: ../../operation/visual_console/render_view.php:167
-#: ../../enterprise/dashboard/main_dashboard.php:157
+#: ../../enterprise/dashboard/main_dashboard.php:165
 msgid "Back to normal mode"
 msgstr "通常モードへ戻る"
 
-#: ../../extensions/agents_alerts.php:109
+#: ../../extensions/agents_alerts.php:133
 msgid "Agents/Alerts"
 msgstr "エージェント/アラート"
 
-#: ../../extensions/agents_alerts.php:118
-#: ../../operation/agentes/pandora_networkmap.view.php:741
-#: ../../operation/events/events.php:329
-#: ../../operation/snmpconsole/snmp_browser.php:90
+#: ../../extensions/agents_alerts.php:143
+#: ../../operation/agentes/networkmap.dinamic.php:103
+#: ../../operation/agentes/pandora_networkmap.view.php:784
+#: ../../operation/events/events.php:355
+#: ../../operation/snmpconsole/snmp_browser.php:112
 #: ../../operation/snmpconsole/snmp_statistics.php:49
-#: ../../operation/snmpconsole/snmp_view.php:82
+#: ../../operation/snmpconsole/snmp_view.php:90
+#: ../../enterprise/dashboard/dashboards.php:89
+#: ../../enterprise/dashboard/dashboards.php:142
 msgid "Full screen"
 msgstr "全画面"
 
-#: ../../extensions/agents_alerts.php:156
-msgid "There are no agents with alerts"
-msgstr "アラートがついたエージェントがありません"
-
-#: ../../extensions/agents_alerts.php:177
-#: ../../extensions/agents_modules.php:135
-#: ../../extensions/agents_modules.php:329
+#: ../../extensions/agents_alerts.php:179
+#: ../../extensions/agents_alerts.php:325
+#: ../../extensions/agents_modules.php:162
+#: ../../extensions/agents_modules.php:396
 #: ../../godmode/alerts/alert_list.list.php:71
 #: ../../godmode/massive/massive_add_alerts.php:157
 #: ../../godmode/massive/massive_add_tags.php:129
 #: ../../godmode/massive/massive_delete_agents.php:127
 #: ../../godmode/massive/massive_delete_alerts.php:218
-#: ../../godmode/massive/massive_delete_modules.php:496
+#: ../../godmode/massive/massive_delete_modules.php:522
 #: ../../godmode/massive/massive_delete_tags.php:192
-#: ../../godmode/massive/massive_edit_agents.php:228
-#: ../../godmode/massive/massive_edit_modules.php:342
+#: ../../godmode/massive/massive_edit_agents.php:281
+#: ../../godmode/massive/massive_edit_modules.php:362
 #: ../../godmode/massive/massive_edit_plugins.php:299
 #: ../../godmode/massive/massive_enable_disable_alerts.php:141
 #: ../../godmode/massive/massive_standby_alerts.php:142
-#: ../../godmode/reporting/graph_builder.graph_editor.php:146
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1020
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1083
+#: ../../godmode/reporting/graph_builder.graph_editor.php:312
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1062
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1134
 #: ../../godmode/reporting/reporting_builder.list_items.php:165
 #: ../../godmode/reporting/reporting_builder.list_items.php:190
 #: ../../godmode/reporting/visual_console_builder.wizard.php:283
+#: ../../include/functions_pandora_networkmap.php:1831
 #: ../../include/functions_groups.php:46
+#: ../../include/functions_groups.php:778
+#: ../../include/functions_groups.php:780
+#: ../../include/functions_groups.php:782
+#: ../../include/functions_groups.php:783
 #: ../../include/functions_groups.php:784
-#: ../../include/functions_groups.php:786
-#: ../../include/functions_groups.php:788
-#: ../../include/functions_groups.php:789
-#: ../../include/functions_groups.php:790
-#: ../../include/functions_pandora_networkmap.php:1584
-#: ../../include/functions_reporting_html.php:1322
-#: ../../include/functions_reporting_html.php:1562
+#: ../../include/functions_reporting_html.php:1325
+#: ../../include/functions_reporting_html.php:1565
 #: ../../mobile/include/functions_web.php:22
-#: ../../mobile/operation/agents.php:158 ../../mobile/operation/home.php:58
+#: ../../mobile/operation/agents.php:179 ../../mobile/operation/home.php:65
 #: ../../operation/agentes/group_view.php:120
 #: ../../operation/agentes/group_view.php:158
 #: ../../operation/search_results.php:74
-#: ../../enterprise/dashboard/widgets/agent_module.php:256
-#: ../../enterprise/dashboard/widgets/groups_status.php:88
+#: ../../enterprise/dashboard/widgets/agent_module.php:294
+#: ../../enterprise/dashboard/widgets/groups_status.php:86
 #: ../../enterprise/dashboard/widgets/service_map.php:93
 #: ../../enterprise/extensions/cron/functions.php:33
-#: ../../enterprise/extensions/cron/main.php:247
+#: ../../enterprise/extensions/cron/main.php:316
 #: ../../enterprise/godmode/agentes/collections.agents.php:56
 #: ../../enterprise/godmode/agentes/collections.data.php:107
 #: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:92
@@ -346,46 +371,483 @@ msgstr "アラートがついたエージェントがありません"
 #: ../../enterprise/godmode/policies/policies.php:257
 #: ../../enterprise/godmode/policies/policies.php:409
 #: ../../enterprise/godmode/policies/policy.php:50
-#: ../../enterprise/godmode/policies/policy_agents.php:283
-#: ../../enterprise/godmode/policies/policy_agents.php:341
-#: ../../enterprise/godmode/policies/policy_queue.php:375
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:170
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:135
+#: ../../enterprise/godmode/policies/policy_agents.php:418
+#: ../../enterprise/godmode/policies/policy_agents.php:536
+#: ../../enterprise/godmode/policies/policy_queue.php:395
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:171
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:154
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:201
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:155
-#: ../../enterprise/include/functions_policies.php:3307
-#: ../../enterprise/include/functions_reporting.php:5415
-#: ../../enterprise/include/functions_reporting_pdf.php:562
-#: ../../enterprise/include/functions_reporting_pdf.php:695
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:161
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:163
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:324
+#: ../../enterprise/include/functions_policies.php:3486
+#: ../../enterprise/include/functions_reporting.php:5834
+#: ../../enterprise/include/functions_reporting_pdf.php:608
+#: ../../enterprise/include/functions_reporting_pdf.php:741
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:278
 #: ../../enterprise/meta/advanced/policymanager.queue.php:257
+#: ../../enterprise/meta/include/functions_autoprovision.php:384
 #: ../../enterprise/meta/monitoring/group_view.php:98
 #: ../../enterprise/meta/monitoring/group_view.php:136
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:228
-#: ../../enterprise/operation/services/services.service_map.php:135
+#: ../../enterprise/operation/services/services.service_map.php:133
 msgid "Agents"
 msgstr "エージェント"
 
-#: ../../extensions/agents_alerts.php:177
-#: ../../godmode/alerts/alert_templates.php:132
-#: ../../godmode/alerts/alert_templates.php:175
-#: ../../godmode/alerts/alert_templates.php:194
-#: ../../godmode/alerts/alert_templates.php:210
+#: ../../extensions/agents_alerts.php:180
+#: ../../extensions/agents_modules.php:396
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:829
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:542
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:375
+#: ../../godmode/agentes/configurar_agente.php:325
+#: ../../godmode/agentes/configurar_agente.php:559
+#: ../../godmode/agentes/modificar_agente.php:574
+#: ../../godmode/agentes/planned_downtime.editor.php:783
+#: ../../godmode/agentes/planned_downtime.editor.php:857
+#: ../../godmode/massive/massive_add_tags.php:139
+#: ../../godmode/massive/massive_copy_modules.php:149
+#: ../../godmode/massive/massive_delete_modules.php:500
+#: ../../godmode/massive/massive_delete_tags.php:199
+#: ../../godmode/massive/massive_edit_modules.php:324
+#: ../../godmode/massive/massive_edit_plugins.php:308
+#: ../../godmode/reporting/graph_builder.graph_editor.php:314
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1104
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1153
+#: ../../godmode/reporting/reporting_builder.list_items.php:167
+#: ../../godmode/reporting/reporting_builder.list_items.php:193
+#: ../../godmode/reporting/visual_console_builder.wizard.php:294
+#: ../../godmode/servers/servers.build_table.php:68
+#: ../../include/functions_reporting_html.php:1325
+#: ../../include/functions_reporting_html.php:3359
+#: ../../include/functions_reports.php:563
+#: ../../include/functions_reports.php:565
+#: ../../include/functions_reports.php:567
+#: ../../include/functions_reports.php:569
+#: ../../include/functions_reports.php:571
+#: ../../include/functions_reports.php:573
+#: ../../include/functions_reports.php:575
+#: ../../include/functions_reports.php:577
+#: ../../mobile/operation/agent.php:266 ../../mobile/operation/agents.php:79
+#: ../../mobile/operation/agents.php:350 ../../mobile/operation/agents.php:351
+#: ../../mobile/operation/home.php:71 ../../mobile/operation/modules.php:186
+#: ../../operation/agentes/estado_agente.php:570
+#: ../../operation/agentes/exportdata.php:275
+#: ../../operation/agentes/graphs.php:154
+#: ../../operation/agentes/group_view.php:121
+#: ../../operation/agentes/group_view.php:159
+#: ../../operation/search_agents.php:63 ../../operation/search_results.php:134
+#: ../../operation/tree.php:73
+#: ../../enterprise/dashboard/widgets/agent_module.php:294
+#: ../../enterprise/dashboard/widgets/groups_status.php:158
+#: ../../enterprise/dashboard/widgets/service_map.php:98
+#: ../../enterprise/dashboard/widgets/top_n.php:332
+#: ../../enterprise/dashboard/widgets/tree_view.php:39
+#: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:104
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:137
+#: ../../enterprise/godmode/massive/massive_edit_tags_policy.php:93
+#: ../../enterprise/godmode/policies/policies.php:389
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:813
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:527
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:374
+#: ../../enterprise/godmode/policies/policy_modules.php:389
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:173
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:157
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:161
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:556
+#: ../../enterprise/include/ajax/clustermap.php:255
+#: ../../enterprise/include/ajax/clustermap.php:466
+#: ../../enterprise/include/functions_policies.php:3391
+#: ../../enterprise/include/functions_reporting_pdf.php:608
+#: ../../enterprise/include/functions_reporting_pdf.php:760
+#: ../../enterprise/meta/advanced/servers.build_table.php:63
+#: ../../enterprise/meta/agentsearch.php:106
+#: ../../enterprise/meta/include/functions_wizard_meta.php:305
+#: ../../enterprise/meta/include/functions_wizard_meta.php:1649
+#: ../../enterprise/meta/monitoring/group_view.php:99
+#: ../../enterprise/meta/monitoring/group_view.php:137
+#: ../../enterprise/meta/monitoring/wizard/wizard.agent.php:64
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:407
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:515
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:596
+#: ../../enterprise/meta/monitoring/wizard/wizard.php:225
+#: ../../enterprise/operation/agentes/tag_view.php:469
+#: ../../enterprise/operation/services/services.service_map.php:138
+msgid "Modules"
+msgstr "モジュール"
+
+#: ../../extensions/agents_alerts.php:181
+#: ../../extensions/agents_alerts.php:199
+#: ../../extensions/module_groups.php:84
+#: ../../godmode/agentes/fields_manager.php:99
+#: ../../godmode/agentes/modificar_agente.php:478
+#: ../../godmode/agentes/planned_downtime.editor.php:786
+#: ../../godmode/alerts/alert_list.builder.php:83
+#: ../../godmode/alerts/alert_list.list.php:121
+#: ../../godmode/alerts/alert_list.list.php:410
+#: ../../godmode/alerts/alert_view.php:344
+#: ../../godmode/category/category.php:111
+#: ../../godmode/events/event_responses.list.php:57
+#: ../../godmode/groups/group_list.php:378 ../../godmode/menu.php:156
+#: ../../godmode/tag/tag.php:205 ../../include/functions_treeview.php:388
+#: ../../include/functions_filemanager.php:583
+#: ../../include/functions_reporting_html.php:1961
+#: ../../enterprise/extensions/backup/main.php:103
+#: ../../enterprise/extensions/cron/main.php:251
+#: ../../enterprise/extensions/ipam/ipam_ajax.php:261
+#: ../../enterprise/godmode/agentes/collections.php:235
+#: ../../enterprise/godmode/agentes/inventory_manager.php:237
+#: ../../enterprise/godmode/alerts/alert_events_list.php:421
+#: ../../enterprise/godmode/policies/policy_alerts.php:241
+#: ../../enterprise/godmode/policies/policy_external_alerts.php:171
+#: ../../enterprise/godmode/policies/policy_inventory_modules.php:245
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:483
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:654
+#: ../../enterprise/godmode/reporting/cluster_list.php:177
+#: ../../enterprise/godmode/setup/setup_skins.php:120
+#: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:323
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:359
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1196
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1408
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1500
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1583
+#: ../../enterprise/meta/include/functions_alerts_meta.php:111
+#: ../../enterprise/meta/include/functions_alerts_meta.php:128
+#: ../../enterprise/meta/include/functions_autoprovision.php:385
+#: ../../enterprise/meta/monitoring/wizard/wizard.php:98
+#: ../../enterprise/operation/agentes/manage_transmap_creation.php:122
+#: ../../enterprise/operation/agentes/transactional_map.php:155
+#: ../../enterprise/operation/services/services.list.php:348
+msgid "Actions"
+msgstr "アクション"
+
+#: ../../extensions/agents_alerts.php:191
+#: ../../godmode/snmpconsole/snmp_alert.php:82
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:455
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:533
+msgid "Create alert"
+msgstr "アラート作成"
+
+#: ../../extensions/agents_alerts.php:210
+#: ../../godmode/alerts/alert_list.builder.php:94
+#: ../../godmode/alerts/configure_alert_template.php:567
+msgid "Default action"
+msgstr "通常のアクション"
+
+#: ../../extensions/agents_alerts.php:213
+#: ../../godmode/alerts/alert_list.builder.php:97
+#: ../../godmode/alerts/alert_list.list.php:616
+#: ../../godmode/massive/massive_add_action_alerts.php:183
+#: ../../include/ajax/alert_list.ajax.php:176
+#: ../../enterprise/godmode/alerts/alert_events_list.php:599
+#: ../../enterprise/godmode/policies/policy_alerts.php:465
+#: ../../enterprise/godmode/policies/policy_external_alerts.php:278
+msgid "Number of alerts match from"
+msgstr "アクションを起こすアラート数: 開始"
+
+#: ../../extensions/agents_alerts.php:215
+#: ../../godmode/alerts/alert_list.builder.php:99
+#: ../../godmode/alerts/alert_list.list.php:533
+#: ../../godmode/alerts/alert_list.list.php:620
+#: ../../godmode/alerts/alert_templates.php:96
+#: ../../godmode/massive/massive_add_action_alerts.php:185
+#: ../../include/ajax/alert_list.ajax.php:180
+#: ../../include/functions_reporting.php:10658
+#: ../../operation/reporting/reporting_viewer.php:198
+#: ../../enterprise/godmode/agentes/manage_config_remote.php:107
+#: ../../enterprise/godmode/alerts/alert_events_list.php:560
+#: ../../enterprise/godmode/alerts/alert_events_list.php:601
+#: ../../enterprise/godmode/policies/policy_alerts.php:337
+#: ../../enterprise/godmode/policies/policy_alerts.php:469
+#: ../../enterprise/godmode/policies/policy_external_alerts.php:223
+#: ../../enterprise/godmode/policies/policy_external_alerts.php:280
+#: ../../enterprise/include/functions_reporting.php:5005
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:150
+msgid "to"
+msgstr "終了"
+
+#: ../../extensions/agents_alerts.php:224
+#: ../../godmode/alerts/alert_list.builder.php:109
+#: ../../godmode/alerts/configure_alert_action.php:101
+#: ../../enterprise/godmode/alerts/alert_events.php:517
+msgid "Create Action"
+msgstr "アクションの作成"
+
+#: ../../extensions/agents_alerts.php:228
+#: ../../extensions/agents_alerts.php:496
+#: ../../godmode/alerts/alert_list.builder.php:113
+#: ../../godmode/alerts/alert_list.list.php:407
+#: ../../godmode/alerts/alert_view.php:75
+#: ../../include/functions_treeview.php:387
+#: ../../include/functions_treeview.php:428
+#: ../../include/functions_reporting_html.php:1960
+#: ../../include/functions_reporting_html.php:1963
+#: ../../mobile/operation/alerts.php:270
+#: ../../operation/agentes/alerts_status.php:462
+#: ../../operation/agentes/alerts_status.php:503
+#: ../../operation/agentes/alerts_status.php:537
+#: ../../operation/agentes/alerts_status.php:571
+#: ../../operation/search_alerts.php:45
+#: ../../operation/servers/recon_view.php:104
+#: ../../enterprise/extensions/cron/main.php:315
+#: ../../enterprise/godmode/policies/policy_alerts.php:239
+#: ../../enterprise/godmode/policies/policy_alerts.php:438
+#: ../../enterprise/operation/agentes/policy_view.php:195
+msgid "Template"
+msgstr "テンプレート"
+
+#: ../../extensions/agents_alerts.php:240 ../../extensions/insert_data.php:179
+#: ../../general/header.php:215 ../../godmode/alerts/alert_list.builder.php:77
+#: ../../godmode/alerts/alert_list.builder.php:125
+#: ../../godmode/alerts/configure_alert_template.php:595
+#: ../../godmode/gis_maps/configure_gis_map.php:588
+#: ../../godmode/massive/massive_add_alerts.php:176
+#: ../../godmode/massive/massive_copy_modules.php:95
+#: ../../godmode/massive/massive_delete_alerts.php:208
+#: ../../godmode/massive/massive_delete_modules.php:428
+#: ../../godmode/massive/massive_delete_modules.php:502
+#: ../../godmode/massive/massive_edit_modules.php:266
+#: ../../godmode/massive/massive_edit_modules.php:326
+#: ../../godmode/snmpconsole/snmp_trap_generator.php:85
+#: ../../enterprise/godmode/alerts/alert_events.php:513
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:103
+#: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:207
+#: ../../enterprise/godmode/policies/policy_alerts.php:509
+#: ../../enterprise/godmode/policies/policy_alerts.php:513
+#: ../../enterprise/godmode/policies/policy_external_alerts.php:328
+#: ../../enterprise/meta/advanced/synchronizing.user.php:549
+#: ../../enterprise/meta/general/main_header.php:394
+#: ../../enterprise/meta/monitoring/wizard/wizard.create_module.php:224
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:223
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:313
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:374
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:482
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:555
+#: ../../enterprise/meta/monitoring/wizard/wizard.php:107
+msgid "Select"
+msgstr "選択"
+
+#: ../../extensions/agents_alerts.php:246
+#: ../../godmode/alerts/alert_list.builder.php:131
+#: ../../godmode/alerts/configure_alert_template.php:502
+msgid "Create Template"
+msgstr "テンプレートの作成"
+
+#: ../../extensions/agents_alerts.php:249
+#: ../../godmode/alerts/alert_list.builder.php:134
+#: ../../godmode/alerts/alert_list.list.php:539
+#: ../../godmode/alerts/alert_list.list.php:626
+#: ../../godmode/alerts/alert_view.php:391
+#: ../../godmode/alerts/configure_alert_action.php:142
+#: ../../include/ajax/alert_list.ajax.php:186
+#: ../../include/functions_reporting_html.php:2116
+#: ../../include/functions_reporting_html.php:3221
+#: ../../enterprise/godmode/alerts/alert_events_list.php:563
+#: ../../enterprise/godmode/alerts/alert_events_list.php:604
+#: ../../enterprise/include/functions_reporting_pdf.php:2445
+msgid "Threshold"
+msgstr "しきい値"
+
+#: ../../extensions/agents_alerts.php:257
+#: ../../godmode/alerts/alert_list.builder.php:144
+msgid "Add alert"
+msgstr "アラートの追加"
+
+#: ../../extensions/agents_alerts.php:262
+#: ../../extensions/agents_alerts.php:496 ../../extensions/insert_data.php:158
+#: ../../extensions/module_groups.php:41
+#: ../../godmode/agentes/module_manager_editor_common.php:689
+#: ../../godmode/agentes/module_manager_editor_common.php:717
+#: ../../godmode/agentes/module_manager_editor_prediction.php:110
+#: ../../godmode/agentes/planned_downtime.list.php:171
+#: ../../godmode/alerts/alert_list.builder.php:59
+#: ../../godmode/alerts/alert_list.list.php:379
+#: ../../godmode/alerts/alert_list.list.php:591
+#: ../../godmode/alerts/alert_view.php:66
+#: ../../godmode/gis_maps/configure_gis_map.php:420
+#: ../../godmode/massive/massive_copy_modules.php:86
+#: ../../godmode/massive/massive_copy_modules.php:205
+#: ../../godmode/massive/massive_enable_disable_alerts.php:154
+#: ../../godmode/massive/massive_enable_disable_alerts.php:171
+#: ../../godmode/massive/massive_standby_alerts.php:154
+#: ../../godmode/massive/massive_standby_alerts.php:171
+#: ../../godmode/reporting/create_container.php:322
+#: ../../godmode/reporting/create_container.php:492
+#: ../../godmode/reporting/create_container.php:561
+#: ../../godmode/reporting/graph_builder.graph_editor.php:204
+#: ../../godmode/reporting/reporting_builder.item_editor.php:962
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1711
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1910
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1917
+#: ../../godmode/reporting/reporting_builder.list_items.php:294
+#: ../../godmode/reporting/visual_console_builder.elements.php:77
+#: ../../godmode/reporting/visual_console_builder.wizard.php:303
+#: ../../godmode/reporting/visual_console_builder.wizard.php:577
+#: ../../godmode/reporting/visual_console_builder.wizard.php:600
+#: ../../godmode/servers/plugin.php:66
+#: ../../include/ajax/alert_list.ajax.php:151
+#: ../../include/functions_reporting.php:3900
+#: ../../include/functions_reporting.php:4044
+#: ../../include/functions_reporting.php:4186
+#: ../../include/functions_pandora_networkmap.php:1630
+#: ../../include/functions_pandora_networkmap.php:1800
+#: ../../include/functions_visual_map_editor.php:335
+#: ../../include/functions_visual_map_editor.php:367
+#: ../../include/functions_graph.php:6212
+#: ../../include/functions_reporting_html.php:399
+#: ../../include/functions_reporting_html.php:733
+#: ../../include/functions_reporting_html.php:813
+#: ../../include/functions_reporting_html.php:822
+#: ../../include/functions_reporting_html.php:1488
+#: ../../include/functions_reporting_html.php:1892
+#: ../../include/functions_reporting_html.php:1899
+#: ../../include/functions_reporting_html.php:1958
+#: ../../include/functions_reporting_html.php:2232
+#: ../../include/functions_reporting_html.php:2317
+#: ../../include/functions_reporting_html.php:2360
+#: ../../include/functions_reporting_html.php:2656
+#: ../../include/functions_reporting_html.php:2703
+#: ../../include/functions_reporting_html.php:2741
+#: ../../include/functions_reporting_html.php:2993
+#: ../../include/functions_reporting_html.php:3147
+#: ../../include/functions_reporting_html.php:3358
+#: ../../mobile/operation/agents.php:69 ../../mobile/operation/agents.php:333
+#: ../../mobile/operation/alerts.php:266 ../../mobile/operation/events.php:510
+#: ../../mobile/operation/home.php:92 ../../mobile/operation/modules.php:496
+#: ../../operation/agentes/alerts_status.php:460
+#: ../../operation/agentes/alerts_status.php:535
+#: ../../operation/agentes/estado_agente.php:535
+#: ../../operation/agentes/estado_monitores.php:95
+#: ../../operation/agentes/exportdata.csv.php:77
+#: ../../operation/agentes/exportdata.excel.php:76
+#: ../../operation/agentes/exportdata.php:96
+#: ../../operation/agentes/status_monitor.php:956
+#: ../../operation/agentes/ver_agente.php:893
+#: ../../operation/events/events.build_table.php:36
+#: ../../operation/events/sound_events.php:88
+#: ../../operation/gis_maps/ajax.php:216 ../../operation/gis_maps/ajax.php:247
+#: ../../operation/incidents/incident_detail.php:349
+#: ../../operation/search_agents.php:44 ../../operation/search_agents.php:50
+#: ../../operation/search_alerts.php:39 ../../operation/search_modules.php:42
+#: ../../enterprise/dashboard/widgets/agent_module.php:87
+#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:41
+#: ../../enterprise/dashboard/widgets/module_icon.php:52
+#: ../../enterprise/dashboard/widgets/module_status.php:41
+#: ../../enterprise/dashboard/widgets/module_table_value.php:49
+#: ../../enterprise/dashboard/widgets/module_value.php:52
+#: ../../enterprise/dashboard/widgets/single_graph.php:43
+#: ../../enterprise/dashboard/widgets/sla_percent.php:40
+#: ../../enterprise/dashboard/widgets/top_n.php:126
+#: ../../enterprise/dashboard/widgets/ux_transaction.php:57
+#: ../../enterprise/dashboard/widgets/wux_transaction.php:57
+#: ../../enterprise/dashboard/widgets/wux_transaction_stats.php:65
+#: ../../enterprise/extensions/ipam/ipam_ajax.php:172
+#: ../../enterprise/extensions/ipam/ipam_network.php:537
+#: ../../enterprise/godmode/agentes/collections.agents.php:102
+#: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:77
+#: ../../enterprise/godmode/alerts/configure_alert_rule.php:146
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:96
+#: ../../enterprise/godmode/modules/manage_inventory_modules.php:213
+#: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:84
+#: ../../enterprise/godmode/policies/policy_linking.php:120
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1534
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2132
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2282
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2289
+#: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:231
+#: ../../enterprise/godmode/services/services.elements.php:346
+#: ../../enterprise/godmode/services/services.elements.php:363
+#: ../../enterprise/include/ajax/clustermap.php:38
+#: ../../enterprise/include/functions_alert_event.php:923
+#: ../../enterprise/include/functions_events.php:111
+#: ../../enterprise/include/functions_inventory.php:235
+#: ../../enterprise/include/functions_inventory.php:651
+#: ../../enterprise/include/functions_inventory.php:707
+#: ../../enterprise/include/functions_log.php:369
+#: ../../enterprise/include/functions_reporting.php:1649
+#: ../../enterprise/include/functions_reporting.php:1862
+#: ../../enterprise/include/functions_reporting.php:1985
+#: ../../enterprise/include/functions_reporting.php:1999
+#: ../../enterprise/include/functions_reporting.php:2457
+#: ../../enterprise/include/functions_reporting.php:3234
+#: ../../enterprise/include/functions_reporting_csv.php:334
+#: ../../enterprise/include/functions_reporting_csv.php:358
+#: ../../enterprise/include/functions_reporting_csv.php:417
+#: ../../enterprise/include/functions_reporting_csv.php:443
+#: ../../enterprise/include/functions_reporting_csv.php:513
+#: ../../enterprise/include/functions_reporting_csv.php:531
+#: ../../enterprise/include/functions_reporting_csv.php:567
+#: ../../enterprise/include/functions_reporting_csv.php:603
+#: ../../enterprise/include/functions_reporting_csv.php:640
+#: ../../enterprise/include/functions_reporting_csv.php:678
+#: ../../enterprise/include/functions_reporting_csv.php:747
+#: ../../enterprise/include/functions_reporting_csv.php:784
+#: ../../enterprise/include/functions_reporting_csv.php:821
+#: ../../enterprise/include/functions_reporting_csv.php:857
+#: ../../enterprise/include/functions_reporting_csv.php:916
+#: ../../enterprise/include/functions_reporting_csv.php:953
+#: ../../enterprise/include/functions_reporting_csv.php:990
+#: ../../enterprise/include/functions_reporting_csv.php:1039
+#: ../../enterprise/include/functions_reporting_csv.php:1086
+#: ../../enterprise/include/functions_reporting_csv.php:1158
+#: ../../enterprise/include/functions_reporting_csv.php:1274
+#: ../../enterprise/include/functions_reporting_csv.php:1416
+#: ../../enterprise/include/functions_reporting_csv.php:1486
+#: ../../enterprise/include/functions_reporting_pdf.php:357
+#: ../../enterprise/include/functions_reporting_pdf.php:415
+#: ../../enterprise/include/functions_reporting_pdf.php:820
+#: ../../enterprise/include/functions_reporting_pdf.php:881
+#: ../../enterprise/include/functions_reporting_pdf.php:908
+#: ../../enterprise/include/functions_reporting_pdf.php:941
+#: ../../enterprise/include/functions_reporting_pdf.php:1007
+#: ../../enterprise/include/functions_reporting_pdf.php:1345
+#: ../../enterprise/include/functions_reporting_pdf.php:1690
+#: ../../enterprise/include/functions_reporting_pdf.php:1923
+#: ../../enterprise/include/functions_reporting_pdf.php:1941
+#: ../../enterprise/include/functions_services.php:1531
+#: ../../enterprise/meta/agentsearch.php:102
+#: ../../enterprise/meta/include/functions_wizard_meta.php:3248
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:245
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:333
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:404
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:512
+#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:593
+#: ../../enterprise/operation/agentes/manage_transmap_creation.php:119
+#: ../../enterprise/operation/agentes/manage_transmap_creation.php:270
+#: ../../enterprise/operation/agentes/manage_transmap_creation.php:359
+#: ../../enterprise/operation/agentes/tag_view.php:462
+#: ../../enterprise/operation/inventory/inventory.php:207
+#: ../../enterprise/operation/log/log_viewer.php:211
+#: ../../enterprise/operation/maps/networkmap_list_deleted.php:186
+msgid "Agent"
+msgstr "エージェント"
+
+#: ../../extensions/agents_alerts.php:262
+msgid "module"
+msgstr "モジュール"
+
+#: ../../extensions/agents_alerts.php:303
+msgid "There are no agents with alerts"
+msgstr "アラートがついたエージェントがありません"
+
+#: ../../extensions/agents_alerts.php:325
+#: ../../godmode/alerts/alert_templates.php:133
+#: ../../godmode/alerts/alert_templates.php:176
+#: ../../godmode/alerts/alert_templates.php:195
+#: ../../godmode/alerts/alert_templates.php:211
 #: ../../godmode/massive/massive_add_action_alerts.php:163
 #: ../../godmode/massive/massive_delete_action_alerts.php:167
 msgid "Alert templates"
 msgstr "アラートテンプレート"
 
-#: ../../extensions/agents_alerts.php:184
+#: ../../extensions/agents_alerts.php:332
 msgid "Previous templates"
 msgstr "前のテンプレート"
 
-#: ../../extensions/agents_alerts.php:222
+#: ../../extensions/agents_alerts.php:370
 msgid "More templates"
 msgstr "次のテンプレート"
 
-#: ../../extensions/agents_alerts.php:254
-#: ../../godmode/agentes/configurar_agente.php:312
+#: ../../extensions/agents_alerts.php:402
+#: ../../godmode/agentes/configurar_agente.php:335
 #: ../../godmode/agentes/modificar_agente.php:578
 #: ../../godmode/alerts/alert_actions.php:66
 #: ../../godmode/alerts/alert_actions.php:92
@@ -396,38 +858,39 @@ msgstr "次のテンプレート"
 #: ../../godmode/alerts/alert_actions.php:287
 #: ../../godmode/alerts/alert_actions.php:306
 #: ../../godmode/alerts/alert_actions.php:319
-#: ../../godmode/alerts/alert_commands.php:249
+#: ../../godmode/alerts/alert_commands.php:267
 #: ../../godmode/alerts/alert_list.php:326
 #: ../../godmode/alerts/alert_list.php:329
 #: ../../godmode/alerts/alert_special_days.php:44
-#: ../../godmode/alerts/alert_templates.php:132
-#: ../../godmode/alerts/alert_templates.php:175
-#: ../../godmode/alerts/alert_templates.php:194
-#: ../../godmode/alerts/alert_templates.php:210
+#: ../../godmode/alerts/alert_templates.php:133
+#: ../../godmode/alerts/alert_templates.php:176
+#: ../../godmode/alerts/alert_templates.php:195
+#: ../../godmode/alerts/alert_templates.php:211
 #: ../../godmode/alerts/configure_alert_action.php:56
 #: ../../godmode/alerts/configure_alert_action.php:65
 #: ../../godmode/alerts/configure_alert_command.php:41
 #: ../../godmode/alerts/configure_alert_special_days.php:55
-#: ../../godmode/alerts/configure_alert_template.php:62
-#: ../../godmode/alerts/configure_alert_template.php:82
-#: ../../godmode/alerts/configure_alert_template.php:100
+#: ../../godmode/alerts/configure_alert_template.php:65
+#: ../../godmode/alerts/configure_alert_template.php:85
+#: ../../godmode/alerts/configure_alert_template.php:103
 #: ../../godmode/groups/configure_group.php:170
-#: ../../godmode/groups/group_list.php:339
-#: ../../godmode/massive/massive_copy_modules.php:153
-#: ../../godmode/menu.php:140 ../../include/functions_reports.php:609
-#: ../../include/functions_reports.php:611
-#: ../../include/functions_reports.php:614
-#: ../../include/functions_graph.php:748
-#: ../../include/functions_graph.php:3942
-#: ../../include/functions_graph.php:4668
-#: ../../include/functions_reporting_html.php:1608
-#: ../../include/functions_reporting_html.php:3255
-#: ../../include/functions_treeview.php:374
+#: ../../godmode/groups/group_list.php:376
+#: ../../godmode/massive/massive_copy_modules.php:158
+#: ../../godmode/menu.php:140 ../../include/functions_treeview.php:380
+#: ../../include/functions_graph.php:850
+#: ../../include/functions_graph.php:4626
+#: ../../include/functions_graph.php:5511
+#: ../../include/functions_reporting_html.php:1611
+#: ../../include/functions_reporting_html.php:3368
+#: ../../include/functions_reports.php:610
+#: ../../include/functions_reports.php:612
+#: ../../include/functions_reports.php:615
 #: ../../mobile/include/functions_web.php:25
-#: ../../mobile/operation/agent.php:250 ../../mobile/operation/agents.php:83
-#: ../../mobile/operation/agents.php:324 ../../mobile/operation/alerts.php:154
-#: ../../operation/agentes/estado_agente.php:528
-#: ../../operation/agentes/ver_agente.php:973
+#: ../../mobile/operation/agent.php:283 ../../mobile/operation/agents.php:83
+#: ../../mobile/operation/agents.php:347 ../../mobile/operation/alerts.php:154
+#: ../../mobile/operation/home.php:58
+#: ../../operation/agentes/estado_agente.php:576
+#: ../../operation/agentes/ver_agente.php:1048
 #: ../../operation/search_agents.php:65 ../../operation/search_results.php:94
 #: ../../enterprise/godmode/alerts/alert_events.php:71
 #: ../../enterprise/godmode/alerts/alert_events_list.php:67
@@ -438,10 +901,10 @@ msgstr "次のテンプレート"
 #: ../../enterprise/godmode/alerts/configure_alert_rule.php:69
 #: ../../enterprise/godmode/policies/policies.php:397
 #: ../../enterprise/godmode/policies/policy_alerts.php:32
-#: ../../enterprise/godmode/services/services.service.php:323
-#: ../../enterprise/include/functions_policies.php:3260
-#: ../../enterprise/include/functions_reporting_pdf.php:737
-#: ../../enterprise/meta/agentsearch.php:99
+#: ../../enterprise/godmode/services/services.service.php:368
+#: ../../enterprise/include/functions_policies.php:3439
+#: ../../enterprise/include/functions_reporting_pdf.php:783
+#: ../../enterprise/meta/agentsearch.php:108
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1374
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1464
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1584
@@ -450,71 +913,81 @@ msgstr "次のテンプレート"
 #: ../../enterprise/meta/monitoring/wizard/wizard.module.network.php:103
 #: ../../enterprise/meta/monitoring/wizard/wizard.module.web.php:73
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:226
+#: ../../enterprise/operation/agentes/tag_view.php:471
 msgid "Alerts"
 msgstr "アラート"
 
-#: ../../extensions/agents_alerts.php:280
-#: ../../extensions/agents_modules.php:146
+#: ../../extensions/agents_alerts.php:431
+#: ../../extensions/agents_modules.php:173
 #: ../../extensions/insert_data.php:173 ../../extensions/module_groups.php:43
-#: ../../godmode/agentes/agent_manager.php:268
+#: ../../godmode/agentes/agent_manager.php:325
+#: ../../godmode/agentes/agent_manager.php:341
 #: ../../godmode/agentes/module_manager_editor_common.php:699
 #: ../../godmode/agentes/module_manager_editor_common.php:718
 #: ../../godmode/agentes/module_manager_editor_prediction.php:135
-#: ../../godmode/agentes/planned_downtime.editor.php:839
+#: ../../godmode/agentes/planned_downtime.editor.php:865
 #: ../../godmode/agentes/planned_downtime.list.php:175
 #: ../../godmode/alerts/alert_list.builder.php:71
 #: ../../godmode/alerts/alert_list.list.php:393
-#: ../../godmode/alerts/alert_list.list.php:599
+#: ../../godmode/alerts/alert_list.list.php:600
 #: ../../godmode/alerts/alert_view.php:71
-#: ../../godmode/massive/massive_edit_agents.php:296
+#: ../../godmode/massive/massive_edit_agents.php:351
 #: ../../godmode/massive/massive_enable_disable_alerts.php:154
 #: ../../godmode/massive/massive_enable_disable_alerts.php:171
 #: ../../godmode/massive/massive_standby_alerts.php:154
 #: ../../godmode/massive/massive_standby_alerts.php:171
-#: ../../godmode/reporting/graph_builder.graph_editor.php:85
-#: ../../godmode/reporting/reporting_builder.item_editor.php:974
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1546
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1745
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1752
+#: ../../godmode/reporting/create_container.php:345
+#: ../../godmode/reporting/create_container.php:498
+#: ../../godmode/reporting/create_container.php:562
+#: ../../godmode/reporting/graph_builder.graph_editor.php:205
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1016
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1712
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1911
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1918
 #: ../../godmode/reporting/reporting_builder.list_items.php:299
 #: ../../godmode/reporting/visual_console_builder.elements.php:78
 #: ../../godmode/reporting/visual_console_builder.wizard.php:302
 #: ../../godmode/reporting/visual_console_builder.wizard.php:609
 #: ../../godmode/servers/plugin.php:67
-#: ../../include/ajax/alert_list.ajax.php:139
-#: ../../include/functions_visual_map_editor.php:311
-#: ../../include/functions_graph.php:5451
-#: ../../include/functions_reporting_html.php:397
-#: ../../include/functions_reporting_html.php:731
-#: ../../include/functions_reporting_html.php:1486
-#: ../../include/functions_reporting_html.php:1956
-#: ../../include/functions_reporting_html.php:2258
-#: ../../include/functions_reporting_html.php:2301
-#: ../../include/functions_reporting_html.php:2590
+#: ../../include/ajax/alert_list.ajax.php:160
+#: ../../include/functions_reporting.php:3903
+#: ../../include/functions_reporting.php:4047
+#: ../../include/functions_reporting.php:4189
 #: ../../include/functions_treeview.php:66
+#: ../../include/functions_visual_map_editor.php:402
+#: ../../include/functions_graph.php:6328
+#: ../../include/functions_reporting_html.php:400
+#: ../../include/functions_reporting_html.php:734
+#: ../../include/functions_reporting_html.php:1489
+#: ../../include/functions_reporting_html.php:1959
+#: ../../include/functions_reporting_html.php:2233
+#: ../../include/functions_reporting_html.php:2324
+#: ../../include/functions_reporting_html.php:2367
+#: ../../include/functions_reporting_html.php:2657
+#: ../../include/functions_reporting_html.php:2704
 #: ../../mobile/operation/alerts.php:268
-#: ../../operation/agentes/alerts_status.php:428
-#: ../../operation/agentes/alerts_status.php:469
-#: ../../operation/agentes/alerts_status.php:503
-#: ../../operation/agentes/alerts_status.php:537
+#: ../../operation/agentes/alerts_status.php:461
+#: ../../operation/agentes/alerts_status.php:502
+#: ../../operation/agentes/alerts_status.php:536
+#: ../../operation/agentes/alerts_status.php:570
 #: ../../operation/agentes/estado_monitores.php:97
 #: ../../operation/agentes/exportdata.csv.php:77
 #: ../../operation/agentes/exportdata.excel.php:76
 #: ../../operation/agentes/exportdata.php:97
 #: ../../operation/search_alerts.php:42 ../../operation/search_modules.php:35
-#: ../../enterprise/dashboard/widgets/agent_module.php:90
-#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:54
-#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:60
+#: ../../enterprise/dashboard/widgets/agent_module.php:97
+#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:52
+#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:58
 #: ../../enterprise/dashboard/widgets/module_icon.php:63
 #: ../../enterprise/dashboard/widgets/module_icon.php:69
-#: ../../enterprise/dashboard/widgets/module_status.php:63
-#: ../../enterprise/dashboard/widgets/module_status.php:69
+#: ../../enterprise/dashboard/widgets/module_status.php:52
+#: ../../enterprise/dashboard/widgets/module_status.php:58
 #: ../../enterprise/dashboard/widgets/module_table_value.php:60
 #: ../../enterprise/dashboard/widgets/module_table_value.php:66
-#: ../../enterprise/dashboard/widgets/module_value.php:63
-#: ../../enterprise/dashboard/widgets/module_value.php:69
+#: ../../enterprise/dashboard/widgets/module_value.php:64
+#: ../../enterprise/dashboard/widgets/module_value.php:70
+#: ../../enterprise/dashboard/widgets/single_graph.php:55
 #: ../../enterprise/dashboard/widgets/single_graph.php:61
-#: ../../enterprise/dashboard/widgets/single_graph.php:67
 #: ../../enterprise/dashboard/widgets/sla_percent.php:51
 #: ../../enterprise/dashboard/widgets/sla_percent.php:57
 #: ../../enterprise/dashboard/widgets/top_n.php:127
@@ -531,65 +1004,69 @@ msgstr "アラート"
 #: ../../enterprise/godmode/policies/policy_linking.php:121
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:145
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:203
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1476
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1948
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2098
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2105
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1546
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2133
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2283
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2290
 #: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:241
-#: ../../enterprise/godmode/services/services.elements.php:334
-#: ../../enterprise/godmode/services/services.elements.php:360
+#: ../../enterprise/godmode/services/services.elements.php:345
+#: ../../enterprise/godmode/services/services.elements.php:366
 #: ../../enterprise/include/functions_alert_event.php:924
 #: ../../enterprise/include/functions_events.php:120
-#: ../../enterprise/include/functions_inventory.php:507
-#: ../../enterprise/include/functions_inventory.php:563
-#: ../../enterprise/include/functions_reporting.php:1263
-#: ../../enterprise/include/functions_reporting.php:2055
-#: ../../enterprise/include/functions_reporting.php:2832
-#: ../../enterprise/include/functions_reporting_csv.php:323
-#: ../../enterprise/include/functions_reporting_csv.php:347
-#: ../../enterprise/include/functions_reporting_csv.php:404
-#: ../../enterprise/include/functions_reporting_csv.php:430
-#: ../../enterprise/include/functions_reporting_csv.php:496
-#: ../../enterprise/include/functions_reporting_csv.php:523
-#: ../../enterprise/include/functions_reporting_csv.php:558
-#: ../../enterprise/include/functions_reporting_csv.php:594
-#: ../../enterprise/include/functions_reporting_csv.php:631
-#: ../../enterprise/include/functions_reporting_csv.php:699
-#: ../../enterprise/include/functions_reporting_csv.php:735
-#: ../../enterprise/include/functions_reporting_csv.php:771
-#: ../../enterprise/include/functions_reporting_csv.php:807
-#: ../../enterprise/include/functions_reporting_csv.php:843
-#: ../../enterprise/include/functions_reporting_csv.php:879
-#: ../../enterprise/include/functions_reporting_csv.php:928
-#: ../../enterprise/include/functions_reporting_csv.php:975
-#: ../../enterprise/include/functions_reporting_csv.php:1047
-#: ../../enterprise/include/functions_reporting_csv.php:1163
-#: ../../enterprise/include/functions_reporting_csv.php:1305
-#: ../../enterprise/include/functions_reporting_csv.php:1375
-#: ../../enterprise/include/functions_reporting_pdf.php:775
-#: ../../enterprise/include/functions_reporting_pdf.php:833
-#: ../../enterprise/include/functions_reporting_pdf.php:927
-#: ../../enterprise/include/functions_reporting_pdf.php:1265
-#: ../../enterprise/include/functions_reporting_pdf.php:1609
-#: ../../enterprise/include/functions_reporting_pdf.php:1847
-#: ../../enterprise/include/functions_reporting_pdf.php:1866
-#: ../../enterprise/include/functions_services.php:1492
+#: ../../enterprise/include/functions_inventory.php:652
+#: ../../enterprise/include/functions_inventory.php:708
+#: ../../enterprise/include/functions_reporting.php:1649
+#: ../../enterprise/include/functions_reporting.php:2457
+#: ../../enterprise/include/functions_reporting.php:3234
+#: ../../enterprise/include/functions_reporting_csv.php:334
+#: ../../enterprise/include/functions_reporting_csv.php:359
+#: ../../enterprise/include/functions_reporting_csv.php:417
+#: ../../enterprise/include/functions_reporting_csv.php:443
+#: ../../enterprise/include/functions_reporting_csv.php:513
+#: ../../enterprise/include/functions_reporting_csv.php:531
+#: ../../enterprise/include/functions_reporting_csv.php:567
+#: ../../enterprise/include/functions_reporting_csv.php:603
+#: ../../enterprise/include/functions_reporting_csv.php:640
+#: ../../enterprise/include/functions_reporting_csv.php:678
+#: ../../enterprise/include/functions_reporting_csv.php:747
+#: ../../enterprise/include/functions_reporting_csv.php:784
+#: ../../enterprise/include/functions_reporting_csv.php:821
+#: ../../enterprise/include/functions_reporting_csv.php:857
+#: ../../enterprise/include/functions_reporting_csv.php:916
+#: ../../enterprise/include/functions_reporting_csv.php:953
+#: ../../enterprise/include/functions_reporting_csv.php:990
+#: ../../enterprise/include/functions_reporting_csv.php:1040
+#: ../../enterprise/include/functions_reporting_csv.php:1087
+#: ../../enterprise/include/functions_reporting_csv.php:1159
+#: ../../enterprise/include/functions_reporting_csv.php:1275
+#: ../../enterprise/include/functions_reporting_csv.php:1417
+#: ../../enterprise/include/functions_reporting_csv.php:1487
+#: ../../enterprise/include/functions_reporting_pdf.php:358
+#: ../../enterprise/include/functions_reporting_pdf.php:821
+#: ../../enterprise/include/functions_reporting_pdf.php:882
+#: ../../enterprise/include/functions_reporting_pdf.php:909
+#: ../../enterprise/include/functions_reporting_pdf.php:1008
+#: ../../enterprise/include/functions_reporting_pdf.php:1346
+#: ../../enterprise/include/functions_reporting_pdf.php:1690
+#: ../../enterprise/include/functions_reporting_pdf.php:1928
+#: ../../enterprise/include/functions_reporting_pdf.php:1947
+#: ../../enterprise/include/functions_services.php:1581
 #: ../../enterprise/meta/include/functions_wizard_meta.php:3255
 #: ../../enterprise/meta/monitoring/wizard/wizard.create_module.php:222
 #: ../../enterprise/operation/agentes/agent_inventory.php:64
 #: ../../enterprise/operation/agentes/policy_view.php:194
-#: ../../enterprise/operation/inventory/inventory.php:169
+#: ../../enterprise/operation/inventory/inventory.php:170
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:191
 msgid "Module"
 msgstr "モジュール"
 
-#: ../../extensions/agents_alerts.php:281 ../../general/logon_ok.php:225
+#: ../../extensions/agents_alerts.php:432 ../../general/logon_ok.php:225
 #: ../../general/logon_ok.php:422 ../../godmode/admin_access_logs.php:61
 #: ../../godmode/admin_access_logs.php:189
 #: ../../godmode/agentes/agent_template.php:231
-#: ../../godmode/agentes/module_manager.php:568
-#: ../../godmode/agentes/planned_downtime.editor.php:840
-#: ../../godmode/alerts/alert_list.list.php:607
+#: ../../godmode/agentes/module_manager.php:571
+#: ../../godmode/agentes/planned_downtime.editor.php:866
+#: ../../godmode/alerts/alert_list.list.php:608
 #: ../../godmode/alerts/alert_view.php:417
 #: ../../godmode/events/event_filter.php:113
 #: ../../godmode/massive/massive_add_action_alerts.php:179
@@ -600,33 +1077,33 @@ msgstr "モジュール"
 #: ../../godmode/modules/manage_nc_groups.php:195
 #: ../../godmode/modules/manage_network_components.php:570
 #: ../../godmode/modules/manage_network_templates.php:192
-#: ../../godmode/netflow/nf_edit.php:120
+#: ../../godmode/netflow/nf_edit.php:121
 #: ../../godmode/netflow/nf_item_list.php:152
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1551
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1746
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1755
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1717
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1912
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1921
 #: ../../godmode/reporting/visual_console_builder.elements.php:85
 #: ../../godmode/servers/manage_recontask.php:296
 #: ../../godmode/snmpconsole/snmp_alert.php:1172
 #: ../../godmode/snmpconsole/snmp_alert.php:1264
-#: ../../godmode/snmpconsole/snmp_filters.php:133
-#: ../../godmode/users/configure_user.php:626
-#: ../../include/ajax/alert_list.ajax.php:147 ../../include/functions.php:2313
+#: ../../godmode/snmpconsole/snmp_filters.php:226
+#: ../../godmode/users/configure_user.php:740
+#: ../../include/ajax/alert_list.ajax.php:168 ../../include/functions.php:2337
 #: ../../include/functions_ui_renders.php:97
-#: ../../include/functions_events.php:3614
-#: ../../include/functions_reporting_html.php:1959
-#: ../../include/functions_reporting_html.php:3597
+#: ../../include/functions_events.php:3713
+#: ../../include/functions_reporting_html.php:1962
+#: ../../include/functions_reporting_html.php:3710
 #: ../../mobile/operation/tactical.php:308
 #: ../../operation/agentes/alerts_status.functions.php:106
-#: ../../operation/agentes/alerts_status.php:430
-#: ../../operation/agentes/alerts_status.php:471
-#: ../../operation/agentes/alerts_status.php:505
-#: ../../operation/agentes/alerts_status.php:539
+#: ../../operation/agentes/alerts_status.php:463
+#: ../../operation/agentes/alerts_status.php:504
+#: ../../operation/agentes/alerts_status.php:538
+#: ../../operation/agentes/alerts_status.php:572
 #: ../../operation/events/events.build_table.php:253
 #: ../../operation/incidents/incident.php:343
 #: ../../operation/search_alerts.php:48
-#: ../../operation/snmpconsole/snmp_view.php:631
-#: ../../operation/snmpconsole/snmp_view.php:929
+#: ../../operation/snmpconsole/snmp_view.php:739
+#: ../../operation/snmpconsole/snmp_view.php:1041
 #: ../../enterprise/dashboard/widgets/top_n.php:129
 #: ../../enterprise/extensions/ipam/ipam_list.php:200
 #: ../../enterprise/godmode/admin_access_logs.php:25
@@ -635,64 +1112,65 @@ msgstr "モジュール"
 #: ../../enterprise/godmode/alerts/alert_events_list.php:424
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:158
 #: ../../enterprise/godmode/policies/policy_alerts.php:455
-#: ../../enterprise/godmode/policies/policy_modules.php:1205
+#: ../../enterprise/godmode/policies/policy_modules.php:1236
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:151
-#: ../../enterprise/godmode/reporting/graph_template_list.php:130
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1952
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2099
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2107
+#: ../../enterprise/godmode/reporting/graph_template_list.php:133
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2137
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2284
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2292
 #: ../../enterprise/godmode/servers/manage_export.php:131
-#: ../../enterprise/include/functions_services.php:1432
+#: ../../enterprise/include/functions_services.php:1521
 #: ../../enterprise/operation/agentes/policy_view.php:196
 msgid "Action"
 msgstr "アクション"
 
-#: ../../extensions/agents_alerts.php:282
+#: ../../extensions/agents_alerts.php:433
 #: ../../godmode/alerts/alert_view.php:79
 #: ../../godmode/snmpconsole/snmp_alert.php:1169
-#: ../../include/functions_reporting_html.php:3109
-#: ../../include/functions_treeview.php:424
-#: ../../operation/agentes/alerts_status.php:431
-#: ../../operation/agentes/alerts_status.php:472
-#: ../../operation/agentes/alerts_status.php:506
-#: ../../operation/agentes/alerts_status.php:540
+#: ../../include/functions_treeview.php:430
+#: ../../include/functions_reporting_html.php:3222
+#: ../../operation/agentes/alerts_status.php:464
+#: ../../operation/agentes/alerts_status.php:505
+#: ../../operation/agentes/alerts_status.php:539
+#: ../../operation/agentes/alerts_status.php:573
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1528
 #: ../../enterprise/operation/agentes/policy_view.php:197
 msgid "Last fired"
 msgstr "通知日時"
 
-#: ../../extensions/agents_alerts.php:283 ../../extensions/net_tools.php:239
+#: ../../extensions/agents_alerts.php:434 ../../extensions/net_tools.php:243
 #: ../../godmode/agentes/agent_incidents.php:86
-#: ../../godmode/agentes/agent_manager.php:340
-#: ../../godmode/agentes/module_manager.php:564
+#: ../../godmode/agentes/agent_manager.php:359
+#: ../../godmode/agentes/module_manager.php:567
 #: ../../godmode/alerts/alert_list.list.php:411
 #: ../../godmode/alerts/alert_view.php:96
 #: ../../godmode/events/custom_events.php:83
 #: ../../godmode/events/custom_events.php:157
 #: ../../godmode/massive/massive_copy_modules.php:83
-#: ../../godmode/massive/massive_copy_modules.php:196
+#: ../../godmode/massive/massive_copy_modules.php:201
 #: ../../godmode/massive/massive_delete_agents.php:119
-#: ../../godmode/massive/massive_delete_modules.php:450
-#: ../../godmode/massive/massive_edit_agents.php:222
-#: ../../godmode/massive/massive_edit_agents.php:362
+#: ../../godmode/massive/massive_delete_modules.php:471
+#: ../../godmode/massive/massive_edit_agents.php:275
+#: ../../godmode/massive/massive_edit_agents.php:418
 #: ../../godmode/servers/servers.build_table.php:65
-#: ../../include/ajax/module.php:745 ../../include/functions_events.php:39
-#: ../../include/functions_events.php:2415
-#: ../../include/functions_events.php:3520
-#: ../../include/functions_pandora_networkmap.php:1400
-#: ../../include/functions_reporting_html.php:401
-#: ../../include/functions_reporting_html.php:806
-#: ../../include/functions_reporting_html.php:816
-#: ../../include/functions_reporting_html.php:1021
-#: ../../include/functions_reporting_html.php:1031
-#: ../../include/functions_reporting_html.php:1642
-#: ../../include/functions_reporting_html.php:2083
-#: ../../include/functions_reporting_html.php:2118
-#: ../../include/functions_reporting_html.php:2824
-#: ../../include/functions_snmp_browser.php:435
-#: ../../mobile/operation/agents.php:81 ../../mobile/operation/agents.php:111
-#: ../../mobile/operation/agents.php:112 ../../mobile/operation/agents.php:184
-#: ../../mobile/operation/agents.php:185 ../../mobile/operation/agents.php:322
+#: ../../include/ajax/module.php:781
+#: ../../include/functions_pandora_networkmap.php:1647
+#: ../../include/functions_events.php:39
+#: ../../include/functions_events.php:2514
+#: ../../include/functions_events.php:3619
+#: ../../include/functions_snmp_browser.php:481
+#: ../../include/functions_reporting_html.php:404
+#: ../../include/functions_reporting_html.php:809
+#: ../../include/functions_reporting_html.php:819
+#: ../../include/functions_reporting_html.php:1024
+#: ../../include/functions_reporting_html.php:1034
+#: ../../include/functions_reporting_html.php:1645
+#: ../../include/functions_reporting_html.php:2086
+#: ../../include/functions_reporting_html.php:2121
+#: ../../include/functions_reporting_html.php:2937
+#: ../../include/functions_snmp.php:325 ../../mobile/operation/agents.php:81
+#: ../../mobile/operation/agents.php:126 ../../mobile/operation/agents.php:205
+#: ../../mobile/operation/agents.php:206 ../../mobile/operation/agents.php:345
 #: ../../mobile/operation/alerts.php:75 ../../mobile/operation/alerts.php:76
 #: ../../mobile/operation/alerts.php:194 ../../mobile/operation/alerts.php:195
 #: ../../mobile/operation/alerts.php:274 ../../mobile/operation/events.php:342
@@ -712,51 +1190,58 @@ msgstr "通知日時"
 #: ../../mobile/operation/modules.php:623
 #: ../../mobile/operation/modules.php:754
 #: ../../operation/agentes/alerts_status.functions.php:83
-#: ../../operation/agentes/alerts_status.php:432
-#: ../../operation/agentes/alerts_status.php:473
-#: ../../operation/agentes/alerts_status.php:507
-#: ../../operation/agentes/alerts_status.php:541
-#: ../../operation/agentes/estado_agente.php:193
-#: ../../operation/agentes/estado_agente.php:525
-#: ../../operation/agentes/status_monitor.php:971
+#: ../../operation/agentes/alerts_status.php:465
+#: ../../operation/agentes/alerts_status.php:506
+#: ../../operation/agentes/alerts_status.php:540
+#: ../../operation/agentes/alerts_status.php:574
+#: ../../operation/agentes/estado_agente.php:221
+#: ../../operation/agentes/estado_agente.php:573
+#: ../../operation/agentes/status_monitor.php:979
 #: ../../operation/events/events.build_table.php:144
 #: ../../operation/incidents/incident.php:240
 #: ../../operation/incidents/incident.php:336
 #: ../../operation/incidents/incident_detail.php:276
 #: ../../operation/messages/message_list.php:121
 #: ../../operation/search_agents.php:64 ../../operation/search_modules.php:51
-#: ../../operation/servers/recon_view.php:98
-#: ../../operation/snmpconsole/snmp_view.php:404
-#: ../../operation/snmpconsole/snmp_view.php:597
-#: ../../operation/snmpconsole/snmp_view.php:913
+#: ../../operation/servers/recon_view.php:101
+#: ../../operation/snmpconsole/snmp_view.php:461
+#: ../../operation/snmpconsole/snmp_view.php:705
+#: ../../operation/snmpconsole/snmp_view.php:1025
 #: ../../enterprise/dashboard/widgets/tactical.php:32
 #: ../../enterprise/extensions/backup/main.php:101
-#: ../../enterprise/extensions/vmware/vmware_view.php:1002
+#: ../../enterprise/extensions/vmware/vmware_view.php:1016
 #: ../../enterprise/godmode/admin_access_logs.php:22
 #: ../../enterprise/godmode/agentes/collection_manager.php:108
 #: ../../enterprise/godmode/agentes/collection_manager.php:166
 #: ../../enterprise/godmode/alerts/alert_events_list.php:425
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:92
 #: ../../enterprise/godmode/policies/policies.php:253
-#: ../../enterprise/godmode/policies/policy_agents.php:379
+#: ../../enterprise/godmode/policies/policy_agents.php:574
+#: ../../enterprise/godmode/policies/policy_agents.php:819
 #: ../../enterprise/godmode/policies/policy_collections.php:124
 #: ../../enterprise/godmode/policies/policy_collections.php:195
-#: ../../enterprise/godmode/policies/policy_queue.php:348
+#: ../../enterprise/godmode/policies/policy_queue.php:368
+#: ../../enterprise/godmode/reporting/cluster_list.php:121
+#: ../../enterprise/godmode/reporting/cluster_list.php:173
 #: ../../enterprise/godmode/servers/list_satellite.php:36
-#: ../../enterprise/include/functions_reporting.php:1264
-#: ../../enterprise/include/functions_reporting.php:2056
-#: ../../enterprise/include/functions_reporting.php:2833
-#: ../../enterprise/include/functions_reporting.php:4428
-#: ../../enterprise/include/functions_reporting.php:4729
-#: ../../enterprise/include/functions_reporting_csv.php:1322
-#: ../../enterprise/include/functions_reporting_pdf.php:1269
-#: ../../enterprise/include/functions_reporting_pdf.php:1610
-#: ../../enterprise/include/functions_reporting_pdf.php:2042
-#: ../../enterprise/include/functions_reporting_pdf.php:2319
-#: ../../enterprise/include/functions_reporting_pdf.php:2369
-#: ../../enterprise/include/functions_services.php:1429
+#: ../../enterprise/include/ajax/clustermap.php:65
+#: ../../enterprise/include/ajax/clustermap.php:275
+#: ../../enterprise/include/functions_reporting.php:1650
+#: ../../enterprise/include/functions_reporting.php:2458
+#: ../../enterprise/include/functions_reporting.php:3235
+#: ../../enterprise/include/functions_reporting.php:4846
+#: ../../enterprise/include/functions_reporting.php:5147
+#: ../../enterprise/include/functions_reporting_csv.php:1434
+#: ../../enterprise/include/functions_reporting_pdf.php:1350
+#: ../../enterprise/include/functions_reporting_pdf.php:1691
+#: ../../enterprise/include/functions_reporting_pdf.php:2123
+#: ../../enterprise/include/functions_reporting_pdf.php:2400
+#: ../../enterprise/include/functions_reporting_pdf.php:2450
+#: ../../enterprise/include/functions_services.php:1518
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:357
 #: ../../enterprise/meta/advanced/policymanager.queue.php:222
 #: ../../enterprise/meta/advanced/servers.build_table.php:60
-#: ../../enterprise/meta/agentsearch.php:98
+#: ../../enterprise/meta/agentsearch.php:107
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1552
 #: ../../enterprise/meta/include/functions_events_meta.php:70
 #: ../../enterprise/operation/agentes/collection_view.php:66
@@ -764,6 +1249,8 @@ msgstr "通知日時"
 #: ../../enterprise/operation/agentes/policy_view.php:134
 #: ../../enterprise/operation/agentes/policy_view.php:198
 #: ../../enterprise/operation/agentes/policy_view.php:307
+#: ../../enterprise/operation/agentes/tag_view.php:470
+#: ../../enterprise/operation/agentes/tag_view.php:538
 #: ../../enterprise/operation/services/services.list.php:175
 #: ../../enterprise/operation/services/services.list.php:342
 #: ../../enterprise/operation/services/services.service.php:140
@@ -771,29 +1258,31 @@ msgstr "通知日時"
 msgid "Status"
 msgstr "状態"
 
-#: ../../extensions/agents_alerts.php:313
-#: ../../godmode/agentes/module_manager_editor_common.php:394
+#: ../../extensions/agents_alerts.php:464
+#: ../../godmode/agentes/module_manager_editor_common.php:397
 #: ../../godmode/alerts/alert_list.list.php:504
 #: ../../godmode/alerts/alert_special_days.php:275
 #: ../../godmode/alerts/alert_special_days.php:287
 #: ../../godmode/alerts/alert_view.php:43
 #: ../../godmode/events/event_edit_filter.php:278
-#: ../../godmode/massive/massive_edit_agents.php:404
+#: ../../godmode/massive/massive_edit_agents.php:460
 #: ../../godmode/setup/gis_step_2.php:367
 #: ../../godmode/setup/gis_step_2.php:451
-#: ../../godmode/setup/setup_visuals.php:182
-#: ../../godmode/setup/setup_visuals.php:596
-#: ../../godmode/setup/setup_visuals.php:608
-#: ../../godmode/users/configure_user.php:451
-#: ../../include/functions_ui.php:908
-#: ../../operation/events/events_list.php:475
+#: ../../godmode/setup/setup_visuals.php:183
+#: ../../godmode/setup/setup_visuals.php:662
+#: ../../godmode/setup/setup_visuals.php:674
+#: ../../godmode/users/configure_user.php:514
+#: ../../godmode/users/configure_user.php:586
+#: ../../include/functions_ui.php:935
+#: ../../operation/events/events_list.php:543
 #: ../../operation/gis_maps/gis_map.php:93
-#: ../../operation/snmpconsole/snmp_view.php:395
-#: ../../operation/users/user_edit.php:247
+#: ../../operation/snmpconsole/snmp_view.php:452
 #: ../../operation/users/user_edit.php:249
-#: ../../operation/users/user_edit.php:257
-#: ../../operation/users/user_edit.php:276
-#: ../../enterprise/dashboard/main_dashboard.php:66
+#: ../../operation/users/user_edit.php:251
+#: ../../operation/users/user_edit.php:259
+#: ../../operation/users/user_edit.php:278
+#: ../../enterprise/dashboard/main_dashboard.php:74
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:186
 #: ../../enterprise/godmode/policies/policy_alerts.php:304
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:199
 #: ../../enterprise/godmode/reporting/reporting_builder.advanced.php:83
@@ -801,27 +1290,27 @@ msgstr "状態"
 #: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:117
 #: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:122
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:78
-#: ../../enterprise/meta/advanced/metasetup.visual.php:215
-#: ../../enterprise/meta/advanced/metasetup.visual.php:251
-#: ../../enterprise/meta/advanced/metasetup.visual.php:256
+#: ../../enterprise/meta/advanced/metasetup.visual.php:237
+#: ../../enterprise/meta/advanced/metasetup.visual.php:290
+#: ../../enterprise/meta/advanced/metasetup.visual.php:295
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1520
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:99
 #: ../../enterprise/operation/agentes/policy_view.php:253
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../../extensions/agents_alerts.php:324
-#: ../../godmode/alerts/alert_list.list.php:642
+#: ../../extensions/agents_alerts.php:475
+#: ../../godmode/alerts/alert_list.list.php:643
 #: ../../godmode/alerts/alert_view.php:85 ../../include/functions.php:1035
-#: ../../include/functions_agents.php:2179
-#: ../../include/functions_agents.php:2191
+#: ../../include/functions_reporting.php:8662
+#: ../../include/functions_agents.php:2201
+#: ../../include/functions_agents.php:2213 ../../include/functions_ui.php:948
 #: ../../include/functions_events.php:1158
-#: ../../include/functions_events.php:1404
-#: ../../include/functions_reporting.php:7998
-#: ../../include/functions_ui.php:921 ../../mobile/operation/alerts.php:253
+#: ../../include/functions_events.php:1408
+#: ../../mobile/operation/alerts.php:253
 #: ../../operation/agentes/group_view.php:174
 #: ../../operation/events/sound_events.php:83
-#: ../../operation/snmpconsole/snmp_view.php:735
+#: ../../operation/snmpconsole/snmp_view.php:843
 #: ../../enterprise/godmode/alerts/alert_events_list.php:617
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:637
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:872
@@ -831,9 +1320,9 @@ msgstr "デフォルト"
 msgid "Alert fired"
 msgstr "発生中アラート"
 
-#: ../../extensions/agents_alerts.php:324
-#: ../../godmode/alerts/alert_list.list.php:642
-#: ../../godmode/alerts/alert_view.php:85 ../../include/functions_ui.php:921
+#: ../../extensions/agents_alerts.php:475
+#: ../../godmode/alerts/alert_list.list.php:643
+#: ../../godmode/alerts/alert_view.php:85 ../../include/functions_ui.php:948
 #: ../../mobile/operation/alerts.php:253
 #: ../../enterprise/godmode/alerts/alert_events_list.php:618
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:872
@@ -842,11 +1331,11 @@ msgstr "発生中アラート"
 msgid "times"
 msgstr "回"
 
-#: ../../extensions/agents_alerts.php:328
-#: ../../godmode/alerts/alert_list.list.php:646
+#: ../../extensions/agents_alerts.php:479
+#: ../../godmode/alerts/alert_list.list.php:647
 #: ../../godmode/alerts/alert_view.php:89
-#: ../../include/functions_reporting.php:8004
-#: ../../include/functions_ui.php:925 ../../mobile/operation/alerts.php:257
+#: ../../include/functions_reporting.php:8668
+#: ../../include/functions_ui.php:952 ../../mobile/operation/alerts.php:257
 #: ../../enterprise/godmode/alerts/alert_events_list.php:622
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:876
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1544
@@ -854,14 +1343,14 @@ msgstr "回"
 msgid "Alert disabled"
 msgstr "無効アラート"
 
-#: ../../extensions/agents_alerts.php:332
-#: ../../godmode/alerts/alert_list.list.php:650
+#: ../../extensions/agents_alerts.php:483
+#: ../../godmode/alerts/alert_list.list.php:651
 #: ../../godmode/alerts/alert_view.php:93
-#: ../../include/functions_agents.php:2182
-#: ../../include/functions_agents.php:2194
-#: ../../include/functions_reporting.php:7943
-#: ../../include/functions_ui.php:929 ../../mobile/operation/alerts.php:261
-#: ../../operation/snmpconsole/snmp_view.php:738
+#: ../../include/functions_reporting.php:8607
+#: ../../include/functions_agents.php:2204
+#: ../../include/functions_agents.php:2216 ../../include/functions_ui.php:956
+#: ../../mobile/operation/alerts.php:261
+#: ../../operation/snmpconsole/snmp_view.php:846
 #: ../../enterprise/godmode/alerts/alert_events_list.php:626
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:639
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:880
@@ -870,207 +1359,48 @@ msgstr "無効アラート"
 msgid "Alert not fired"
 msgstr "未通知アラート"
 
-#: ../../extensions/agents_alerts.php:345 ../../extensions/insert_data.php:158
-#: ../../extensions/module_groups.php:41
-#: ../../godmode/agentes/module_manager_editor_common.php:689
-#: ../../godmode/agentes/module_manager_editor_common.php:717
-#: ../../godmode/agentes/module_manager_editor_prediction.php:110
-#: ../../godmode/agentes/planned_downtime.list.php:171
-#: ../../godmode/alerts/alert_list.builder.php:59
-#: ../../godmode/alerts/alert_list.list.php:379
-#: ../../godmode/alerts/alert_list.list.php:590
-#: ../../godmode/alerts/alert_view.php:66
-#: ../../godmode/gis_maps/configure_gis_map.php:420
-#: ../../godmode/massive/massive_copy_modules.php:86
-#: ../../godmode/massive/massive_copy_modules.php:200
-#: ../../godmode/massive/massive_enable_disable_alerts.php:154
-#: ../../godmode/massive/massive_enable_disable_alerts.php:171
-#: ../../godmode/massive/massive_standby_alerts.php:154
-#: ../../godmode/massive/massive_standby_alerts.php:171
-#: ../../godmode/reporting/graph_builder.graph_editor.php:84
-#: ../../godmode/reporting/reporting_builder.item_editor.php:920
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1545
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1744
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1751
-#: ../../godmode/reporting/reporting_builder.list_items.php:294
-#: ../../godmode/reporting/visual_console_builder.elements.php:77
-#: ../../godmode/reporting/visual_console_builder.wizard.php:303
-#: ../../godmode/reporting/visual_console_builder.wizard.php:577
-#: ../../godmode/reporting/visual_console_builder.wizard.php:600
-#: ../../godmode/servers/plugin.php:66
-#: ../../include/ajax/alert_list.ajax.php:130
-#: ../../include/functions_visual_map_editor.php:277
-#: ../../include/functions_graph.php:5335
-#: ../../include/functions_pandora_networkmap.php:1383
-#: ../../include/functions_pandora_networkmap.php:1553
-#: ../../include/functions_reporting_html.php:396
-#: ../../include/functions_reporting_html.php:730
-#: ../../include/functions_reporting_html.php:810
-#: ../../include/functions_reporting_html.php:819
-#: ../../include/functions_reporting_html.php:1485
-#: ../../include/functions_reporting_html.php:1889
-#: ../../include/functions_reporting_html.php:1896
-#: ../../include/functions_reporting_html.php:1955
-#: ../../include/functions_reporting_html.php:2251
-#: ../../include/functions_reporting_html.php:2294
-#: ../../include/functions_reporting_html.php:2589
-#: ../../include/functions_reporting_html.php:2637
-#: ../../include/functions_reporting_html.php:2880
-#: ../../include/functions_reporting_html.php:3034
-#: ../../include/functions_reporting_html.php:3245
-#: ../../mobile/operation/agents.php:69 ../../mobile/operation/agents.php:310
-#: ../../mobile/operation/alerts.php:266 ../../mobile/operation/events.php:510
-#: ../../mobile/operation/home.php:72 ../../mobile/operation/modules.php:496
-#: ../../operation/agentes/alerts_status.php:427
-#: ../../operation/agentes/alerts_status.php:502
-#: ../../operation/agentes/estado_agente.php:490
-#: ../../operation/agentes/estado_monitores.php:95
-#: ../../operation/agentes/exportdata.csv.php:77
-#: ../../operation/agentes/exportdata.excel.php:76
-#: ../../operation/agentes/exportdata.php:96
-#: ../../operation/agentes/status_monitor.php:948
-#: ../../operation/agentes/ver_agente.php:818
-#: ../../operation/events/events.build_table.php:36
-#: ../../operation/events/sound_events.php:80
-#: ../../operation/gis_maps/ajax.php:216 ../../operation/gis_maps/ajax.php:247
-#: ../../operation/incidents/incident_detail.php:349
-#: ../../operation/search_agents.php:44 ../../operation/search_agents.php:50
-#: ../../operation/search_alerts.php:39 ../../operation/search_modules.php:42
-#: ../../enterprise/dashboard/widgets/agent_module.php:80
-#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:43
-#: ../../enterprise/dashboard/widgets/module_icon.php:52
-#: ../../enterprise/dashboard/widgets/module_status.php:52
-#: ../../enterprise/dashboard/widgets/module_table_value.php:49
-#: ../../enterprise/dashboard/widgets/module_value.php:52
-#: ../../enterprise/dashboard/widgets/single_graph.php:50
-#: ../../enterprise/dashboard/widgets/sla_percent.php:40
-#: ../../enterprise/dashboard/widgets/top_n.php:126
-#: ../../enterprise/extensions/ipam/ipam_ajax.php:172
-#: ../../enterprise/extensions/ipam/ipam_network.php:537
-#: ../../enterprise/godmode/agentes/collections.agents.php:102
-#: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:77
-#: ../../enterprise/godmode/alerts/configure_alert_rule.php:146
-#: ../../enterprise/godmode/modules/manage_inventory_modules.php:213
-#: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:84
-#: ../../enterprise/godmode/policies/policy_linking.php:120
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1464
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1947
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2097
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2104
-#: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:231
-#: ../../enterprise/godmode/services/services.elements.php:335
-#: ../../enterprise/godmode/services/services.elements.php:344
-#: ../../enterprise/include/functions_alert_event.php:923
-#: ../../enterprise/include/functions_events.php:111
-#: ../../enterprise/include/functions_inventory.php:234
-#: ../../enterprise/include/functions_inventory.php:506
-#: ../../enterprise/include/functions_inventory.php:562
-#: ../../enterprise/include/functions_log.php:346
-#: ../../enterprise/include/functions_reporting.php:1263
-#: ../../enterprise/include/functions_reporting.php:1471
-#: ../../enterprise/include/functions_reporting.php:1594
-#: ../../enterprise/include/functions_reporting.php:1597
-#: ../../enterprise/include/functions_reporting.php:2055
-#: ../../enterprise/include/functions_reporting.php:2832
-#: ../../enterprise/include/functions_reporting_csv.php:323
-#: ../../enterprise/include/functions_reporting_csv.php:346
-#: ../../enterprise/include/functions_reporting_csv.php:404
-#: ../../enterprise/include/functions_reporting_csv.php:430
-#: ../../enterprise/include/functions_reporting_csv.php:496
-#: ../../enterprise/include/functions_reporting_csv.php:523
-#: ../../enterprise/include/functions_reporting_csv.php:558
-#: ../../enterprise/include/functions_reporting_csv.php:594
-#: ../../enterprise/include/functions_reporting_csv.php:631
-#: ../../enterprise/include/functions_reporting_csv.php:699
-#: ../../enterprise/include/functions_reporting_csv.php:735
-#: ../../enterprise/include/functions_reporting_csv.php:771
-#: ../../enterprise/include/functions_reporting_csv.php:807
-#: ../../enterprise/include/functions_reporting_csv.php:843
-#: ../../enterprise/include/functions_reporting_csv.php:879
-#: ../../enterprise/include/functions_reporting_csv.php:927
-#: ../../enterprise/include/functions_reporting_csv.php:974
-#: ../../enterprise/include/functions_reporting_csv.php:1046
-#: ../../enterprise/include/functions_reporting_csv.php:1162
-#: ../../enterprise/include/functions_reporting_csv.php:1304
-#: ../../enterprise/include/functions_reporting_csv.php:1374
-#: ../../enterprise/include/functions_reporting_pdf.php:366
-#: ../../enterprise/include/functions_reporting_pdf.php:375
-#: ../../enterprise/include/functions_reporting_pdf.php:774
-#: ../../enterprise/include/functions_reporting_pdf.php:832
-#: ../../enterprise/include/functions_reporting_pdf.php:860
-#: ../../enterprise/include/functions_reporting_pdf.php:926
-#: ../../enterprise/include/functions_reporting_pdf.php:1264
-#: ../../enterprise/include/functions_reporting_pdf.php:1609
-#: ../../enterprise/include/functions_reporting_pdf.php:1842
-#: ../../enterprise/include/functions_reporting_pdf.php:1860
-#: ../../enterprise/include/functions_services.php:1442
-#: ../../enterprise/meta/agentsearch.php:93
-#: ../../enterprise/meta/include/functions_wizard_meta.php:3248
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:245
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:333
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:404
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:512
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:593
-#: ../../enterprise/operation/agentes/manage_transmap_creation.php:119
-#: ../../enterprise/operation/agentes/manage_transmap_creation.php:270
-#: ../../enterprise/operation/agentes/manage_transmap_creation.php:359
-#: ../../enterprise/operation/inventory/inventory.php:206
-#: ../../enterprise/operation/log/log_viewer.php:193
-#: ../../enterprise/operation/maps/networkmap_list_deleted.php:186
-msgid "Agent"
-msgstr "エージェント"
-
-#: ../../extensions/agents_alerts.php:345
-#: ../../godmode/alerts/alert_list.builder.php:113
-#: ../../godmode/alerts/alert_list.list.php:407
-#: ../../godmode/alerts/alert_view.php:75
-#: ../../include/functions_reporting_html.php:1957
-#: ../../include/functions_reporting_html.php:1960
-#: ../../include/functions_treeview.php:381
-#: ../../include/functions_treeview.php:422
-#: ../../mobile/operation/alerts.php:270
-#: ../../operation/agentes/alerts_status.php:429
-#: ../../operation/agentes/alerts_status.php:470
-#: ../../operation/agentes/alerts_status.php:504
-#: ../../operation/agentes/alerts_status.php:538
-#: ../../operation/search_alerts.php:45
-#: ../../operation/servers/recon_view.php:101
-#: ../../enterprise/extensions/cron/main.php:246
-#: ../../enterprise/godmode/policies/policy_alerts.php:239
-#: ../../enterprise/godmode/policies/policy_alerts.php:438
-#: ../../enterprise/operation/agentes/policy_view.php:195
-msgid "Template"
-msgstr "テンプレート"
-
-#: ../../extensions/agents_alerts.php:348
+#: ../../extensions/agents_alerts.php:499
 msgid "Agents/Alerts view"
 msgstr "エージェント/アラート 表示"
 
-#: ../../extensions/agents_modules.php:117
+#: ../../extensions/agents_modules.php:141
+#: ../../godmode/agentes/modificar_agente.php:190
+#: ../../godmode/agentes/planned_downtime.editor.php:719
+#: ../../godmode/reporting/reporting_builder.item_editor.php:917
+#: ../../operation/agentes/estado_agente.php:203
+#: ../../enterprise/dashboard/widgets/agent_module.php:84
+#: ../../enterprise/godmode/policies/policies.php:233
+#: ../../enterprise/godmode/reporting/cluster_list.php:104
+msgid "Recursion"
+msgstr "子を含める"
+
+#: ../../extensions/agents_modules.php:144
 #: ../../godmode/agentes/module_manager_editor_common.php:174
-#: ../../godmode/massive/massive_edit_modules.php:518
+#: ../../godmode/massive/massive_edit_modules.php:544
 #: ../../godmode/modules/manage_network_components_form_common.php:95
-#: ../../godmode/reporting/reporting_builder.item_editor.php:909
-#: ../../include/functions_events.php:2075
-#: ../../include/functions_graph.php:5357
+#: ../../godmode/reporting/create_container.php:484
+#: ../../godmode/reporting/reporting_builder.item_editor.php:951
 #: ../../include/functions_treeview.php:123
+#: ../../include/functions_events.php:2176
+#: ../../include/functions_graph.php:6234
 #: ../../mobile/operation/modules.php:140
 #: ../../mobile/operation/modules.php:141
 #: ../../mobile/operation/modules.php:229
 #: ../../mobile/operation/modules.php:230
-#: ../../operation/agentes/estado_monitores.php:463
-#: ../../operation/agentes/status_monitor.php:311
-#: ../../operation/agentes/ver_agente.php:810
+#: ../../operation/agentes/estado_monitores.php:476
+#: ../../operation/agentes/status_monitor.php:309
+#: ../../operation/agentes/ver_agente.php:885
 #: ../../enterprise/godmode/modules/configure_local_component.php:211
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1453
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1523
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1377
 #: ../../enterprise/meta/monitoring/wizard/wizard.create_module.php:157
+#: ../../enterprise/operation/agentes/tag_view.php:94
 #: ../../enterprise/operation/agentes/ver_agente.php:33
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:206
 msgid "Module group"
 msgstr "モジュールグループ"
 
-#: ../../extensions/agents_modules.php:119
+#: ../../extensions/agents_modules.php:146
 #: ../../extensions/files_repo/files_repo_form.php:50
 #: ../../general/subselect_data_module.php:42
 #: ../../godmode/admin_access_logs.php:62
@@ -1082,31 +1412,32 @@ msgstr "モジュールグループ"
 #: ../../godmode/alerts/alert_list.php:291
 #: ../../godmode/alerts/alert_list.php:345
 #: ../../godmode/alerts/alert_list.php:358
-#: ../../godmode/alerts/alert_templates.php:255
+#: ../../godmode/alerts/alert_templates.php:256
 #: ../../godmode/events/event_edit_filter.php:237
 #: ../../godmode/events/event_edit_filter.php:241
 #: ../../godmode/events/event_edit_filter.php:382
 #: ../../godmode/massive/massive_copy_modules.php:85
-#: ../../godmode/massive/massive_copy_modules.php:198
+#: ../../godmode/massive/massive_copy_modules.php:203
 #: ../../godmode/massive/massive_delete_agents.php:121
 #: ../../godmode/massive/massive_delete_agents.php:124
-#: ../../godmode/massive/massive_delete_modules.php:409
-#: ../../godmode/massive/massive_delete_modules.php:437
-#: ../../godmode/massive/massive_delete_modules.php:460
-#: ../../godmode/massive/massive_delete_modules.php:474
-#: ../../godmode/massive/massive_edit_agents.php:224
-#: ../../godmode/massive/massive_edit_agents.php:226
-#: ../../godmode/massive/massive_edit_modules.php:253
-#: ../../godmode/massive/massive_edit_modules.php:281
-#: ../../godmode/massive/massive_edit_modules.php:303
-#: ../../godmode/massive/massive_edit_modules.php:334
+#: ../../godmode/massive/massive_delete_modules.php:425
+#: ../../godmode/massive/massive_delete_modules.php:453
+#: ../../godmode/massive/massive_delete_modules.php:481
+#: ../../godmode/massive/massive_delete_modules.php:495
+#: ../../godmode/massive/massive_edit_agents.php:277
+#: ../../godmode/massive/massive_edit_agents.php:279
+#: ../../godmode/massive/massive_edit_modules.php:263
+#: ../../godmode/massive/massive_edit_modules.php:291
+#: ../../godmode/massive/massive_edit_modules.php:312
+#: ../../godmode/massive/massive_edit_modules.php:350
 #: ../../godmode/modules/manage_network_components.php:515
 #: ../../godmode/modules/manage_network_templates_form.php:269
-#: ../../godmode/reporting/reporting_builder.item_editor.php:904
-#: ../../godmode/reporting/reporting_builder.item_editor.php:914
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1096
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1406
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1418
+#: ../../godmode/reporting/create_container.php:487
+#: ../../godmode/reporting/reporting_builder.item_editor.php:946
+#: ../../godmode/reporting/reporting_builder.item_editor.php:956
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1147
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1472
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1484
 #: ../../godmode/reporting/reporting_builder.list_items.php:166
 #: ../../godmode/reporting/reporting_builder.list_items.php:168
 #: ../../godmode/reporting/reporting_builder.list_items.php:170
@@ -1115,17 +1446,18 @@ msgstr "モジュールグループ"
 #: ../../godmode/reporting/reporting_builder.list_items.php:198
 #: ../../godmode/reporting/visual_console_builder.wizard.php:249
 #: ../../godmode/reporting/visual_console_builder.wizard.php:254
-#: ../../godmode/setup/gis_step_2.php:154 ../../include/functions.php:906
-#: ../../include/functions.php:1129 ../../include/functions_users.php:187
-#: ../../include/functions_users.php:192 ../../include/functions_users.php:886
-#: ../../include/functions_events.php:3339
-#: ../../include/functions_events.php:3852
-#: ../../include/functions_graph.php:2874
+#: ../../godmode/setup/gis_step_2.php:154
+#: ../../godmode/setup/setup_visuals.php:558 ../../include/functions.php:906
+#: ../../include/functions.php:1129 ../../include/functions_reporting.php:1751
+#: ../../include/functions_events.php:3438
+#: ../../include/functions_events.php:3951
+#: ../../include/functions_users.php:336
+#: ../../include/functions_users.php:1056
+#: ../../include/functions_graph.php:3355
 #: ../../include/functions_groups.php:616
-#: ../../include/functions_groups.php:2359
-#: ../../include/functions_modules.php:2497
-#: ../../include/functions_modules.php:2498
-#: ../../include/functions_reporting.php:1662
+#: ../../include/functions_groups.php:2410
+#: ../../include/functions_modules.php:2585
+#: ../../include/functions_modules.php:2587
 #: ../../mobile/operation/agents.php:32 ../../mobile/operation/alerts.php:37
 #: ../../mobile/operation/alerts.php:43 ../../mobile/operation/events.php:624
 #: ../../mobile/operation/events.php:634
@@ -1141,73 +1473,76 @@ msgstr "モジュールグループ"
 #: ../../operation/agentes/alerts_status.functions.php:94
 #: ../../operation/agentes/alerts_status.functions.php:111
 #: ../../operation/agentes/alerts_status.functions.php:113
-#: ../../operation/agentes/estado_agente.php:194
-#: ../../operation/agentes/estado_monitores.php:447
-#: ../../operation/agentes/estado_monitores.php:466
-#: ../../operation/agentes/status_monitor.php:307
-#: ../../operation/agentes/status_monitor.php:324
-#: ../../operation/agentes/status_monitor.php:334
-#: ../../operation/agentes/status_monitor.php:353
-#: ../../operation/agentes/status_monitor.php:396
-#: ../../operation/agentes/status_monitor.php:398
-#: ../../operation/agentes/status_monitor.php:463
+#: ../../operation/agentes/estado_agente.php:222
+#: ../../operation/agentes/estado_monitores.php:460
+#: ../../operation/agentes/estado_monitores.php:479
+#: ../../operation/agentes/status_monitor.php:305
+#: ../../operation/agentes/status_monitor.php:322
+#: ../../operation/agentes/status_monitor.php:332
+#: ../../operation/agentes/status_monitor.php:351
+#: ../../operation/agentes/status_monitor.php:400
+#: ../../operation/agentes/status_monitor.php:402
+#: ../../operation/agentes/status_monitor.php:472
 #: ../../operation/events/events.build_table.php:506
-#: ../../operation/events/events_list.php:451
-#: ../../operation/events/events_list.php:455
-#: ../../operation/events/events_list.php:464
-#: ../../operation/events/events_list.php:567
-#: ../../operation/events/events_list.php:571
+#: ../../operation/events/events_list.php:519
+#: ../../operation/events/events_list.php:523
+#: ../../operation/events/events_list.php:532
+#: ../../operation/events/events_list.php:632
+#: ../../operation/events/events_list.php:636
 #: ../../operation/events/events_rss.php:110
 #: ../../operation/events/export_csv.php:54
 #: ../../operation/gis_maps/render_view.php:148
-#: ../../operation/snmpconsole/snmp_view.php:384
-#: ../../operation/snmpconsole/snmp_view.php:401
-#: ../../operation/snmpconsole/snmp_view.php:406
-#: ../../operation/snmpconsole/snmp_view.php:637 ../../operation/tree.php:130
-#: ../../operation/tree.php:155
+#: ../../operation/snmpconsole/snmp_view.php:441
+#: ../../operation/snmpconsole/snmp_view.php:458
+#: ../../operation/snmpconsole/snmp_view.php:463
+#: ../../operation/snmpconsole/snmp_view.php:745 ../../operation/tree.php:136
+#: ../../operation/tree.php:168
 #: ../../enterprise/dashboard/widgets/events_list.php:52
-#: ../../enterprise/dashboard/widgets/tree_view.php:52
-#: ../../enterprise/dashboard/widgets/tree_view.php:65
+#: ../../enterprise/dashboard/widgets/tree_view.php:54
+#: ../../enterprise/dashboard/widgets/tree_view.php:67
 #: ../../enterprise/extensions/backup/main.php:85
 #: ../../enterprise/extensions/ipam/ipam_network.php:305
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:94
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:204
 #: ../../enterprise/godmode/modules/local_components.php:438
 #: ../../enterprise/godmode/modules/local_components.php:448
 #: ../../enterprise/godmode/modules/local_components.php:462
-#: ../../enterprise/godmode/policies/policy_agents.php:370
-#: ../../enterprise/godmode/policies/policy_queue.php:340
-#: ../../enterprise/godmode/policies/policy_queue.php:344
-#: ../../enterprise/godmode/policies/policy_queue.php:350
-#: ../../enterprise/godmode/policies/policy_queue.php:407
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:153
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:121
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1441
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1443
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1458
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1676
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1688
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:236
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:128
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:290
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:301
+#: ../../enterprise/godmode/policies/policy_agents.php:565
+#: ../../enterprise/godmode/policies/policy_queue.php:360
+#: ../../enterprise/godmode/policies/policy_queue.php:364
+#: ../../enterprise/godmode/policies/policy_queue.php:370
+#: ../../enterprise/godmode/policies/policy_queue.php:427
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:156
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:122
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1511
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1513
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1528
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1782
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1794
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:237
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:147
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:408
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:419
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:127
-#: ../../enterprise/godmode/setup/setup_acl.php:158
-#: ../../enterprise/godmode/setup/setup_acl.php:163
-#: ../../enterprise/godmode/setup/setup_acl.php:168
-#: ../../enterprise/godmode/setup/setup_acl.php:374
-#: ../../enterprise/godmode/setup/setup_acl.php:384
-#: ../../enterprise/godmode/setup/setup_acl.php:396
-#: ../../enterprise/godmode/setup/setup_acl.php:441
-#: ../../enterprise/godmode/setup/setup_acl.php:470
-#: ../../enterprise/include/functions_metaconsole.php:663
-#: ../../enterprise/include/functions_metaconsole.php:664
-#: ../../enterprise/include/functions_metaconsole.php:1268
+#: ../../enterprise/godmode/reporting/cluster_list.php:122
+#: ../../enterprise/godmode/setup/setup_acl.php:367
+#: ../../enterprise/godmode/setup/setup_acl.php:372
+#: ../../enterprise/godmode/setup/setup_acl.php:377
+#: ../../enterprise/godmode/setup/setup_acl.php:583
+#: ../../enterprise/godmode/setup/setup_acl.php:593
+#: ../../enterprise/godmode/setup/setup_acl.php:605
+#: ../../enterprise/godmode/setup/setup_acl.php:650
+#: ../../enterprise/godmode/setup/setup_acl.php:679
+#: ../../enterprise/include/functions_metaconsole.php:668
+#: ../../enterprise/include/functions_metaconsole.php:669
+#: ../../enterprise/include/functions_metaconsole.php:930
+#: ../../enterprise/meta/advanced/metasetup.visual.php:134
 #: ../../enterprise/meta/advanced/policymanager.queue.php:214
 #: ../../enterprise/meta/advanced/policymanager.queue.php:218
 #: ../../enterprise/meta/advanced/policymanager.queue.php:224
 #: ../../enterprise/meta/advanced/policymanager.queue.php:298
-#: ../../enterprise/meta/include/ajax/wizard.ajax.php:226
-#: ../../enterprise/meta/include/ajax/wizard.ajax.php:265
+#: ../../enterprise/meta/include/ajax/wizard.ajax.php:229
+#: ../../enterprise/meta/include/ajax/wizard.ajax.php:268
 #: ../../enterprise/meta/include/functions_agents_meta.php:1053
 #: ../../enterprise/meta/include/functions_html_meta.php:51
 #: ../../enterprise/meta/include/functions_users_meta.php:79
@@ -1217,202 +1552,128 @@ msgstr "モジュールグループ"
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:374
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:105
 #: ../../enterprise/operation/agentes/agent_inventory.php:69
+#: ../../enterprise/operation/agentes/tag_view.php:90
+#: ../../enterprise/operation/agentes/tag_view.php:109
+#: ../../enterprise/operation/agentes/tag_view.php:137
+#: ../../enterprise/operation/agentes/tag_view.php:155
+#: ../../enterprise/operation/agentes/tag_view.php:199
+#: ../../enterprise/operation/agentes/tag_view.php:201
+#: ../../enterprise/operation/agentes/tag_view.php:265
 #: ../../enterprise/operation/inventory/inventory.php:55
 #: ../../enterprise/operation/inventory/inventory.php:57
 #: ../../enterprise/operation/inventory/inventory.php:120
 #: ../../enterprise/operation/inventory/inventory.php:122
-#: ../../enterprise/operation/inventory/inventory.php:176
-#: ../../enterprise/operation/log/log_viewer.php:194
+#: ../../enterprise/operation/inventory/inventory.php:177
 #: ../../enterprise/operation/log/log_viewer.php:212
+#: ../../enterprise/operation/log/log_viewer.php:228
 #: ../../enterprise/operation/snmpconsole/snmp_view.php:32
 msgid "All"
 msgstr "全て"
 
-#: ../../extensions/agents_modules.php:139
-#: ../../extensions/agents_modules.php:141
+#: ../../extensions/agents_modules.php:166
+#: ../../extensions/agents_modules.php:168
+#: ../../godmode/agentes/planned_downtime.editor.php:734
 #: ../../godmode/massive/massive_add_action_alerts.php:171
 #: ../../godmode/massive/massive_add_alerts.php:169
 #: ../../godmode/massive/massive_delete_action_alerts.php:172
 #: ../../godmode/massive/massive_delete_alerts.php:229
-#: ../../godmode/massive/massive_delete_modules.php:501
-#: ../../godmode/massive/massive_edit_modules.php:349
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1045
-#: ../../enterprise/dashboard/widgets/agent_module.php:84
-#: ../../enterprise/dashboard/widgets/agent_module.php:86
+#: ../../godmode/massive/massive_delete_modules.php:527
+#: ../../godmode/massive/massive_edit_modules.php:369
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1096
+#: ../../enterprise/dashboard/widgets/agent_module.php:91
+#: ../../enterprise/dashboard/widgets/agent_module.php:93
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:228
 msgid "Show common modules"
 msgstr "共通モジュールの表示"
 
-#: ../../extensions/agents_modules.php:140
+#: ../../extensions/agents_modules.php:167
+#: ../../godmode/agentes/planned_downtime.editor.php:734
 #: ../../godmode/massive/massive_add_action_alerts.php:172
 #: ../../godmode/massive/massive_add_alerts.php:169
 #: ../../godmode/massive/massive_delete_action_alerts.php:173
 #: ../../godmode/massive/massive_delete_alerts.php:229
-#: ../../godmode/massive/massive_delete_modules.php:501
-#: ../../godmode/massive/massive_edit_modules.php:350
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1046
-#: ../../enterprise/dashboard/widgets/agent_module.php:87
+#: ../../godmode/massive/massive_delete_modules.php:527
+#: ../../godmode/massive/massive_edit_modules.php:370
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1097
+#: ../../enterprise/dashboard/widgets/agent_module.php:94
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:229
 msgid "Show all modules"
 msgstr "全モジュール表示"
 
-#: ../../extensions/agents_modules.php:150
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1517
-#: ../../include/functions_visual_map_editor.php:673
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1915
+#: ../../extensions/agents_modules.php:177
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1683
+#: ../../include/functions_visual_map_editor.php:890
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2100
 msgid "Update item"
 msgstr "アイテム更新"
 
-#: ../../extensions/agents_modules.php:160
-#: ../../include/functions_reports.php:588
-#: ../../include/graphs/functions_pchart.php:1190
+#: ../../extensions/agents_modules.php:187
+#: ../../include/functions_reports.php:589
+#: ../../include/graphs/functions_pchart.php:1473
 msgid "Agents/Modules"
 msgstr "エージェント/モジュール"
 
-#: ../../extensions/agents_modules.php:194
+#: ../../extensions/agents_modules.php:233
 msgid "Agent/module view"
 msgstr "エージェント/モジュール表示"
 
-#: ../../extensions/agents_modules.php:321
-#: ../../include/functions_reporting.php:1684
+#: ../../extensions/agents_modules.php:388
+#: ../../include/functions_reporting.php:1773
 msgid "There are no agents with modules"
 msgstr "モジュールが定義されたエージェントがありません。"
 
-#: ../../extensions/agents_modules.php:329
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:804
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:437
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:311
-#: ../../godmode/agentes/configurar_agente.php:302
-#: ../../godmode/agentes/configurar_agente.php:535
-#: ../../godmode/agentes/modificar_agente.php:574
-#: ../../godmode/agentes/planned_downtime.editor.php:757
-#: ../../godmode/agentes/planned_downtime.editor.php:831
-#: ../../godmode/db/db_refine.php:95
-#: ../../godmode/massive/massive_add_tags.php:139
-#: ../../godmode/massive/massive_copy_modules.php:144
-#: ../../godmode/massive/massive_delete_modules.php:479
-#: ../../godmode/massive/massive_delete_tags.php:199
-#: ../../godmode/massive/massive_edit_modules.php:308
-#: ../../godmode/massive/massive_edit_plugins.php:308
-#: ../../godmode/reporting/graph_builder.graph_editor.php:148
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1053
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1102
-#: ../../godmode/reporting/reporting_builder.list_items.php:167
-#: ../../godmode/reporting/reporting_builder.list_items.php:193
-#: ../../godmode/reporting/visual_console_builder.wizard.php:294
-#: ../../godmode/servers/servers.build_table.php:68
-#: ../../include/functions_reports.php:563
-#: ../../include/functions_reports.php:565
-#: ../../include/functions_reports.php:567
-#: ../../include/functions_reports.php:569
-#: ../../include/functions_reports.php:571
-#: ../../include/functions_reports.php:573
-#: ../../include/functions_reports.php:575
-#: ../../include/functions_reporting_html.php:1322
-#: ../../include/functions_reporting_html.php:3246
-#: ../../mobile/operation/agent.php:233 ../../mobile/operation/agents.php:79
-#: ../../mobile/operation/agents.php:327 ../../mobile/operation/agents.php:328
-#: ../../mobile/operation/home.php:64 ../../mobile/operation/modules.php:186
-#: ../../operation/agentes/estado_agente.php:522
-#: ../../operation/agentes/exportdata.php:275
-#: ../../operation/agentes/graphs.php:123
-#: ../../operation/agentes/group_view.php:121
-#: ../../operation/agentes/group_view.php:159
-#: ../../operation/search_agents.php:63 ../../operation/search_results.php:134
-#: ../../operation/tree.php:73
-#: ../../enterprise/dashboard/widgets/agent_module.php:256
-#: ../../enterprise/dashboard/widgets/groups_status.php:160
-#: ../../enterprise/dashboard/widgets/service_map.php:98
-#: ../../enterprise/dashboard/widgets/top_n.php:332
-#: ../../enterprise/dashboard/widgets/tree_view.php:37
-#: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:104
-#: ../../enterprise/godmode/massive/massive_edit_tags_policy.php:93
-#: ../../enterprise/godmode/policies/policies.php:389
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:788
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:430
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:309
-#: ../../enterprise/godmode/policies/policy_modules.php:389
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:172
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:138
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:161
-#: ../../enterprise/include/functions_policies.php:3212
-#: ../../enterprise/include/functions_reporting_pdf.php:562
-#: ../../enterprise/include/functions_reporting_pdf.php:714
-#: ../../enterprise/meta/advanced/servers.build_table.php:63
-#: ../../enterprise/meta/agentsearch.php:97
-#: ../../enterprise/meta/include/functions_wizard_meta.php:305
-#: ../../enterprise/meta/include/functions_wizard_meta.php:1649
-#: ../../enterprise/meta/monitoring/group_view.php:99
-#: ../../enterprise/meta/monitoring/group_view.php:137
-#: ../../enterprise/meta/monitoring/wizard/wizard.agent.php:64
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:407
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:515
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:596
-#: ../../enterprise/meta/monitoring/wizard/wizard.php:225
-#: ../../enterprise/operation/services/services.service_map.php:140
-msgid "Modules"
-msgstr "モジュール"
-
-#: ../../extensions/agents_modules.php:347
+#: ../../extensions/agents_modules.php:414
 msgid "Previous modules"
 msgstr "前のモジュールへ"
 
-#: ../../extensions/agents_modules.php:386
+#: ../../extensions/agents_modules.php:453
 msgid "More modules"
 msgstr "次のモジュールへ"
 
-#: ../../extensions/agents_modules.php:506
+#: ../../extensions/agents_modules.php:572
 #: ../../extensions/module_groups.php:296
 #: ../../godmode/snmpconsole/snmp_alert.php:1343
-#: ../../include/functions_reporting_html.php:1444
-#: ../../operation/snmpconsole/snmp_view.php:935
+#: ../../include/functions_reporting_html.php:1447
+#: ../../operation/snmpconsole/snmp_view.php:1047
 #: ../../enterprise/dashboard/widgets/service_map.php:49
 #: ../../enterprise/dashboard/widgets/service_map.php:74
-#: ../../enterprise/operation/services/services.service_map.php:116
+#: ../../enterprise/operation/services/services.service_map.php:114
 msgid "Legend"
 msgstr "凡例"
 
-#: ../../extensions/agents_modules.php:507
-#: ../../include/functions_reporting_html.php:1445
+#: ../../extensions/agents_modules.php:573
+#: ../../include/functions_reporting_html.php:1448
 msgid "Orange cell when the module has fired alerts"
 msgstr "オレンジのセルは、アラート発生中を示します。"
 
-#: ../../extensions/agents_modules.php:508
-#: ../../include/functions_reporting_html.php:1446
+#: ../../extensions/agents_modules.php:574
+#: ../../include/functions_reporting_html.php:1449
 msgid "Red cell when the module has a critical status"
 msgstr "赤のセルは、障害状態を示します。"
 
-#: ../../extensions/agents_modules.php:509
-#: ../../include/functions_reporting_html.php:1447
+#: ../../extensions/agents_modules.php:575
+#: ../../include/functions_reporting_html.php:1450
 msgid "Yellow cell when the module has a warning status"
 msgstr "黄色のセルは、警告状態を示します。"
 
-#: ../../extensions/agents_modules.php:510
-#: ../../include/functions_reporting_html.php:1448
+#: ../../extensions/agents_modules.php:576
+#: ../../include/functions_reporting_html.php:1451
 msgid "Green cell when the module has a normal status"
 msgstr "緑のセルは、正常状態を示します。"
 
-#: ../../extensions/agents_modules.php:511
-#: ../../include/functions_reporting_html.php:1449
+#: ../../extensions/agents_modules.php:577
+#: ../../include/functions_reporting_html.php:1452
 msgid "Grey cell when the module has an unknown status"
 msgstr "グレーのセルは、不明状態を示します。"
 
-#: ../../extensions/agents_modules.php:512
-#: ../../include/functions_reporting_html.php:1450
-msgid "Cell turns grey when the module is in 'not initialize' status"
-msgstr "青色のセルは、不明状態を示します。"
+#: ../../extensions/agents_modules.php:578
+msgid "Cell turns blue when the module is in 'not initialize' status"
+msgstr "モジュールが未初期化状態のときにセルが青になります。"
 
-#: ../../extensions/agents_modules.php:554
+#: ../../extensions/agents_modules.php:590
 msgid "Agents/Modules view"
 msgstr "エージェント/モジュール表示"
 
-#: ../../extensions/agents_modules.php:574
-#: ../../operation/events/events.php:579
-#: ../../operation/visual_console/public_console.php:153
-#: ../../operation/visual_console/render_view.php:232
-msgid "Until refresh"
-msgstr "リフレッシュまで"
-
 #: ../../extensions/api_checker.php:92 ../../extensions/api_checker.php:228
 msgid "API checker"
 msgstr "API チェッカ"
@@ -1420,13 +1681,13 @@ msgstr "API チェッカ"
 #: ../../extensions/api_checker.php:99 ../../extensions/users_connected.php:78
 #: ../../godmode/admin_access_logs.php:69
 #: ../../godmode/admin_access_logs.php:70
-#: ../../godmode/reporting/visual_console_builder.elements.php:558
-#: ../../include/functions_visual_map_editor.php:699
-#: ../../include/functions_reporting_html.php:1907
-#: ../../include/functions_reporting_html.php:2081
+#: ../../godmode/reporting/visual_console_builder.elements.php:564
+#: ../../include/functions_visual_map_editor.php:916
+#: ../../include/functions_reporting_html.php:1910
+#: ../../include/functions_reporting_html.php:2084
 #: ../../enterprise/extensions/ipam/ipam_network.php:272
 #: ../../enterprise/extensions/ipam/ipam_network.php:273
-#: ../../enterprise/include/functions_reporting_pdf.php:2317
+#: ../../enterprise/include/functions_reporting_pdf.php:2398
 msgid "IP"
 msgstr "IP アドレス"
 
@@ -1439,75 +1700,69 @@ msgid "API Pass"
 msgstr "API パス"
 
 #: ../../extensions/api_checker.php:114
-#: ../../extensions/disabled/ssh_gateway.php:59
-#: ../../extensions/users_connected.php:77 ../../general/login_page.php:140
-#: ../../general/login_page.php:169 ../../general/logon_ok.php:224
+#: ../../extensions/users_connected.php:77 ../../general/login_page.php:165
+#: ../../general/login_page.php:194 ../../general/logon_ok.php:224
 #: ../../general/logon_ok.php:420 ../../godmode/admin_access_logs.php:63
 #: ../../godmode/admin_access_logs.php:188
 #: ../../godmode/events/custom_events.php:77
 #: ../../godmode/events/custom_events.php:155
-#: ../../godmode/setup/setup_ehorus.php:73 ../../include/functions.php:2312
-#: ../../include/functions_config.php:332
-#: ../../include/functions_config.php:343
-#: ../../include/functions_config.php:353
+#: ../../godmode/setup/setup_ehorus.php:73 ../../include/functions.php:2336
+#: ../../include/functions_config.php:372
+#: ../../include/functions_config.php:383
 #: ../../include/functions_events.php:37
-#: ../../include/functions_events.php:3547
-#: ../../include/functions_events.php:3928
-#: ../../include/functions_reporting_html.php:3595
+#: ../../include/functions_events.php:3646
+#: ../../include/functions_events.php:4027
+#: ../../include/functions_reporting_html.php:3708
 #: ../../mobile/include/user.class.php:245
 #: ../../mobile/operation/tactical.php:309
 #: ../../operation/events/events.build_table.php:173
 #: ../../operation/events/events.build_table.php:582
 #: ../../operation/search_users.php:68
-#: ../../enterprise/extensions/cron/main.php:196
+#: ../../enterprise/extensions/cron/main.php:246
 #: ../../enterprise/extensions/disabled/check_acls.php:42
 #: ../../enterprise/extensions/disabled/check_acls.php:120
-#: ../../enterprise/extensions/vmware/main.php:243
 #: ../../enterprise/godmode/alerts/configure_alert_rule.php:167
 #: ../../enterprise/godmode/servers/manage_export_form.php:97
-#: ../../enterprise/godmode/setup/setup_auth.php:272
-#: ../../enterprise/godmode/setup/setup_auth.php:303
-#: ../../enterprise/godmode/setup/setup_auth.php:334
-#: ../../enterprise/meta/general/login_page.php:79
-#: ../../enterprise/meta/general/login_page.php:108
+#: ../../enterprise/godmode/setup/setup_auth.php:613
+#: ../../enterprise/godmode/setup/setup_auth.php:644
+#: ../../enterprise/meta/general/login_page.php:107
+#: ../../enterprise/meta/general/login_page.php:136
 #: ../../enterprise/meta/include/functions_events_meta.php:64
-#: ../../enterprise/meta/include/functions_meta.php:859
-#: ../../enterprise/meta/include/functions_meta.php:912
-#: ../../enterprise/meta/include/functions_meta.php:965
+#: ../../enterprise/meta/include/functions_meta.php:943
+#: ../../enterprise/meta/include/functions_meta.php:996
+#: ../../enterprise/meta/include/functions_meta.php:1049
 #: ../../enterprise/meta/include/functions_wizard_meta.php:402
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1311
 msgid "User"
 msgstr "ユーザ"
 
-#: ../../extensions/api_checker.php:119 ../../general/login_page.php:148
-#: ../../general/login_page.php:176
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:264
+#: ../../extensions/api_checker.php:119 ../../general/login_page.php:173
+#: ../../general/login_page.php:201
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:307
 #: ../../godmode/agentes/module_manager_editor_wmi.php:57
-#: ../../godmode/massive/massive_edit_modules.php:528
+#: ../../godmode/massive/massive_edit_modules.php:554
 #: ../../godmode/modules/manage_network_components_form_wmi.php:50
 #: ../../godmode/setup/setup_ehorus.php:79
-#: ../../godmode/users/configure_user.php:454
-#: ../../include/functions_config.php:334
-#: ../../include/functions_config.php:345
-#: ../../include/functions_config.php:355
+#: ../../godmode/users/configure_user.php:517
+#: ../../include/functions_config.php:374
+#: ../../include/functions_config.php:385
 #: ../../mobile/include/user.class.php:252
-#: ../../enterprise/extensions/vmware/main.php:248
+#: ../../enterprise/extensions/vmware/functions.php:416
 #: ../../enterprise/godmode/agentes/inventory_manager.php:191
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:262
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:306
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:203
 #: ../../enterprise/godmode/servers/credential_boxes_satellite.php:326
 #: ../../enterprise/godmode/servers/manage_credential_boxes.php:55
 #: ../../enterprise/godmode/servers/manage_export_form.php:101
-#: ../../enterprise/godmode/setup/setup_auth.php:278
-#: ../../enterprise/godmode/setup/setup_auth.php:309
-#: ../../enterprise/godmode/setup/setup_auth.php:340
+#: ../../enterprise/godmode/setup/setup_auth.php:619
+#: ../../enterprise/godmode/setup/setup_auth.php:650
 #: ../../enterprise/include/functions_setup.php:30
 #: ../../enterprise/include/functions_setup.php:59
-#: ../../enterprise/meta/general/login_page.php:87
-#: ../../enterprise/meta/general/login_page.php:116
-#: ../../enterprise/meta/include/functions_meta.php:869
-#: ../../enterprise/meta/include/functions_meta.php:922
-#: ../../enterprise/meta/include/functions_meta.php:975
+#: ../../enterprise/meta/general/login_page.php:115
+#: ../../enterprise/meta/general/login_page.php:144
+#: ../../enterprise/meta/include/functions_meta.php:953
+#: ../../enterprise/meta/include/functions_meta.php:1006
+#: ../../enterprise/meta/include/functions_meta.php:1059
 #: ../../enterprise/meta/include/functions_wizard_meta.php:406
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1315
 msgid "Password"
@@ -1519,35 +1774,38 @@ msgstr "アクション (get または set)"
 
 #: ../../extensions/api_checker.php:132 ../../extensions/net_tools.php:118
 #: ../../godmode/extensions.php:153
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1753
-#: ../../include/functions_menu.php:574
-#: ../../include/functions_reporting_html.php:1487
-#: ../../include/functions_reporting_html.php:2592
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1919
+#: ../../include/functions_menu.php:595
+#: ../../include/functions_reporting_html.php:1490
+#: ../../include/functions_reporting_html.php:2659
 #: ../../enterprise/dashboard/widgets/top_n.php:128
 #: ../../enterprise/dashboard/widgets/top_n.php:337
-#: ../../enterprise/godmode/policies/policy_queue.php:342
-#: ../../enterprise/godmode/policies/policy_queue.php:376
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:173
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2106
-#: ../../enterprise/include/functions_reporting_pdf.php:835
-#: ../../enterprise/include/functions_reporting_pdf.php:928
+#: ../../enterprise/godmode/policies/policy_queue.php:362
+#: ../../enterprise/godmode/policies/policy_queue.php:396
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:174
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2291
+#: ../../enterprise/include/functions_reporting_csv.php:513
+#: ../../enterprise/include/functions_reporting_pdf.php:884
+#: ../../enterprise/include/functions_reporting_pdf.php:1009
 #: ../../enterprise/meta/advanced/policymanager.queue.php:216
 #: ../../enterprise/meta/advanced/policymanager.queue.php:258
+#: ../../enterprise/meta/include/functions_autoprovision.php:539
 msgid "Operation"
 msgstr "操作"
 
 #: ../../extensions/api_checker.php:137
 #: ../../godmode/agentes/agent_incidents.php:85
 #: ../../godmode/agentes/agent_manager.php:163
-#: ../../godmode/agentes/fields_manager.php:94
+#: ../../godmode/agentes/fields_manager.php:96
 #: ../../godmode/agentes/module_manager_editor_common.php:156
-#: ../../godmode/alerts/alert_commands.php:331
-#: ../../godmode/groups/group_list.php:337
-#: ../../godmode/groups/modu_group_list.php:182
+#: ../../godmode/alerts/alert_commands.php:349
+#: ../../godmode/groups/group_list.php:374
+#: ../../godmode/groups/modu_group_list.php:189
 #: ../../godmode/modules/module_list.php:58 ../../godmode/setup/os.list.php:33
-#: ../../include/functions_events.php:3511
+#: ../../include/functions_events.php:3610
 #: ../../operation/events/events.build_table.php:133
 #: ../../operation/incidents/incident.php:335
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:71
 msgid "ID"
 msgstr "ID"
 
@@ -1562,27 +1820,32 @@ msgstr "Return Type"
 #: ../../extensions/api_checker.php:152
 #: ../../godmode/groups/configure_group.php:190
 #: ../../godmode/snmpconsole/snmp_alert.php:33
-#: ../../include/functions_graph.php:2596
-#: ../../include/functions_graph.php:2746
-#: ../../include/functions_graph.php:2787
-#: ../../include/functions_graph.php:2828
-#: ../../include/functions_graph.php:2884
-#: ../../include/functions_graph.php:2940
-#: ../../include/functions_graph.php:2994
-#: ../../include/functions_graph.php:3172
-#: ../../include/functions_graph.php:3317
-#: ../../include/functions_graph.php:3367
-#: ../../include/functions_graph.php:4366
+#: ../../godmode/users/configure_user.php:593
+#: ../../include/functions_graph.php:3073
+#: ../../include/functions_graph.php:3227
+#: ../../include/functions_graph.php:3268
+#: ../../include/functions_graph.php:3309
+#: ../../include/functions_graph.php:3365
+#: ../../include/functions_graph.php:3421
+#: ../../include/functions_graph.php:3475
+#: ../../include/functions_graph.php:3653
+#: ../../include/functions_graph.php:3798
+#: ../../include/functions_graph.php:3848
+#: ../../include/functions_graph.php:3948
+#: ../../include/functions_graph.php:3949
+#: ../../include/functions_graph.php:3952
+#: ../../include/functions_graph.php:3953
+#: ../../include/functions_graph.php:5206
 #: ../../operation/gis_maps/render_view.php:152
 #: ../../operation/snmpconsole/snmp_statistics.php:172
 #: ../../operation/snmpconsole/snmp_statistics.php:219
-#: ../../operation/snmpconsole/snmp_view.php:429
-#: ../../operation/snmpconsole/snmp_view.php:810
-#: ../../operation/snmpconsole/snmp_view.php:832
-#: ../../operation/users/user_edit.php:282
+#: ../../operation/snmpconsole/snmp_view.php:496
+#: ../../operation/snmpconsole/snmp_view.php:922
+#: ../../operation/snmpconsole/snmp_view.php:944
+#: ../../operation/users/user_edit.php:284
 #: ../../enterprise/godmode/massive/massive_delete_alerts_snmp.php:33
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:34
-#: ../../enterprise/godmode/setup/setup_acl.php:157
+#: ../../enterprise/godmode/setup/setup_acl.php:366
 msgid "Other"
 msgstr "その他"
 
@@ -1613,18 +1876,18 @@ msgid "Custom URL"
 msgstr "カスタムURL"
 
 #: ../../extensions/api_checker.php:200 ../../extensions/api_checker.php:207
-#: ../../include/functions_db.php:1516
+#: ../../include/functions_db.php:1581
 msgid "Result"
 msgstr "結果"
 
 #: ../../extensions/api_checker.php:201
-#: ../../godmode/events/event_responses.editor.php:114
+#: ../../godmode/events/event_responses.editor.php:115
 #: ../../godmode/events/event_responses.editor.php:121
-#: ../../godmode/events/event_responses.editor.php:124
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1243
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1304
 #: ../../operation/gis_maps/ajax.php:293
 #: ../../enterprise/dashboard/widgets/url.php:25
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1549
+#: ../../enterprise/extensions/vmware/functions.php:468
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1637
 msgid "URL"
 msgstr "URL"
 
@@ -1636,11 +1899,12 @@ msgstr "URL を表示"
 msgid "Hide URL"
 msgstr "URL を隠す"
 
-#: ../../extensions/db_status.php:43 ../../extensions/db_status.php:361
-msgid "DB Status"
-msgstr "DB の状態"
+#: ../../extensions/db_status.php:41 ../../extensions/db_status.php:348
+#: ../../godmode/menu.php:341
+msgid "DB Schema check"
+msgstr "DBスキーマチェック"
 
-#: ../../extensions/db_status.php:56
+#: ../../extensions/db_status.php:54
 msgid ""
 "This extension checks the DB is correct. Because sometimes the old DB from a "
 "migration has not some fields in the tables or the data is changed."
@@ -1648,120 +1912,65 @@ msgstr ""
 "この拡張は、DB "
 "が正しいかどうか確認します。たまに、古いDBからのマイグレーションでテーブルのフィールドが不足していたりデータが変更されていなかったりするためです。"
 
-#: ../../extensions/db_status.php:58
+#: ../../extensions/db_status.php:56
 msgid "At the moment the checks is for MySQL/MariaDB."
 msgstr "現時点では、MySQL/MariaDB 用です。"
 
-#: ../../extensions/db_status.php:63
+#: ../../extensions/db_status.php:61
 msgid "DB settings"
 msgstr "DB 設定"
 
-#: ../../extensions/db_status.php:67
+#: ../../extensions/db_status.php:65
 msgid "DB User with privileges"
 msgstr "権限のある DB ユーザ"
 
-#: ../../extensions/db_status.php:69
+#: ../../extensions/db_status.php:67
 msgid "DB Password for this user"
 msgstr "この DB ユーザのパスワード"
 
-#: ../../extensions/db_status.php:73
+#: ../../extensions/db_status.php:71
 msgid "DB Hostname"
 msgstr "DB ホスト名"
 
-#: ../../extensions/db_status.php:75
+#: ../../extensions/db_status.php:73
 msgid "DB Name (temporal for testing)"
 msgstr "DB 名 (一時的なテスト用)"
 
-#: ../../extensions/db_status.php:83
+#: ../../extensions/db_status.php:81
 msgid "Execute Test"
 msgstr "テスト実行"
 
-#: ../../extensions/db_status.php:110
+#: ../../extensions/db_status.php:108
 msgid "Unsuccessful connected to the DB"
 msgstr "DB 接続に失敗しました"
 
-#: ../../extensions/db_status.php:117
+#: ../../extensions/db_status.php:115
 msgid "Unsuccessful created the testing DB"
 msgstr "テスト DB の作成に失敗しました"
 
-#: ../../extensions/db_status.php:128
+#: ../../extensions/db_status.php:126
 msgid "Unsuccessful installed tables into the testing DB"
 msgstr "テスト DB へのテーブル設定に失敗しました"
 
-#: ../../extensions/db_status.php:139
-msgid "Unsuccessful installed enterprise tables into the testing DB"
-msgstr "テスト DB への enterprise テーブル設定に失敗しました"
-
-#: ../../extensions/db_status.php:186
+#: ../../extensions/db_status.php:184
 msgid "Successful the DB Pandora has all tables"
 msgstr "DB Pandora にはすべてのテーブルが揃っています"
 
-#: ../../extensions/db_status.php:187
+#: ../../extensions/db_status.php:185
 #, php-format
-msgid ""
-"Unsuccessful the DB Pandora has not all tables. The tables lost are (%s)"
-msgstr "DB Pandora にはすべてのテーブルが揃っていません。不足テーブルは (%s) です。"
+msgid "Pandora DB could not retrieve all tables. The missing tables are (%s)"
+msgstr "Pandora DB はすべてのテーブルを確認できませんでした。不足テーブルは (%s) です。"
 
-#: ../../extensions/db_status.php:197 ../../extensions/db_status.php:254
-#: ../../extensions/db_status.php:274 ../../extensions/db_status.php:286
-#: ../../extensions/db_status.php:294
+#: ../../extensions/db_status.php:195 ../../extensions/db_status.php:251
 msgid "You can execute this SQL query for to fix."
 msgstr "修正するには、この SQL クエリを実行します。"
 
-#: ../../extensions/db_status.php:251
+#: ../../extensions/db_status.php:248
 #, php-format
 msgid "Unsuccessful the table %s has not the field %s"
 msgstr "テーブル %s に、フィールド %s がありません。"
 
-#: ../../extensions/db_status.php:271
-#, php-format
-msgid ""
-"Unsuccessful the field %s in the table %s must be setted the type with %s."
-msgstr "フィールド %s (テーブル %s 内)は、%s のタイプに設定されている必要があります。"
-
-#: ../../extensions/db_status.php:282
-#, php-format
-msgid ""
-"Unsuccessful the field %s in the table %s must be setted the null values "
-"with %s."
-msgstr "フィールド %s (テーブル %s 内)は、%s の null 値に設定されている必要があります。"
-
-#: ../../extensions/db_status.php:304
-#, php-format
-msgid ""
-"Unsuccessful the field %s in the table %s must be setted the key as defined "
-"in the SQL file."
-msgstr "フィールド %s (テーブル %s 内)は、SQL ファイル内で定義されている通りのキーが設定されている必要があります。"
-
-#: ../../extensions/db_status.php:307
-msgid "Please check the SQL file for to know the kind of key needed."
-msgstr "必要なキーを特定するには、SQL ファイルを確認してください。"
-
-#: ../../extensions/db_status.php:311
-#, php-format
-msgid ""
-"Unsuccessful the field %s in the table %s must be setted the default value "
-"as %s."
-msgstr "フィールド %s (テーブル %s 内)は、デフォルト値が %s に設定されている必要があります。"
-
-#: ../../extensions/db_status.php:314
-msgid ""
-"Please check the SQL file for to know the kind of default value needed."
-msgstr "必要なデフォルト値を特定するには、SQL ファイルを確認してください。"
-
-#: ../../extensions/db_status.php:318
-#, php-format
-msgid ""
-"Unsuccessful the field %s in the table %s must be setted as defined in the "
-"SQL file."
-msgstr "フィールド %s (テーブル %s 内)は、SQL ファイルに定義されている通りに設定されている必要があります。"
-
-#: ../../extensions/db_status.php:321
-msgid ""
-"Please check the SQL file for to know the kind of extra config needed."
-msgstr "必要な追加設定を知るには、SQL ファイルを確認してください。"
-
-#: ../../extensions/db_status.php:332
+#: ../../extensions/db_status.php:319
 msgid "Successful all the tables have the correct fields"
 msgstr "すべてのテーブルにおいてフィールドは正しい状態です"
 
@@ -1773,7 +1982,7 @@ msgstr "DBインタフェース"
 msgid "Execute SQL"
 msgstr "SQLの実行"
 
-#: ../../extensions/dbmanager.php:196
+#: ../../extensions/dbmanager.php:196 ../../godmode/menu.php:341
 msgid "DB interface"
 msgstr "DBインタフェース"
 
@@ -1781,44 +1990,6 @@ msgstr "DBインタフェース"
 msgid "Matrix events"
 msgstr "Matrix イベント"
 
-#: ../../extensions/disabled/ssh_gateway.php:52
-msgid "You need to specify a user and a host address"
-msgstr "ユーザとホストのアドレスを指定する必要があります"
-
-#: ../../extensions/disabled/ssh_gateway.php:57
-#: ../../godmode/snmpconsole/snmp_trap_generator.php:66
-msgid "Host address"
-msgstr "ホストアドレス"
-
-#: ../../extensions/disabled/ssh_gateway.php:59
-#, php-format
-msgid "For security reasons the following characters are not allowed: %s"
-msgstr "セキュリティ上の理由により、次の文字は利用できません: %s"
-
-#: ../../extensions/disabled/ssh_gateway.php:60
-msgid "Connect"
-msgstr "接続"
-
-#: ../../extensions/disabled/ssh_gateway.php:63
-msgid "Port (use 0 for default)"
-msgstr "ポート (デフォルトは 0)"
-
-#: ../../extensions/disabled/ssh_gateway.php:65
-msgid "Connect mode"
-msgstr "接続モード"
-
-#: ../../extensions/disabled/vnc_view.php:25
-msgid "VNC Display (:0 by default)"
-msgstr "VNC ディスプレイ (デフォルトは :0)"
-
-#: ../../extensions/disabled/vnc_view.php:28
-msgid "Send"
-msgstr "送信"
-
-#: ../../extensions/disabled/vnc_view.php:42
-msgid "VNC view"
-msgstr "VNCビュー"
-
 #: ../../extensions/extension_uploader.php:28
 msgid "Uploader extension"
 msgstr "拡張アップローダ"
@@ -1848,7 +2019,7 @@ msgstr "Enterprise 拡張のアップロード"
 #: ../../extensions/resource_registration.php:876
 #: ../../godmode/alerts/alert_special_days.php:260
 #: ../../operation/incidents/incident_detail.php:507
-#: ../../enterprise/include/functions_policies.php:4110
+#: ../../enterprise/include/functions_policies.php:4289
 msgid "Upload"
 msgstr "アップロード"
 
@@ -1859,41 +2030,45 @@ msgstr "拡張アップローダ"
 #: ../../extensions/files_repo/files_repo_form.php:65
 #: ../../godmode/reporting/visual_console_builder.wizard.php:260
 #: ../../include/functions_maps.php:40
-#: ../../include/functions_networkmap.php:1632
+#: ../../include/functions_networkmap.php:1669
 #: ../../mobile/include/functions_web.php:26
 #: ../../mobile/operation/groups.php:66 ../../mobile/operation/home.php:50
-#: ../../operation/agentes/pandora_networkmap.php:404
+#: ../../operation/agentes/pandora_networkmap.php:567
 #: ../../operation/tree.php:61
 #: ../../enterprise/dashboard/widgets/events_list.php:57
 #: ../../enterprise/dashboard/widgets/groups_status.php:28
 #: ../../enterprise/dashboard/widgets/top_n_events_by_group.php:35
 #: ../../enterprise/dashboard/widgets/top_n_events_by_module.php:35
-#: ../../enterprise/dashboard/widgets/tree_view.php:34
-#: ../../enterprise/godmode/setup/setup_auth.php:427
-#: ../../enterprise/godmode/setup/setup_auth.php:468
+#: ../../enterprise/dashboard/widgets/tree_view.php:36
+#: ../../enterprise/godmode/policies/policy_agents.php:435
+#: ../../enterprise/godmode/setup/setup_auth.php:138
+#: ../../enterprise/godmode/setup/setup_auth.php:182
+#: ../../enterprise/godmode/setup/setup_auth.php:737
+#: ../../enterprise/godmode/setup/setup_auth.php:778
+#: ../../enterprise/meta/advanced/synchronizing.group.php:162
 msgid "Groups"
 msgstr "グループ"
 
 #: ../../extensions/files_repo/files_repo_form.php:72
 #: ../../extensions/files_repo/files_repo_list.php:59
-#: ../../godmode/agentes/agent_manager.php:305
+#: ../../godmode/agentes/agent_manager.php:289
 #: ../../godmode/agentes/agent_template.php:230
-#: ../../godmode/agentes/modificar_agente.php:493
-#: ../../godmode/agentes/module_manager.php:563
-#: ../../godmode/agentes/module_manager_editor_common.php:356
-#: ../../godmode/agentes/planned_downtime.editor.php:482
+#: ../../godmode/agentes/modificar_agente.php:477
+#: ../../godmode/agentes/module_manager.php:566
+#: ../../godmode/agentes/module_manager_editor_common.php:355
+#: ../../godmode/agentes/planned_downtime.editor.php:497
 #: ../../godmode/agentes/planned_downtime.list.php:392
-#: ../../godmode/alerts/alert_commands.php:332
+#: ../../godmode/alerts/alert_commands.php:350
 #: ../../godmode/alerts/alert_templates.php:47
 #: ../../godmode/alerts/configure_alert_command.php:155
 #: ../../godmode/alerts/configure_alert_special_days.php:90
-#: ../../godmode/alerts/configure_alert_template.php:763
-#: ../../godmode/events/event_responses.editor.php:87
+#: ../../godmode/alerts/configure_alert_template.php:766
+#: ../../godmode/events/event_responses.editor.php:88
 #: ../../godmode/events/event_responses.list.php:55
 #: ../../godmode/groups/configure_group.php:182
-#: ../../godmode/groups/group_list.php:340
-#: ../../godmode/massive/massive_edit_agents.php:321
-#: ../../godmode/massive/massive_edit_modules.php:459
+#: ../../godmode/groups/group_list.php:377
+#: ../../godmode/massive/massive_edit_agents.php:376
+#: ../../godmode/massive/massive_edit_modules.php:479
 #: ../../godmode/massive/massive_edit_plugins.php:451
 #: ../../godmode/modules/manage_network_components.php:567
 #: ../../godmode/modules/manage_network_components_form.php:263
@@ -1902,13 +2077,14 @@ msgstr "グループ"
 #: ../../godmode/modules/manage_network_templates_form.php:201
 #: ../../godmode/modules/module_list.php:60
 #: ../../godmode/netflow/nf_item_list.php:149
-#: ../../godmode/reporting/graph_builder.main.php:123
-#: ../../godmode/reporting/graphs.php:153
-#: ../../godmode/reporting/reporting_builder.item_editor.php:684
+#: ../../godmode/reporting/create_container.php:238
+#: ../../godmode/reporting/graph_builder.main.php:134
+#: ../../godmode/reporting/graphs.php:156
+#: ../../godmode/reporting/reporting_builder.item_editor.php:700
 #: ../../godmode/reporting/reporting_builder.list_items.php:306
 #: ../../godmode/reporting/reporting_builder.main.php:121
-#: ../../godmode/reporting/reporting_builder.php:533
-#: ../../godmode/servers/modificar_server.php:48
+#: ../../godmode/reporting/reporting_builder.php:567
+#: ../../godmode/servers/modificar_server.php:57
 #: ../../godmode/servers/plugin.php:312 ../../godmode/servers/plugin.php:444
 #: ../../godmode/servers/recon_script.php:107
 #: ../../godmode/servers/recon_script.php:154
@@ -1917,35 +2093,36 @@ msgstr "グループ"
 #: ../../godmode/setup/snmp_wizard.php:40
 #: ../../godmode/snmpconsole/snmp_alert.php:627
 #: ../../godmode/snmpconsole/snmp_alert.php:1163
-#: ../../godmode/snmpconsole/snmp_filters.php:94
-#: ../../godmode/snmpconsole/snmp_filters.php:131
+#: ../../godmode/snmpconsole/snmp_filters.php:149
+#: ../../godmode/snmpconsole/snmp_filters.php:224
 #: ../../godmode/tag/edit_tag.php:177 ../../godmode/tag/tag.php:156
-#: ../../godmode/tag/tag.php:200 ../../godmode/users/user_list.php:277
-#: ../../include/ajax/module.php:744 ../../include/functions_events.php:1810
+#: ../../godmode/tag/tag.php:200 ../../godmode/users/user_list.php:274
+#: ../../include/ajax/module.php:780 ../../include/functions_treeview.php:129
+#: ../../include/functions_treeview.php:593
+#: ../../include/functions_container.php:130
+#: ../../include/functions_events.php:1802
+#: ../../include/functions_snmp_browser.php:461
 #: ../../include/functions_reporting_html.php:123
-#: ../../include/functions_reporting_html.php:2082
-#: ../../include/functions_reporting_html.php:2115
-#: ../../include/functions_reporting_html.php:3106
-#: ../../include/functions_reporting_html.php:3820
-#: ../../include/functions_snmp_browser.php:415
-#: ../../include/functions_treeview.php:129
-#: ../../include/functions_treeview.php:587
+#: ../../include/functions_reporting_html.php:2085
+#: ../../include/functions_reporting_html.php:2118
+#: ../../include/functions_reporting_html.php:3219
+#: ../../include/functions_reporting_html.php:4099
 #: ../../mobile/operation/tactical.php:312
 #: ../../operation/agentes/custom_fields.php:64
-#: ../../operation/agentes/estado_agente.php:495
-#: ../../operation/agentes/estado_generalagente.php:171
-#: ../../operation/agentes/gis_view.php:183
-#: ../../operation/agentes/pandora_networkmap.editor.php:191
+#: ../../operation/agentes/estado_agente.php:540
+#: ../../operation/agentes/estado_generalagente.php:200
+#: ../../operation/agentes/gis_view.php:203
+#: ../../operation/agentes/pandora_networkmap.editor.php:232
 #: ../../operation/events/events.php:91 ../../operation/gis_maps/ajax.php:302
 #: ../../operation/incidents/incident_detail.php:454
 #: ../../operation/incidents/incident_detail.php:506
 #: ../../operation/reporting/custom_reporting.php:39
-#: ../../operation/reporting/graph_viewer.php:339
+#: ../../operation/reporting/graph_viewer.php:341
 #: ../../operation/search_graphs.php:34 ../../operation/search_reports.php:39
 #: ../../operation/search_users.php:53
 #: ../../enterprise/extensions/backup/main.php:98
 #: ../../enterprise/extensions/backup/main.php:213
-#: ../../enterprise/extensions/cron/functions.php:62
+#: ../../enterprise/extensions/cron/functions.php:66
 #: ../../enterprise/extensions/ipam/ipam_editor.php:85
 #: ../../enterprise/extensions/ipam/ipam_list.php:160
 #: ../../enterprise/extensions/ipam/ipam_network.php:143
@@ -1953,6 +2130,8 @@ msgstr "グループ"
 #: ../../enterprise/godmode/agentes/collection_manager.php:165
 #: ../../enterprise/godmode/agentes/collections.php:234
 #: ../../enterprise/godmode/agentes/inventory_manager.php:234
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:153
+#: ../../enterprise/godmode/agentes/pandora_networkmap_empty.editor.php:109
 #: ../../enterprise/godmode/alerts/alert_events.php:501
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:241
 #: ../../enterprise/godmode/modules/configure_local_component.php:305
@@ -1964,77 +2143,82 @@ msgstr "グループ"
 #: ../../enterprise/godmode/policies/policy_collections.php:194
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:243
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:163
-#: ../../enterprise/godmode/reporting/graph_template_list.php:125
+#: ../../enterprise/godmode/reporting/graph_template_list.php:128
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:286
-#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:122
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1223
+#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:123
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1293
 #: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:252
-#: ../../enterprise/godmode/services/services.elements.php:383
-#: ../../enterprise/godmode/services/services.service.php:247
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:332
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:270
+#: ../../enterprise/godmode/reporting/cluster_list.php:158
+#: ../../enterprise/godmode/services/services.elements.php:384
+#: ../../enterprise/godmode/services/services.service.php:287
 #: ../../enterprise/godmode/setup/edit_skin.php:231
 #: ../../enterprise/godmode/setup/setup_skins.php:119
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:322
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:78
 #: ../../enterprise/include/functions_netflow_pdf.php:166
-#: ../../enterprise/include/functions_reporting.php:4559
-#: ../../enterprise/include/functions_reporting_csv.php:256
-#: ../../enterprise/include/functions_reporting_csv.php:259
-#: ../../enterprise/include/functions_reporting_csv.php:341
-#: ../../enterprise/include/functions_reporting_csv.php:343
-#: ../../enterprise/include/functions_reporting_csv.php:372
-#: ../../enterprise/include/functions_reporting_csv.php:374
-#: ../../enterprise/include/functions_reporting_csv.php:398
-#: ../../enterprise/include/functions_reporting_csv.php:400
-#: ../../enterprise/include/functions_reporting_csv.php:425
-#: ../../enterprise/include/functions_reporting_csv.php:427
-#: ../../enterprise/include/functions_reporting_csv.php:451
-#: ../../enterprise/include/functions_reporting_csv.php:453
-#: ../../enterprise/include/functions_reporting_csv.php:491
-#: ../../enterprise/include/functions_reporting_csv.php:493
-#: ../../enterprise/include/functions_reporting_csv.php:519
-#: ../../enterprise/include/functions_reporting_csv.php:521
-#: ../../enterprise/include/functions_reporting_csv.php:523
-#: ../../enterprise/include/functions_reporting_csv.php:554
-#: ../../enterprise/include/functions_reporting_csv.php:556
-#: ../../enterprise/include/functions_reporting_csv.php:558
-#: ../../enterprise/include/functions_reporting_csv.php:590
-#: ../../enterprise/include/functions_reporting_csv.php:592
-#: ../../enterprise/include/functions_reporting_csv.php:594
-#: ../../enterprise/include/functions_reporting_csv.php:626
-#: ../../enterprise/include/functions_reporting_csv.php:628
-#: ../../enterprise/include/functions_reporting_csv.php:631
-#: ../../enterprise/include/functions_reporting_csv.php:661
-#: ../../enterprise/include/functions_reporting_csv.php:663
-#: ../../enterprise/include/functions_reporting_csv.php:695
-#: ../../enterprise/include/functions_reporting_csv.php:697
-#: ../../enterprise/include/functions_reporting_csv.php:699
-#: ../../enterprise/include/functions_reporting_csv.php:731
-#: ../../enterprise/include/functions_reporting_csv.php:733
-#: ../../enterprise/include/functions_reporting_csv.php:735
-#: ../../enterprise/include/functions_reporting_csv.php:767
-#: ../../enterprise/include/functions_reporting_csv.php:769
-#: ../../enterprise/include/functions_reporting_csv.php:771
-#: ../../enterprise/include/functions_reporting_csv.php:803
-#: ../../enterprise/include/functions_reporting_csv.php:805
-#: ../../enterprise/include/functions_reporting_csv.php:807
-#: ../../enterprise/include/functions_reporting_csv.php:839
-#: ../../enterprise/include/functions_reporting_csv.php:841
-#: ../../enterprise/include/functions_reporting_csv.php:843
-#: ../../enterprise/include/functions_reporting_csv.php:875
-#: ../../enterprise/include/functions_reporting_csv.php:877
+#: ../../enterprise/include/functions_reporting.php:4977
+#: ../../enterprise/include/functions_reporting_csv.php:266
+#: ../../enterprise/include/functions_reporting_csv.php:269
+#: ../../enterprise/include/functions_reporting_csv.php:353
+#: ../../enterprise/include/functions_reporting_csv.php:355
+#: ../../enterprise/include/functions_reporting_csv.php:385
+#: ../../enterprise/include/functions_reporting_csv.php:387
+#: ../../enterprise/include/functions_reporting_csv.php:411
+#: ../../enterprise/include/functions_reporting_csv.php:413
+#: ../../enterprise/include/functions_reporting_csv.php:438
+#: ../../enterprise/include/functions_reporting_csv.php:440
+#: ../../enterprise/include/functions_reporting_csv.php:464
+#: ../../enterprise/include/functions_reporting_csv.php:466
+#: ../../enterprise/include/functions_reporting_csv.php:504
+#: ../../enterprise/include/functions_reporting_csv.php:506
+#: ../../enterprise/include/functions_reporting_csv.php:563
+#: ../../enterprise/include/functions_reporting_csv.php:565
+#: ../../enterprise/include/functions_reporting_csv.php:567
+#: ../../enterprise/include/functions_reporting_csv.php:599
+#: ../../enterprise/include/functions_reporting_csv.php:601
+#: ../../enterprise/include/functions_reporting_csv.php:603
+#: ../../enterprise/include/functions_reporting_csv.php:636
+#: ../../enterprise/include/functions_reporting_csv.php:638
+#: ../../enterprise/include/functions_reporting_csv.php:640
+#: ../../enterprise/include/functions_reporting_csv.php:673
+#: ../../enterprise/include/functions_reporting_csv.php:675
+#: ../../enterprise/include/functions_reporting_csv.php:678
+#: ../../enterprise/include/functions_reporting_csv.php:708
+#: ../../enterprise/include/functions_reporting_csv.php:710
+#: ../../enterprise/include/functions_reporting_csv.php:743
+#: ../../enterprise/include/functions_reporting_csv.php:745
+#: ../../enterprise/include/functions_reporting_csv.php:747
+#: ../../enterprise/include/functions_reporting_csv.php:780
+#: ../../enterprise/include/functions_reporting_csv.php:782
+#: ../../enterprise/include/functions_reporting_csv.php:784
+#: ../../enterprise/include/functions_reporting_csv.php:817
+#: ../../enterprise/include/functions_reporting_csv.php:819
+#: ../../enterprise/include/functions_reporting_csv.php:821
+#: ../../enterprise/include/functions_reporting_csv.php:853
+#: ../../enterprise/include/functions_reporting_csv.php:855
+#: ../../enterprise/include/functions_reporting_csv.php:912
+#: ../../enterprise/include/functions_reporting_csv.php:914
 #: ../../enterprise/include/functions_reporting_csv.php:916
-#: ../../enterprise/include/functions_reporting_csv.php:918
-#: ../../enterprise/include/functions_reporting_csv.php:1039
-#: ../../enterprise/include/functions_reporting_csv.php:1152
-#: ../../enterprise/include/functions_reporting_csv.php:1299
-#: ../../enterprise/include/functions_reporting_csv.php:1364
-#: ../../enterprise/include/functions_reporting_csv.php:1504
-#: ../../enterprise/include/functions_reporting_csv.php:1508
-#: ../../enterprise/include/functions_reporting_pdf.php:2175
-#: ../../enterprise/include/functions_reporting_pdf.php:2318
-#: ../../enterprise/include/functions_reporting_pdf.php:2366
-#: ../../enterprise/include/functions_reporting_pdf.php:2421
-#: ../../enterprise/include/functions_services.php:1414
+#: ../../enterprise/include/functions_reporting_csv.php:949
+#: ../../enterprise/include/functions_reporting_csv.php:951
+#: ../../enterprise/include/functions_reporting_csv.php:953
+#: ../../enterprise/include/functions_reporting_csv.php:986
+#: ../../enterprise/include/functions_reporting_csv.php:988
+#: ../../enterprise/include/functions_reporting_csv.php:1028
+#: ../../enterprise/include/functions_reporting_csv.php:1030
+#: ../../enterprise/include/functions_reporting_csv.php:1151
+#: ../../enterprise/include/functions_reporting_csv.php:1264
+#: ../../enterprise/include/functions_reporting_csv.php:1411
+#: ../../enterprise/include/functions_reporting_csv.php:1476
+#: ../../enterprise/include/functions_reporting_csv.php:1616
+#: ../../enterprise/include/functions_reporting_csv.php:1620
+#: ../../enterprise/include/functions_reporting_pdf.php:2256
+#: ../../enterprise/include/functions_reporting_pdf.php:2399
+#: ../../enterprise/include/functions_reporting_pdf.php:2447
+#: ../../enterprise/include/functions_reporting_pdf.php:2502
+#: ../../enterprise/include/functions_services.php:1503
 #: ../../enterprise/include/functions_update_manager.php:172
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:102
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1113
@@ -2048,11 +2232,14 @@ msgstr "グループ"
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1419
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1519
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1637
+#: ../../enterprise/meta/include/functions_autoprovision.php:383
 #: ../../enterprise/mobile/include/enterprise.class.php:80
 #: ../../enterprise/operation/agentes/collection_view.php:65
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:269
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:358
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:78
 #: ../../enterprise/operation/agentes/policy_view.php:49
+#: ../../enterprise/operation/agentes/tag_view.php:463
 #: ../../enterprise/operation/agentes/transactional_map.php:149
 #: ../../enterprise/operation/agentes/ver_agente.php:58
 #: ../../enterprise/operation/services/services.list.php:331
@@ -2065,7 +2252,6 @@ msgid "Only 200 characters are permitted"
 msgstr "200文字までです"
 
 #: ../../extensions/files_repo/files_repo_form.php:84
-#: ../../extensions/system_info.php:471 ../../extensions/system_info.php:526
 #: ../../godmode/extensions.php:143
 msgid "File"
 msgstr "ファイル"
@@ -2077,13 +2263,13 @@ msgid "Public link"
 msgstr "公開リンク"
 
 #: ../../extensions/files_repo/files_repo_form.php:88
-#: ../../extensions/net_tools.php:338
+#: ../../extensions/net_tools.php:343
 #: ../../godmode/agentes/agent_conf_gis.php:88
-#: ../../godmode/agentes/agent_manager.php:489
+#: ../../godmode/agentes/agent_manager.php:514
 #: ../../godmode/agentes/agent_template.php:253
-#: ../../godmode/agentes/configure_field.php:61
-#: ../../godmode/agentes/module_manager_editor.php:525
-#: ../../godmode/agentes/planned_downtime.editor.php:624
+#: ../../godmode/agentes/configure_field.php:66
+#: ../../godmode/agentes/module_manager_editor.php:534
+#: ../../godmode/agentes/planned_downtime.editor.php:639
 #: ../../godmode/agentes/planned_downtime.list.php:466
 #: ../../godmode/agentes/planned_downtime.list.php:475
 #: ../../godmode/alerts/alert_list.list.php:147
@@ -2095,61 +2281,66 @@ msgstr "公開リンク"
 #: ../../godmode/category/edit_category.php:169
 #: ../../godmode/events/custom_events.php:201
 #: ../../godmode/events/event_edit_filter.php:401
-#: ../../godmode/events/event_responses.editor.php:145
+#: ../../godmode/events/event_responses.editor.php:167
 #: ../../godmode/groups/configure_group.php:221
 #: ../../godmode/groups/configure_modu_group.php:83
-#: ../../godmode/massive/massive_edit_agents.php:473
-#: ../../godmode/massive/massive_edit_modules.php:619
+#: ../../godmode/massive/massive_edit_agents.php:535
+#: ../../godmode/massive/massive_edit_modules.php:698
 #: ../../godmode/massive/massive_edit_plugins.php:321
 #: ../../godmode/modules/manage_nc_groups_form.php:80
 #: ../../godmode/modules/manage_network_components_form.php:274
 #: ../../godmode/modules/manage_network_templates_form.php:156
 #: ../../godmode/netflow/nf_edit_form.php:240
-#: ../../godmode/reporting/graph_builder.main.php:183
+#: ../../godmode/reporting/create_container.php:276
+#: ../../godmode/reporting/graph_builder.main.php:204
 #: ../../godmode/reporting/reporting_builder.main.php:38
-#: ../../godmode/reporting/visual_console_builder.data.php:185
-#: ../../godmode/reporting/visual_console_builder.elements.php:516
+#: ../../godmode/reporting/visual_console_builder.data.php:194
+#: ../../godmode/reporting/visual_console_builder.elements.php:522
 #: ../../godmode/servers/manage_recontask_form.php:407
-#: ../../godmode/servers/modificar_server.php:53
+#: ../../godmode/servers/modificar_server.php:72
 #: ../../godmode/servers/plugin.php:173 ../../godmode/servers/plugin.php:546
 #: ../../godmode/servers/recon_script.php:223
 #: ../../godmode/setup/links.php:120 ../../godmode/setup/news.php:207
 #: ../../godmode/setup/os.php:57 ../../godmode/setup/os.php:110
-#: ../../godmode/setup/performance.php:154
-#: ../../godmode/setup/setup_auth.php:202
+#: ../../godmode/setup/performance.php:157
+#: ../../godmode/setup/setup_auth.php:213
 #: ../../godmode/setup/setup_ehorus.php:57
 #: ../../godmode/setup/setup_ehorus.php:158
-#: ../../godmode/setup/setup_general.php:232
+#: ../../godmode/setup/setup_general.php:241
 #: ../../godmode/setup/setup_netflow.php:81
-#: ../../godmode/setup/setup_visuals.php:766
+#: ../../godmode/setup/setup_visuals.php:852
 #: ../../godmode/setup/snmp_wizard.php:106
 #: ../../godmode/snmpconsole/snmp_alert.php:977
 #: ../../godmode/snmpconsole/snmp_alert.php:1232
-#: ../../godmode/snmpconsole/snmp_filters.php:105
-#: ../../godmode/snmpconsole/snmp_filters.php:142
+#: ../../godmode/snmpconsole/snmp_filters.php:197
+#: ../../godmode/snmpconsole/snmp_filters.php:237
+#: ../../godmode/snmpconsole/snmp_filters.php:252
 #: ../../godmode/tag/edit_tag.php:224
 #: ../../godmode/update_manager/update_manager.setup.php:132
 #: ../../godmode/users/configure_profile.php:381
-#: ../../godmode/users/configure_user.php:594
-#: ../../include/ajax/alert_list.ajax.php:172
-#: ../../include/functions_events.php:1706
-#: ../../include/functions_events.php:1744
-#: ../../include/functions_visual_map_editor.php:465
-#: ../../include/functions_pandora_networkmap.php:1486
+#: ../../godmode/users/configure_user.php:708
+#: ../../include/ajax/alert_list.ajax.php:193
+#: ../../include/functions_pandora_networkmap.php:1733
+#: ../../include/functions_events.php:1698
+#: ../../include/functions_events.php:1736
+#: ../../include/functions_visual_map_editor.php:623
 #: ../../operation/agentes/datos_agente.php:209
-#: ../../operation/events/events_list.php:628
+#: ../../operation/events/events_list.php:696
 #: ../../operation/reporting/reporting_viewer.php:201
-#: ../../operation/snmpconsole/snmp_view.php:450
-#: ../../operation/users/user_edit.php:472
-#: ../../enterprise/dashboard/main_dashboard.php:286
-#: ../../enterprise/dashboard/widget.php:190
-#: ../../enterprise/extensions/cron/main.php:350
+#: ../../operation/snmpconsole/snmp_view.php:517
+#: ../../operation/users/user_edit.php:483
+#: ../../enterprise/dashboard/main_dashboard.php:302
+#: ../../enterprise/dashboard/widget.php:191
+#: ../../enterprise/extensions/cron/main.php:496
 #: ../../enterprise/extensions/ipam/ipam_editor.php:118
 #: ../../enterprise/extensions/ipam/ipam_massive.php:95
 #: ../../enterprise/extensions/ipam/ipam_network.php:670
-#: ../../enterprise/extensions/translate_string.php:306
-#: ../../enterprise/extensions/translate_string.php:313
-#: ../../enterprise/extensions/vmware/vmware_view.php:1353
+#: ../../enterprise/extensions/translate_string.php:303
+#: ../../enterprise/extensions/translate_string.php:310
+#: ../../enterprise/extensions/vmware/vmware_admin.php:355
+#: ../../enterprise/extensions/vmware/vmware_admin.php:490
+#: ../../enterprise/extensions/vmware/vmware_view.php:1169
+#: ../../enterprise/extensions/vmware/vmware_view.php:1430
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:216
 #: ../../enterprise/godmode/agentes/collection_manager.php:132
 #: ../../enterprise/godmode/agentes/collection_manager.php:217
@@ -2157,8 +2348,8 @@ msgstr "公開リンク"
 #: ../../enterprise/godmode/agentes/collections.data.php:202
 #: ../../enterprise/godmode/agentes/collections.data.php:260
 #: ../../enterprise/godmode/agentes/collections.data.php:335
-#: ../../enterprise/godmode/agentes/collections.editor.php:130
-#: ../../enterprise/godmode/agentes/collections.editor.php:196
+#: ../../enterprise/godmode/agentes/collections.editor.php:124
+#: ../../enterprise/godmode/agentes/collections.editor.php:190
 #: ../../enterprise/godmode/agentes/inventory_manager.php:204
 #: ../../enterprise/godmode/agentes/inventory_manager.php:267
 #: ../../enterprise/godmode/agentes/plugins_manager.php:145
@@ -2179,30 +2370,32 @@ msgstr "公開リンク"
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:229
 #: ../../enterprise/godmode/reporting/reporting_builder.advanced.php:109
 #: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:146
-#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:78
-#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:88
+#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:79
+#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:89
 #: ../../enterprise/godmode/servers/credential_boxes_satellite.php:327
 #: ../../enterprise/godmode/servers/manage_credential_boxes.php:87
 #: ../../enterprise/godmode/servers/manage_export_form.php:120
 #: ../../enterprise/godmode/servers/server_disk_conf_editor.php:172
-#: ../../enterprise/godmode/services/services.elements.php:421
-#: ../../enterprise/godmode/services/services.service.php:377
+#: ../../enterprise/godmode/services/services.elements.php:418
 #: ../../enterprise/godmode/setup/edit_skin.php:262
-#: ../../enterprise/godmode/setup/setup.php:225
-#: ../../enterprise/godmode/setup/setup.php:318
+#: ../../enterprise/godmode/setup/setup.php:270
+#: ../../enterprise/godmode/setup/setup.php:370
 #: ../../enterprise/godmode/setup/setup_history.php:84
-#: ../../enterprise/godmode/setup/setup_log_collector.php:55
+#: ../../enterprise/godmode/setup/setup_log_collector.php:60
 #: ../../enterprise/godmode/setup/setup_metaconsole.php:218
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:345
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:86
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:348
+#: ../../enterprise/meta/advanced/metasetup.mail.php:106
 #: ../../enterprise/meta/advanced/metasetup.password.php:146
-#: ../../enterprise/meta/advanced/metasetup.performance.php:103
-#: ../../enterprise/meta/advanced/metasetup.setup.php:258
-#: ../../enterprise/meta/advanced/metasetup.translate_string.php:186
+#: ../../enterprise/meta/advanced/metasetup.performance.php:106
+#: ../../enterprise/meta/advanced/metasetup.setup.php:268
+#: ../../enterprise/meta/advanced/metasetup.translate_string.php:185
 #: ../../enterprise/meta/advanced/metasetup.update_manager_setup.php:102
-#: ../../enterprise/meta/advanced/metasetup.visual.php:283
+#: ../../enterprise/meta/advanced/metasetup.visual.php:329
 #: ../../enterprise/meta/event/custom_events.php:197
+#: ../../enterprise/meta/include/functions_autoprovision.php:494
+#: ../../enterprise/meta/include/functions_autoprovision.php:679
 #: ../../enterprise/operation/agentes/collection_view.php:98
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:191
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:399
@@ -2212,30 +2405,30 @@ msgid "Update"
 msgstr "更新"
 
 #: ../../extensions/files_repo/files_repo_form.php:94
-#: ../../godmode/agentes/planned_downtime.editor.php:628
-#: ../../godmode/agentes/planned_downtime.editor.php:724
-#: ../../godmode/agentes/planned_downtime.editor.php:864
-#: ../../godmode/alerts/alert_list.list.php:632
+#: ../../godmode/agentes/planned_downtime.editor.php:643
+#: ../../godmode/agentes/planned_downtime.editor.php:750
+#: ../../godmode/agentes/planned_downtime.editor.php:890
+#: ../../godmode/alerts/alert_list.list.php:633
 #: ../../godmode/events/event_edit_filter.php:353
 #: ../../godmode/events/event_edit_filter.php:368
 #: ../../godmode/massive/massive_add_action_alerts.php:205
 #: ../../godmode/massive/massive_add_alerts.php:185
 #: ../../godmode/massive/massive_add_tags.php:161
 #: ../../godmode/modules/manage_network_templates_form.php:310
-#: ../../godmode/reporting/graph_builder.graph_editor.php:163
+#: ../../godmode/reporting/graph_builder.graph_editor.php:329
 #: ../../godmode/reporting/visual_console_builder.wizard.php:367
 #: ../../godmode/servers/manage_recontask_form.php:411
 #: ../../godmode/servers/plugin.php:796
 #: ../../godmode/servers/recon_script.php:383
 #: ../../godmode/setup/links.php:158 ../../godmode/setup/news.php:275
-#: ../../godmode/setup/setup_visuals.php:710
-#: ../../godmode/setup/setup_visuals.php:746
+#: ../../godmode/setup/setup_visuals.php:776
+#: ../../godmode/setup/setup_visuals.php:812
 #: ../../godmode/snmpconsole/snmp_alert.php:1317
 #: ../../godmode/users/configure_profile.php:375
-#: ../../operation/events/events_list.php:336
-#: ../../operation/events/events_list.php:363
+#: ../../operation/events/events_list.php:405
+#: ../../operation/events/events_list.php:432
 #: ../../operation/incidents/incident_detail.php:404
-#: ../../enterprise/dashboard/main_dashboard.php:340
+#: ../../enterprise/dashboard/main_dashboard.php:365
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:186
 #: ../../enterprise/godmode/agentes/collection_manager.php:109
 #: ../../enterprise/godmode/agentes/collection_manager.php:126
@@ -2253,24 +2446,28 @@ msgstr "更新"
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:219
 #: ../../enterprise/godmode/policies/policy_plugins.php:70
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:214
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:183
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:316
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:162
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:358
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:184
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:330
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:181
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:222
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:527
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:193
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:243
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:133
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:527
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:700
 #: ../../enterprise/godmode/servers/credential_boxes_satellite.php:380
 #: ../../enterprise/godmode/servers/manage_credential_boxes.php:78
 #: ../../enterprise/godmode/servers/manage_export_form.php:122
-#: ../../enterprise/godmode/setup/setup_acl.php:172
-#: ../../enterprise/godmode/setup/setup_acl.php:191
+#: ../../enterprise/godmode/setup/setup_acl.php:381
+#: ../../enterprise/godmode/setup/setup_acl.php:400
 #: ../../enterprise/godmode/setup/setup_metaconsole.php:221
 #: ../../enterprise/godmode/setup/setup_metaconsole.php:329
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:352
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:484
-#: ../../enterprise/meta/advanced/metasetup.visual.php:149
+#: ../../enterprise/meta/advanced/metasetup.visual.php:171
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1213
+#: ../../enterprise/meta/include/functions_autoprovision.php:598
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:235
 msgid "Add"
 msgstr "追加"
@@ -2284,75 +2481,79 @@ msgid "Please contact the administrator"
 msgstr "管理者に連絡してください"
 
 #: ../../extensions/files_repo/files_repo_list.php:58
-#: ../../godmode/agentes/configure_field.php:48
-#: ../../godmode/agentes/module_manager.php:545
+#: ../../godmode/agentes/configure_field.php:50
+#: ../../godmode/agentes/module_manager.php:548
 #: ../../godmode/agentes/module_manager_editor_common.php:149
 #: ../../godmode/agentes/module_manager_editor_common.php:655
-#: ../../godmode/agentes/planned_downtime.editor.php:478
-#: ../../godmode/agentes/planned_downtime.editor.php:753
+#: ../../godmode/agentes/planned_downtime.editor.php:493
+#: ../../godmode/agentes/planned_downtime.editor.php:779
 #: ../../godmode/alerts/alert_actions.php:340
-#: ../../godmode/alerts/alert_commands.php:330
-#: ../../godmode/alerts/alert_templates.php:298
+#: ../../godmode/alerts/alert_commands.php:348
+#: ../../godmode/alerts/alert_templates.php:299
 #: ../../godmode/alerts/configure_alert_action.php:112
 #: ../../godmode/alerts/configure_alert_command.php:146
-#: ../../godmode/alerts/configure_alert_template.php:747
+#: ../../godmode/alerts/configure_alert_template.php:750
 #: ../../godmode/category/edit_category.php:155
 #: ../../godmode/events/event_filter.php:108
-#: ../../godmode/events/event_responses.editor.php:76
+#: ../../godmode/events/event_responses.editor.php:77
 #: ../../godmode/events/event_responses.list.php:54
 #: ../../godmode/groups/configure_group.php:116
 #: ../../godmode/groups/configure_modu_group.php:69
-#: ../../godmode/groups/group_list.php:336
-#: ../../godmode/groups/modu_group_list.php:183
+#: ../../godmode/groups/group_list.php:373
+#: ../../godmode/groups/modu_group_list.php:190
 #: ../../godmode/modules/manage_nc_groups.php:194
 #: ../../godmode/modules/manage_nc_groups_form.php:67
 #: ../../godmode/modules/manage_network_components_form_common.php:54
 #: ../../godmode/modules/manage_network_templates.php:190
 #: ../../godmode/modules/manage_network_templates_form.php:146
 #: ../../godmode/modules/module_list.php:59
-#: ../../godmode/netflow/nf_edit.php:118
+#: ../../godmode/netflow/nf_edit.php:119
 #: ../../godmode/netflow/nf_edit_form.php:189
-#: ../../godmode/reporting/graph_builder.main.php:103
-#: ../../godmode/reporting/reporting_builder.item_editor.php:653
+#: ../../godmode/reporting/create_container.php:211
+#: ../../godmode/reporting/graph_builder.main.php:114
+#: ../../godmode/reporting/reporting_builder.item_editor.php:670
 #: ../../godmode/reporting/reporting_builder.list_items.php:306
 #: ../../godmode/reporting/reporting_builder.main.php:65
 #: ../../godmode/reporting/reporting_builder.main.php:67
 #: ../../godmode/servers/manage_recontask.php:296
-#: ../../godmode/servers/modificar_server.php:46
+#: ../../godmode/servers/modificar_server.php:55
 #: ../../godmode/servers/plugin.php:293 ../../godmode/servers/plugin.php:735
 #: ../../godmode/servers/recon_script.php:95
 #: ../../godmode/servers/recon_script.php:348
 #: ../../godmode/servers/servers.build_table.php:64
 #: ../../godmode/setup/os.builder.php:35 ../../godmode/setup/os.list.php:34
 #: ../../godmode/tag/edit_tag.php:169 ../../godmode/tag/tag.php:156
-#: ../../godmode/users/user_list.php:269 ../../godmode/users/user_list.php:403
-#: ../../include/functions_events.php:2018
-#: ../../include/functions_events.php:2068
-#: ../../include/functions_filemanager.php:580
-#: ../../include/functions_pandora_networkmap.php:1399
-#: ../../include/functions_pandora_networkmap.php:1432
-#: ../../include/functions_pandora_networkmap.php:1439
-#: ../../include/functions_pandora_networkmap.php:1600
-#: ../../include/functions_reporting_html.php:808
-#: ../../include/functions_reporting_html.php:817
-#: ../../include/functions_reporting_html.php:1646
-#: ../../include/functions_reporting_html.php:2110
-#: ../../include/functions_reporting_html.php:3819
+#: ../../godmode/users/user_list.php:266 ../../godmode/users/user_list.php:400
+#: ../../include/functions_pandora_networkmap.php:1646
+#: ../../include/functions_pandora_networkmap.php:1679
+#: ../../include/functions_pandora_networkmap.php:1686
+#: ../../include/functions_pandora_networkmap.php:1847
 #: ../../include/functions_treeview.php:79
+#: ../../include/functions_events.php:2118
+#: ../../include/functions_events.php:2169
+#: ../../include/functions_filemanager.php:580
+#: ../../include/functions_reporting_html.php:811
+#: ../../include/functions_reporting_html.php:820
+#: ../../include/functions_reporting_html.php:1649
+#: ../../include/functions_reporting_html.php:2113
+#: ../../include/functions_reporting_html.php:4098
 #: ../../mobile/operation/networkmaps.php:195
 #: ../../mobile/operation/visualmaps.php:139
-#: ../../operation/agentes/pandora_networkmap.editor.php:180
-#: ../../operation/agentes/pandora_networkmap.php:402
+#: ../../operation/agentes/pandora_networkmap.editor.php:221
+#: ../../operation/agentes/pandora_networkmap.php:563
 #: ../../operation/gis_maps/gis_map.php:89
 #: ../../operation/netflow/nf_live_view.php:305
 #: ../../operation/search_helps.php:36 ../../operation/search_maps.php:31
 #: ../../operation/search_users.php:41
-#: ../../enterprise/dashboard/dashboards.php:82
-#: ../../enterprise/dashboard/main_dashboard.php:295
-#: ../../enterprise/dashboard/main_dashboard.php:330
+#: ../../enterprise/dashboard/dashboards.php:86
+#: ../../enterprise/dashboard/main_dashboard.php:311
+#: ../../enterprise/dashboard/main_dashboard.php:355
 #: ../../enterprise/godmode/agentes/collection_manager.php:105
 #: ../../enterprise/godmode/agentes/collection_manager.php:163
 #: ../../enterprise/godmode/agentes/inventory_manager.php:233
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:64
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:219
+#: ../../enterprise/godmode/agentes/pandora_networkmap_empty.editor.php:98
 #: ../../enterprise/godmode/alerts/alert_events.php:488
 #: ../../enterprise/godmode/alerts/alert_events_list.php:422
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:407
@@ -2363,46 +2564,49 @@ msgstr "管理者に連絡してください"
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:78
 #: ../../enterprise/godmode/policies/configure_policy.php:65
 #: ../../enterprise/godmode/policies/policies.php:254
-#: ../../enterprise/godmode/policies/policy_agents.php:377
+#: ../../enterprise/godmode/policies/policy_agents.php:572
+#: ../../enterprise/godmode/policies/policy_agents.php:818
 #: ../../enterprise/godmode/policies/policy_collections.php:121
 #: ../../enterprise/godmode/policies/policy_collections.php:192
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:242
-#: ../../enterprise/godmode/policies/policy_modules.php:1203
+#: ../../enterprise/godmode/policies/policy_modules.php:1234
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:153
 #: ../../enterprise/godmode/reporting/mysql_builder.php:41
 #: ../../enterprise/godmode/reporting/mysql_builder.php:138
 #: ../../enterprise/godmode/reporting/mysql_builder.php:139
-#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:111
 #: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:112
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1213
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:84
+#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:113
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1283
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:103
 #: ../../enterprise/godmode/servers/credential_boxes_satellite.php:325
 #: ../../enterprise/godmode/servers/list_satellite.php:35
 #: ../../enterprise/godmode/servers/manage_credential_boxes.php:54
 #: ../../enterprise/godmode/servers/manage_export.php:131
 #: ../../enterprise/godmode/servers/manage_export_form.php:67
-#: ../../enterprise/godmode/services/services.service.php:244
+#: ../../enterprise/godmode/services/services.service.php:284
 #: ../../enterprise/godmode/setup/edit_skin.php:208
+#: ../../enterprise/godmode/setup/setup_auth.php:97
 #: ../../enterprise/godmode/setup/setup_skins.php:82
-#: ../../enterprise/include/functions_reporting.php:4558
-#: ../../enterprise/include/functions_reporting_pdf.php:2420
-#: ../../enterprise/include/functions_services.php:1413
+#: ../../enterprise/include/functions_reporting.php:4976
+#: ../../enterprise/include/functions_reporting_pdf.php:2501
+#: ../../enterprise/include/functions_services.php:1502
 #: ../../enterprise/meta/advanced/servers.build_table.php:59
-#: ../../enterprise/meta/include/functions_wizard_meta.php:148
 #: ../../enterprise/meta/include/functions_wizard_meta.php:359
 #: ../../enterprise/meta/include/functions_wizard_meta.php:464
 #: ../../enterprise/meta/include/functions_wizard_meta.php:995
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1298
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1415
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1515
-#: ../../enterprise/meta/include/functions_wizard_meta.php:1629
+#: ../../enterprise/meta/include/functions_autoprovision.php:382
 #: ../../enterprise/mobile/include/enterprise.class.php:79
 #: ../../enterprise/operation/agentes/collection_view.php:63
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:118
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:268
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:357
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:69
 #: ../../enterprise/operation/agentes/policy_view.php:131
 #: ../../enterprise/operation/agentes/policy_view.php:305
+#: ../../enterprise/operation/agentes/tag_view.php:530
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:158
 #: ../../enterprise/operation/services/services.list.php:326
 #: ../../enterprise/operation/services/services.service.php:129
@@ -2410,11 +2614,11 @@ msgid "Name"
 msgstr "名前"
 
 #: ../../extensions/files_repo/files_repo_list.php:60
-#: ../../godmode/events/event_responses.editor.php:97
-#: ../../include/functions_visual_map_editor.php:107
-#: ../../include/functions_visual_map_editor.php:149
-#: ../../include/functions_visual_map_editor.php:444
-#: ../../include/functions_visual_map_editor.php:511
+#: ../../godmode/events/event_responses.editor.php:98
+#: ../../include/functions_visual_map_editor.php:109
+#: ../../include/functions_visual_map_editor.php:151
+#: ../../include/functions_visual_map_editor.php:595
+#: ../../include/functions_visual_map_editor.php:671
 #: ../../include/functions_filemanager.php:582
 #: ../../operation/incidents/incident_detail.php:455
 #: ../../enterprise/extensions/backup/main.php:100
@@ -2431,36 +2635,36 @@ msgid "Copy to clipboard"
 msgstr "クリップボードへコピー"
 
 #: ../../extensions/files_repo/files_repo_list.php:94
-#: ../../extensions/system_info.php:467
 #: ../../enterprise/extensions/backup/main.php:179
 msgid "Download"
 msgstr "ダウンロード"
 
 #: ../../extensions/files_repo/files_repo_list.php:101
-#: ../../godmode/agentes/fields_manager.php:126
+#: ../../godmode/agentes/fields_manager.php:128
 #: ../../godmode/agentes/modificar_agente.php:569
 #: ../../godmode/agentes/planned_downtime.list.php:401
 #: ../../godmode/alerts/alert_special_days.php:449
 #: ../../godmode/events/event_responses.list.php:67
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1194
-#: ../../godmode/reporting/reporting_builder.list_items.php:437
-#: ../../godmode/reporting/reporting_builder.php:698
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1245
+#: ../../godmode/reporting/reporting_builder.list_items.php:443
+#: ../../godmode/reporting/reporting_builder.php:736
 #: ../../godmode/servers/plugin.php:157 ../../godmode/servers/plugin.php:781
-#: ../../godmode/servers/servers.build_table.php:159
+#: ../../godmode/servers/servers.build_table.php:167
 #: ../../godmode/setup/snmp_wizard.php:119
 #: ../../godmode/users/profile_list.php:389
-#: ../../godmode/users/user_list.php:468 ../../include/ajax/module.php:866
-#: ../../include/functions_groups.php:2166
-#: ../../include/functions_pandora_networkmap.php:1464
-#: ../../operation/agentes/estado_agente.php:581
-#: ../../operation/agentes/pandora_networkmap.php:407
-#: ../../operation/agentes/status_monitor.php:1118
+#: ../../godmode/users/user_list.php:465 ../../include/ajax/module.php:903
+#: ../../include/functions_pandora_networkmap.php:1711
+#: ../../include/functions_groups.php:2160
+#: ../../operation/agentes/estado_agente.php:644
+#: ../../operation/agentes/pandora_networkmap.php:570
+#: ../../operation/agentes/status_monitor.php:1126
 #: ../../operation/gis_maps/gis_map.php:163
 #: ../../operation/search_reports.php:52
-#: ../../operation/servers/recon_view.php:110
-#: ../../enterprise/extensions/cron/main.php:293
+#: ../../operation/servers/recon_view.php:113
+#: ../../enterprise/extensions/cron/main.php:413
+#: ../../enterprise/extensions/cron/main.php:426
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:256
-#: ../../enterprise/godmode/agentes/collections.editor.php:178
+#: ../../enterprise/godmode/agentes/collections.editor.php:172
 #: ../../enterprise/godmode/alerts/alert_events_list.php:634
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:475
 #: ../../enterprise/godmode/massive/massive_edit_tags_policy.php:128
@@ -2476,44 +2680,47 @@ msgstr "ダウンロード"
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1909
 #: ../../enterprise/meta/include/functions_wizard_meta.php:2003
 #: ../../enterprise/meta/include/functions_wizard_meta.php:2481
+#: ../../enterprise/meta/include/functions_autoprovision.php:415
+#: ../../enterprise/meta/include/functions_autoprovision.php:568
+#: ../../enterprise/meta/include/functions_autoprovision.php:569
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:264
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:425
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:617
 #: ../../enterprise/meta/screens/screens.visualmap.php:63
+#: ../../enterprise/operation/agentes/tag_view.php:592
 msgid "Edit"
 msgstr "編集"
 
 #: ../../extensions/files_repo/files_repo_list.php:105
-#: ../../godmode/agentes/agent_manager.php:203
+#: ../../godmode/agentes/agent_manager.php:200
 #: ../../godmode/agentes/agent_template.php:251
-#: ../../godmode/agentes/fields_manager.php:127
-#: ../../godmode/agentes/modificar_agente.php:635
-#: ../../godmode/agentes/module_manager.php:759
+#: ../../godmode/agentes/fields_manager.php:129
+#: ../../godmode/agentes/modificar_agente.php:643
 #: ../../godmode/agentes/module_manager.php:767
-#: ../../godmode/agentes/module_manager.php:782
-#: ../../godmode/agentes/module_manager.php:797
-#: ../../godmode/agentes/module_manager.php:808
+#: ../../godmode/agentes/module_manager.php:775
+#: ../../godmode/agentes/module_manager.php:790
+#: ../../godmode/agentes/module_manager.php:805
+#: ../../godmode/agentes/module_manager.php:816
 #: ../../godmode/agentes/module_manager_editor_common.php:159
-#: ../../godmode/agentes/planned_downtime.editor.php:848
+#: ../../godmode/agentes/planned_downtime.editor.php:874
 #: ../../godmode/alerts/alert_actions.php:385
 #: ../../godmode/alerts/alert_actions.php:388
-#: ../../godmode/alerts/alert_commands.php:361
-#: ../../godmode/alerts/alert_list.list.php:825
+#: ../../godmode/alerts/alert_commands.php:379
+#: ../../godmode/alerts/alert_list.list.php:826
 #: ../../godmode/alerts/alert_special_days.php:451
-#: ../../godmode/alerts/alert_templates.php:341
+#: ../../godmode/alerts/alert_templates.php:342
 #: ../../godmode/category/category.php:126
-#: ../../godmode/category/category.php:131 ../../godmode/db/db_audit.php:107
-#: ../../godmode/db/db_event.php:92 ../../godmode/db/db_refine.php:119
+#: ../../godmode/category/category.php:131
 #: ../../godmode/events/event_filter.php:146
-#: ../../godmode/groups/modu_group_list.php:198
-#: ../../godmode/groups/modu_group_list.php:200
+#: ../../godmode/groups/modu_group_list.php:205
+#: ../../godmode/groups/modu_group_list.php:207
 #: ../../godmode/massive/massive_add_action_alerts.php:203
 #: ../../godmode/massive/massive_add_alerts.php:183
 #: ../../godmode/massive/massive_add_profiles.php:115
 #: ../../godmode/massive/massive_add_tags.php:158
 #: ../../godmode/massive/massive_delete_action_alerts.php:202
 #: ../../godmode/massive/massive_delete_agents.php:138
-#: ../../godmode/massive/massive_delete_modules.php:511
+#: ../../godmode/massive/massive_delete_modules.php:537
 #: ../../godmode/massive/massive_delete_profiles.php:129
 #: ../../godmode/massive/massive_delete_tags.php:215
 #: ../../godmode/massive/massive_edit_plugins.php:533
@@ -2525,39 +2732,45 @@ msgstr "編集"
 #: ../../godmode/modules/manage_network_components.php:616
 #: ../../godmode/modules/manage_network_templates.php:209
 #: ../../godmode/modules/manage_network_templates.php:214
-#: ../../godmode/netflow/nf_edit.php:143
+#: ../../godmode/netflow/nf_edit.php:144
 #: ../../godmode/netflow/nf_item_list.php:237
-#: ../../godmode/reporting/graphs.php:190
-#: ../../godmode/reporting/reporting_builder.php:703
-#: ../../godmode/reporting/visual_console_builder.elements.php:318
+#: ../../godmode/reporting/create_container.php:618
+#: ../../godmode/reporting/graphs.php:195
+#: ../../godmode/reporting/reporting_builder.php:741
+#: ../../godmode/reporting/visual_console_builder.elements.php:323
 #: ../../godmode/servers/plugin.php:782 ../../godmode/setup/links.php:150
 #: ../../godmode/setup/news.php:267
 #: ../../godmode/snmpconsole/snmp_alert.php:1200
 #: ../../godmode/snmpconsole/snmp_alert.php:1236
-#: ../../godmode/snmpconsole/snmp_alert.php:1455
-#: ../../godmode/snmpconsole/snmp_filters.php:143
-#: ../../godmode/tag/tag.php:273 ../../godmode/users/configure_user.php:667
+#: ../../godmode/snmpconsole/snmp_alert.php:1452
+#: ../../godmode/snmpconsole/snmp_filters.php:238
+#: ../../godmode/snmpconsole/snmp_filters.php:253
+#: ../../godmode/tag/tag.php:273 ../../godmode/users/configure_user.php:781
 #: ../../godmode/users/profile_list.php:390
-#: ../../godmode/users/user_list.php:470 ../../godmode/users/user_list.php:472
-#: ../../include/functions_events.php:1761
-#: ../../include/functions_filemanager.php:740
-#: ../../include/functions_groups.php:2173
-#: ../../operation/agentes/pandora_networkmap.php:496
+#: ../../godmode/users/user_list.php:467 ../../godmode/users/user_list.php:469
+#: ../../include/functions_container.php:167
+#: ../../include/functions_container.php:294
+#: ../../include/functions_events.php:1753
+#: ../../include/functions_filemanager.php:751
+#: ../../include/functions_groups.php:2167
+#: ../../operation/agentes/pandora_networkmap.php:666
 #: ../../operation/events/events.build_table.php:774
-#: ../../operation/events/events.php:852
+#: ../../operation/events/events.php:878
 #: ../../operation/incidents/incident_detail.php:425
 #: ../../operation/incidents/incident_detail.php:472
 #: ../../operation/messages/message_list.php:193
 #: ../../operation/messages/message_list.php:199
-#: ../../operation/snmpconsole/snmp_view.php:750
-#: ../../operation/snmpconsole/snmp_view.php:756
-#: ../../operation/snmpconsole/snmp_view.php:907
-#: ../../operation/users/user_edit.php:799
-#: ../../enterprise/dashboard/dashboards.php:140
+#: ../../operation/snmpconsole/snmp_view.php:858
+#: ../../operation/snmpconsole/snmp_view.php:864
+#: ../../operation/snmpconsole/snmp_view.php:1019
+#: ../../operation/users/user_edit.php:810
+#: ../../enterprise/dashboard/dashboards.php:155
 #: ../../enterprise/extensions/backup/main.php:238
+#: ../../enterprise/extensions/vmware/vmware_admin.php:502
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:206
 #: ../../enterprise/godmode/agentes/inventory_manager.php:261
 #: ../../enterprise/godmode/agentes/manage_config_remote.php:210
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:73
 #: ../../enterprise/godmode/alerts/alert_events_list.php:643
 #: ../../enterprise/godmode/alerts/alert_events_list.php:756
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:479
@@ -2567,34 +2780,37 @@ msgstr "編集"
 #: ../../enterprise/godmode/policies/policies.php:430
 #: ../../enterprise/godmode/policies/policies.php:440
 #: ../../enterprise/godmode/policies/policies.php:458
-#: ../../enterprise/godmode/policies/policy_agents.php:227
-#: ../../enterprise/godmode/policies/policy_agents.php:326
-#: ../../enterprise/godmode/policies/policy_agents.php:470
-#: ../../enterprise/godmode/policies/policy_agents.php:523
+#: ../../enterprise/godmode/policies/policy_agents.php:347
+#: ../../enterprise/godmode/policies/policy_agents.php:521
+#: ../../enterprise/godmode/policies/policy_agents.php:680
+#: ../../enterprise/godmode/policies/policy_agents.php:734
+#: ../../enterprise/godmode/policies/policy_agents.php:798
+#: ../../enterprise/godmode/policies/policy_agents.php:921
 #: ../../enterprise/godmode/policies/policy_alerts.php:411
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:246
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:263
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:269
-#: ../../enterprise/godmode/policies/policy_modules.php:1251
-#: ../../enterprise/godmode/policies/policy_modules.php:1258
-#: ../../enterprise/godmode/policies/policy_modules.php:1287
-#: ../../enterprise/godmode/policies/policy_queue.php:440
-#: ../../enterprise/godmode/policies/policy_queue.php:476
-#: ../../enterprise/godmode/policies/policy_queue.php:492
+#: ../../enterprise/godmode/policies/policy_modules.php:1282
+#: ../../enterprise/godmode/policies/policy_modules.php:1289
+#: ../../enterprise/godmode/policies/policy_modules.php:1318
+#: ../../enterprise/godmode/policies/policy_queue.php:460
+#: ../../enterprise/godmode/policies/policy_queue.php:496
+#: ../../enterprise/godmode/policies/policy_queue.php:512
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:175
-#: ../../enterprise/godmode/reporting/graph_template_list.php:146
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:393
+#: ../../enterprise/godmode/reporting/graph_template_list.php:149
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:396
 #: ../../enterprise/godmode/reporting/mysql_builder.php:49
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:361
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:369
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:762
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:763
 #: ../../enterprise/godmode/servers/credential_boxes_satellite.php:367
 #: ../../enterprise/godmode/servers/server_disk_conf_editor.php:162
 #: ../../enterprise/godmode/setup/setup_skins.php:136
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:348
 #: ../../enterprise/include/ajax/transactional.ajax.php:120
 #: ../../enterprise/include/ajax/transactional.ajax.php:212
-#: ../../enterprise/include/functions_services.php:1660
+#: ../../enterprise/include/functions_services.php:1749
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:429
 #: ../../enterprise/meta/advanced/policymanager.queue.php:330
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:101
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:195
@@ -2608,30 +2824,29 @@ msgstr "よろしいですか?"
 
 #: ../../extensions/files_repo/files_repo_list.php:106
 #: ../../godmode/agentes/agent_template.php:251
-#: ../../godmode/agentes/fields_manager.php:127
-#: ../../godmode/agentes/module_manager.php:569
-#: ../../godmode/agentes/module_manager.php:799
-#: ../../godmode/agentes/module_manager.php:816
+#: ../../godmode/agentes/fields_manager.php:129
+#: ../../godmode/agentes/module_manager.php:572
+#: ../../godmode/agentes/module_manager.php:807
+#: ../../godmode/agentes/module_manager.php:824
 #: ../../godmode/agentes/module_manager_editor_common.php:720
-#: ../../godmode/agentes/planned_downtime.editor.php:798
-#: ../../godmode/agentes/planned_downtime.editor.php:803
-#: ../../godmode/agentes/planned_downtime.editor.php:851
+#: ../../godmode/agentes/planned_downtime.editor.php:824
+#: ../../godmode/agentes/planned_downtime.editor.php:829
+#: ../../godmode/agentes/planned_downtime.editor.php:877
 #: ../../godmode/agentes/planned_downtime.list.php:402
 #: ../../godmode/agentes/planned_downtime.list.php:470
 #: ../../godmode/alerts/alert_actions.php:343
-#: ../../godmode/alerts/alert_commands.php:333
-#: ../../godmode/alerts/alert_list.list.php:710
-#: ../../godmode/alerts/alert_templates.php:344
-#: ../../godmode/db/db_refine.php:119
+#: ../../godmode/alerts/alert_commands.php:351
+#: ../../godmode/alerts/alert_list.list.php:711
+#: ../../godmode/alerts/alert_templates.php:345
 #: ../../godmode/events/event_filter.php:148
 #: ../../godmode/events/event_filter.php:162
 #: ../../godmode/events/event_responses.list.php:66
 #: ../../godmode/extensions.php:272 ../../godmode/extensions.php:276
-#: ../../godmode/groups/modu_group_list.php:184
+#: ../../godmode/groups/modu_group_list.php:191
 #: ../../godmode/massive/massive_delete_action_alerts.php:204
 #: ../../godmode/massive/massive_delete_agents.php:140
 #: ../../godmode/massive/massive_delete_alerts.php:238
-#: ../../godmode/massive/massive_delete_modules.php:513
+#: ../../godmode/massive/massive_delete_modules.php:539
 #: ../../godmode/massive/massive_delete_profiles.php:131
 #: ../../godmode/massive/massive_delete_tags.php:218
 #: ../../godmode/modules/manage_nc_groups.php:222
@@ -2641,36 +2856,42 @@ msgstr "よろしいですか?"
 #: ../../godmode/modules/manage_network_templates.php:214
 #: ../../godmode/modules/manage_network_templates.php:227
 #: ../../godmode/modules/manage_network_templates_form.php:221
-#: ../../godmode/netflow/nf_edit.php:145 ../../godmode/netflow/nf_edit.php:157
+#: ../../godmode/netflow/nf_edit.php:146 ../../godmode/netflow/nf_edit.php:158
 #: ../../godmode/netflow/nf_item_list.php:239
 #: ../../godmode/netflow/nf_item_list.php:250
-#: ../../godmode/reporting/graph_builder.graph_editor.php:88
-#: ../../godmode/reporting/graph_builder.graph_editor.php:127
-#: ../../godmode/reporting/graphs.php:191
-#: ../../godmode/reporting/graphs.php:204
-#: ../../godmode/reporting/map_builder.php:215
-#: ../../godmode/reporting/reporting_builder.list_items.php:439
-#: ../../godmode/reporting/reporting_builder.list_items.php:466
-#: ../../godmode/reporting/reporting_builder.list_items.php:485
-#: ../../godmode/reporting/reporting_builder.list_items.php:545
-#: ../../godmode/reporting/reporting_builder.php:707
-#: ../../godmode/reporting/visual_console_builder.elements.php:518
+#: ../../godmode/reporting/create_container.php:564
+#: ../../godmode/reporting/create_container.php:619
+#: ../../godmode/reporting/graph_builder.graph_editor.php:208
+#: ../../godmode/reporting/graph_builder.graph_editor.php:249
+#: ../../godmode/reporting/graphs.php:196
+#: ../../godmode/reporting/graphs.php:211
+#: ../../godmode/reporting/map_builder.php:262
+#: ../../godmode/reporting/reporting_builder.list_items.php:445
+#: ../../godmode/reporting/reporting_builder.list_items.php:472
+#: ../../godmode/reporting/reporting_builder.list_items.php:491
+#: ../../godmode/reporting/reporting_builder.list_items.php:551
+#: ../../godmode/reporting/reporting_builder.php:745
+#: ../../godmode/reporting/reporting_builder.php:789
+#: ../../godmode/reporting/visual_console_builder.elements.php:524
 #: ../../godmode/servers/recon_script.php:350
-#: ../../godmode/servers/servers.build_table.php:172
+#: ../../godmode/servers/servers.build_table.php:180
 #: ../../godmode/setup/gis.php:64 ../../godmode/setup/links.php:137
-#: ../../godmode/setup/news.php:225 ../../godmode/setup/setup_visuals.php:720
-#: ../../godmode/setup/setup_visuals.php:751
+#: ../../godmode/setup/news.php:225 ../../godmode/setup/setup_visuals.php:786
+#: ../../godmode/setup/setup_visuals.php:817
 #: ../../godmode/setup/snmp_wizard.php:122
 #: ../../godmode/snmpconsole/snmp_alert.php:1201
 #: ../../godmode/snmpconsole/snmp_alert.php:1237
-#: ../../godmode/snmpconsole/snmp_filters.php:144
+#: ../../godmode/snmpconsole/snmp_filters.php:239
+#: ../../godmode/snmpconsole/snmp_filters.php:254
 #: ../../godmode/update_manager/update_manager.messages.php:91
 #: ../../godmode/update_manager/update_manager.messages.php:165
-#: ../../godmode/users/user_list.php:470
-#: ../../include/functions_groups.php:2173
-#: ../../include/functions_pandora_networkmap.php:762
-#: ../../operation/agentes/pandora_networkmap.php:408
-#: ../../operation/agentes/pandora_networkmap.php:496
+#: ../../godmode/users/user_list.php:467
+#: ../../include/functions_pandora_networkmap.php:1006
+#: ../../include/functions_container.php:168
+#: ../../include/functions_container.php:295
+#: ../../include/functions_groups.php:2167
+#: ../../operation/agentes/pandora_networkmap.php:571
+#: ../../operation/agentes/pandora_networkmap.php:666
 #: ../../operation/gis_maps/gis_map.php:165
 #: ../../operation/incidents/incident_detail.php:456
 #: ../../operation/messages/message_edit.php:109
@@ -2678,14 +2899,15 @@ msgstr "よろしいですか?"
 #: ../../operation/messages/message_list.php:194
 #: ../../operation/messages/message_list.php:200
 #: ../../operation/messages/message_list.php:218
-#: ../../operation/snmpconsole/snmp_view.php:750
-#: ../../operation/snmpconsole/snmp_view.php:756
-#: ../../operation/snmpconsole/snmp_view.php:907
-#: ../../operation/snmpconsole/snmp_view.php:932
-#: ../../enterprise/dashboard/dashboards.php:97
-#: ../../enterprise/dashboard/dashboards.php:140
+#: ../../operation/snmpconsole/snmp_view.php:858
+#: ../../operation/snmpconsole/snmp_view.php:864
+#: ../../operation/snmpconsole/snmp_view.php:1019
+#: ../../operation/snmpconsole/snmp_view.php:1044
+#: ../../enterprise/dashboard/dashboards.php:93
+#: ../../enterprise/dashboard/dashboards.php:155
 #: ../../enterprise/extensions/backup/main.php:190
-#: ../../enterprise/extensions/cron/main.php:296
+#: ../../enterprise/extensions/cron/main.php:419
+#: ../../enterprise/extensions/cron/main.php:432
 #: ../../enterprise/godmode/agentes/inventory_manager.php:262
 #: ../../enterprise/godmode/agentes/plugins_manager.php:147
 #: ../../enterprise/godmode/agentes/plugins_manager.php:218
@@ -2699,30 +2921,32 @@ msgstr "よろしいですか?"
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:224
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:237
 #: ../../enterprise/godmode/policies/policies.php:444
-#: ../../enterprise/godmode/policies/policy_agents.php:478
+#: ../../enterprise/godmode/policies/policy_agents.php:688
+#: ../../enterprise/godmode/policies/policy_agents.php:929
 #: ../../enterprise/godmode/policies/policy_alerts.php:422
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:257
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:270
-#: ../../enterprise/godmode/policies/policy_modules.php:1269
-#: ../../enterprise/godmode/policies/policy_modules.php:1293
+#: ../../enterprise/godmode/policies/policy_modules.php:1300
+#: ../../enterprise/godmode/policies/policy_modules.php:1324
 #: ../../enterprise/godmode/policies/policy_plugins.php:88
-#: ../../enterprise/godmode/policies/policy_queue.php:344
-#: ../../enterprise/godmode/policies/policy_queue.php:379
-#: ../../enterprise/godmode/policies/policy_queue.php:421
+#: ../../enterprise/godmode/policies/policy_queue.php:364
+#: ../../enterprise/godmode/policies/policy_queue.php:399
+#: ../../enterprise/godmode/policies/policy_queue.php:441
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:177
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:188
-#: ../../enterprise/godmode/reporting/graph_template_list.php:158
+#: ../../enterprise/godmode/reporting/graph_template_list.php:161
 #: ../../enterprise/godmode/reporting/mysql_builder.php:42
 #: ../../enterprise/godmode/reporting/mysql_builder.php:49
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:373
 #: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:355
 #: ../../enterprise/godmode/servers/credential_boxes_satellite.php:328
 #: ../../enterprise/godmode/servers/credential_boxes_satellite.php:366
-#: ../../enterprise/godmode/setup/setup_acl.php:227
+#: ../../enterprise/godmode/setup/setup_acl.php:436
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:349
 #: ../../enterprise/include/ajax/transactional.ajax.php:121
 #: ../../enterprise/include/ajax/transactional.ajax.php:213
-#: ../../enterprise/meta/advanced/metasetup.visual.php:154
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:433
+#: ../../enterprise/meta/advanced/metasetup.visual.php:176
 #: ../../enterprise/meta/advanced/policymanager.queue.php:218
 #: ../../enterprise/meta/advanced/policymanager.queue.php:261
 #: ../../enterprise/meta/advanced/policymanager.queue.php:312
@@ -2730,6 +2954,8 @@ msgstr "よろしいですか?"
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1425
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1594
 #: ../../enterprise/meta/include/functions_wizard_meta.php:294
+#: ../../enterprise/meta/include/functions_autoprovision.php:425
+#: ../../enterprise/meta/include/functions_autoprovision.php:584
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:267
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:428
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:620
@@ -2745,7 +2971,7 @@ msgstr "アイテムがありません。"
 
 #: ../../extensions/files_repo/functions_files_repo.php:29
 #: ../../extensions/files_repo/functions_files_repo.php:40
-#: ../../include/functions_config.php:1779
+#: ../../include/functions_config.php:1988
 msgid "Attachment directory is not writable by HTTP Server"
 msgstr "添付ファイルディレクトリが HTTP サーバから書き込みできません。"
 
@@ -2764,7 +2990,6 @@ msgid "There was an error creating the file"
 msgstr "ファイル作成でエラーが発生しました"
 
 #: ../../extensions/files_repo/functions_files_repo.php:274
-#: ../../enterprise/extensions/vmware/main.php:76
 msgid "There was an error updating the file"
 msgstr "ファイル更新でエラーが発生しました"
 
@@ -2789,42 +3014,42 @@ msgstr "操作画面"
 msgid "Files repository manager"
 msgstr "ファイルリポジトリ管理"
 
-#: ../../extensions/files_repo.php:133 ../../include/functions.php:2190
-#: ../../include/functions.php:2193
+#: ../../extensions/files_repo.php:133 ../../include/functions.php:2214
+#: ../../include/functions.php:2217
 msgid "The file exceeds the maximum size"
 msgstr "ファイルサイズが上限を超えています。"
 
 #: ../../extensions/files_repo.php:166
 #: ../../godmode/agentes/planned_downtime.list.php:107
 #: ../../godmode/alerts/alert_actions.php:332
-#: ../../godmode/alerts/alert_commands.php:319
+#: ../../godmode/alerts/alert_commands.php:337
 #: ../../godmode/alerts/alert_list.php:145
 #: ../../godmode/alerts/alert_list.php:213
 #: ../../godmode/alerts/alert_special_days.php:223
-#: ../../godmode/alerts/alert_templates.php:224
+#: ../../godmode/alerts/alert_templates.php:225
 #: ../../godmode/events/event_filter.php:56
 #: ../../godmode/events/event_filter.php:77
 #: ../../godmode/massive/massive_delete_action_alerts.php:114
 #: ../../godmode/massive/massive_delete_alerts.php:156
-#: ../../godmode/massive/massive_delete_modules.php:236
+#: ../../godmode/massive/massive_delete_modules.php:250
 #: ../../godmode/massive/massive_delete_tags.php:151
 #: ../../godmode/modules/manage_nc_groups.php:122
 #: ../../godmode/modules/manage_network_components.php:372
 #: ../../godmode/netflow/nf_edit.php:76 ../../godmode/netflow/nf_edit.php:100
 #: ../../godmode/netflow/nf_item_list.php:105
 #: ../../godmode/netflow/nf_item_list.php:126
-#: ../../godmode/reporting/graphs.php:86 ../../godmode/reporting/graphs.php:94
-#: ../../godmode/reporting/graphs.php:136
-#: ../../godmode/reporting/map_builder.php:87
-#: ../../godmode/reporting/reporting_builder.php:412
+#: ../../godmode/reporting/graphs.php:89 ../../godmode/reporting/graphs.php:97
+#: ../../godmode/reporting/graphs.php:139
+#: ../../godmode/reporting/map_builder.php:94
+#: ../../godmode/reporting/reporting_builder.php:446
 #: ../../godmode/setup/gis.php:57 ../../godmode/setup/links.php:69
 #: ../../godmode/setup/news.php:97
 #: ../../godmode/snmpconsole/snmp_alert.php:560
-#: ../../godmode/snmpconsole/snmp_filters.php:76
-#: ../../godmode/users/configure_user.php:415
+#: ../../godmode/snmpconsole/snmp_filters.php:128
+#: ../../godmode/users/configure_user.php:478
 #: ../../godmode/users/profile_list.php:94
 #: ../../godmode/users/user_list.php:147 ../../godmode/users/user_list.php:188
-#: ../../operation/events/events.php:536
+#: ../../operation/events/events.php:562
 #: ../../operation/gis_maps/gis_map.php:74
 #: ../../operation/incidents/incident.php:66
 #: ../../operation/incidents/incident_detail.php:85
@@ -2833,8 +3058,8 @@ msgstr "ファイルサイズが上限を超えています。"
 #: ../../operation/messages/message_list.php:73
 #: ../../operation/reporting/graph_viewer.php:44
 #: ../../operation/reporting/graph_viewer.php:51
-#: ../../operation/snmpconsole/snmp_view.php:95
-#: ../../enterprise/dashboard/dashboards.php:51
+#: ../../operation/snmpconsole/snmp_view.php:113
+#: ../../enterprise/dashboard/dashboards.php:53
 #: ../../enterprise/extensions/ipam/ipam_action.php:64
 #: ../../enterprise/godmode/alerts/alert_events_list.php:160
 #: ../../enterprise/godmode/alerts/alert_events_list.php:204
@@ -2843,11 +3068,12 @@ msgstr "ファイルサイズが上限を超えています。"
 #: ../../enterprise/godmode/policies/policies.php:174
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:98
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:119
-#: ../../enterprise/godmode/reporting/graph_template_list.php:86
-#: ../../enterprise/godmode/reporting/graph_template_list.php:106
+#: ../../enterprise/godmode/reporting/graph_template_list.php:89
+#: ../../enterprise/godmode/reporting/graph_template_list.php:109
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:244
 #: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:190
 #: ../../enterprise/godmode/setup/setup_metaconsole.php:117
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:225
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:53
 #: ../../enterprise/operation/agentes/transactional_map.php:132
 msgid "Successfully deleted"
@@ -2855,41 +3081,42 @@ msgstr "削除しました。"
 
 #: ../../extensions/files_repo.php:166
 #: ../../godmode/alerts/alert_actions.php:333
-#: ../../godmode/alerts/alert_commands.php:320
+#: ../../godmode/alerts/alert_commands.php:338
 #: ../../godmode/alerts/alert_list.php:145
 #: ../../godmode/alerts/alert_list.php:213
 #: ../../godmode/alerts/alert_special_days.php:224
-#: ../../godmode/alerts/alert_templates.php:225
+#: ../../godmode/alerts/alert_templates.php:226
 #: ../../godmode/massive/massive_delete_action_alerts.php:115
 #: ../../godmode/massive/massive_delete_alerts.php:157
 #: ../../godmode/massive/massive_delete_tags.php:152
 #: ../../godmode/modules/manage_network_components.php:373
-#: ../../godmode/reporting/reporting_builder.php:413
+#: ../../godmode/reporting/reporting_builder.php:447
 #: ../../godmode/setup/gis.php:55 ../../godmode/setup/news.php:98
-#: ../../godmode/users/configure_user.php:416
-#: ../../operation/agentes/pandora_networkmap.php:273
-#: ../../operation/events/events.php:537
+#: ../../godmode/users/configure_user.php:479
+#: ../../operation/agentes/pandora_networkmap.php:427
+#: ../../operation/events/events.php:563
 #: ../../operation/gis_maps/gis_map.php:75
 #: ../../operation/incidents/incident.php:67
 #: ../../operation/incidents/incident_detail.php:86
 #: ../../operation/incidents/incident_detail.php:115
 #: ../../operation/messages/message_list.php:57
-#: ../../operation/snmpconsole/snmp_view.php:96
-#: ../../enterprise/dashboard/dashboards.php:52
+#: ../../operation/snmpconsole/snmp_view.php:114
+#: ../../enterprise/dashboard/dashboards.php:54
 #: ../../enterprise/extensions/ipam/ipam_action.php:61
 #: ../../enterprise/godmode/alerts/alert_events_list.php:161
 #: ../../enterprise/godmode/alerts/alert_events_list.php:205
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:282
 #: ../../enterprise/godmode/modules/local_components.php:331
 #: ../../enterprise/godmode/policies/policies.php:175
-#: ../../enterprise/godmode/policies/policy_agents.php:91
+#: ../../enterprise/godmode/policies/policy_agents.php:96
+#: ../../enterprise/godmode/policies/policy_agents.php:118
 #: ../../enterprise/godmode/policies/policy_alerts.php:165
 #: ../../enterprise/godmode/policies/policy_alerts.php:206
 #: ../../enterprise/godmode/policies/policy_collections.php:69
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:96
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:141
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:96
-#: ../../enterprise/godmode/policies/policy_modules.php:1097
+#: ../../enterprise/godmode/policies/policy_modules.php:1128
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:245
 #: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:191
 #: ../../enterprise/godmode/setup/setup_metaconsole.php:118
@@ -2932,45 +3159,18 @@ msgstr ""
 "ファイルフォーマットは、date;value&lt;newline&gt;date;value&lt;newline&gt;... です。CSV "
 "内の日時フォーマットは Y/m/d H:i:s です。"
 
-#: ../../extensions/insert_data.php:179 ../../general/header.php:204
-#: ../../godmode/alerts/alert_list.builder.php:77
-#: ../../godmode/alerts/alert_list.builder.php:125
-#: ../../godmode/alerts/configure_alert_template.php:592
-#: ../../godmode/gis_maps/configure_gis_map.php:588
-#: ../../godmode/massive/massive_add_alerts.php:176
-#: ../../godmode/massive/massive_copy_modules.php:95
-#: ../../godmode/massive/massive_delete_alerts.php:208
-#: ../../godmode/massive/massive_delete_modules.php:412
-#: ../../godmode/massive/massive_delete_modules.php:481
-#: ../../godmode/massive/massive_edit_modules.php:256
-#: ../../godmode/massive/massive_edit_modules.php:310
-#: ../../godmode/snmpconsole/snmp_trap_generator.php:85
-#: ../../enterprise/godmode/alerts/alert_events.php:513
-#: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:207
-#: ../../enterprise/godmode/policies/policy_alerts.php:509
-#: ../../enterprise/godmode/policies/policy_alerts.php:513
-#: ../../enterprise/godmode/policies/policy_external_alerts.php:328
-#: ../../enterprise/meta/advanced/synchronizing.user.php:538
-#: ../../enterprise/meta/general/main_header.php:392
-#: ../../enterprise/meta/monitoring/wizard/wizard.create_module.php:224
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:223
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:313
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:374
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:482
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:555
-#: ../../enterprise/meta/monitoring/wizard/wizard.php:107
-msgid "Select"
-msgstr "選択"
-
 #: ../../extensions/insert_data.php:180 ../../extensions/insert_data.php:181
-#: ../../include/ajax/module.php:749 ../../include/functions_graph.php:3435
+#: ../../include/ajax/module.php:785
+#: ../../include/functions_reporting.php:2449
+#: ../../include/functions_reporting.php:2483
+#: ../../include/functions_graph.php:875
+#: ../../include/functions_graph.php:3925
+#: ../../include/functions_graph.php:4634
 #: ../../include/functions_netflow.php:311
-#: ../../include/functions_reporting.php:2360
-#: ../../include/functions_reporting.php:2394
-#: ../../include/functions_reporting_html.php:1812
 #: ../../include/functions_reporting_html.php:1815
-#: ../../include/functions_reporting_html.php:1816
+#: ../../include/functions_reporting_html.php:1818
 #: ../../include/functions_reporting_html.php:1819
+#: ../../include/functions_reporting_html.php:1822
 #: ../../mobile/operation/modules.php:606
 #: ../../mobile/operation/modules.php:613
 #: ../../mobile/operation/modules.php:621
@@ -2978,8 +3178,8 @@ msgstr "選択"
 #: ../../operation/agentes/exportdata.csv.php:77
 #: ../../operation/agentes/exportdata.excel.php:76
 #: ../../operation/agentes/exportdata.php:98
-#: ../../operation/agentes/gis_view.php:194
-#: ../../operation/agentes/status_monitor.php:983
+#: ../../operation/agentes/gis_view.php:214
+#: ../../operation/agentes/status_monitor.php:991
 #: ../../operation/search_modules.php:53
 #: ../../enterprise/godmode/agentes/collections.agents.php:50
 #: ../../enterprise/godmode/agentes/collections.agents.php:59
@@ -2992,23 +3192,25 @@ msgstr "選択"
 #: ../../enterprise/godmode/agentes/collections.data.php:214
 #: ../../enterprise/godmode/agentes/collections.data.php:235
 #: ../../enterprise/godmode/agentes/collections.data.php:254
-#: ../../enterprise/godmode/agentes/collections.editor.php:39
-#: ../../enterprise/include/functions_reporting.php:1470
-#: ../../enterprise/include/functions_reporting.php:1594
-#: ../../enterprise/include/functions_reporting.php:1597
-#: ../../enterprise/include/functions_reporting_csv.php:348
-#: ../../enterprise/include/functions_reporting_csv.php:404
-#: ../../enterprise/include/functions_reporting_csv.php:430
-#: ../../enterprise/include/functions_reporting_csv.php:496
-#: ../../enterprise/include/functions_reporting_csv.php:879
-#: ../../enterprise/include/functions_reporting_pdf.php:365
-#: ../../enterprise/include/functions_reporting_pdf.php:371
-#: ../../enterprise/include/functions_reporting_pdf.php:977
-#: ../../enterprise/include/functions_reporting_pdf.php:983
-#: ../../enterprise/include/functions_reporting_pdf.php:984
-#: ../../enterprise/include/functions_reporting_pdf.php:987
-#: ../../enterprise/include/functions_services.php:1428
+#: ../../enterprise/godmode/agentes/collections.editor.php:38
+#: ../../enterprise/include/ajax/clustermap.php:66
+#: ../../enterprise/include/ajax/clustermap.php:276
+#: ../../enterprise/include/functions_reporting.php:1861
+#: ../../enterprise/include/functions_reporting.php:1985
+#: ../../enterprise/include/functions_reporting.php:1988
+#: ../../enterprise/include/functions_reporting_csv.php:360
+#: ../../enterprise/include/functions_reporting_csv.php:417
+#: ../../enterprise/include/functions_reporting_csv.php:443
+#: ../../enterprise/include/functions_reporting_csv.php:513
+#: ../../enterprise/include/functions_reporting_csv.php:990
+#: ../../enterprise/include/functions_reporting_pdf.php:410
+#: ../../enterprise/include/functions_reporting_pdf.php:1058
+#: ../../enterprise/include/functions_reporting_pdf.php:1064
+#: ../../enterprise/include/functions_reporting_pdf.php:1065
+#: ../../enterprise/include/functions_reporting_pdf.php:1068
+#: ../../enterprise/include/functions_services.php:1517
 #: ../../enterprise/operation/agentes/policy_view.php:308
+#: ../../enterprise/operation/agentes/tag_view.php:537
 msgid "Data"
 msgstr "データ"
 
@@ -3016,35 +3218,34 @@ msgstr "データ"
 #: ../../extensions/users_connected.php:79 ../../general/logon_ok.php:226
 #: ../../general/logon_ok.php:423 ../../godmode/admin_access_logs.php:190
 #: ../../godmode/alerts/configure_alert_special_days.php:66
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1121
-#: ../../include/functions.php:2314 ../../include/functions_events.php:3927
-#: ../../include/functions_reporting.php:2360
-#: ../../include/functions_reporting.php:2393
-#: ../../include/functions_reporting_html.php:1812
-#: ../../include/functions_reporting_html.php:1816
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1172
+#: ../../include/functions.php:2338 ../../include/functions_reporting.php:2449
+#: ../../include/functions_reporting.php:2482
+#: ../../include/functions_events.php:4026
+#: ../../include/functions_reporting_html.php:1815
 #: ../../include/functions_reporting_html.php:1819
-#: ../../include/functions_reporting_html.php:1834
-#: ../../include/functions_reporting_html.php:3598
+#: ../../include/functions_reporting_html.php:1822
+#: ../../include/functions_reporting_html.php:1837
+#: ../../include/functions_reporting_html.php:3711
 #: ../../mobile/operation/tactical.php:310
 #: ../../operation/events/events.build_table.php:581
 #: ../../operation/netflow/nf_live_view.php:234
-#: ../../operation/reporting/graph_viewer.php:205
+#: ../../operation/reporting/graph_viewer.php:207
 #: ../../enterprise/extensions/backup/main.php:99
-#: ../../enterprise/include/functions_inventory.php:508
-#: ../../enterprise/include/functions_log.php:346
-#: ../../enterprise/include/functions_reporting.php:1446
-#: ../../enterprise/include/functions_reporting.php:1469
-#: ../../enterprise/include/functions_reporting.php:1594
-#: ../../enterprise/include/functions_reporting.php:1597
-#: ../../enterprise/include/functions_reporting_csv.php:323
-#: ../../enterprise/include/functions_reporting_csv.php:377
-#: ../../enterprise/include/functions_reporting_pdf.php:364
-#: ../../enterprise/include/functions_reporting_pdf.php:373
-#: ../../enterprise/include/functions_reporting_pdf.php:976
-#: ../../enterprise/include/functions_reporting_pdf.php:982
-#: ../../enterprise/include/functions_reporting_pdf.php:999
+#: ../../enterprise/include/functions_inventory.php:653
+#: ../../enterprise/include/functions_log.php:369
+#: ../../enterprise/include/functions_reporting.php:1831
+#: ../../enterprise/include/functions_reporting.php:1860
+#: ../../enterprise/include/functions_reporting.php:1985
+#: ../../enterprise/include/functions_reporting.php:1999
+#: ../../enterprise/include/functions_reporting_csv.php:334
+#: ../../enterprise/include/functions_reporting_csv.php:390
+#: ../../enterprise/include/functions_reporting_pdf.php:414
+#: ../../enterprise/include/functions_reporting_pdf.php:1057
+#: ../../enterprise/include/functions_reporting_pdf.php:1063
+#: ../../enterprise/include/functions_reporting_pdf.php:1080
 #: ../../enterprise/operation/agentes/agent_inventory.php:70
-#: ../../enterprise/operation/inventory/inventory.php:223
+#: ../../enterprise/operation/inventory/inventory.php:224
 msgid "Date"
 msgstr "日付"
 
@@ -3057,196 +3258,210 @@ msgstr "CSVファイル"
 
 #: ../../extensions/insert_data.php:194
 #: ../../godmode/reporting/reporting_builder.main.php:32
-#: ../../godmode/reporting/visual_console_builder.data.php:181
+#: ../../godmode/reporting/visual_console_builder.data.php:190
 #: ../../godmode/setup/gis_step_2.php:310
 #: ../../godmode/setup/snmp_wizard.php:104
-#: ../../operation/agentes/graphs.php:235
-#: ../../enterprise/dashboard/main_dashboard.php:315
+#: ../../operation/agentes/graphs.php:270
+#: ../../enterprise/dashboard/main_dashboard.php:340
 #: ../../enterprise/godmode/reporting/mysql_builder.php:149
-#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:67
+#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:68
 #: ../../enterprise/include/ajax/transactional.ajax.php:83
 msgid "Save"
 msgstr "保存"
 
 #: ../../extensions/insert_data.php:210
-#: ../../godmode/agentes/planned_downtime.editor.php:1169
-#: ../../godmode/alerts/configure_alert_template.php:1074
-#: ../../godmode/reporting/reporting_builder.item_editor.php:2028
+#: ../../godmode/agentes/planned_downtime.editor.php:1198
+#: ../../godmode/alerts/configure_alert_template.php:1077
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2225
 #: ../../godmode/setup/news.php:297
 #: ../../operation/agentes/datos_agente.php:304
-#: ../../operation/agentes/estado_monitores.php:401
-#: ../../operation/agentes/interface_traffic_graph_win.php:354
-#: ../../operation/agentes/stat_win.php:506
-#: ../../operation/events/events_list.php:1587
-#: ../../operation/netflow/nf_live_view.php:659
-#: ../../operation/reporting/graph_viewer.php:277
+#: ../../operation/agentes/estado_monitores.php:414
+#: ../../operation/agentes/interface_traffic_graph_win.php:380
+#: ../../operation/agentes/stat_win.php:537
+#: ../../operation/events/events_list.php:1584
+#: ../../operation/netflow/nf_live_view.php:657
+#: ../../operation/reporting/graph_viewer.php:279
 #: ../../operation/reporting/reporting_viewer.php:254
 #: ../../operation/reporting/reporting_viewer.php:274
-#: ../../operation/tree.php:391
-#: ../../enterprise/dashboard/widgets/tree_view.php:317
-#: ../../enterprise/extensions/cron/main.php:370
+#: ../../operation/snmpconsole/snmp_view.php:1082
+#: ../../operation/snmpconsole/snmp_view.php:1094 ../../operation/tree.php:413
+#: ../../enterprise/dashboard/widgets/tree_view.php:327
+#: ../../enterprise/extensions/cron/main.php:542
 #: ../../enterprise/godmode/alerts/alert_events.php:577
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:683
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2283
-#: ../../enterprise/operation/log/log_viewer.php:310
-#: ../../enterprise/operation/log/log_viewer.php:322
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:684
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2468
+#: ../../enterprise/godmode/reporting/cluster_view.php:696
+#: ../../enterprise/operation/log/log_viewer.php:329
+#: ../../enterprise/operation/log/log_viewer.php:341
 msgid "Choose time"
 msgstr "時間を選択"
 
 #: ../../extensions/insert_data.php:211
-#: ../../godmode/agentes/planned_downtime.editor.php:1170
-#: ../../godmode/alerts/configure_alert_template.php:1075
-#: ../../godmode/reporting/reporting_builder.item_editor.php:2029
+#: ../../godmode/agentes/planned_downtime.editor.php:1199
+#: ../../godmode/alerts/configure_alert_template.php:1078
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2226
 #: ../../godmode/setup/news.php:298
 #: ../../operation/agentes/datos_agente.php:305
-#: ../../operation/agentes/estado_monitores.php:402
-#: ../../operation/agentes/interface_traffic_graph_win.php:355
-#: ../../operation/agentes/stat_win.php:507
-#: ../../operation/events/events_list.php:1588
-#: ../../operation/netflow/nf_live_view.php:660
-#: ../../operation/reporting/graph_viewer.php:278
+#: ../../operation/agentes/estado_monitores.php:415
+#: ../../operation/agentes/interface_traffic_graph_win.php:381
+#: ../../operation/agentes/stat_win.php:538
+#: ../../operation/events/events_list.php:1585
+#: ../../operation/netflow/nf_live_view.php:658
+#: ../../operation/reporting/graph_viewer.php:280
 #: ../../operation/reporting/reporting_viewer.php:255
 #: ../../operation/reporting/reporting_viewer.php:275
-#: ../../operation/tree.php:392
-#: ../../enterprise/dashboard/widgets/tree_view.php:318
-#: ../../enterprise/extensions/cron/main.php:371
+#: ../../operation/snmpconsole/snmp_view.php:1083
+#: ../../operation/snmpconsole/snmp_view.php:1095 ../../operation/tree.php:414
+#: ../../enterprise/dashboard/widgets/tree_view.php:328
+#: ../../enterprise/extensions/cron/main.php:543
 #: ../../enterprise/godmode/alerts/alert_events.php:578
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:684
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2284
-#: ../../enterprise/operation/log/log_viewer.php:311
-#: ../../enterprise/operation/log/log_viewer.php:323
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:685
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2469
+#: ../../enterprise/godmode/reporting/cluster_view.php:697
+#: ../../enterprise/operation/log/log_viewer.php:330
+#: ../../enterprise/operation/log/log_viewer.php:342
 msgid "Time"
 msgstr "時刻"
 
 #: ../../extensions/insert_data.php:212
-#: ../../godmode/agentes/planned_downtime.editor.php:1171
-#: ../../godmode/alerts/configure_alert_template.php:1076
-#: ../../godmode/reporting/reporting_builder.item_editor.php:2030
-#: ../../godmode/setup/news.php:299 ../../include/functions_html.php:861
+#: ../../godmode/agentes/planned_downtime.editor.php:1200
+#: ../../godmode/alerts/configure_alert_template.php:1079
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2227
+#: ../../godmode/setup/news.php:299 ../../include/functions_html.php:951
 #: ../../operation/agentes/datos_agente.php:306
-#: ../../operation/agentes/estado_monitores.php:403
-#: ../../operation/agentes/interface_traffic_graph_win.php:356
-#: ../../operation/agentes/stat_win.php:508
-#: ../../operation/events/events_list.php:1589
-#: ../../operation/netflow/nf_live_view.php:661
-#: ../../operation/reporting/graph_viewer.php:279
+#: ../../operation/agentes/estado_monitores.php:416
+#: ../../operation/agentes/interface_traffic_graph_win.php:382
+#: ../../operation/agentes/stat_win.php:539
+#: ../../operation/events/events_list.php:1586
+#: ../../operation/netflow/nf_live_view.php:659
+#: ../../operation/reporting/graph_viewer.php:281
 #: ../../operation/reporting/reporting_viewer.php:256
 #: ../../operation/reporting/reporting_viewer.php:276
-#: ../../operation/tree.php:393
-#: ../../enterprise/dashboard/widgets/tree_view.php:319
-#: ../../enterprise/extensions/cron/main.php:372
+#: ../../operation/snmpconsole/snmp_view.php:1084
+#: ../../operation/snmpconsole/snmp_view.php:1096 ../../operation/tree.php:415
+#: ../../enterprise/dashboard/widgets/tree_view.php:329
+#: ../../enterprise/extensions/cron/main.php:544
 #: ../../enterprise/godmode/alerts/alert_events.php:579
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:685
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2285
-#: ../../enterprise/operation/log/log_viewer.php:312
-#: ../../enterprise/operation/log/log_viewer.php:324
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:686
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2470
+#: ../../enterprise/godmode/reporting/cluster_view.php:698
+#: ../../enterprise/operation/log/log_viewer.php:331
+#: ../../enterprise/operation/log/log_viewer.php:343
 msgid "Hour"
 msgstr "時"
 
 #: ../../extensions/insert_data.php:213
-#: ../../godmode/agentes/planned_downtime.editor.php:1172
-#: ../../godmode/alerts/configure_alert_template.php:1077
-#: ../../godmode/reporting/reporting_builder.item_editor.php:2031
-#: ../../godmode/setup/news.php:300 ../../include/functions_html.php:862
+#: ../../godmode/agentes/planned_downtime.editor.php:1201
+#: ../../godmode/alerts/configure_alert_template.php:1080
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2228
+#: ../../godmode/setup/news.php:300 ../../include/functions_html.php:952
 #: ../../operation/agentes/datos_agente.php:307
-#: ../../operation/agentes/estado_monitores.php:404
-#: ../../operation/agentes/interface_traffic_graph_win.php:357
-#: ../../operation/agentes/stat_win.php:509
-#: ../../operation/events/events_list.php:1590
-#: ../../operation/netflow/nf_live_view.php:662
-#: ../../operation/reporting/graph_viewer.php:280
+#: ../../operation/agentes/estado_monitores.php:417
+#: ../../operation/agentes/interface_traffic_graph_win.php:383
+#: ../../operation/agentes/stat_win.php:540
+#: ../../operation/events/events_list.php:1587
+#: ../../operation/netflow/nf_live_view.php:660
+#: ../../operation/reporting/graph_viewer.php:282
 #: ../../operation/reporting/reporting_viewer.php:257
 #: ../../operation/reporting/reporting_viewer.php:277
-#: ../../operation/tree.php:394
-#: ../../enterprise/dashboard/widgets/tree_view.php:320
-#: ../../enterprise/extensions/cron/main.php:373
+#: ../../operation/snmpconsole/snmp_view.php:1085
+#: ../../operation/snmpconsole/snmp_view.php:1097 ../../operation/tree.php:416
+#: ../../enterprise/dashboard/widgets/tree_view.php:330
+#: ../../enterprise/extensions/cron/main.php:545
 #: ../../enterprise/godmode/alerts/alert_events.php:580
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:686
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2286
-#: ../../enterprise/operation/log/log_viewer.php:313
-#: ../../enterprise/operation/log/log_viewer.php:325
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:687
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2471
+#: ../../enterprise/godmode/reporting/cluster_view.php:699
+#: ../../enterprise/operation/log/log_viewer.php:332
+#: ../../enterprise/operation/log/log_viewer.php:344
 msgid "Minute"
 msgstr "分"
 
 #: ../../extensions/insert_data.php:214
-#: ../../godmode/agentes/planned_downtime.editor.php:1173
-#: ../../godmode/alerts/configure_alert_template.php:1078
-#: ../../godmode/reporting/reporting_builder.item_editor.php:2032
+#: ../../godmode/agentes/planned_downtime.editor.php:1202
+#: ../../godmode/alerts/configure_alert_template.php:1081
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2229
 #: ../../godmode/setup/news.php:301
 #: ../../operation/agentes/datos_agente.php:308
-#: ../../operation/agentes/estado_monitores.php:405
-#: ../../operation/agentes/interface_traffic_graph_win.php:358
-#: ../../operation/agentes/stat_win.php:510
-#: ../../operation/events/events_list.php:1591
-#: ../../operation/netflow/nf_live_view.php:663
-#: ../../operation/reporting/graph_viewer.php:281
+#: ../../operation/agentes/estado_monitores.php:418
+#: ../../operation/agentes/interface_traffic_graph_win.php:384
+#: ../../operation/agentes/stat_win.php:541
+#: ../../operation/events/events_list.php:1588
+#: ../../operation/netflow/nf_live_view.php:661
+#: ../../operation/reporting/graph_viewer.php:283
 #: ../../operation/reporting/reporting_viewer.php:258
 #: ../../operation/reporting/reporting_viewer.php:278
-#: ../../operation/tree.php:395
-#: ../../enterprise/dashboard/widgets/tree_view.php:321
-#: ../../enterprise/extensions/cron/main.php:374
+#: ../../operation/snmpconsole/snmp_view.php:1086
+#: ../../operation/snmpconsole/snmp_view.php:1098 ../../operation/tree.php:417
+#: ../../enterprise/dashboard/widgets/tree_view.php:331
+#: ../../enterprise/extensions/cron/main.php:546
 #: ../../enterprise/godmode/alerts/alert_events.php:581
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:687
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2287
-#: ../../enterprise/operation/log/log_viewer.php:314
-#: ../../enterprise/operation/log/log_viewer.php:326
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:688
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2472
+#: ../../enterprise/godmode/reporting/cluster_view.php:700
+#: ../../enterprise/operation/log/log_viewer.php:333
+#: ../../enterprise/operation/log/log_viewer.php:345
 msgid "Second"
 msgstr "秒"
 
 #: ../../extensions/insert_data.php:215
-#: ../../godmode/agentes/planned_downtime.editor.php:1174
-#: ../../godmode/alerts/configure_alert_template.php:1079
-#: ../../godmode/reporting/reporting_builder.item_editor.php:2033
+#: ../../godmode/agentes/planned_downtime.editor.php:1203
+#: ../../godmode/alerts/configure_alert_template.php:1082
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2230
 #: ../../godmode/setup/news.php:302 ../../include/functions.php:436
 #: ../../include/functions.php:570
 #: ../../operation/agentes/datos_agente.php:309
-#: ../../operation/agentes/estado_monitores.php:406
-#: ../../operation/agentes/interface_traffic_graph_win.php:359
-#: ../../operation/agentes/stat_win.php:511
-#: ../../operation/events/events_list.php:1592
-#: ../../operation/netflow/nf_live_view.php:664
-#: ../../operation/reporting/graph_viewer.php:282
+#: ../../operation/agentes/estado_monitores.php:419
+#: ../../operation/agentes/interface_traffic_graph_win.php:385
+#: ../../operation/agentes/stat_win.php:542
+#: ../../operation/events/events_list.php:1589
+#: ../../operation/netflow/nf_live_view.php:662
+#: ../../operation/reporting/graph_viewer.php:284
 #: ../../operation/reporting/reporting_viewer.php:259
 #: ../../operation/reporting/reporting_viewer.php:279
-#: ../../operation/tree.php:396
-#: ../../enterprise/dashboard/widgets/tree_view.php:322
-#: ../../enterprise/extensions/cron/main.php:375
+#: ../../operation/snmpconsole/snmp_view.php:1087
+#: ../../operation/snmpconsole/snmp_view.php:1099 ../../operation/tree.php:418
+#: ../../enterprise/dashboard/widgets/tree_view.php:332
+#: ../../enterprise/extensions/cron/main.php:547
 #: ../../enterprise/godmode/alerts/alert_events.php:582
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:688
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2288
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:689
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2473
+#: ../../enterprise/godmode/reporting/cluster_view.php:701
 #: ../../enterprise/operation/agentes/agent_inventory.php:89
-#: ../../enterprise/operation/log/log_viewer.php:315
-#: ../../enterprise/operation/log/log_viewer.php:327
+#: ../../enterprise/operation/log/log_viewer.php:334
+#: ../../enterprise/operation/log/log_viewer.php:346
 msgid "Now"
 msgstr "今"
 
 #: ../../extensions/insert_data.php:216
-#: ../../godmode/agentes/planned_downtime.editor.php:1175
-#: ../../godmode/alerts/configure_alert_template.php:1080
-#: ../../godmode/reporting/reporting_builder.item_editor.php:2034
+#: ../../godmode/agentes/planned_downtime.editor.php:1204
+#: ../../godmode/alerts/configure_alert_template.php:1083
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2231
 #: ../../godmode/setup/news.php:303
 #: ../../include/functions_filemanager.php:619
 #: ../../include/functions_filemanager.php:640
 #: ../../include/functions_filemanager.php:656
-#: ../../include/functions_snmp_browser.php:441
+#: ../../include/functions_snmp_browser.php:487
 #: ../../mobile/include/ui.class.php:571 ../../mobile/include/ui.class.php:610
 #: ../../operation/agentes/datos_agente.php:310
-#: ../../operation/agentes/estado_monitores.php:407
-#: ../../operation/agentes/interface_traffic_graph_win.php:360
-#: ../../operation/agentes/stat_win.php:512
-#: ../../operation/events/events_list.php:1593
-#: ../../operation/netflow/nf_live_view.php:665
-#: ../../operation/reporting/graph_viewer.php:283
+#: ../../operation/agentes/estado_monitores.php:420
+#: ../../operation/agentes/interface_traffic_graph_win.php:386
+#: ../../operation/agentes/stat_win.php:543
+#: ../../operation/events/events_list.php:1590
+#: ../../operation/netflow/nf_live_view.php:663
+#: ../../operation/reporting/graph_viewer.php:285
 #: ../../operation/reporting/reporting_viewer.php:260
 #: ../../operation/reporting/reporting_viewer.php:280
-#: ../../operation/tree.php:397
-#: ../../enterprise/dashboard/widgets/tree_view.php:323
-#: ../../enterprise/extensions/cron/main.php:376
+#: ../../operation/snmpconsole/snmp_view.php:1088
+#: ../../operation/snmpconsole/snmp_view.php:1100 ../../operation/tree.php:419
+#: ../../enterprise/dashboard/widgets/tree_view.php:333
+#: ../../enterprise/extensions/cron/main.php:548
 #: ../../enterprise/godmode/alerts/alert_events.php:583
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:689
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2289
-#: ../../enterprise/operation/log/log_viewer.php:316
-#: ../../enterprise/operation/log/log_viewer.php:328
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:690
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2474
+#: ../../enterprise/godmode/reporting/cluster_view.php:702
+#: ../../enterprise/operation/log/log_viewer.php:335
+#: ../../enterprise/operation/log/log_viewer.php:347
 msgid "Close"
 msgstr "閉じる"
 
@@ -3269,44 +3484,6 @@ msgstr "アラート発生数"
 msgid "Alert template"
 msgstr "アラートテンプレート"
 
-#: ../../extensions/module_groups.php:84
-#: ../../godmode/agentes/fields_manager.php:97
-#: ../../godmode/agentes/modificar_agente.php:494
-#: ../../godmode/agentes/planned_downtime.editor.php:760
-#: ../../godmode/alerts/alert_list.builder.php:83
-#: ../../godmode/alerts/alert_list.list.php:121
-#: ../../godmode/alerts/alert_list.list.php:410
-#: ../../godmode/alerts/alert_view.php:344
-#: ../../godmode/category/category.php:111
-#: ../../godmode/events/event_responses.list.php:57
-#: ../../godmode/groups/group_list.php:341 ../../godmode/menu.php:156
-#: ../../godmode/tag/tag.php:205 ../../include/functions_filemanager.php:583
-#: ../../include/functions_reporting_html.php:1958
-#: ../../include/functions_treeview.php:382
-#: ../../enterprise/extensions/backup/main.php:103
-#: ../../enterprise/extensions/cron/main.php:201
-#: ../../enterprise/extensions/ipam/ipam_ajax.php:261
-#: ../../enterprise/godmode/agentes/collections.php:235
-#: ../../enterprise/godmode/agentes/inventory_manager.php:237
-#: ../../enterprise/godmode/alerts/alert_events_list.php:421
-#: ../../enterprise/godmode/policies/policy_alerts.php:241
-#: ../../enterprise/godmode/policies/policy_external_alerts.php:171
-#: ../../enterprise/godmode/policies/policy_inventory_modules.php:245
-#: ../../enterprise/godmode/setup/setup_skins.php:120
-#: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:323
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1196
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1408
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1500
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1583
-#: ../../enterprise/meta/include/functions_alerts_meta.php:111
-#: ../../enterprise/meta/include/functions_alerts_meta.php:128
-#: ../../enterprise/meta/monitoring/wizard/wizard.php:98
-#: ../../enterprise/operation/agentes/manage_transmap_creation.php:122
-#: ../../enterprise/operation/agentes/transactional_map.php:155
-#: ../../enterprise/operation/services/services.list.php:348
-msgid "Actions"
-msgstr "アクション"
-
 #: ../../extensions/module_groups.php:168
 msgid "Combined table of agent group and module group"
 msgstr "エージェントグループとモジュールグループの一覧"
@@ -3358,7 +3535,7 @@ msgstr "定義済のグループまたはモジュールグループがありま
 
 #: ../../extensions/module_groups.php:325 ../../godmode/menu.php:49
 #: ../../operation/tree.php:67
-#: ../../enterprise/dashboard/widgets/tree_view.php:36
+#: ../../enterprise/dashboard/widgets/tree_view.php:38
 msgid "Module groups"
 msgstr "モジュールグループ"
 
@@ -3393,7 +3570,7 @@ msgid "DiG/Whois Lookup"
 msgstr "DiG/Whois ルックアップ"
 
 #: ../../extensions/net_tools.php:131
-#: ../../operation/agentes/estado_generalagente.php:147
+#: ../../operation/agentes/estado_generalagente.php:176
 msgid "IP address"
 msgstr "IP アドレス"
 
@@ -3403,126 +3580,133 @@ msgstr "IP アドレス"
 msgid "SNMP Community"
 msgstr "SNMP コミュニティ"
 
-#: ../../extensions/net_tools.php:148 ../../include/functions_events.php:1796
+#: ../../extensions/net_tools.php:148 ../../include/functions_events.php:1788
 msgid "Execute"
 msgstr "実行"
 
-#: ../../extensions/net_tools.php:162
+#: ../../extensions/net_tools.php:159
+#: ../../godmode/agentes/configurar_agente.php:652
+#: ../../godmode/agentes/configurar_agente.php:775
+msgid "The ip or dns name entered cannot be resolved"
+msgstr "入力された IP または DNS 名の名前解決ができません。"
+
+#: ../../extensions/net_tools.php:166
 msgid "Traceroute executable does not exist."
 msgstr "traceroute コマンドがありません。"
 
-#: ../../extensions/net_tools.php:165
+#: ../../extensions/net_tools.php:169
 msgid "Traceroute to "
 msgstr "以下へのtraceroute "
 
-#: ../../extensions/net_tools.php:174
+#: ../../extensions/net_tools.php:178
 msgid "Ping executable does not exist."
 msgstr "pingコマンドがありません。"
 
-#: ../../extensions/net_tools.php:177
+#: ../../extensions/net_tools.php:181
 #, php-format
 msgid "Ping to %s"
 msgstr "%s への ping"
 
-#: ../../extensions/net_tools.php:186
+#: ../../extensions/net_tools.php:190
 msgid "Nmap executable does not exist."
 msgstr "nmapコマンドがありません。"
 
-#: ../../extensions/net_tools.php:189
+#: ../../extensions/net_tools.php:193
 msgid "Basic TCP Scan on "
 msgstr "基本TCPスキャン: "
 
-#: ../../extensions/net_tools.php:196
+#: ../../extensions/net_tools.php:200
 msgid "Domain and IP information for "
 msgstr "ドメインおよびIP情報: "
 
-#: ../../extensions/net_tools.php:200
+#: ../../extensions/net_tools.php:204
 msgid "Dig executable does not exist."
 msgstr "digコマンドがありません。"
 
-#: ../../extensions/net_tools.php:210
+#: ../../extensions/net_tools.php:214
 msgid "Whois executable does not exist."
 msgstr "whoisコマンドがありません。"
 
-#: ../../extensions/net_tools.php:219
+#: ../../extensions/net_tools.php:223
 msgid "SNMP information for "
 msgstr "SNMP情報: "
 
-#: ../../extensions/net_tools.php:223
+#: ../../extensions/net_tools.php:227
 msgid "SNMPget executable does not exist."
 msgstr "snmpgetコマンドがありません。"
 
-#: ../../extensions/net_tools.php:226
+#: ../../extensions/net_tools.php:230
 msgid "Uptime"
 msgstr "稼働時間"
 
-#: ../../extensions/net_tools.php:230
+#: ../../extensions/net_tools.php:234
 msgid "Device info"
 msgstr "デバイス情報"
 
-#: ../../extensions/net_tools.php:238
+#: ../../extensions/net_tools.php:242
 msgid "Interface"
 msgstr "インタフェース"
 
-#: ../../extensions/net_tools.php:268 ../../extensions/net_tools.php:343
+#: ../../extensions/net_tools.php:273 ../../extensions/net_tools.php:348
 msgid "Config Network Tools"
 msgstr "ネットワークツール設定"
 
-#: ../../extensions/net_tools.php:289 ../../extensions/net_tools.php:290
+#: ../../extensions/net_tools.php:294 ../../extensions/net_tools.php:295
 msgid "Set the paths."
 msgstr "パスを設定しました。"
 
-#: ../../extensions/net_tools.php:310
+#: ../../extensions/net_tools.php:315
 msgid "Traceroute path"
 msgstr "Traceroute パス"
 
-#: ../../extensions/net_tools.php:311
+#: ../../extensions/net_tools.php:316
 msgid "If it is empty, Pandora searchs the traceroute system."
 msgstr "空の場合、Pandora はシステムから traceroute を探します。"
 
-#: ../../extensions/net_tools.php:314
+#: ../../extensions/net_tools.php:319
 msgid "Ping path"
 msgstr "Ping パス"
 
-#: ../../extensions/net_tools.php:315
+#: ../../extensions/net_tools.php:320
 msgid "If it is empty, Pandora searchs the ping system."
 msgstr "空の場合、Pandora はシステムから ping を探します。"
 
-#: ../../extensions/net_tools.php:318
+#: ../../extensions/net_tools.php:323
 msgid "Nmap path"
 msgstr "Nmap パス"
 
-#: ../../extensions/net_tools.php:319
+#: ../../extensions/net_tools.php:324
 msgid "If it is empty, Pandora searchs the nmap system."
 msgstr "空の場合、Pandora はシステムから nmap を探します。"
 
-#: ../../extensions/net_tools.php:322
+#: ../../extensions/net_tools.php:327
 msgid "Dig path"
 msgstr "dig パス"
 
-#: ../../extensions/net_tools.php:323
+#: ../../extensions/net_tools.php:328
 msgid "If it is empty, Pandora searchs the dig system."
 msgstr "空の場合、Pandora はシステムから dig を探します。"
 
-#: ../../extensions/net_tools.php:326
+#: ../../extensions/net_tools.php:331
 msgid "Snmpget path"
 msgstr "snmpget パス"
 
-#: ../../extensions/net_tools.php:327
+#: ../../extensions/net_tools.php:332
 msgid "If it is empty, Pandora searchs the snmpget system."
 msgstr "空の場合、Pandora はシステムから snmpget を探します。"
 
-#: ../../extensions/net_tools.php:332
+#: ../../extensions/net_tools.php:337
 #: ../../godmode/reporting/reporting_builder.list_items.php:308
 #: ../../godmode/update_manager/update_manager.php:35
-#: ../../enterprise/dashboard/main_dashboard.php:162
-#: ../../enterprise/dashboard/main_dashboard.php:242
+#: ../../enterprise/dashboard/main_dashboard.php:170
+#: ../../enterprise/dashboard/main_dashboard.php:258
+#: ../../enterprise/extensions/vmware/vmware_view.php:1224
 #: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:254
 #: ../../enterprise/meta/monitoring/wizard/wizard.create_module.php:243
 msgid "Options"
 msgstr "オプション"
 
-#: ../../extensions/pandora_logs.php:33 ../../extensions/system_info.php:174
+#: ../../extensions/pandora_logs.php:33
 msgid "Cannot find file"
 msgstr "ファイルが見つかりません"
 
@@ -3534,19 +3718,20 @@ msgstr "PHP のメモリ割り当てよりもファイルが大きすぎます
 msgid "The preview file is imposible."
 msgstr "ファイルのプレビューはできません。"
 
-#: ../../extensions/pandora_logs.php:44
-msgid "File is too large (> 500KB)"
-msgstr "ファイルが大きすぎます。(> 500KB)"
-
-#: ../../extensions/pandora_logs.php:72
+#: ../../extensions/pandora_logs.php:70
 msgid "System logfile viewer"
 msgstr "システムログファイルビューワ"
 
+#: ../../extensions/pandora_logs.php:72
+msgid ""
+"Use this tool to view your Pandora FMS logfiles directly on the console"
+msgstr "コンソールで Pandora FMS ログファイルを直接見るためにこのツールを使ってください。"
+
 #: ../../extensions/pandora_logs.php:74
 msgid ""
-"This tool is used just to view your Pandora FMS system logfiles directly "
-"from console"
-msgstr "このツールは、コンソールから Pandora FMS のシステムログファイルを直接参照するのに利用します。"
+"You can choose the amount of information shown in general setup (Log size "
+"limit in system logs viewer extension), "
+msgstr "一般の設定で表示される情報量(システムログビューワのログサイズ制限)を選択できます。 "
 
 #: ../../extensions/pandora_logs.php:83
 msgid "System logfiles"
@@ -3603,8 +3788,10 @@ msgstr "モジュールプラグインを登録しました。"
 
 #: ../../extensions/plugin_registration.php:422
 #: ../../godmode/agentes/module_manager_editor_plugin.php:50
+#: ../../godmode/massive/massive_edit_modules.php:671
 #: ../../godmode/massive/massive_edit_plugins.php:287
 #: ../../godmode/modules/manage_network_components_form_plugin.php:22
+#: ../../enterprise/extensions/vmware/vmware_admin.php:360
 msgid "Plugin"
 msgstr "プラグイン"
 
@@ -3649,13 +3836,16 @@ msgstr "Pandora サーバのロード"
 msgid "SNMP Interface throughput"
 msgstr "SNMP インタフェーススループット"
 
-#: ../../extensions/realtime_graphs.php:72 ../../include/ajax/module.php:750
-#: ../../include/functions_events.php:2103
+#: ../../extensions/realtime_graphs.php:72 ../../include/ajax/module.php:786
+#: ../../include/functions_pandora_networkmap.php:1648
+#: ../../include/functions_events.php:2204
 #: ../../include/functions_visual_map_editor.php:56
-#: ../../include/functions_pandora_networkmap.php:1401
-#: ../../operation/agentes/status_monitor.php:977
+#: ../../operation/agentes/status_monitor.php:985
 #: ../../operation/search_modules.php:52
 #: ../../enterprise/dashboard/widgets/custom_graph.php:33
+#: ../../enterprise/include/ajax/clustermap.php:67
+#: ../../enterprise/include/ajax/clustermap.php:277
+#: ../../enterprise/operation/agentes/tag_view.php:535
 #: ../../enterprise/operation/services/services.list.php:344
 #: ../../enterprise/operation/services/services.service.php:143
 msgid "Graph"
@@ -3674,28 +3864,28 @@ msgid "Clear graph"
 msgstr "グラフをクリア"
 
 #: ../../extensions/realtime_graphs.php:94
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:700
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:339
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:254
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:705
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:423
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:297
 #: ../../godmode/agentes/module_manager_editor_network.php:67
 #: ../../godmode/agentes/module_manager_editor_wmi.php:45
-#: ../../godmode/massive/massive_edit_modules.php:488
-#: ../../include/functions_snmp_browser.php:506
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:689
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:336
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:252
+#: ../../godmode/massive/massive_edit_modules.php:514
+#: ../../include/functions_snmp_browser.php:552
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:694
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:412
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:296
 msgid "Target IP"
 msgstr "対象IP"
 
 #: ../../extensions/realtime_graphs.php:97
 #: ../../godmode/snmpconsole/snmp_trap_generator.php:69
-#: ../../include/functions_snmp_browser.php:508
+#: ../../include/functions_snmp_browser.php:554
 msgid "Community"
 msgstr "コミュニティ"
 
 #: ../../extensions/realtime_graphs.php:108
 #: ../../godmode/setup/snmp_wizard.php:41
-#: ../../include/functions_snmp_browser.php:401
+#: ../../include/functions_snmp_browser.php:447
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:243
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:318
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:56
@@ -3704,7 +3894,7 @@ msgstr "OID"
 
 #: ../../extensions/realtime_graphs.php:111 ../../godmode/extensions.php:144
 #: ../../godmode/servers/servers.build_table.php:67
-#: ../../include/functions_snmp_browser.php:513
+#: ../../include/functions_snmp_browser.php:559
 #: ../../enterprise/extensions/ipam/ipam_calculator.php:39
 #: ../../enterprise/godmode/servers/list_satellite.php:37
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:388
@@ -3738,10 +3928,10 @@ msgstr ""
 #: ../../extensions/resource_exportation.php:352
 #: ../../enterprise/dashboard/widgets/reports.php:27
 #: ../../enterprise/dashboard/widgets/reports.php:43
-#: ../../enterprise/extensions/cron/functions.php:445
-#: ../../enterprise/extensions/cron/main.php:225
-#: ../../enterprise/extensions/cron/main.php:267
+#: ../../enterprise/extensions/cron/functions.php:487
 #: ../../enterprise/extensions/cron/main.php:281
+#: ../../enterprise/extensions/cron/main.php:360
+#: ../../enterprise/extensions/cron/main.php:386
 msgid "Report"
 msgstr "レポート"
 
@@ -3752,10 +3942,11 @@ msgstr "レポート"
 msgid "Export"
 msgstr "エクスポート"
 
-#: ../../extensions/resource_exportation.php:355 ../../operation/menu.php:128
-#: ../../operation/users/user_edit.php:277
-#: ../../enterprise/meta/screens/screens.visualmap.php:216
-#: ../../enterprise/meta/screens/screens.visualmap.php:220
+#: ../../extensions/resource_exportation.php:355
+#: ../../godmode/users/configure_user.php:587 ../../operation/menu.php:134
+#: ../../operation/menu.php:139 ../../operation/users/user_edit.php:279
+#: ../../enterprise/meta/screens/screens.visualmap.php:156
+#: ../../enterprise/meta/screens/screens.visualmap.php:160
 msgid "Visual console"
 msgstr "ビジュアルコンソール"
 
@@ -3808,7 +3999,7 @@ msgstr "コンテンツ '%s'を追加しました。"
 #: ../../extensions/resource_registration.php:328
 #: ../../extensions/resource_registration.php:349
 #: ../../extensions/resource_registration.php:359
-#: ../../enterprise/extensions/resource_registration/functions.php:482
+#: ../../enterprise/extensions/resource_registration/functions.php:516
 #, php-format
 msgid "Error add '%s' action."
 msgstr "アクション '%s' の追加に失敗しました。"
@@ -3888,7 +4079,7 @@ msgid "Resource registration"
 msgstr "リソース登録"
 
 #: ../../extensions/resource_registration.php:852
-#: ../../enterprise/include/functions_policies.php:4090
+#: ../../enterprise/include/functions_policies.php:4269
 msgid "Error, please install the PHP libXML in the system."
 msgstr "エラー。PHP libXML をインストールしてください。"
 
@@ -3907,104 +4098,10 @@ msgstr ""
 "Resource Library</a>から取得できます。"
 
 #: ../../extensions/resource_registration.php:872
-#: ../../enterprise/include/functions_policies.php:4106
+#: ../../enterprise/include/functions_policies.php:4285
 msgid "Group filter: "
 msgstr "グループフィルター: "
 
-#: ../../extensions/system_info.php:179
-msgid "Cannot read file"
-msgstr "ファイルを読み込めません"
-
-#: ../../extensions/system_info.php:388
-msgid "No options selected"
-msgstr "オプションが選択されていません"
-
-#: ../../extensions/system_info.php:391
-msgid "There was an error with the zip file"
-msgstr "zipファイルにエラーがあります。"
-
-#: ../../extensions/system_info.php:415 ../../extensions/system_info.php:808
-msgid "System Info"
-msgstr "システム情報"
-
-#: ../../extensions/system_info.php:418
-msgid ""
-"This extension can run as PHP script in a shell for extract more "
-"information, but it must be run as root or across sudo. For example: <i>sudo "
-"php /var/www/pandora_console/extensions/system_info.php -d -s -c</i>"
-msgstr ""
-"この拡張は、シェル上で情報を表示するための PHP スクリプトとしても実行できます。ただし、root 権限が必要です。<br>例: <i>sudo "
-"php /var/www/pandora_console/extensions/system_info.php -d -s -c</i>"
-
-#: ../../extensions/system_info.php:428 ../../extensions/system_info.php:431
-#: ../../extensions/system_info.php:504
-msgid "Pandora Diagnostic info"
-msgstr "Pandora 診断情報"
-
-#: ../../extensions/system_info.php:435 ../../extensions/system_info.php:438
-#: ../../extensions/system_info.php:510
-msgid "System info"
-msgstr "システム情報"
-
-#: ../../extensions/system_info.php:443 ../../extensions/system_info.php:446
-#: ../../extensions/system_info.php:514
-msgid "Log Info"
-msgstr "ログ情報"
-
-#: ../../extensions/system_info.php:449 ../../extensions/system_info.php:450
-msgid "Number lines of log"
-msgstr "ログの行数"
-
-#: ../../extensions/system_info.php:476
-#: ../../enterprise/extensions/ipam/ipam_ajax.php:216
-msgid "Created"
-msgstr "作成"
-
-#: ../../extensions/system_info.php:481 ../../extensions/system_info.php:527
-#: ../../godmode/events/event_responses.editor.php:93
-#: ../../enterprise/extensions/ipam/ipam_editor.php:89
-#: ../../enterprise/extensions/ipam/ipam_list.php:161
-#: ../../enterprise/extensions/ipam/ipam_network.php:140
-msgid "Location"
-msgstr "場所"
-
-#: ../../extensions/system_info.php:495
-msgid "Generate file"
-msgstr "ファイル生成"
-
-#: ../../extensions/system_info.php:496 ../../general/ui/agents_list.php:121
-#: ../../godmode/massive/massive_copy_modules.php:164
-#: ../../operation/reporting/reporting_viewer.php:234
-#: ../../enterprise/godmode/policies/policy_modules.php:1309
-#: ../../enterprise/meta/monitoring/wizard/wizard.php:106
-#: ../../enterprise/operation/log/log_viewer.php:246
-#: ../../enterprise/operation/log/log_viewer.php:252
-msgid "Loading"
-msgstr "読み込み中"
-
-#: ../../extensions/system_info.php:533 ../../extensions/system_info.php:594
-#: ../../godmode/db/db_refine.php:42 ../../godmode/db/db_refine.php:47
-#: ../../godmode/massive/massive_edit_plugins.php:813
-#: ../../godmode/massive/massive_edit_plugins.php:814
-#: ../../include/ajax/double_auth.ajax.php:250
-#: ../../include/ajax/double_auth.ajax.php:347
-#: ../../include/ajax/double_auth.ajax.php:392
-#: ../../include/ajax/double_auth.ajax.php:507
-#: ../../include/functions.php:1043 ../../include/functions_events.php:1176
-#: ../../include/functions_events.php:1422 ../../include/functions_ui.php:228
-#: ../../operation/users/user_edit.php:696
-#: ../../operation/users/user_edit.php:761
-#: ../../enterprise/dashboard/main_dashboard.php:355
-#: ../../enterprise/dashboard/main_dashboard.php:435
-#: ../../enterprise/include/functions_login.php:99
-#: ../../enterprise/meta/include/functions_ui_meta.php:779
-msgid "Error"
-msgstr "エラー"
-
-#: ../../extensions/system_info.php:548
-msgid "At least one option must be selected"
-msgstr "少なくとも一つのオプションを選択する必要があります"
-
 #: ../../extensions/users_connected.php:38
 #: ../../extensions/users_connected.php:122
 #: ../../extensions/users_connected.php:123
@@ -4015,17 +4112,42 @@ msgstr "接続ユーザ"
 msgid "No other users connected"
 msgstr "他のユーザは接続していません"
 
-#: ../../extras/pandora_diag.php:90
+#: ../../extras/pandora_diag.php:91
 msgid "Pandora FMS Diagnostic tool"
 msgstr "Pandora FMS 診断ツール"
 
-#: ../../extras/pandora_diag.php:93
-msgid "Item"
-msgstr "項目"
-
 #: ../../extras/pandora_diag.php:94
-msgid "Data value"
-msgstr "値"
+msgid "Pandora status info"
+msgstr "Pandora ステータス情報"
+
+#: ../../extras/pandora_diag.php:123
+msgid "PHP setup"
+msgstr "PHP 設定"
+
+#: ../../extras/pandora_diag.php:136 ../../godmode/db/db_main.php:95
+msgid "Database size stats"
+msgstr "データベースサイズ"
+
+#: ../../extras/pandora_diag.php:154 ../../godmode/db/db_main.php:160
+msgid "Database sanity"
+msgstr "データベースの健全性"
+
+#: ../../extras/pandora_diag.php:236
+msgid "Database status info"
+msgstr "データベースステータス情報"
+
+#: ../../extras/pandora_diag.php:252
+msgid "System info"
+msgstr "システム情報"
+
+#: ../../extras/pandora_diag.php:322
+msgid ""
+"(*) Please check your Pandora Server setup and be sure that database "
+"maintenance daemon is running. It' very important to \n"
+"keep up-to-date database to get the best performance and results in Pandora"
+msgstr ""
+"(*) Pandora サーバ設定を確認し、データベースメンテナスデーモンが動作していることを確認してください。\n"
+"データベースを最新の状態にし、Pandora で最高のパフォーマンスを出すためにとても重要です。"
 
 #: ../../general/alert_enterprise.php:96
 msgid ""
@@ -4035,13 +4157,15 @@ msgid ""
 "probably don't need to read it entirely, but sure, you should download it "
 "and take a look.<br><br>\n"
 "\t<a href='https://pandorafms.org/en/docs/monitoring-documentation/' "
-"target='_blanck'>Download the official documentation</a>"
+"target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: "
+"underline;'>Download the official documentation</a>"
 msgstr ""
-"Pandora FMS コンソールのオンラインヘルプです。これは、その場で最適な手助けをするのもであり、Pandora FMS "
-"の使い方を教えるものではありません。Pandora FMS の公式ドキュメントは約 "
-"900ページあり全体を読む必要はありません。しかしダウンロードして確認すると良いでしょう。<br><br>\n"
+"これは、Pandora FMS コンソールのオンラインヘルプです。このヘルプは、Pandora "
+"FMS　の使い方を教えるためのものではなく、状況に応じた簡単なヘルプです。Pandora FMS の公式ドキュメントは約 "
+"900ページあり、おそらく全体を読む必要はありませんが、ダウンロードして確認した方が良いでしょう。<br><br>\n"
 "\t<a href='https://pandorafms.org/ja/docs/monitoring-documentation/' "
-"target='_blanck'>公式ドキュメントをダウンロード</a>"
+"target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: "
+"underline;'>公式ドキュメントのダウンロード</a>"
 
 #: ../../general/alert_enterprise.php:103
 msgid ""
@@ -4250,12 +4374,12 @@ msgstr "コレクションが定義されていません。"
 #: ../../general/firts_task/collections.php:25
 #: ../../enterprise/godmode/agentes/collections.agents.php:47
 #: ../../enterprise/godmode/agentes/collections.data.php:42
-#: ../../enterprise/godmode/agentes/collections.editor.php:50
+#: ../../enterprise/godmode/agentes/collections.editor.php:49
 #: ../../enterprise/godmode/menu.php:56
 #: ../../enterprise/godmode/policies/policies.php:385
 #: ../../enterprise/godmode/policies/policy_collections.php:29
 #: ../../enterprise/godmode/policies/policy_collections.php:173
-#: ../../enterprise/include/functions_policies.php:3289
+#: ../../enterprise/include/functions_policies.php:3468
 msgid "Collections"
 msgstr "コレクション"
 
@@ -4366,11 +4490,11 @@ msgid "There are no incidents defined yet."
 msgstr "インシデントが定義されていません。"
 
 #: ../../general/firts_task/incidents.php:32
-#: ../../godmode/agentes/configurar_agente.php:418
-#: ../../godmode/agentes/configurar_agente.php:550
-#: ../../operation/agentes/ver_agente.php:1022
+#: ../../godmode/agentes/configurar_agente.php:441
+#: ../../godmode/agentes/configurar_agente.php:577
+#: ../../operation/agentes/ver_agente.php:1116
 #: ../../operation/incidents/incident_statistics.php:30
-#: ../../operation/menu.php:354
+#: ../../operation/menu.php:391
 msgid "Incidents"
 msgstr "インシデント"
 
@@ -4404,12 +4528,13 @@ msgstr ""
 "\t\t"
 
 #: ../../general/firts_task/map_builder.php:26
-#: ../../godmode/reporting/map_builder.php:255
+#: ../../godmode/reporting/map_builder.php:336
 msgid "There are no visual console defined yet."
 msgstr "ビジュアルコンソールが定義されていません。"
 
 #: ../../general/firts_task/map_builder.php:32
-#: ../../godmode/reporting/map_builder.php:39
+#: ../../godmode/reporting/map_builder.php:43
+#: ../../godmode/reporting/visual_console_favorite.php:33
 #: ../../enterprise/include/functions_enterprise.php:292
 #: ../../enterprise/meta/general/main_header.php:189
 msgid "Visual Console"
@@ -4524,7 +4649,7 @@ msgstr "自動検出タスクが定義されていません。"
 
 #: ../../general/firts_task/recon_view.php:25
 #: ../../godmode/servers/manage_recontask_form.php:228
-#: ../../include/functions_servers.php:378
+#: ../../include/functions_servers.php:379
 #: ../../enterprise/extensions/ipam/ipam_editor.php:80
 msgid "Recon server"
 msgstr "自動検出サーバ"
@@ -4558,21 +4683,21 @@ msgid "There are no services defined yet."
 msgstr "サービスが定義されていません。"
 
 #: ../../general/firts_task/service_list.php:28
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:300
-#: ../../operation/agentes/ver_agente.php:1111
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:364
+#: ../../operation/agentes/ver_agente.php:1205
 #: ../../enterprise/dashboard/widgets/service_map.php:79
 #: ../../enterprise/godmode/menu.php:92
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:298
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:363
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:164
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:101
 #: ../../enterprise/godmode/services/services.elements.php:135
-#: ../../enterprise/godmode/services/services.service.php:210
+#: ../../enterprise/godmode/services/services.service.php:250
 #: ../../enterprise/include/functions_groups.php:61
 #: ../../enterprise/meta/general/main_header.php:172
-#: ../../enterprise/operation/menu.php:31
+#: ../../enterprise/operation/menu.php:42
 #: ../../enterprise/operation/services/services.list.php:60
 #: ../../enterprise/operation/services/services.list.php:64
-#: ../../enterprise/operation/services/services.service_map.php:121
+#: ../../enterprise/operation/services/services.service_map.php:119
 #: ../../enterprise/operation/services/services.table_services.php:46
 #: ../../enterprise/operation/services/services.table_services.php:50
 msgid "Services"
@@ -4645,32 +4770,43 @@ msgstr "タグが定義されていません。"
 #: ../../godmode/events/custom_events.php:104
 #: ../../godmode/events/custom_events.php:164
 #: ../../godmode/massive/massive_add_tags.php:147
+#: ../../godmode/massive/massive_copy_modules.php:134
+#: ../../godmode/massive/massive_delete_modules.php:466
+#: ../../godmode/massive/massive_delete_modules.php:516
 #: ../../godmode/massive/massive_delete_tags.php:187
-#: ../../godmode/massive/massive_edit_modules.php:562
+#: ../../godmode/massive/massive_edit_modules.php:318
+#: ../../godmode/massive/massive_edit_modules.php:356
+#: ../../godmode/massive/massive_edit_modules.php:594
 #: ../../godmode/modules/manage_network_components_form_common.php:200
 #: ../../godmode/tag/edit_tag.php:57
-#: ../../godmode/users/configure_user.php:625
-#: ../../include/functions_events.php:46
-#: ../../include/functions_events.php:2446
-#: ../../include/functions_events.php:3589
-#: ../../include/functions_reporting_html.php:2119
+#: ../../godmode/users/configure_user.php:739
 #: ../../include/functions_treeview.php:165
+#: ../../include/functions_events.php:46
+#: ../../include/functions_events.php:2545
+#: ../../include/functions_events.php:3688
+#: ../../include/functions_reporting_html.php:2122
 #: ../../mobile/operation/events.php:514
 #: ../../operation/agentes/alerts_status.functions.php:86
 #: ../../operation/agentes/group_view.php:164
-#: ../../operation/agentes/status_monitor.php:340
-#: ../../operation/agentes/status_monitor.php:343
+#: ../../operation/agentes/status_monitor.php:338
+#: ../../operation/agentes/status_monitor.php:341
 #: ../../operation/events/events.build_table.php:223
-#: ../../operation/tree.php:49 ../../operation/users/user_edit.php:506
+#: ../../operation/tree.php:49 ../../operation/users/user_edit.php:517
 #: ../../enterprise/dashboard/widgets/events_list.php:62
-#: ../../enterprise/dashboard/widgets/tree_view.php:35
+#: ../../enterprise/dashboard/widgets/tree_view.php:37
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:94
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:133
 #: ../../enterprise/godmode/massive/massive_tags_edit_policy.php:92
 #: ../../enterprise/godmode/modules/configure_local_component.php:375
-#: ../../enterprise/godmode/setup/setup_auth.php:427
-#: ../../enterprise/godmode/setup/setup_auth.php:468
-#: ../../enterprise/include/functions_reporting_pdf.php:2370
+#: ../../enterprise/godmode/setup/setup_auth.php:138
+#: ../../enterprise/godmode/setup/setup_auth.php:182
+#: ../../enterprise/godmode/setup/setup_auth.php:737
+#: ../../enterprise/godmode/setup/setup_auth.php:778
+#: ../../enterprise/include/functions_reporting_pdf.php:2451
 #: ../../enterprise/meta/include/functions_events_meta.php:91
+#: ../../enterprise/operation/agentes/tag_view.php:143
+#: ../../enterprise/operation/agentes/tag_view.php:146
+#: ../../enterprise/operation/agentes/tag_view.php:531
 msgid "Tags"
 msgstr "タグ"
 
@@ -4718,16 +4854,67 @@ msgstr ""
 "\n"
 "トランザクショングラフは、サービスを提供するために利用するインフラ内の異なる処理を表現します。"
 
-#: ../../general/footer.php:35
+#: ../../general/firts_task/cluster_builder.php:32
+msgid "There are no clusters defined yet."
+msgstr "クラスタが定義されていません。"
+
+#: ../../general/firts_task/cluster_builder.php:37
+#: ../../enterprise/godmode/reporting/cluster_list.php:25
+msgid "Clusters"
+msgstr "クラスタ"
+
+#: ../../general/firts_task/cluster_builder.php:40
+#: ../../general/firts_task/cluster_builder.php:53
+msgid "Create Cluster"
+msgstr "クラスタ作成"
+
+#: ../../general/firts_task/cluster_builder.php:43
+msgid ""
+"A cluster is a group of devices that provide the same service in high "
+"availability."
+msgstr "クラスタは、同一サービスの高可用性を提供するデバイスのグループです。"
+
+#: ../../general/firts_task/cluster_builder.php:45
+msgid "Depending on how they provide that service, we can find two types:"
+msgstr "どのようにサービス提供であるかに依存し、次の 2つのタイプがあります:"
+
+#: ../../general/firts_task/cluster_builder.php:47
+msgid ""
+"<b>Clusters to balance the service load</b>: these are  active - active "
+"(A/A)  mode clusters. It means that all the nodes (or machines that compose "
+"it) are working. They must be working because if one stops working, it will "
+"overload the others."
+msgstr ""
+"<br>サービス負荷分散クラスタ</b>:これらは、アクティブ-"
+"アクティブ(A/A)モードクラスタです。すべてのノード(構成するマシン)が動作していることを意味します。1台が停止しても動作を継続しますが負荷は増えます。"
+
+#: ../../general/firts_task/cluster_builder.php:49
+msgid ""
+"<b>Clusters to guarantee service</b>: these are active - passive (A/P) mode "
+"clusters. It means that one of the nodes (or machines that make up the "
+"cluster) will be running (primary) and another won't (secondary). When the "
+"primary goes down, the secondary must take over and give the service "
+"instead. Although many of the elements of this cluster are active-passive, "
+"it will also have active elements in both of them that indicate that the "
+"passive node is \"online\", so that in the case of a service failure in the "
+"master, the active node collects this information."
+msgstr ""
+"<b>サービス保証クラスタ</b>:これらは、アクティブ-"
+"スタンバイモードクラスタです。一つのノード(クラスタを構成するマシン)が動作しており(プライマリ)、もう一方は動作していません(セカンダリ)。プライマリが"
+"ダウンした場合、セカンダリがサービスを代わりに引き継ぎます。このクラスタの要素の多くはアクティブ-"
+"スタンバイですが、スタンバイノードが「オンライン」であることを示すアクティブな要素もあります。したがって、マスタのサービス障害の場合、アクティブノードはこ"
+"の情報を収集します。"
+
+#: ../../general/footer.php:48 ../../enterprise/meta/general/footer.php:30
 #, php-format
 msgid "Pandora FMS %s - Build %s - MR %s"
 msgstr "Pandora FMS %s - ビルド %s - MR %s"
 
-#: ../../general/footer.php:38 ../../enterprise/meta/general/footer.php:27
+#: ../../general/footer.php:51 ../../enterprise/meta/general/footer.php:31
 msgid "Page generated at"
 msgstr "ページ更新日時:"
 
-#: ../../general/footer.php:39 ../../enterprise/meta/general/footer.php:28
+#: ../../general/footer.php:52 ../../enterprise/meta/general/footer.php:32
 msgid "&reg; Ártica ST"
 msgstr "&reg; Ãrtica ST"
 
@@ -4774,65 +4961,79 @@ msgstr "ページの QR コード"
 msgid "Pandora FMS assistant"
 msgstr "Pandora FMS アシスタント"
 
-#: ../../general/header.php:195
-#: ../../enterprise/meta/general/main_header.php:388
+#: ../../general/header.php:206
+#: ../../enterprise/meta/general/main_header.php:390
 msgid "Configure autorefresh"
 msgstr "自動更新設定"
 
-#: ../../general/header.php:222
-#: ../../enterprise/meta/general/main_header.php:405
-#: ../../enterprise/meta/general/main_header.php:415
+#: ../../general/header.php:233 ../../general/header.php:243
+#: ../../enterprise/meta/general/main_header.php:407
+#: ../../enterprise/meta/general/main_header.php:417
 msgid "Disabled autorefresh"
 msgstr "自動更新の無効化"
 
-#: ../../general/header.php:248
+#: ../../general/header.php:266
+msgid "Sobre actualización de revisión menor"
+msgstr ""
+
+#: ../../general/header.php:269
+#: ../../godmode/update_manager/update_manager.offline.php:63
+#: ../../godmode/update_manager/update_manager.offline.php:66
+#: ../../include/functions_update_manager.php:363
+#: ../../include/functions_update_manager.php:366
+#: ../../enterprise/include/functions_update_manager.php:195
+#: ../../enterprise/include/functions_update_manager.php:198
+msgid "About minor release update"
+msgstr "マイナーアップデートに関して"
+
+#: ../../general/header.php:277
 msgid "System alerts detected - Please fix as soon as possible"
 msgstr "システムアラートを検知しました。できるだけ早く修正してください。"
 
-#: ../../general/header.php:263
+#: ../../general/header.php:292
 #, php-format
 msgid "You have %d warning(s)"
 msgstr "警告が %d 件あります。"
 
-#: ../../general/header.php:274
+#: ../../general/header.php:303
 msgid "There are not warnings"
 msgstr "警告はありません"
 
-#: ../../general/header.php:283
+#: ../../general/header.php:312
 msgid "Main help"
 msgstr "メインヘルプ"
 
-#: ../../general/header.php:289 ../../mobile/include/functions_web.php:33
+#: ../../general/header.php:318 ../../mobile/include/functions_web.php:33
 #: ../../mobile/include/ui.class.php:175
-#: ../../mobile/include/user.class.php:286 ../../mobile/operation/home.php:118
+#: ../../mobile/include/user.class.php:286 ../../mobile/operation/home.php:151
 #: ../../enterprise/meta/general/main_header.php:373
 msgid "Logout"
 msgstr "ログアウト"
 
-#: ../../general/header.php:294 ../../general/header.php:296
-#: ../../operation/menu.php:336
-#: ../../enterprise/meta/general/main_header.php:428
-#: ../../enterprise/meta/general/main_header.php:433
+#: ../../general/header.php:323 ../../general/header.php:325
+#: ../../operation/menu.php:373
+#: ../../enterprise/meta/general/main_header.php:430
+#: ../../enterprise/meta/general/main_header.php:435
 #: ../../enterprise/meta/include/functions_users_meta.php:178
 #: ../../enterprise/meta/include/functions_users_meta.php:190
 msgid "Edit my user"
 msgstr "ユーザ情報編集"
 
-#: ../../general/header.php:305
+#: ../../general/header.php:334
 msgid "New chat message"
 msgstr "新規チャットメッセージ"
 
-#: ../../general/header.php:314
+#: ../../general/header.php:343
 msgid "Message overview"
 msgstr "メッセージ概要"
 
-#: ../../general/header.php:315
+#: ../../general/header.php:344
 #, php-format
 msgid "You have %d unread message(s)"
 msgstr "未読メッセージが %d 件あります。"
 
-#: ../../general/links_menu.php:20 ../../godmode/menu.php:298
-#: ../../godmode/menu.php:414
+#: ../../general/links_menu.php:20 ../../godmode/menu.php:299
+#: ../../godmode/menu.php:420
 msgid "Links"
 msgstr "リンク"
 
@@ -4861,8 +5062,12 @@ msgid "Enterprise version"
 msgstr "Enterprise版"
 
 #: ../../general/login_help_dialog.php:67
-#: ../../general/login_help_dialog.php:69 ../../general/login_page.php:90
-#: ../../enterprise/meta/general/login_page.php:45
+#: ../../general/login_help_dialog.php:69 ../../general/login_page.php:113
+#: ../../enterprise/include/process_reset_pass.php:58
+#: ../../enterprise/include/reset_pass.php:59
+#: ../../enterprise/meta/general/login_page.php:67
+#: ../../enterprise/meta/include/process_reset_pass.php:43
+#: ../../enterprise/meta/include/reset_pass.php:43
 msgid "Support"
 msgstr "サポート"
 
@@ -4879,15 +5084,15 @@ msgstr "ドキュメント"
 msgid "Click here to don't show again this message"
 msgstr "このメッセージを再度表示したくない場合はこちらをクリックしてください"
 
-#: ../../general/login_identification_wizard.php:142
+#: ../../general/login_identification_wizard.php:141
 msgid "The Pandora FMS community wizard"
 msgstr "Pandora FMS コミュニティウィザード"
 
-#: ../../general/login_identification_wizard.php:147
+#: ../../general/login_identification_wizard.php:146
 msgid "Stay up to date with the Pandora FMS community"
 msgstr "Pandora FMS コミュニティで最新情報を確認してください"
 
-#: ../../general/login_identification_wizard.php:151
+#: ../../general/login_identification_wizard.php:150
 msgid ""
 "When you subscribe to the Pandora FMS Update Manager service, you accept "
 "that we register your Pandora instance as an identifier on the database "
@@ -4901,7 +5106,7 @@ msgstr ""
 "に関する情報を提供する目的にのみ利用し、第三者へ提供されることはありません。アップデートマネージャオプションからいつでもデータベースの登録解除を行うことが"
 "できます。"
 
-#: ../../general/login_identification_wizard.php:152
+#: ../../general/login_identification_wizard.php:151
 msgid ""
 "In the same fashion, when subscribed to the newsletter you accept that your "
 "email will pass on to a database property of Artica TS. This data will "
@@ -4913,113 +5118,117 @@ msgstr ""
 "Pandora FMS "
 "に関する情報を提供する目的にのみ利用し、第三者へ提供されることはありません。ニュースレターの購読オプションでいつでも登録解除を行うことができます。"
 
-#: ../../general/login_identification_wizard.php:157
-#: ../../godmode/alerts/configure_alert_template.php:814
+#: ../../general/login_identification_wizard.php:156
+#: ../../godmode/alerts/configure_alert_template.php:817
 #: ../../enterprise/godmode/alerts/alert_events.php:548
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:91
 msgid "Finish"
 msgstr "終了"
 
-#: ../../general/login_identification_wizard.php:161
+#: ../../general/login_identification_wizard.php:160
 msgid "Return"
 msgstr "戻る"
 
-#: ../../general/login_identification_wizard.php:165
+#: ../../general/login_identification_wizard.php:164
 msgid "Join the Pandora FMS community"
 msgstr "Pandora FMS コミュニティに参加する"
 
-#: ../../general/login_identification_wizard.php:167
-#: ../../operation/users/user_edit.php:355
+#: ../../general/login_identification_wizard.php:166
+#: ../../operation/users/user_edit.php:358
 msgid "Subscribe to our newsletter"
 msgstr "ニュースレターを購読する"
 
+#: ../../general/login_identification_wizard.php:169
 #: ../../general/login_identification_wizard.php:170
-#: ../../general/login_identification_wizard.php:171
 #: ../../godmode/tag/edit_tag.php:195 ../../godmode/tag/tag.php:203
 #: ../../operation/search_users.php:44
-#: ../../enterprise/extensions/cron/main.php:226
-#: ../../enterprise/extensions/cron/main.php:251
+#: ../../enterprise/extensions/cron/main.php:282
+#: ../../enterprise/extensions/cron/main.php:320
+#: ../../enterprise/godmode/setup/setup_auth.php:94
 #: ../../enterprise/operation/reporting/custom_reporting.php:24
 #: ../../enterprise/operation/reporting/custom_reporting.php:78
 msgid "Email"
 msgstr "Email"
 
-#: ../../general/login_identification_wizard.php:172
+#: ../../general/login_identification_wizard.php:171
 msgid "Required"
 msgstr "必須"
 
-#: ../../general/login_identification_wizard.php:180
+#: ../../general/login_identification_wizard.php:179
 #: ../../general/login_required.php:69
 msgid "Pandora FMS instance identification wizard"
 msgstr "Pandora FMS インスタンス識別ウィザード"
 
-#: ../../general/login_identification_wizard.php:182
+#: ../../general/login_identification_wizard.php:181
 msgid "Do you want to continue without any registration"
 msgstr "登録せずに進みますか"
 
-#: ../../general/login_identification_wizard.php:185
+#: ../../general/login_identification_wizard.php:184
 #: ../../godmode/agentes/agent_conf_gis.php:80
-#: ../../godmode/agentes/agent_manager.php:414
+#: ../../godmode/agentes/agent_manager.php:433
 #: ../../godmode/alerts/alert_view.php:107
 #: ../../godmode/alerts/alert_view.php:303
 #: ../../godmode/alerts/alert_view.php:385
-#: ../../godmode/massive/massive_edit_agents.php:293
-#: ../../godmode/massive/massive_edit_agents.php:413
-#: ../../godmode/massive/massive_edit_agents.php:419
-#: ../../godmode/massive/massive_edit_modules.php:408
-#: ../../godmode/massive/massive_edit_modules.php:453
-#: ../../godmode/massive/massive_edit_modules.php:472
-#: ../../godmode/massive/massive_edit_modules.php:558
-#: ../../godmode/massive/massive_edit_modules.php:586
-#: ../../godmode/massive/massive_edit_modules.php:604
+#: ../../godmode/massive/massive_edit_agents.php:348
+#: ../../godmode/massive/massive_edit_agents.php:469
+#: ../../godmode/massive/massive_edit_agents.php:475
+#: ../../godmode/massive/massive_edit_modules.php:428
+#: ../../godmode/massive/massive_edit_modules.php:473
+#: ../../godmode/massive/massive_edit_modules.php:492
+#: ../../godmode/massive/massive_edit_modules.php:590
+#: ../../godmode/massive/massive_edit_modules.php:618
+#: ../../godmode/massive/massive_edit_modules.php:636
 #: ../../godmode/reporting/reporting_builder.main.php:115
-#: ../../godmode/reporting/reporting_builder.php:639
+#: ../../godmode/reporting/reporting_builder.php:677
 #: ../../godmode/reporting/visual_console_builder.wizard.php:274
 #: ../../godmode/reporting/visual_console_builder.wizard.php:315
 #: ../../godmode/servers/manage_recontask.php:340
 #: ../../godmode/servers/manage_recontask_form.php:317
+#: ../../godmode/servers/modificar_server.php:45
 #: ../../godmode/setup/news.php:264 ../../godmode/setup/performance.php:119
 #: ../../godmode/setup/performance.php:126
 #: ../../godmode/setup/performance.php:133
-#: ../../godmode/setup/setup_auth.php:52 ../../godmode/setup/setup_auth.php:59
+#: ../../godmode/setup/setup_auth.php:52 ../../godmode/setup/setup_auth.php:60
 #: ../../godmode/setup/setup_auth.php:95
-#: ../../godmode/setup/setup_auth.php:133
+#: ../../godmode/setup/setup_auth.php:144
 #: ../../godmode/setup/setup_ehorus.php:56
 #: ../../godmode/setup/setup_general.php:72
 #: ../../godmode/setup/setup_general.php:76
 #: ../../godmode/setup/setup_general.php:80
 #: ../../godmode/setup/setup_general.php:104
 #: ../../godmode/setup/setup_general.php:113
-#: ../../godmode/setup/setup_general.php:170
-#: ../../godmode/setup/setup_general.php:178
-#: ../../godmode/setup/setup_general.php:185
-#: ../../godmode/setup/setup_general.php:206
-#: ../../godmode/setup/setup_general.php:215
+#: ../../godmode/setup/setup_general.php:171
+#: ../../godmode/setup/setup_general.php:179
+#: ../../godmode/setup/setup_general.php:186
+#: ../../godmode/setup/setup_general.php:211
+#: ../../godmode/setup/setup_general.php:220
+#: ../../godmode/setup/setup_general.php:228
 #: ../../godmode/setup/setup_netflow.php:64
 #: ../../godmode/setup/setup_netflow.php:72
 #: ../../godmode/setup/setup_visuals.php:90
 #: ../../godmode/setup/setup_visuals.php:110
-#: ../../godmode/setup/setup_visuals.php:132
-#: ../../godmode/setup/setup_visuals.php:259
-#: ../../godmode/setup/setup_visuals.php:268
-#: ../../godmode/setup/setup_visuals.php:276
-#: ../../godmode/setup/setup_visuals.php:304
-#: ../../godmode/setup/setup_visuals.php:397
-#: ../../godmode/setup/setup_visuals.php:482
-#: ../../godmode/setup/setup_visuals.php:489
-#: ../../godmode/setup/setup_visuals.php:501
-#: ../../godmode/setup/setup_visuals.php:528
-#: ../../godmode/setup/setup_visuals.php:645
-#: ../../godmode/setup/setup_visuals.php:672
+#: ../../godmode/setup/setup_visuals.php:133
+#: ../../godmode/setup/setup_visuals.php:272
+#: ../../godmode/setup/setup_visuals.php:281
+#: ../../godmode/setup/setup_visuals.php:289
+#: ../../godmode/setup/setup_visuals.php:302
+#: ../../godmode/setup/setup_visuals.php:325
+#: ../../godmode/setup/setup_visuals.php:418
+#: ../../godmode/setup/setup_visuals.php:510
+#: ../../godmode/setup/setup_visuals.php:517
+#: ../../godmode/setup/setup_visuals.php:544
+#: ../../godmode/setup/setup_visuals.php:711
+#: ../../godmode/setup/setup_visuals.php:738
 #: ../../godmode/update_manager/update_manager.setup.php:125
-#: ../../godmode/users/configure_user.php:516
-#: ../../include/functions_events.php:2375
-#: ../../include/functions_events.php:2382
-#: ../../mobile/operation/events.php:186 ../../mobile/operation/events.php:193
+#: ../../godmode/users/configure_user.php:579
+#: ../../include/functions_events.php:2487
+#: ../../include/functions_events.php:2494
+#: ../../include/functions_snmp.php:334 ../../mobile/operation/events.php:186
+#: ../../mobile/operation/events.php:193
 #: ../../operation/netflow/nf_live_view.php:280
-#: ../../operation/snmpconsole/snmp_view.php:439
-#: ../../operation/users/user_edit.php:249
-#: ../../enterprise/extensions/cron/functions.php:327
+#: ../../operation/snmpconsole/snmp_view.php:506
+#: ../../operation/users/user_edit.php:251
+#: ../../enterprise/extensions/cron/functions.php:351
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:173
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:334
 #: ../../enterprise/godmode/setup/setup.php:32
@@ -5027,15 +5236,19 @@ msgstr "登録せずに進みますか"
 #: ../../enterprise/godmode/setup/setup.php:57
 #: ../../enterprise/godmode/setup/setup.php:141
 #: ../../enterprise/godmode/setup/setup.php:206
-#: ../../enterprise/godmode/setup/setup.php:245
-#: ../../enterprise/godmode/setup/setup.php:254
-#: ../../enterprise/godmode/setup/setup.php:259
-#: ../../enterprise/godmode/setup/setup.php:268
-#: ../../enterprise/godmode/setup/setup.php:282
-#: ../../enterprise/godmode/setup/setup.php:287
-#: ../../enterprise/godmode/setup/setup_auth.php:359
-#: ../../enterprise/godmode/setup/setup_auth.php:394
-#: ../../enterprise/godmode/setup/setup_auth.php:513
+#: ../../enterprise/godmode/setup/setup.php:289
+#: ../../enterprise/godmode/setup/setup.php:298
+#: ../../enterprise/godmode/setup/setup.php:303
+#: ../../enterprise/godmode/setup/setup.php:312
+#: ../../enterprise/godmode/setup/setup.php:326
+#: ../../enterprise/godmode/setup/setup.php:331
+#: ../../enterprise/godmode/setup/setup.php:342
+#: ../../enterprise/godmode/setup/setup_auth.php:82
+#: ../../enterprise/godmode/setup/setup_auth.php:106
+#: ../../enterprise/godmode/setup/setup_auth.php:240
+#: ../../enterprise/godmode/setup/setup_auth.php:669
+#: ../../enterprise/godmode/setup/setup_auth.php:704
+#: ../../enterprise/godmode/setup/setup_auth.php:823
 #: ../../enterprise/godmode/setup/setup_history.php:47
 #: ../../enterprise/godmode/setup/setup_history.php:51
 #: ../../enterprise/meta/advanced/metasetup.password.php:80
@@ -5044,78 +5257,84 @@ msgstr "登録せずに進みますか"
 #: ../../enterprise/meta/advanced/metasetup.password.php:108
 #: ../../enterprise/meta/advanced/metasetup.password.php:124
 #: ../../enterprise/meta/advanced/metasetup.password.php:130
-#: ../../enterprise/meta/advanced/metasetup.performance.php:84
+#: ../../enterprise/meta/advanced/metasetup.performance.php:83
 #: ../../enterprise/meta/advanced/metasetup.setup.php:138
 #: ../../enterprise/meta/advanced/metasetup.setup.php:189
+#: ../../enterprise/meta/advanced/metasetup.setup.php:194
+#: ../../enterprise/meta/advanced/metasetup.setup.php:259
 #: ../../enterprise/meta/advanced/metasetup.update_manager_setup.php:95
-#: ../../enterprise/meta/advanced/metasetup.visual.php:122
 #: ../../enterprise/meta/advanced/metasetup.visual.php:126
-#: ../../enterprise/meta/advanced/metasetup.visual.php:170
-#: ../../enterprise/meta/advanced/metasetup.visual.php:179
+#: ../../enterprise/meta/advanced/metasetup.visual.php:130
+#: ../../enterprise/meta/advanced/metasetup.visual.php:192
+#: ../../enterprise/meta/advanced/metasetup.visual.php:201
+#: ../../enterprise/meta/advanced/metasetup.visual.php:321
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1565
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:95
 msgid "No"
 msgstr "いいえ"
 
-#: ../../general/login_identification_wizard.php:188
+#: ../../general/login_identification_wizard.php:187
 #: ../../godmode/agentes/agent_conf_gis.php:79
-#: ../../godmode/agentes/agent_manager.php:411
+#: ../../godmode/agentes/agent_manager.php:430
 #: ../../godmode/alerts/alert_view.php:107
 #: ../../godmode/alerts/alert_view.php:301
-#: ../../godmode/massive/massive_edit_agents.php:293
-#: ../../godmode/massive/massive_edit_agents.php:412
-#: ../../godmode/massive/massive_edit_agents.php:419
-#: ../../godmode/massive/massive_edit_modules.php:407
-#: ../../godmode/massive/massive_edit_modules.php:452
-#: ../../godmode/massive/massive_edit_modules.php:471
-#: ../../godmode/massive/massive_edit_modules.php:558
-#: ../../godmode/massive/massive_edit_modules.php:585
-#: ../../godmode/massive/massive_edit_modules.php:604
+#: ../../godmode/massive/massive_edit_agents.php:348
+#: ../../godmode/massive/massive_edit_agents.php:468
+#: ../../godmode/massive/massive_edit_agents.php:475
+#: ../../godmode/massive/massive_edit_modules.php:427
+#: ../../godmode/massive/massive_edit_modules.php:472
+#: ../../godmode/massive/massive_edit_modules.php:491
+#: ../../godmode/massive/massive_edit_modules.php:590
+#: ../../godmode/massive/massive_edit_modules.php:617
+#: ../../godmode/massive/massive_edit_modules.php:636
 #: ../../godmode/reporting/reporting_builder.main.php:111
-#: ../../godmode/reporting/reporting_builder.php:637
+#: ../../godmode/reporting/reporting_builder.php:675
 #: ../../godmode/reporting/visual_console_builder.wizard.php:269
 #: ../../godmode/reporting/visual_console_builder.wizard.php:312
 #: ../../godmode/servers/manage_recontask.php:340
 #: ../../godmode/servers/manage_recontask_form.php:317
+#: ../../godmode/servers/modificar_server.php:47
 #: ../../godmode/setup/performance.php:118
 #: ../../godmode/setup/performance.php:125
 #: ../../godmode/setup/performance.php:132
-#: ../../godmode/setup/setup_auth.php:51 ../../godmode/setup/setup_auth.php:58
+#: ../../godmode/setup/setup_auth.php:51 ../../godmode/setup/setup_auth.php:59
 #: ../../godmode/setup/setup_auth.php:94
-#: ../../godmode/setup/setup_auth.php:130
+#: ../../godmode/setup/setup_auth.php:141
 #: ../../godmode/setup/setup_ehorus.php:55
 #: ../../godmode/setup/setup_general.php:71
 #: ../../godmode/setup/setup_general.php:75
 #: ../../godmode/setup/setup_general.php:79
 #: ../../godmode/setup/setup_general.php:103
 #: ../../godmode/setup/setup_general.php:112
-#: ../../godmode/setup/setup_general.php:167
-#: ../../godmode/setup/setup_general.php:175
-#: ../../godmode/setup/setup_general.php:184
-#: ../../godmode/setup/setup_general.php:205
-#: ../../godmode/setup/setup_general.php:214
+#: ../../godmode/setup/setup_general.php:168
+#: ../../godmode/setup/setup_general.php:176
+#: ../../godmode/setup/setup_general.php:185
+#: ../../godmode/setup/setup_general.php:210
+#: ../../godmode/setup/setup_general.php:219
+#: ../../godmode/setup/setup_general.php:227
 #: ../../godmode/setup/setup_netflow.php:63
 #: ../../godmode/setup/setup_netflow.php:71
 #: ../../godmode/setup/setup_visuals.php:86
 #: ../../godmode/setup/setup_visuals.php:106
-#: ../../godmode/setup/setup_visuals.php:128
-#: ../../godmode/setup/setup_visuals.php:251
-#: ../../godmode/setup/setup_visuals.php:265
-#: ../../godmode/setup/setup_visuals.php:273
-#: ../../godmode/setup/setup_visuals.php:302
-#: ../../godmode/setup/setup_visuals.php:395
-#: ../../godmode/setup/setup_visuals.php:481
-#: ../../godmode/setup/setup_visuals.php:487
-#: ../../godmode/setup/setup_visuals.php:497
-#: ../../godmode/setup/setup_visuals.php:526
-#: ../../godmode/setup/setup_visuals.php:641
-#: ../../godmode/setup/setup_visuals.php:668
+#: ../../godmode/setup/setup_visuals.php:129
+#: ../../godmode/setup/setup_visuals.php:264
+#: ../../godmode/setup/setup_visuals.php:278
+#: ../../godmode/setup/setup_visuals.php:286
+#: ../../godmode/setup/setup_visuals.php:299
+#: ../../godmode/setup/setup_visuals.php:323
+#: ../../godmode/setup/setup_visuals.php:416
+#: ../../godmode/setup/setup_visuals.php:509
+#: ../../godmode/setup/setup_visuals.php:515
+#: ../../godmode/setup/setup_visuals.php:542
+#: ../../godmode/setup/setup_visuals.php:707
+#: ../../godmode/setup/setup_visuals.php:734
 #: ../../godmode/update_manager/update_manager.setup.php:124
-#: ../../godmode/users/configure_user.php:516
+#: ../../godmode/users/configure_user.php:579
+#: ../../include/functions_snmp.php:340
 #: ../../operation/netflow/nf_live_view.php:276
-#: ../../operation/snmpconsole/snmp_view.php:436
-#: ../../operation/users/user_edit.php:249
-#: ../../enterprise/extensions/cron/functions.php:327
+#: ../../operation/snmpconsole/snmp_view.php:503
+#: ../../operation/users/user_edit.php:251
+#: ../../enterprise/extensions/cron/functions.php:351
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:171
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:332
 #: ../../enterprise/godmode/setup/setup.php:31
@@ -5123,15 +5342,19 @@ msgstr "いいえ"
 #: ../../enterprise/godmode/setup/setup.php:56
 #: ../../enterprise/godmode/setup/setup.php:140
 #: ../../enterprise/godmode/setup/setup.php:205
-#: ../../enterprise/godmode/setup/setup.php:244
-#: ../../enterprise/godmode/setup/setup.php:253
-#: ../../enterprise/godmode/setup/setup.php:258
-#: ../../enterprise/godmode/setup/setup.php:267
-#: ../../enterprise/godmode/setup/setup.php:281
-#: ../../enterprise/godmode/setup/setup.php:286
-#: ../../enterprise/godmode/setup/setup_auth.php:356
-#: ../../enterprise/godmode/setup/setup_auth.php:391
-#: ../../enterprise/godmode/setup/setup_auth.php:512
+#: ../../enterprise/godmode/setup/setup.php:288
+#: ../../enterprise/godmode/setup/setup.php:297
+#: ../../enterprise/godmode/setup/setup.php:302
+#: ../../enterprise/godmode/setup/setup.php:311
+#: ../../enterprise/godmode/setup/setup.php:325
+#: ../../enterprise/godmode/setup/setup.php:330
+#: ../../enterprise/godmode/setup/setup.php:341
+#: ../../enterprise/godmode/setup/setup_auth.php:79
+#: ../../enterprise/godmode/setup/setup_auth.php:103
+#: ../../enterprise/godmode/setup/setup_auth.php:237
+#: ../../enterprise/godmode/setup/setup_auth.php:666
+#: ../../enterprise/godmode/setup/setup_auth.php:701
+#: ../../enterprise/godmode/setup/setup_auth.php:822
 #: ../../enterprise/godmode/setup/setup_history.php:46
 #: ../../enterprise/godmode/setup/setup_history.php:50
 #: ../../enterprise/meta/advanced/metasetup.password.php:79
@@ -5140,111 +5363,165 @@ msgstr "いいえ"
 #: ../../enterprise/meta/advanced/metasetup.password.php:107
 #: ../../enterprise/meta/advanced/metasetup.password.php:123
 #: ../../enterprise/meta/advanced/metasetup.password.php:129
-#: ../../enterprise/meta/advanced/metasetup.performance.php:83
+#: ../../enterprise/meta/advanced/metasetup.performance.php:82
 #: ../../enterprise/meta/advanced/metasetup.setup.php:137
 #: ../../enterprise/meta/advanced/metasetup.setup.php:188
+#: ../../enterprise/meta/advanced/metasetup.setup.php:193
+#: ../../enterprise/meta/advanced/metasetup.setup.php:258
 #: ../../enterprise/meta/advanced/metasetup.update_manager_setup.php:94
-#: ../../enterprise/meta/advanced/metasetup.visual.php:121
 #: ../../enterprise/meta/advanced/metasetup.visual.php:125
-#: ../../enterprise/meta/advanced/metasetup.visual.php:166
-#: ../../enterprise/meta/advanced/metasetup.visual.php:175
+#: ../../enterprise/meta/advanced/metasetup.visual.php:129
+#: ../../enterprise/meta/advanced/metasetup.visual.php:188
+#: ../../enterprise/meta/advanced/metasetup.visual.php:197
+#: ../../enterprise/meta/advanced/metasetup.visual.php:318
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1563
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:94
 msgid "Yes"
 msgstr "はい"
 
-#: ../../general/login_page.php:35
+#: ../../general/login_page.php:53
 msgid "Go to Pandora FMS Website"
 msgstr "Pandora FMS のウェブサイトへ"
 
-#: ../../general/login_page.php:47
+#: ../../general/login_page.php:65
 msgid "Go to Login"
 msgstr "ログインへ"
 
-#: ../../general/login_page.php:55
-#: ../../enterprise/meta/general/login_page.php:32
+#: ../../general/login_page.php:73
+#: ../../enterprise/meta/general/login_page.php:48
+#: ../../enterprise/meta/include/process_reset_pass.php:30
+#: ../../enterprise/meta/include/reset_pass.php:30
 msgid "Splash login"
 msgstr "スプラッシュログイン"
 
-#: ../../general/login_page.php:88
+#: ../../general/login_page.php:107
+#: ../../enterprise/include/process_reset_pass.php:56
+#: ../../enterprise/include/reset_pass.php:57
 msgid "Docs"
 msgstr "ドキュメント"
 
-#: ../../general/login_page.php:152
+#: ../../general/login_page.php:177
 msgid "Login as admin"
 msgstr "admin としてログイン"
 
-#: ../../general/login_page.php:160
-#: ../../enterprise/meta/general/login_page.php:99
+#: ../../general/login_page.php:185
+#: ../../enterprise/meta/general/login_page.php:127
 msgid "Login with SAML"
 msgstr "SAML でログイン"
 
-#: ../../general/login_page.php:179 ../../mobile/include/user.class.php:256
-#: ../../enterprise/meta/general/login_page.php:91
+#: ../../general/login_page.php:204 ../../mobile/include/user.class.php:256
 #: ../../enterprise/meta/general/login_page.php:119
+#: ../../enterprise/meta/general/login_page.php:147
 msgid "Login"
 msgstr "ログイン"
 
-#: ../../general/login_page.php:194
+#: ../../general/login_page.php:219
 msgid "Authentication code"
 msgstr "認証コード"
 
-#: ../../general/login_page.php:197 ../../mobile/include/user.class.php:306
+#: ../../general/login_page.php:222 ../../mobile/include/user.class.php:306
 msgid "Check code"
 msgstr "コードの確認"
 
-#: ../../general/login_page.php:205
+#: ../../general/login_page.php:230
 msgid "View details"
 msgstr "詳細を表示"
 
-#: ../../general/login_page.php:223 ../../general/login_page.php:227
-#: ../../include/functions_config.php:1120
+#: ../../general/login_page.php:244
+#: ../../enterprise/meta/general/login_page.php:155
+msgid "Forgot your password?"
+msgstr "パスワードを忘れましたか?"
+
+#: ../../general/login_page.php:259 ../../general/login_page.php:263
+#: ../../include/functions_config.php:1192
+#: ../../enterprise/include/process_reset_pass.php:132
+#: ../../enterprise/include/process_reset_pass.php:136
+#: ../../enterprise/include/reset_pass.php:122
+#: ../../enterprise/include/reset_pass.php:126
 msgid "WELCOME TO PANDORA FMS"
 msgstr "PANDORA FMS へようこそ"
 
-#: ../../general/login_page.php:236 ../../general/login_page.php:240
-#: ../../include/functions_config.php:1124
+#: ../../general/login_page.php:272 ../../general/login_page.php:276
+#: ../../include/functions_config.php:1196
+#: ../../enterprise/include/process_reset_pass.php:145
+#: ../../enterprise/include/process_reset_pass.php:149
+#: ../../enterprise/include/reset_pass.php:135
+#: ../../enterprise/include/reset_pass.php:139
 msgid "NEXT GENERATION"
 msgstr "NEXT GENERATION"
 
-#: ../../general/login_page.php:259
-#: ../../enterprise/meta/general/login_page.php:154
+#: ../../general/login_page.php:295
+#: ../../enterprise/include/process_reset_pass.php:170
+#: ../../enterprise/include/reset_pass.php:160
+#: ../../enterprise/meta/general/login_page.php:191
+#: ../../enterprise/meta/include/process_reset_pass.php:129
+#: ../../enterprise/meta/include/reset_pass.php:118
 msgid "Build"
 msgstr "ビルド"
 
-#: ../../general/login_page.php:263 ../../general/login_page.php:266
-#: ../../general/login_page.php:365 ../../general/login_page.php:368
-#: ../../enterprise/include/functions_login.php:132
-#: ../../enterprise/meta/general/login_page.php:157
-#: ../../enterprise/meta/general/login_page.php:160
-msgid "Login failed"
-msgstr "ログインに失敗しました"
+#: ../../general/login_page.php:299 ../../general/login_page.php:302
+#: ../../general/login_page.php:317 ../../general/login_page.php:320
+#: ../../general/login_page.php:337 ../../general/login_page.php:340
+#: ../../enterprise/meta/general/login_page.php:195
+#: ../../enterprise/meta/general/login_page.php:198
+#: ../../enterprise/meta/general/login_page.php:213
+#: ../../enterprise/meta/general/login_page.php:216
+#: ../../enterprise/meta/general/login_page.php:233
+#: ../../enterprise/meta/general/login_page.php:236
+msgid "Password reset"
+msgstr "パスワードのリセット"
 
-#: ../../general/login_page.php:270
-#: ../../enterprise/meta/general/login_page.php:164
+#: ../../general/login_page.php:306
+#: ../../enterprise/meta/general/login_page.php:202
+msgid "INFO"
+msgstr "情報"
+
+#: ../../general/login_page.php:307
+#: ../../enterprise/meta/general/login_page.php:203
+msgid "An email has been sent to your email address"
+msgstr "あなたのアドレス宛にメールを送信しました"
+
+#: ../../general/login_page.php:324 ../../general/login_page.php:363
+#: ../../enterprise/include/reset_pass.php:171
+#: ../../enterprise/meta/general/login_page.php:220
+#: ../../enterprise/meta/general/login_page.php:259
+#: ../../enterprise/meta/include/reset_pass.php:129
 msgid "ERROR"
 msgstr "エラー"
 
-#: ../../general/login_page.php:282 ../../general/login_page.php:285
-#: ../../general/login_page.php:289
-#: ../../enterprise/meta/general/login_page.php:176
-#: ../../enterprise/meta/general/login_page.php:179
-#: ../../enterprise/meta/general/login_page.php:183
+#: ../../general/login_page.php:344
+#: ../../enterprise/meta/general/login_page.php:240
+msgid "SUCCESS"
+msgstr "成功"
+
+#: ../../general/login_page.php:356 ../../general/login_page.php:359
+#: ../../general/login_page.php:458 ../../general/login_page.php:461
+#: ../../enterprise/include/functions_login.php:131
+#: ../../enterprise/meta/general/login_page.php:252
+#: ../../enterprise/meta/general/login_page.php:255
+msgid "Login failed"
+msgstr "ログインに失敗しました"
+
+#: ../../general/login_page.php:375 ../../general/login_page.php:378
+#: ../../general/login_page.php:382
+#: ../../enterprise/meta/general/login_page.php:271
+#: ../../enterprise/meta/general/login_page.php:274
+#: ../../enterprise/meta/general/login_page.php:278
 msgid "Logged out"
 msgstr "ログアウトしました。"
 
-#: ../../general/login_page.php:290 ../../mobile/include/user.class.php:221
-#: ../../enterprise/meta/general/login_page.php:184
+#: ../../general/login_page.php:383 ../../mobile/include/user.class.php:221
+#: ../../enterprise/meta/general/login_page.php:279
 msgid ""
 "Your session is over. Please close your browser window to close this Pandora "
 "session."
 msgstr "セッションを終了しました。ブラウザのウインドウを閉じてください。"
 
-#: ../../general/login_page.php:303 ../../include/functions_ui.php:3574
+#: ../../general/login_page.php:396 ../../include/functions_ui.php:3720
 msgid "Problem with Pandora FMS database"
 msgstr "Pandora FMS データベースに問題があります"
 
-#: ../../general/login_page.php:304
+#: ../../general/login_page.php:397
 msgid ""
 "Cannot connect to the database, please check your database setup in the "
 "<b>include/config.php</b> file.<i><br/><br/>\n"
@@ -5252,16 +5529,15 @@ msgid ""
 "or\n"
 "\t\tthe database server is not running."
 msgstr ""
-"データベースへ接続できません。<b>include/config.php</b> "
-"ファイル内のデータベース設定を確認してください。<i><br/><br/>\n"
-"\t\tおそらく、データベース名、ホスト名、ユーザ名、パスワードが正しくないか、\n"
+"データベースに接続できません。<b>include/config.php</b>ファイル内のデータベース設定を確認してください。<br/><br/>\n"
+"\t\tおそらく、データベース名、ホスト名、ユーザ名、パスワードの値が不正か\n"
 "\t\tデータベースサーバが動作していません。"
 
-#: ../../general/login_page.php:308 ../../include/functions_ui.php:3579
+#: ../../general/login_page.php:401 ../../include/functions_ui.php:3725
 msgid "DB ERROR"
 msgstr "DB エラー"
 
-#: ../../general/login_page.php:314 ../../include/functions_ui.php:3585
+#: ../../general/login_page.php:407 ../../include/functions_ui.php:3731
 msgid ""
 "If you have modified auth system, this problem could be because Pandora "
 "cannot override authorization variables from the config database. Remove "
@@ -5272,11 +5548,11 @@ msgstr ""
 "は、データベース設定では認証方法を上書きできないためです。次のクエリを実行することにより、それらをデータベースから削除してください。: "
 "<br><pre>DELETE FROM tconfig WHERE token = \"auth\";</pre>"
 
-#: ../../general/login_page.php:318 ../../include/functions_ui.php:3589
+#: ../../general/login_page.php:411 ../../include/functions_ui.php:3735
 msgid "Empty configuration table"
 msgstr "設定テーブルが空です"
 
-#: ../../general/login_page.php:319
+#: ../../general/login_page.php:412
 msgid ""
 "Cannot load configuration variables from database. Please check your "
 "database setup in the\n"
@@ -5289,51 +5565,50 @@ msgid ""
 "\t\tpermissions and HTTP server cannot read it. Please read documentation to "
 "fix this problem.</i>"
 msgstr ""
-"データベースから設定を読み込めません。<b>include/config.php</b> ファイル内のデータベース\n"
-"\t\t設定を確認してください。<i><br><br>\n"
-"\t\tデータベーススキーマは作成されていますが、データが無い可能性があります。データベースへのアクセス権の問題かスキーマが古くなっています。\n"
-"\t\t<br><br>Pandora FMS コンソールが "
-"<i>include/config.php</i>ファイルを見つけられないか、このファイルの\n"
-"\t\tパーミッションが不正または HTTP サーバから読めません。問題解決には、ドキュメントを確認してください。</i>"
+"データベースから設定値を読み込めません。<b>include/config.php</b> ファイル内の\n"
+"\t\tデータベース設定を確認してください。<br><br>\n"
+"\t\tデータベーススキーマは作成されていますが、データが無い、データベースへのアクセス権の問題、またはスキーマが古い可能性があります。\n"
+"\t\t<br><br>Pandora FMS コンソールが <i>include/config.php</i> ファイルを見つけることができないか\n"
+"\t\tパーミッションが不正で HTTP サーバから読み込めません。問題修正のためにはドキュメントを確認してください。"
 
-#: ../../general/login_page.php:326 ../../include/functions_ui.php:3597
+#: ../../general/login_page.php:419 ../../include/functions_ui.php:3743
 msgid "No configuration file found"
 msgstr "設定ファイルがありません"
 
-#: ../../general/login_page.php:327
+#: ../../general/login_page.php:420
 msgid ""
 "Pandora FMS Console cannot find <i>include/config.php</i> or this file has "
 "invalid\n"
 "\t\tpermissions and HTTP server cannot read it. Please read documentation to "
 "fix this problem."
 msgstr ""
-"Pandora FMS コンソールが <i>include/config.php</i>ファイルを見つけられないか、このファイルの\n"
-"\t\tパーミッションが不正または HTTP サーバから読めません。問題解決には、ドキュメントを確認してください。"
+"Pandora FMS コンソールが <i>include/config.php</i> を見つけられないか、このファイルのパーミッション\n"
+"\t\tが不正で HTTP サーバが読み込めません。この問題を修正するにはドキュメントを参照してください。"
 
-#: ../../general/login_page.php:338 ../../include/functions_ui.php:3609
+#: ../../general/login_page.php:431 ../../include/functions_ui.php:3755
 #, php-format
 msgid "You may try to run the %s<b>installation wizard</b>%s to create one."
 msgstr "作成するには、%s<b>インストールウィザード</b>%s を実行します。"
 
-#: ../../general/login_page.php:341 ../../include/functions_ui.php:3612
+#: ../../general/login_page.php:434 ../../include/functions_ui.php:3758
 msgid "Installer active"
 msgstr "インストーラが有効です"
 
-#: ../../general/login_page.php:342
+#: ../../general/login_page.php:435
 msgid ""
 "For security reasons, normal operation is not possible until you delete "
 "installer file.\n"
 "\t\tPlease delete the <i>./install.php</i> file before running Pandora FMS "
 "Console."
 msgstr ""
-"セキュリティ上の理由により、インストーラのファイルを削除するまで通常の操作はできません。\n"
+"セキュリティ上の理由jにより、インストーラファイルを削除するまで通常の操作はできません。\n"
 "\t\tPandora FMS コンソールを実行する前に <i>./install.php</i> ファイルを削除してください。"
 
-#: ../../general/login_page.php:346 ../../include/functions_ui.php:3617
+#: ../../general/login_page.php:439 ../../include/functions_ui.php:3763
 msgid "Bad permission for include/config.php"
 msgstr "include/config.php のパーミッションが不正です"
 
-#: ../../general/login_page.php:347
+#: ../../general/login_page.php:440
 msgid ""
 "For security reasons, <i>config.php</i> must have restrictive permissions, "
 "and \"other\" users\n"
@@ -5343,32 +5618,32 @@ msgid ""
 "\t\tpermissions for <i>include/config.php</i> file. Please do it, it is for "
 "your security."
 msgstr ""
-"セキュリティ上の理由により、<i>config.php</i> のパーミッションは限定する必要があります。また、\n"
-"\t\t\"other\"ユーザは、読み書きできないようにする必要があります。owner(通常は www-data や\n"
-"\t\thttp のデーモンユーザ)のみが書き込めるようにします。<i>include/config.php</i> ファイルの\n"
-"\t\tパーミッションを変更するまで通常の操作はできません。セキュリティのために設定をしてください。"
+"セキュリティ上の理由により、<i>config.php</i> は制限したパーミッションでなければいけません。\n"
+"\t\t\"other\"ユーザが読み書きできなようにし、所有者(通常は www-data または http デーモンのユーザ)\n"
+"\t\tのみが書けるようにする必要があります。<i>config.php</i>のパーミッションを変更するまで\n"
+"\t\t通常の操作はできません。セキュリティのために対応してください。"
 
-#: ../../general/login_page.php:353
+#: ../../general/login_page.php:446
 msgid "Bad defined homedir"
-msgstr "homedir 設定が不正です"
+msgstr "homedir の定義が不正です"
 
-#: ../../general/login_page.php:354
+#: ../../general/login_page.php:447
 msgid ""
 "In the config.php file in the variable $config[\"homedir\"] = add the "
 "correct path"
-msgstr "config.php ファイル内の $config[\"homedir\"] = に正しいパスを追加してください"
+msgstr "config.php ファイル内で、$config[\"homedir\"] = に正しいパスを設定してください。"
 
-#: ../../general/login_page.php:357
+#: ../../general/login_page.php:450
 msgid "Bad defined homeurl or homeurl_static"
-msgstr "homeurl または homeurl_static 設定が不正です"
+msgstr "homeurl または homeurl_static の定義が不正です"
 
-#: ../../general/login_page.php:358
+#: ../../general/login_page.php:451
 msgid ""
 "In the config.php file in the variable $config[\"homeurl\"] or "
 "$config[\"homeurl_static\"] = add the correct path"
 msgstr ""
-"config.php ファイル内の $config[\"homeurl\"] または $config[\"homeurl_statis\"] = "
-"に正しいパスを追加してください"
+"config.php ファイルで $config[\"homeurl\"] または $config[\"homeurl_static\"] "
+"に正しいパスを設定してください。"
 
 #: ../../general/login_required.php:72
 msgid ""
@@ -5380,72 +5655,83 @@ msgstr "Pandora FMS インスタンスを正しく設定するために、以下
 #: ../../godmode/setup/setup_general.php:52
 #: ../../include/functions_config.php:129
 #: ../../enterprise/meta/advanced/metasetup.setup.php:119
-#: ../../enterprise/meta/include/functions_meta.php:358
+#: ../../enterprise/meta/include/functions_meta.php:337
 msgid "Language code for Pandora"
 msgstr "Pandoraの言語"
 
 #: ../../general/login_required.php:91
 #: ../../godmode/setup/setup_general.php:115
+#: ../../include/functions_visual_map_editor.php:227
 #: ../../enterprise/meta/advanced/metasetup.setup.php:148
 msgid "Africa"
 msgstr "アフリカ"
 
 #: ../../general/login_required.php:91
 #: ../../godmode/setup/setup_general.php:115
+#: ../../include/functions_visual_map_editor.php:227
 #: ../../enterprise/meta/advanced/metasetup.setup.php:149
 msgid "America"
 msgstr "アメリカ"
 
 #: ../../general/login_required.php:91
 #: ../../godmode/setup/setup_general.php:115
+#: ../../include/functions_visual_map_editor.php:227
 #: ../../enterprise/meta/advanced/metasetup.setup.php:150
 msgid "Antarctica"
 msgstr "南極大陸"
 
 #: ../../general/login_required.php:91
 #: ../../godmode/setup/setup_general.php:115
+#: ../../include/functions_visual_map_editor.php:227
 #: ../../enterprise/meta/advanced/metasetup.setup.php:151
 msgid "Arctic"
 msgstr "北極"
 
 #: ../../general/login_required.php:91
 #: ../../godmode/setup/setup_general.php:115
+#: ../../include/functions_visual_map_editor.php:227
 #: ../../enterprise/meta/advanced/metasetup.setup.php:152
 msgid "Asia"
 msgstr "アジア"
 
 #: ../../general/login_required.php:91
 #: ../../godmode/setup/setup_general.php:115
+#: ../../include/functions_visual_map_editor.php:227
 #: ../../enterprise/meta/advanced/metasetup.setup.php:153
 msgid "Atlantic"
 msgstr "大西洋"
 
 #: ../../general/login_required.php:91
 #: ../../godmode/setup/setup_general.php:115
+#: ../../include/functions_visual_map_editor.php:227
 #: ../../enterprise/meta/advanced/metasetup.setup.php:154
 msgid "Australia"
 msgstr "オーストラリア"
 
 #: ../../general/login_required.php:91
 #: ../../godmode/setup/setup_general.php:115
+#: ../../include/functions_visual_map_editor.php:227
 #: ../../enterprise/meta/advanced/metasetup.setup.php:155
 msgid "Europe"
 msgstr "ヨーロッパ"
 
 #: ../../general/login_required.php:91
 #: ../../godmode/setup/setup_general.php:115
+#: ../../include/functions_visual_map_editor.php:227
 #: ../../enterprise/meta/advanced/metasetup.setup.php:156
 msgid "Indian"
 msgstr "インド"
 
 #: ../../general/login_required.php:91
 #: ../../godmode/setup/setup_general.php:115
+#: ../../include/functions_visual_map_editor.php:227
 #: ../../enterprise/meta/advanced/metasetup.setup.php:157
 msgid "Pacific"
 msgstr "太平洋"
 
 #: ../../general/login_required.php:91
 #: ../../godmode/setup/setup_general.php:115
+#: ../../include/functions_visual_map_editor.php:227
 #: ../../enterprise/meta/advanced/metasetup.setup.php:158
 msgid "UTC"
 msgstr "UTC"
@@ -5454,7 +5740,7 @@ msgstr "UTC"
 #: ../../godmode/setup/setup_general.php:135
 #: ../../include/functions_config.php:166
 #: ../../enterprise/meta/advanced/metasetup.setup.php:177
-#: ../../enterprise/meta/include/functions_meta.php:408
+#: ../../enterprise/meta/include/functions_meta.php:387
 msgid "Timezone setup"
 msgstr "タイムゾーン設定"
 
@@ -5475,13 +5761,15 @@ msgstr "登録"
 
 #: ../../general/login_required.php:127
 #: ../../godmode/setup/snmp_wizard.php:109
-#: ../../godmode/update_manager/update_manager.offline.php:65
-#: ../../include/functions_update_manager.php:365
-#: ../../include/functions_visual_map_editor.php:464
-#: ../../include/functions_visual_map_editor.php:472
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:167
+#: ../../godmode/update_manager/update_manager.offline.php:72
+#: ../../include/functions_pandora_networkmap.php:1015
+#: ../../include/functions_update_manager.php:372
+#: ../../include/functions_visual_map_editor.php:622
+#: ../../include/functions_visual_map_editor.php:630
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:186
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:227
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:194
-#: ../../enterprise/include/functions_update_manager.php:197
+#: ../../enterprise/include/functions_update_manager.php:204
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -5494,9 +5782,9 @@ msgstr "全フィールドが必須です"
 #: ../../include/ajax/double_auth.ajax.php:344
 #: ../../include/ajax/double_auth.ajax.php:389
 #: ../../include/ajax/double_auth.ajax.php:503
-#: ../../operation/users/user_edit.php:693
-#: ../../operation/users/user_edit.php:758
-#: ../../operation/users/user_edit.php:829
+#: ../../operation/users/user_edit.php:704
+#: ../../operation/users/user_edit.php:769
+#: ../../operation/users/user_edit.php:840
 msgid "Authentication error"
 msgstr "認証エラー"
 
@@ -5520,6 +5808,8 @@ msgid "News board"
 msgstr "ニュースボード"
 
 #: ../../general/logon_ok.php:186 ../../general/logon_ok.php:385
+#: ../../enterprise/operation/agentes/wux_console_view.php:251
+#: ../../enterprise/operation/agentes/wux_console_view.php:286
 msgid "ago"
 msgstr "前"
 
@@ -5529,7 +5819,7 @@ msgstr "発行者:"
 
 #: ../../general/logon_ok.php:227 ../../general/logon_ok.php:424
 #: ../../godmode/admin_access_logs.php:191
-#: ../../include/functions_reporting_html.php:3599
+#: ../../include/functions_reporting_html.php:3712
 #: ../../mobile/operation/tactical.php:311
 #: ../../operation/snmpconsole/snmp_statistics.php:140
 msgid "Source IP"
@@ -5538,13 +5828,14 @@ msgstr "ソースIP"
 #: ../../general/logon_ok.php:228 ../../general/logon_ok.php:425
 #: ../../godmode/admin_access_logs.php:192
 #: ../../godmode/servers/manage_recontask_form.php:371
-#: ../../godmode/users/configure_user.php:485
-#: ../../include/ajax/events.php:302 ../../include/functions.php:2316
-#: ../../include/functions_reporting_html.php:3600
+#: ../../godmode/users/configure_user.php:548
+#: ../../include/ajax/events.php:347 ../../include/functions.php:2340
+#: ../../include/functions_reporting_html.php:3713
 #: ../../mobile/operation/events.php:518
-#: ../../operation/users/user_edit.php:448
+#: ../../operation/users/user_edit.php:459
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:93
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:206
+#: ../../enterprise/extensions/ipam/ipam_excel.php:124
 #: ../../enterprise/extensions/ipam/ipam_massive.php:69
 #: ../../enterprise/extensions/ipam/ipam_network.php:543
 #: ../../enterprise/extensions/ipam/ipam_network.php:654
@@ -5556,8 +5847,8 @@ msgid "This is your last activity in Pandora FMS console"
 msgstr "Pandora FMS コンソールにおける最近の操作"
 
 #: ../../general/noaccess2.php:18 ../../general/noaccess2.php:21
-#: ../../mobile/index.php:240 ../../mobile/operation/agent.php:66
-#: ../../mobile/operation/agents.php:145 ../../mobile/operation/alerts.php:141
+#: ../../mobile/index.php:232 ../../mobile/operation/agent.php:87
+#: ../../mobile/operation/agents.php:166 ../../mobile/operation/alerts.php:141
 #: ../../mobile/operation/events.php:430 ../../mobile/operation/groups.php:53
 #: ../../mobile/operation/module_graph.php:270
 #: ../../mobile/operation/modules.php:173
@@ -5595,31 +5886,37 @@ msgstr ""
 msgid "Pandora FMS help system"
 msgstr "Pandora FMS ヘルプシステム"
 
-#: ../../general/pandora_help.php:74
+#: ../../general/pandora_help.php:75
 msgid "Help system error"
 msgstr "ヘルプシステムエラー"
 
-#: ../../general/pandora_help.php:79
+#: ../../general/pandora_help.php:80
 msgid ""
 "Pandora FMS help system has been called with a help reference that currently "
 "don't exist. There is no help content to show."
 msgstr "Pandora FMS ヘルプシステムが呼び出されましたが、表示するヘルプが存在しません。"
 
 #: ../../general/ui/agents_list.php:80 ../../general/ui/agents_list.php:91
-#: ../../godmode/agentes/modificar_agente.php:169
-#: ../../godmode/agentes/modificar_agente.php:173
+#: ../../godmode/agentes/modificar_agente.php:194
+#: ../../godmode/agentes/modificar_agente.php:200
 #: ../../godmode/agentes/module_manager.php:45
 #: ../../godmode/agentes/planned_downtime.list.php:141
 #: ../../godmode/agentes/planned_downtime.list.php:177
-#: ../../godmode/alerts/alert_templates.php:256
-#: ../../godmode/alerts/alert_templates.php:260
+#: ../../godmode/alerts/alert_templates.php:257
+#: ../../godmode/alerts/alert_templates.php:261
 #: ../../godmode/modules/manage_network_components.php:524
-#: ../../godmode/reporting/reporting_builder.php:439
-#: ../../godmode/users/user_list.php:230 ../../godmode/users/user_list.php:234
-#: ../../include/functions_snmp_browser.php:556
-#: ../../operation/agentes/estado_agente.php:180
-#: ../../operation/agentes/estado_agente.php:198
-#: ../../operation/agentes/status_monitor.php:336
+#: ../../godmode/reporting/map_builder.php:229
+#: ../../godmode/reporting/map_builder.php:248
+#: ../../godmode/reporting/reporting_builder.item_editor.php:720
+#: ../../godmode/reporting/reporting_builder.php:473
+#: ../../godmode/reporting/visual_console_favorite.php:55
+#: ../../godmode/reporting/visual_console_favorite.php:72
+#: ../../godmode/users/user_list.php:228 ../../godmode/users/user_list.php:232
+#: ../../include/functions_snmp_browser.php:623
+#: ../../include/functions_snmp.php:318
+#: ../../operation/agentes/estado_agente.php:208
+#: ../../operation/agentes/estado_agente.php:231
+#: ../../operation/agentes/status_monitor.php:334
 #: ../../operation/incidents/incident.php:294
 #: ../../operation/search_results.php:161
 #: ../../enterprise/extensions/translate_string.php:265
@@ -5629,12 +5926,14 @@ msgstr "Pandora FMS ヘルプシステムが呼び出されましたが、表示
 #: ../../enterprise/godmode/alerts/alert_events_list.php:368
 #: ../../enterprise/godmode/modules/local_components.php:450
 #: ../../enterprise/godmode/modules/local_components.php:464
-#: ../../enterprise/godmode/policies/policy_agents.php:366
-#: ../../enterprise/godmode/policies/policy_agents.php:371
+#: ../../enterprise/godmode/policies/policy_agents.php:561
+#: ../../enterprise/godmode/policies/policy_agents.php:566
 #: ../../enterprise/godmode/policies/policy_collections.php:182
+#: ../../enterprise/godmode/reporting/cluster_list.php:109
+#: ../../enterprise/godmode/reporting/cluster_list.php:128
 #: ../../enterprise/meta/advanced/metasetup.translate_string.php:138
-#: ../../enterprise/meta/agentsearch.php:69
-#: ../../enterprise/meta/general/main_header.php:486
+#: ../../enterprise/meta/agentsearch.php:78
+#: ../../enterprise/meta/general/main_header.php:488
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:228
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:318
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:379
@@ -5642,10 +5941,11 @@ msgstr "Pandora FMS ヘルプシステムが呼び出されましたが、表示
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:560
 #: ../../enterprise/operation/agentes/agent_inventory.php:90
 #: ../../enterprise/operation/agentes/agent_inventory.php:95
-#: ../../enterprise/operation/inventory/inventory.php:179
-#: ../../enterprise/operation/inventory/inventory.php:219
-#: ../../enterprise/operation/log/log_viewer.php:170
-#: ../../enterprise/operation/log/log_viewer.php:238
+#: ../../enterprise/operation/agentes/tag_view.php:139
+#: ../../enterprise/operation/inventory/inventory.php:180
+#: ../../enterprise/operation/inventory/inventory.php:220
+#: ../../enterprise/operation/log/log_viewer.php:187
+#: ../../enterprise/operation/log/log_viewer.php:254
 #: ../../enterprise/operation/services/services.list.php:164
 #: ../../enterprise/operation/services/services.list.php:203
 #: ../../enterprise/operation/services/services.table_services.php:133
@@ -5653,8 +5953,20 @@ msgstr "Pandora FMS ヘルプシステムが呼び出されましたが、表示
 msgid "Search"
 msgstr "検索"
 
+#: ../../general/ui/agents_list.php:121
+#: ../../godmode/massive/massive_copy_modules.php:169
+#: ../../operation/reporting/reporting_viewer.php:234
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:148
+#: ../../enterprise/godmode/policies/policy_modules.php:1340
+#: ../../enterprise/meta/monitoring/wizard/wizard.php:106
+#: ../../enterprise/operation/log/log_viewer.php:262
+#: ../../enterprise/operation/log/log_viewer.php:268
+msgid "Loading"
+msgstr "読み込み中"
+
 #: ../../general/ui/agents_list.php:127
-#: ../../enterprise/extensions/vmware/vmware_view.php:1363
+#: ../../enterprise/extensions/vmware/vmware_view.php:1440
+#: ../../enterprise/godmode/reporting/cluster_view.php:486
 #: ../../enterprise/operation/policies/networkmap.policies.php:71
 msgid "No agents found"
 msgstr "エージェントがありません"
@@ -5673,19 +5985,19 @@ msgstr "ログ一覧"
 #: ../../godmode/modules/manage_network_templates_form.php:244
 #: ../../godmode/modules/manage_network_templates_form.php:300
 #: ../../godmode/netflow/nf_item_list.php:148
-#: ../../godmode/reporting/reporting_builder.item_editor.php:663
+#: ../../godmode/reporting/reporting_builder.item_editor.php:679
 #: ../../godmode/reporting/reporting_builder.list_items.php:177
 #: ../../godmode/reporting/reporting_builder.list_items.php:200
 #: ../../godmode/snmpconsole/snmp_alert.php:1014
-#: ../../godmode/snmpconsole/snmp_filters.php:96
-#: ../../godmode/snmpconsole/snmp_filters.php:132
+#: ../../godmode/snmpconsole/snmp_filters.php:151
+#: ../../godmode/snmpconsole/snmp_filters.php:225
 #: ../../godmode/tag/tag.php:161
 #: ../../operation/agentes/alerts_status.functions.php:116
 #: ../../operation/agentes/alerts_status.functions.php:126
-#: ../../operation/agentes/estado_monitores.php:474
-#: ../../operation/agentes/graphs.php:159
+#: ../../operation/agentes/estado_monitores.php:487
+#: ../../operation/agentes/graphs.php:194
 #: ../../operation/incidents/incident.php:230
-#: ../../operation/netflow/nf_live_view.php:320 ../../operation/tree.php:147
+#: ../../operation/netflow/nf_live_view.php:320 ../../operation/tree.php:160
 #: ../../enterprise/extensions/backup/main.php:87
 #: ../../enterprise/extensions/ipam/ipam_network.php:328
 #: ../../enterprise/godmode/agentes/manage_config_remote.php:150
@@ -5693,8 +6005,8 @@ msgstr "ログ一覧"
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:230
 #: ../../enterprise/godmode/policies/policies.php:239
 #: ../../enterprise/godmode/policies/policy_linking.php:68
-#: ../../enterprise/godmode/policies/policy_queue.php:354
-#: ../../enterprise/godmode/setup/setup_acl.php:207
+#: ../../enterprise/godmode/policies/policy_queue.php:374
+#: ../../enterprise/godmode/setup/setup_acl.php:416
 #: ../../enterprise/godmode/setup/setup_skins.php:91
 #: ../../enterprise/meta/advanced/policymanager.queue.php:228
 #: ../../enterprise/operation/services/services.list.php:293
@@ -5721,7 +6033,7 @@ msgstr "検索文字列 (*)"
 #: ../../godmode/admin_access_logs.php:68
 #: ../../godmode/events/event_edit_filter.php:281
 #: ../../mobile/operation/events.php:647
-#: ../../operation/events/events_list.php:579
+#: ../../operation/events/events_list.php:644
 #: ../../enterprise/dashboard/widgets/events_list.php:38
 #: ../../enterprise/dashboard/widgets/top_n_events_by_group.php:33
 #: ../../enterprise/dashboard/widgets/top_n_events_by_module.php:33
@@ -5769,8 +6081,8 @@ msgid "Altitude: "
 msgstr "高度: "
 
 #: ../../godmode/agentes/agent_conf_gis.php:78
-#: ../../godmode/agentes/agent_manager.php:410
-#: ../../godmode/massive/massive_edit_agents.php:410
+#: ../../godmode/agentes/agent_manager.php:429
+#: ../../godmode/massive/massive_edit_agents.php:466
 msgid "Ignore new GIS data:"
 msgstr "新たな GIS データを無視する:"
 
@@ -5790,12 +6102,12 @@ msgstr "インシデント"
 #: ../../godmode/alerts/alert_list.list.php:127
 #: ../../godmode/alerts/alert_templates.php:52
 #: ../../godmode/alerts/alert_view.php:102
-#: ../../godmode/alerts/configure_alert_template.php:767
+#: ../../godmode/alerts/configure_alert_template.php:770
 #: ../../godmode/snmpconsole/snmp_alert.php:941
 #: ../../godmode/snmpconsole/snmp_alert.php:1006
-#: ../../include/functions_events.php:2173
-#: ../../include/functions_reporting_html.php:2883
-#: ../../operation/agentes/estado_generalagente.php:407
+#: ../../include/functions_events.php:2274
+#: ../../include/functions_reporting_html.php:2996
+#: ../../operation/agentes/estado_generalagente.php:436
 #: ../../operation/incidents/incident.php:246
 #: ../../operation/incidents/incident.php:338
 #: ../../operation/incidents/incident_detail.php:318
@@ -5803,6 +6115,7 @@ msgstr "インシデント"
 #: ../../enterprise/godmode/massive/massive_delete_alerts_snmp.php:172
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:223
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:276
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:355
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:107
 msgid "Priority"
 msgstr "優先度"
@@ -5819,26 +6132,28 @@ msgstr "更新"
 #: ../../godmode/events/custom_events.php:107
 #: ../../godmode/events/custom_events.php:165
 #: ../../godmode/massive/massive_copy_modules.php:108
-#: ../../godmode/reporting/reporting_builder.item_editor.php:881
+#: ../../godmode/reporting/reporting_builder.item_editor.php:923
 #: ../../include/functions_events.php:47
-#: ../../include/functions_events.php:2146
-#: ../../include/functions_events.php:2261
-#: ../../include/functions_events.php:3594
-#: ../../operation/agentes/pandora_networkmap.editor.php:194
+#: ../../include/functions_events.php:2247
+#: ../../include/functions_events.php:2305
+#: ../../include/functions_events.php:3693
+#: ../../operation/agentes/pandora_networkmap.editor.php:246
 #: ../../operation/events/events.build_table.php:229
 #: ../../operation/incidents/incident.php:341
 #: ../../operation/incidents/incident_detail.php:289
-#: ../../enterprise/include/functions_log.php:346
-#: ../../enterprise/meta/advanced/policymanager.sync.php:295
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:116
+#: ../../enterprise/include/functions_log.php:369
+#: ../../enterprise/meta/advanced/policymanager.sync.php:291
 #: ../../enterprise/meta/advanced/synchronizing.alert.php:332
 #: ../../enterprise/meta/advanced/synchronizing.component.php:310
-#: ../../enterprise/meta/advanced/synchronizing.group.php:147
-#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:91
-#: ../../enterprise/meta/advanced/synchronizing.os.php:91
+#: ../../enterprise/meta/advanced/synchronizing.group.php:152
+#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:75
+#: ../../enterprise/meta/advanced/synchronizing.os.php:75
 #: ../../enterprise/meta/advanced/synchronizing.tag.php:91
-#: ../../enterprise/meta/advanced/synchronizing.user.php:517
+#: ../../enterprise/meta/advanced/synchronizing.user.php:528
 #: ../../enterprise/meta/include/functions_events_meta.php:94
-#: ../../enterprise/operation/log/log_viewer.php:205
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:103
+#: ../../enterprise/operation/log/log_viewer.php:221
 msgid "Source"
 msgstr "ソース"
 
@@ -5846,8 +6161,8 @@ msgstr "ソース"
 #: ../../godmode/events/custom_events.php:113
 #: ../../godmode/events/custom_events.php:167
 #: ../../include/functions_events.php:49
-#: ../../include/functions_events.php:2353
-#: ../../include/functions_events.php:3552
+#: ../../include/functions_events.php:2465
+#: ../../include/functions_events.php:3651
 #: ../../mobile/operation/events.php:477
 #: ../../operation/events/events.build_table.php:179
 #: ../../operation/incidents/incident.php:342
@@ -5857,18 +6172,19 @@ msgid "Owner"
 msgstr "所有者"
 
 #: ../../godmode/agentes/agent_manager.php:155
-#: ../../godmode/agentes/modificar_agente.php:477
+#: ../../godmode/agentes/modificar_agente.php:460
 #: ../../godmode/events/custom_events.php:74
 #: ../../godmode/events/custom_events.php:154
+#: ../../include/functions_treeview.php:561
 #: ../../include/functions_events.php:36
 #: ../../include/functions_events.php:908
-#: ../../include/functions_events.php:3536
-#: ../../include/functions_reporting_html.php:2078
-#: ../../include/functions_treeview.php:555
+#: ../../include/functions_events.php:3635
+#: ../../include/functions_reporting_html.php:2081
 #: ../../mobile/operation/modules.php:495
 #: ../../mobile/operation/modules.php:753
 #: ../../operation/events/events.build_table.php:161
-#: ../../enterprise/include/functions_reporting_pdf.php:2314
+#: ../../enterprise/extensions/ipam/ipam_excel.php:123
+#: ../../enterprise/include/functions_reporting_pdf.php:2395
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1071
 #: ../../enterprise/meta/include/functions_events_meta.php:61
 msgid "Agent name"
@@ -5883,40 +6199,42 @@ msgid "QR Code Agent view"
 msgstr "エージェント表示 QR コード"
 
 #: ../../godmode/agentes/agent_manager.php:166
-#: ../../operation/agentes/estado_agente.php:145 ../../operation/menu.php:54
+#: ../../operation/agentes/estado_agente.php:173 ../../operation/menu.php:55
 msgid "Agent detail"
 msgstr "エージェント詳細"
 
-#: ../../godmode/agentes/agent_manager.php:193
-#: ../../enterprise/godmode/policies/policy_agents.php:428
+#: ../../godmode/agentes/agent_manager.php:190
+#: ../../enterprise/godmode/policies/policy_agents.php:626
 msgid "This agent can be remotely configured"
 msgstr "このエージェントはリモートから設定可能です。"
 
-#: ../../godmode/agentes/agent_manager.php:196
+#: ../../godmode/agentes/agent_manager.php:193
 msgid "You can remotely edit this agent configuration"
 msgstr "このエージェントはリモートから設定可能です。"
 
-#: ../../godmode/agentes/agent_manager.php:203
+#: ../../godmode/agentes/agent_manager.php:200
 msgid "Delete agent"
 msgstr "エージェント削除"
 
-#: ../../godmode/agentes/agent_manager.php:205
+#: ../../godmode/agentes/agent_manager.php:202
+#: ../../enterprise/meta/include/functions_wizard_meta.php:148
+#: ../../enterprise/meta/include/functions_wizard_meta.php:1629
 msgid "Alias"
 msgstr "別名"
 
-#: ../../godmode/agentes/agent_manager.php:208
+#: ../../godmode/agentes/agent_manager.php:205
 msgid "Use alias as name"
 msgstr "名前に別名を利用"
 
-#: ../../godmode/agentes/agent_manager.php:211
-#: ../../godmode/servers/modificar_server.php:47
-#: ../../include/functions_events.php:2028
-#: ../../include/functions_reporting_html.php:2255
-#: ../../include/functions_reporting_html.php:2298
-#: ../../include/functions_treeview.php:575
+#: ../../godmode/agentes/agent_manager.php:208
+#: ../../godmode/servers/modificar_server.php:56
+#: ../../include/functions_treeview.php:581
+#: ../../include/functions_events.php:2128
+#: ../../include/functions_reporting_html.php:2321
+#: ../../include/functions_reporting_html.php:2364
 #: ../../operation/gis_maps/ajax.php:269
-#: ../../enterprise/include/functions_reporting_pdf.php:1844
-#: ../../enterprise/include/functions_reporting_pdf.php:1863
+#: ../../enterprise/include/functions_reporting_pdf.php:1925
+#: ../../enterprise/include/functions_reporting_pdf.php:1944
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1087
 #: ../../enterprise/meta/include/functions_wizard_meta.php:163
 #: ../../enterprise/meta/include/functions_wizard_meta.php:166
@@ -5926,45 +6244,56 @@ msgstr "名前に別名を利用"
 msgid "IP Address"
 msgstr "IP アドレス"
 
-#: ../../godmode/agentes/agent_manager.php:220
+#: ../../godmode/agentes/agent_manager.php:217
 #: ../../godmode/snmpconsole/snmp_alert.php:1331
 #: ../../operation/events/events.build_table.php:770
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:210
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:211
 msgid "Delete selected"
 msgstr "選択範囲を削除します"
 
-#: ../../godmode/agentes/agent_manager.php:238
+#: ../../godmode/agentes/agent_manager.php:235
 msgid "Only it is show when<br />the agent is saved."
 msgstr "エージェントが保存されたときのみ<br />表示されます。"
 
-#: ../../godmode/agentes/agent_manager.php:250
-#: ../../godmode/agentes/planned_downtime.editor.php:713
+#: ../../godmode/agentes/agent_manager.php:247
+#: ../../godmode/agentes/agent_manager.php:332
+#: ../../godmode/agentes/planned_downtime.editor.php:727
 #: ../../godmode/agentes/planned_downtime.list.php:154
 #: ../../godmode/events/event_edit_filter.php:297
 #: ../../godmode/massive/massive_add_action_alerts.php:161
-#: ../../godmode/massive/massive_edit_agents.php:275
+#: ../../godmode/massive/massive_copy_modules.php:136
+#: ../../godmode/massive/massive_delete_modules.php:468
+#: ../../godmode/massive/massive_delete_modules.php:518
+#: ../../godmode/massive/massive_edit_agents.php:328
+#: ../../godmode/massive/massive_edit_modules.php:320
+#: ../../godmode/massive/massive_edit_modules.php:358
+#: ../../godmode/reporting/create_container.php:507
 #: ../../godmode/reporting/visual_console_builder.wizard.php:372
 #: ../../godmode/servers/manage_recontask.php:344
 #: ../../godmode/servers/manage_recontask_form.php:303
-#: ../../godmode/users/configure_user.php:696
-#: ../../include/ajax/visual_console_builder.ajax.php:693
-#: ../../include/functions_visual_map_editor.php:313
-#: ../../include/functions_visual_map_editor.php:698
-#: ../../include/functions_html.php:868 ../../include/functions_html.php:869
-#: ../../include/functions_html.php:870 ../../include/functions_html.php:871
-#: ../../include/functions_html.php:872 ../../include/functions_html.php:875
-#: ../../include/functions_html.php:876 ../../include/functions_html.php:877
-#: ../../include/functions_html.php:878 ../../include/functions_html.php:879
-#: ../../operation/events/events_list.php:441
+#: ../../godmode/users/configure_user.php:810
+#: ../../include/ajax/visual_console_builder.ajax.php:919
+#: ../../include/functions_visual_map_editor.php:404
+#: ../../include/functions_visual_map_editor.php:915
+#: ../../include/functions_visual_map_editor.php:956
+#: ../../include/functions_html.php:958 ../../include/functions_html.php:959
+#: ../../include/functions_html.php:960 ../../include/functions_html.php:961
+#: ../../include/functions_html.php:962 ../../include/functions_html.php:965
+#: ../../include/functions_html.php:966 ../../include/functions_html.php:967
+#: ../../include/functions_html.php:968 ../../include/functions_html.php:969
+#: ../../operation/events/events_list.php:509
 #: ../../enterprise/dashboard/widgets/events_list.php:31
 #: ../../enterprise/godmode/alerts/configure_alert_rule.php:156
 #: ../../enterprise/godmode/alerts/configure_alert_rule.php:159
 #: ../../enterprise/godmode/alerts/configure_alert_rule.php:164
 #: ../../enterprise/godmode/alerts/configure_alert_rule.php:207
-#: ../../enterprise/godmode/setup/setup_acl.php:205
-#: ../../enterprise/godmode/setup/setup_auth.php:66
-#: ../../enterprise/godmode/setup/setup_auth.php:383
-#: ../../enterprise/godmode/setup/setup_auth.php:475
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:135
+#: ../../enterprise/godmode/setup/setup_acl.php:414
+#: ../../enterprise/godmode/setup/setup_auth.php:65
+#: ../../enterprise/godmode/setup/setup_auth.php:190
+#: ../../enterprise/godmode/setup/setup_auth.php:224
+#: ../../enterprise/godmode/setup/setup_auth.php:693
+#: ../../enterprise/godmode/setup/setup_auth.php:785
 #: ../../enterprise/operation/services/services.list.php:176
 #: ../../enterprise/operation/services/services.list.php:193
 #: ../../enterprise/operation/services/services.table_services.php:145
@@ -5972,58 +6301,43 @@ msgstr "エージェントが保存されたときのみ<br />表示されます
 msgid "Any"
 msgstr "任意"
 
-#: ../../godmode/agentes/agent_manager.php:255
-#: ../../godmode/groups/configure_group.php:134
-#: ../../godmode/massive/massive_edit_agents.php:280
-#: ../../godmode/modules/manage_nc_groups_form.php:70
-#: ../../godmode/reporting/visual_console_builder.elements.php:81
-#: ../../include/functions_visual_map_editor.php:528
-#: ../../operation/agentes/estado_generalagente.php:278
-#: ../../operation/agentes/ver_agente.php:854
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1277
-msgid "Parent"
-msgstr "親"
-
-#: ../../godmode/agentes/agent_manager.php:266
-#: ../../godmode/massive/massive_edit_agents.php:291
-msgid "Cascade protection"
-msgstr "関連障害検知抑制"
-
-#: ../../godmode/agentes/agent_manager.php:276
-#: ../../godmode/agentes/module_manager.php:560
-#: ../../godmode/agentes/module_manager_editor_common.php:379
-#: ../../godmode/agentes/module_manager_editor_common.php:405
-#: ../../godmode/massive/massive_edit_agents.php:301
-#: ../../godmode/massive/massive_edit_modules.php:464
+#: ../../godmode/agentes/agent_manager.php:260
+#: ../../godmode/agentes/module_manager.php:563
+#: ../../godmode/agentes/module_manager_editor_common.php:382
+#: ../../godmode/agentes/module_manager_editor_common.php:408
+#: ../../godmode/massive/massive_edit_agents.php:356
+#: ../../godmode/massive/massive_edit_modules.php:484
 #: ../../godmode/modules/manage_network_components_form_common.php:104
 #: ../../godmode/servers/manage_recontask.php:296
 #: ../../godmode/servers/manage_recontask_form.php:259
-#: ../../include/functions_reporting_html.php:2116
 #: ../../include/functions_treeview.php:85
-#: ../../include/functions_treeview.php:581
+#: ../../include/functions_treeview.php:587
+#: ../../include/functions_reporting_html.php:2119
 #: ../../mobile/operation/modules.php:540
 #: ../../mobile/operation/modules.php:543
 #: ../../mobile/operation/modules.php:544
 #: ../../mobile/operation/modules.php:755
-#: ../../operation/agentes/estado_agente.php:512
-#: ../../operation/agentes/estado_generalagente.php:200
-#: ../../operation/agentes/status_monitor.php:966
+#: ../../operation/agentes/estado_agente.php:557
+#: ../../operation/agentes/estado_generalagente.php:229
+#: ../../operation/agentes/status_monitor.php:974
 #: ../../operation/netflow/nf_live_view.php:245
 #: ../../operation/search_agents.php:46 ../../operation/search_agents.php:56
 #: ../../operation/search_modules.php:50
-#: ../../operation/servers/recon_view.php:92
+#: ../../operation/servers/recon_view.php:95
 #: ../../enterprise/extensions/ipam/ipam_list.php:162
 #: ../../enterprise/extensions/ipam/ipam_network.php:125
-#: ../../enterprise/extensions/vmware/main.php:253
+#: ../../enterprise/extensions/vmware/functions.php:571
 #: ../../enterprise/godmode/agentes/inventory_manager.php:174
 #: ../../enterprise/godmode/agentes/inventory_manager.php:236
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:171
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:197
 #: ../../enterprise/godmode/modules/configure_local_component.php:223
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:188
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:244
 #: ../../enterprise/godmode/servers/manage_export.php:131
 #: ../../enterprise/godmode/servers/manage_export_form.php:80
-#: ../../enterprise/include/functions_reporting_pdf.php:2367
-#: ../../enterprise/meta/agentsearch.php:95
+#: ../../enterprise/include/functions_reporting_pdf.php:2448
+#: ../../enterprise/meta/agentsearch.php:104
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1108
 #: ../../enterprise/meta/include/functions_wizard_meta.php:780
 #: ../../enterprise/meta/include/functions_wizard_meta.php:898
@@ -6031,24 +6345,26 @@ msgstr "関連障害検知抑制"
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1360
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1441
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1574
+#: ../../enterprise/operation/agentes/tag_view.php:466
+#: ../../enterprise/operation/agentes/tag_view.php:534
 msgid "Interval"
 msgstr "間隔"
 
-#: ../../godmode/agentes/agent_manager.php:282
-#: ../../godmode/agentes/modificar_agente.php:485
-#: ../../godmode/agentes/planned_downtime.editor.php:755
-#: ../../godmode/massive/massive_edit_agents.php:305
+#: ../../godmode/agentes/agent_manager.php:266
+#: ../../godmode/agentes/modificar_agente.php:468
+#: ../../godmode/agentes/planned_downtime.editor.php:781
+#: ../../godmode/massive/massive_edit_agents.php:360
 #: ../../godmode/servers/manage_recontask.php:296
 #: ../../godmode/servers/manage_recontask_form.php:298
-#: ../../include/functions_events.php:2033
-#: ../../include/functions_reporting_html.php:2080
-#: ../../mobile/operation/agents.php:73 ../../mobile/operation/agents.php:316
-#: ../../operation/agentes/estado_agente.php:507
-#: ../../operation/agentes/estado_generalagente.php:127
+#: ../../include/functions_events.php:2133
+#: ../../include/functions_reporting_html.php:2083
+#: ../../mobile/operation/agents.php:73 ../../mobile/operation/agents.php:339
+#: ../../operation/agentes/estado_agente.php:552
+#: ../../operation/agentes/estado_generalagente.php:156
 #: ../../operation/gis_maps/ajax.php:276 ../../operation/search_agents.php:45
 #: ../../operation/search_agents.php:53 ../../operation/tree.php:55
 #: ../../operation/tree.php:94
-#: ../../enterprise/dashboard/widgets/tree_view.php:38
+#: ../../enterprise/dashboard/widgets/tree_view.php:40
 #: ../../enterprise/extensions/ipam/ipam_network.php:538
 #: ../../enterprise/godmode/modules/configure_local_component.php:168
 #: ../../enterprise/godmode/modules/local_components.php:446
@@ -6056,23 +6372,24 @@ msgstr "間隔"
 #: ../../enterprise/godmode/modules/local_components.php:482
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:156
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:82
-#: ../../enterprise/meta/agentsearch.php:94
+#: ../../enterprise/meta/agentsearch.php:103
+#: ../../enterprise/operation/agentes/tag_view.php:465
 msgid "OS"
 msgstr "OS"
 
-#: ../../godmode/agentes/agent_manager.php:294
-#: ../../godmode/agentes/module_manager.php:554
-#: ../../godmode/massive/massive_edit_agents.php:316
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1226
-#: ../../include/functions_events.php:3515
+#: ../../godmode/agentes/agent_manager.php:278
+#: ../../godmode/agentes/module_manager.php:557
+#: ../../godmode/massive/massive_edit_agents.php:371
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1287
+#: ../../include/functions_events.php:3614
 #: ../../operation/events/events.build_table.php:139
-#: ../../operation/events/events_list.php:448
-#: ../../operation/servers/recon_view.php:173
-#: ../../enterprise/extensions/csv_import/main.php:75
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1401
+#: ../../operation/events/events_list.php:516
+#: ../../operation/servers/recon_view.php:176
+#: ../../enterprise/extensions/csv_import/main.php:95
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1471
 #: ../../enterprise/include/functions_events.php:204
 #: ../../enterprise/meta/advanced/policymanager.queue.php:255
-#: ../../enterprise/meta/agentsearch.php:92
+#: ../../enterprise/meta/agentsearch.php:101
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1081
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1371
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1494
@@ -6081,37 +6398,37 @@ msgstr "OS"
 msgid "Server"
 msgstr "サーバ"
 
-#: ../../godmode/agentes/agent_manager.php:302
-#: ../../godmode/agentes/agent_manager.php:401
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:692
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:771
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:933
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:949
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:965
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:981
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:997
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1012
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1018
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:331
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:409
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:246
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:286
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:416
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:432
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:448
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:464
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:479
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:485
-#: ../../godmode/agentes/module_manager_editor_common.php:429
+#: ../../godmode/agentes/agent_manager.php:286
+#: ../../godmode/agentes/agent_manager.php:420
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:697
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:796
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:958
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:974
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:990
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1006
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1022
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1037
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1043
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:415
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:513
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:289
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:349
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:480
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:496
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:512
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:528
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:543
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:549
+#: ../../godmode/agentes/module_manager_editor_common.php:432
 #: ../../godmode/agentes/module_manager_editor_common.php:631
 #: ../../godmode/agentes/module_manager_editor_common.php:791
 #: ../../godmode/agentes/module_manager_editor_common.php:797
 #: ../../godmode/agentes/module_manager_editor_common.php:806
 #: ../../godmode/agentes/module_manager_editor_common.php:812
 #: ../../godmode/agentes/module_manager_editor_plugin.php:52
-#: ../../godmode/alerts/alert_list.list.php:610
+#: ../../godmode/alerts/alert_list.list.php:611
 #: ../../godmode/alerts/configure_alert_action.php:131
-#: ../../godmode/alerts/configure_alert_template.php:585
+#: ../../godmode/alerts/configure_alert_template.php:588
 #: ../../godmode/events/custom_events.php:213
 #: ../../godmode/events/custom_events.php:224
 #: ../../godmode/events/event_edit_filter.php:422
@@ -6121,27 +6438,28 @@ msgstr "サーバ"
 #: ../../godmode/massive/massive_add_alerts.php:193
 #: ../../godmode/massive/massive_add_tags.php:169
 #: ../../godmode/massive/massive_delete_alerts.php:243
-#: ../../godmode/massive/massive_delete_modules.php:490
-#: ../../godmode/massive/massive_delete_modules.php:564
-#: ../../godmode/massive/massive_delete_modules.php:609
-#: ../../godmode/massive/massive_delete_modules.php:610
-#: ../../godmode/massive/massive_delete_modules.php:611
-#: ../../godmode/massive/massive_delete_modules.php:612
-#: ../../godmode/massive/massive_delete_modules.php:679
+#: ../../godmode/massive/massive_delete_modules.php:511
+#: ../../godmode/massive/massive_delete_modules.php:591
+#: ../../godmode/massive/massive_delete_modules.php:643
+#: ../../godmode/massive/massive_delete_modules.php:644
+#: ../../godmode/massive/massive_delete_modules.php:645
+#: ../../godmode/massive/massive_delete_modules.php:646
+#: ../../godmode/massive/massive_delete_modules.php:712
 #: ../../godmode/massive/massive_delete_tags.php:226
 #: ../../godmode/massive/massive_delete_tags.php:253
 #: ../../godmode/massive/massive_delete_tags.php:289
-#: ../../godmode/massive/massive_edit_agents.php:315
-#: ../../godmode/massive/massive_edit_modules.php:319
-#: ../../godmode/massive/massive_edit_modules.php:536
+#: ../../godmode/massive/massive_edit_agents.php:370
+#: ../../godmode/massive/massive_edit_modules.php:335
 #: ../../godmode/massive/massive_edit_modules.php:564
-#: ../../godmode/massive/massive_edit_modules.php:625
-#: ../../godmode/massive/massive_edit_modules.php:684
-#: ../../godmode/massive/massive_edit_modules.php:769
-#: ../../godmode/massive/massive_edit_modules.php:770
-#: ../../godmode/massive/massive_edit_modules.php:771
-#: ../../godmode/massive/massive_edit_modules.php:772
-#: ../../godmode/massive/massive_edit_modules.php:967
+#: ../../godmode/massive/massive_edit_modules.php:596
+#: ../../godmode/massive/massive_edit_modules.php:673
+#: ../../godmode/massive/massive_edit_modules.php:704
+#: ../../godmode/massive/massive_edit_modules.php:766
+#: ../../godmode/massive/massive_edit_modules.php:932
+#: ../../godmode/massive/massive_edit_modules.php:933
+#: ../../godmode/massive/massive_edit_modules.php:934
+#: ../../godmode/massive/massive_edit_modules.php:935
+#: ../../godmode/massive/massive_edit_modules.php:1160
 #: ../../godmode/massive/massive_edit_plugins.php:284
 #: ../../godmode/modules/manage_nc_groups_form.php:72
 #: ../../godmode/modules/manage_network_components_form.php:455
@@ -6151,17 +6469,18 @@ msgstr "サーバ"
 #: ../../godmode/modules/manage_network_components_form_common.php:191
 #: ../../godmode/modules/manage_network_components_form_plugin.php:24
 #: ../../godmode/netflow/nf_edit_form.php:226
-#: ../../godmode/reporting/graph_builder.graph_editor.php:135
-#: ../../godmode/reporting/graph_builder.graph_editor.php:194
-#: ../../godmode/reporting/graph_builder.graph_editor.php:214
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1077
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1105
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1146
+#: ../../godmode/reporting/create_container.php:432
+#: ../../godmode/reporting/graph_builder.graph_editor.php:301
+#: ../../godmode/reporting/graph_builder.graph_editor.php:360
+#: ../../godmode/reporting/graph_builder.graph_editor.php:380
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1128
 #: ../../godmode/reporting/reporting_builder.item_editor.php:1156
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1181
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1474
-#: ../../godmode/reporting/visual_console_builder.elements.php:288
-#: ../../godmode/reporting/visual_console_builder.elements.php:429
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1197
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1207
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1232
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1568
+#: ../../godmode/reporting/visual_console_builder.elements.php:293
+#: ../../godmode/reporting/visual_console_builder.elements.php:434
 #: ../../godmode/reporting/visual_console_builder.wizard.php:199
 #: ../../godmode/reporting/visual_console_builder.wizard.php:296
 #: ../../godmode/reporting/visual_console_builder.wizard.php:304
@@ -6173,54 +6492,64 @@ msgstr "サーバ"
 #: ../../godmode/reporting/visual_console_builder.wizard.php:613
 #: ../../godmode/servers/manage_recontask_form.php:277
 #: ../../godmode/setup/os.builder.php:40
-#: ../../godmode/setup/setup_visuals.php:315
+#: ../../godmode/setup/setup_visuals.php:557
 #: ../../godmode/snmpconsole/snmp_alert.php:27
 #: ../../godmode/snmpconsole/snmp_alert.php:1008
-#: ../../godmode/users/configure_user.php:510
-#: ../../godmode/users/configure_user.php:682
-#: ../../godmode/users/configure_user.php:686
-#: ../../godmode/users/configure_user.php:691
-#: ../../include/ajax/alert_list.ajax.php:150
+#: ../../godmode/users/configure_user.php:573
+#: ../../godmode/users/configure_user.php:657
+#: ../../godmode/users/configure_user.php:662
+#: ../../godmode/users/configure_user.php:796
+#: ../../godmode/users/configure_user.php:800
+#: ../../godmode/users/configure_user.php:805
+#: ../../include/ajax/alert_list.ajax.php:171
 #: ../../include/ajax/planned_downtime.ajax.php:85
-#: ../../include/functions.php:909 ../../include/functions_events.php:1698
-#: ../../include/functions_events.php:1705
-#: ../../include/functions_visual_map_editor.php:268
-#: ../../include/functions_visual_map_editor.php:353
-#: ../../include/functions_visual_map_editor.php:531
-#: ../../include/functions_html.php:317 ../../include/functions_html.php:480
-#: ../../include/functions_pandora_networkmap.php:267
-#: ../../include/functions_pandora_networkmap.php:753
-#: ../../include/functions_pandora_networkmap.php:1471
-#: ../../include/functions_pandora_networkmap.php:1474
-#: ../../include/functions_pandora_networkmap.php:1525
-#: ../../include/functions_pandora_networkmap.php:1529
-#: ../../include/functions_pandora_networkmap.php:1581
-#: ../../include/functions_pandora_networkmap.php:1586
+#: ../../include/functions.php:909
+#: ../../include/functions_pandora_networkmap.php:424
+#: ../../include/functions_pandora_networkmap.php:997
+#: ../../include/functions_pandora_networkmap.php:1718
+#: ../../include/functions_pandora_networkmap.php:1721
+#: ../../include/functions_pandora_networkmap.php:1772
+#: ../../include/functions_pandora_networkmap.php:1776
+#: ../../include/functions_pandora_networkmap.php:1828
+#: ../../include/functions_pandora_networkmap.php:1833
+#: ../../include/functions_events.php:1690
+#: ../../include/functions_events.php:1697
+#: ../../include/functions_visual_map_editor.php:326
+#: ../../include/functions_visual_map_editor.php:467
+#: ../../include/functions_visual_map_editor.php:692
+#: ../../include/functions_html.php:317 ../../include/functions_html.php:495
 #: ../../mobile/operation/events.php:587
-#: ../../operation/agentes/pandora_networkmap.editor.php:204
-#: ../../operation/agentes/ver_agente.php:813
-#: ../../operation/agentes/ver_agente.php:856
-#: ../../operation/agentes/ver_agente.php:866
-#: ../../operation/events/events_list.php:282
-#: ../../operation/events/events_list.php:891
+#: ../../operation/agentes/pandora_networkmap.editor.php:256
+#: ../../operation/agentes/ver_agente.php:888
+#: ../../operation/agentes/ver_agente.php:931
+#: ../../operation/agentes/ver_agente.php:941
+#: ../../operation/events/events_list.php:351
+#: ../../operation/events/events_list.php:877
 #: ../../operation/netflow/nf_live_view.php:399
-#: ../../operation/snmpconsole/snmp_view.php:423
-#: ../../operation/snmpconsole/snmp_view.php:810
-#: ../../operation/snmpconsole/snmp_view.php:814
-#: ../../operation/users/user_edit.php:323
-#: ../../operation/users/user_edit.php:347
-#: ../../operation/users/user_edit.php:387
-#: ../../operation/users/user_edit.php:401
-#: ../../operation/users/user_edit.php:554
-#: ../../operation/users/user_edit.php:561
-#: ../../operation/users/user_edit.php:570
-#: ../../operation/users/user_edit.php:577
+#: ../../operation/snmpconsole/snmp_view.php:490
+#: ../../operation/snmpconsole/snmp_view.php:922
+#: ../../operation/snmpconsole/snmp_view.php:926
+#: ../../operation/users/user_edit.php:326
+#: ../../operation/users/user_edit.php:350
+#: ../../operation/users/user_edit.php:395
+#: ../../operation/users/user_edit.php:409
+#: ../../operation/users/user_edit.php:565
+#: ../../operation/users/user_edit.php:572
+#: ../../operation/users/user_edit.php:581
+#: ../../operation/users/user_edit.php:588
 #: ../../enterprise/dashboard/widgets/service_map.php:39
 #: ../../enterprise/dashboard/widgets/top_n.php:398
+#: ../../enterprise/dashboard/widgets/ux_transaction.php:69
+#: ../../enterprise/dashboard/widgets/ux_transaction.php:72
+#: ../../enterprise/dashboard/widgets/wux_transaction.php:69
+#: ../../enterprise/dashboard/widgets/wux_transaction.php:72
+#: ../../enterprise/dashboard/widgets/wux_transaction_stats.php:77
+#: ../../enterprise/dashboard/widgets/wux_transaction_stats.php:80
 #: ../../enterprise/extensions/ipam/ipam_network.php:635
-#: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:427
-#: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:558
-#: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:654
+#: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:428
+#: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:559
+#: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:655
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:106
 #: ../../enterprise/godmode/alerts/alert_events.php:468
 #: ../../enterprise/godmode/alerts/alert_events_list.php:595
 #: ../../enterprise/godmode/massive/massive_add_alerts_policy.php:98
@@ -6250,101 +6579,109 @@ msgstr "サーバ"
 #: ../../enterprise/godmode/modules/configure_local_component.php:513
 #: ../../enterprise/godmode/modules/configure_local_component.php:521
 #: ../../enterprise/godmode/modules/configure_local_component.php:527
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:681
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:756
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:917
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:933
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:949
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:965
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:981
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:996
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:1002
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:328
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:403
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:244
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:284
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:414
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:430
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:446
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:462
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:477
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:483
-#: ../../enterprise/godmode/policies/policy_agents.php:223
-#: ../../enterprise/godmode/policies/policy_agents.php:653
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:686
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:781
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:942
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:958
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:974
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:990
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:1006
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:1021
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:1027
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:404
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:499
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:288
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:348
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:479
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:495
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:511
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:527
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:542
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:548
+#: ../../enterprise/godmode/policies/policy_agents.php:339
+#: ../../enterprise/godmode/policies/policy_agents.php:1051
 #: ../../enterprise/godmode/policies/policy_alerts.php:459
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:273
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:138
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:344
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:363
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:374
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:389
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:421
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:59
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:336
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:353
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:369
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:385
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:409
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:425
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:467
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:500
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:509
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:528
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:665
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:729
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:744
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:754
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:768
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1745
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1832
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:252
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:699
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:720
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:735
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:745
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:755
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:759
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:786
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:57
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:422
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:438
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:459
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:468
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:625
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:653
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:672
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:699
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:141
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:347
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:366
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:377
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:392
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:424
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:60
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:350
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:367
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:383
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:399
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:423
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:439
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:481
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:514
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:523
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:542
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:666
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:730
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:745
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:755
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:769
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1856
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1964
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:253
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:700
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:721
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:736
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:746
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:756
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:760
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:787
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:76
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:591
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:607
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:628
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:637
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:999
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:1027
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:1046
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:1073
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:75
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:222
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:274
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:282
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:292
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:314
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:332
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:365
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:352
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:385
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:395
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:416
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:405
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:415
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:436
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:461
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:480
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:456
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:481
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:500
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:520
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:158
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:190
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:196
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:208
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:218
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:863
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:926
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:941
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:951
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:975
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:990
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:1000
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:1015
 #: ../../enterprise/godmode/servers/manage_export_form.php:73
-#: ../../enterprise/godmode/setup/setup.php:332
-#: ../../enterprise/godmode/setup/setup.php:338
-#: ../../enterprise/godmode/setup/setup.php:346
-#: ../../enterprise/godmode/setup/setup.php:352
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:148
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:258
-#: ../../enterprise/meta/advanced/metasetup.setup.php:277
-#: ../../enterprise/meta/advanced/metasetup.setup.php:283
+#: ../../enterprise/godmode/setup/setup.php:384
+#: ../../enterprise/godmode/setup/setup.php:390
+#: ../../enterprise/godmode/setup/setup.php:398
+#: ../../enterprise/godmode/setup/setup.php:404
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:645
+#: ../../enterprise/meta/advanced/metasetup.setup.php:287
 #: ../../enterprise/meta/advanced/metasetup.setup.php:293
-#: ../../enterprise/meta/advanced/metasetup.setup.php:299
+#: ../../enterprise/meta/advanced/metasetup.setup.php:303
+#: ../../enterprise/meta/advanced/metasetup.setup.php:309
+#: ../../enterprise/meta/advanced/metasetup.visual.php:133
 #: ../../enterprise/meta/event/custom_events.php:211
 #: ../../enterprise/meta/event/custom_events.php:222
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:232
@@ -6353,60 +6690,99 @@ msgstr "サーバ"
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:491
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:564
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:100
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:135
 #: ../../enterprise/operation/agentes/ver_agente.php:36
 msgid "None"
 msgstr "なし"
 
-#: ../../godmode/agentes/agent_manager.php:323
-#: ../../godmode/agentes/module_manager_editor_common.php:361
+#: ../../godmode/agentes/agent_manager.php:307
+#: ../../godmode/agentes/module_manager_editor_common.php:360
 #: ../../godmode/groups/configure_group.php:178
-#: ../../godmode/massive/massive_edit_agents.php:352
+#: ../../godmode/massive/massive_edit_agents.php:407
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:158
 msgid "Custom ID"
 msgstr "カスタムID"
 
-#: ../../godmode/agentes/agent_manager.php:327
-#: ../../godmode/massive/massive_edit_agents.php:356
+#: ../../godmode/agentes/agent_manager.php:310
+#: ../../godmode/groups/configure_group.php:134
+#: ../../godmode/massive/massive_edit_agents.php:333
+#: ../../godmode/modules/manage_nc_groups_form.php:70
+#: ../../godmode/reporting/visual_console_builder.elements.php:81
+#: ../../include/functions_visual_map_editor.php:689
+#: ../../operation/agentes/estado_generalagente.php:307
+#: ../../operation/agentes/ver_agente.php:929
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1277
+msgid "Parent"
+msgstr "親"
+
+#: ../../godmode/agentes/agent_manager.php:324
+#: ../../godmode/massive/massive_edit_agents.php:346
+msgid "Cascade protection"
+msgstr "関連障害検知抑制"
+
+#: ../../godmode/agentes/agent_manager.php:337
+msgid "Safe operation mode"
+msgstr "セーフオペレーションモード"
+
+#: ../../godmode/agentes/agent_manager.php:338
+msgid ""
+"This mode allow Pandora FMS to disable all modules \n"
+"\t\tof this agent while the selected module is on CRITICAL status"
+msgstr ""
+"このモードは、選択したモジュールが障害状態の間、このエージェントの\n"
+"\t\t全モジュールを Pandora FMS が無効化することができます。"
+
+#: ../../godmode/agentes/agent_manager.php:346
+#: ../../godmode/massive/massive_edit_agents.php:411
 msgid "Module definition"
 msgstr "モジュール定義"
 
-#: ../../godmode/agentes/agent_manager.php:329
-#: ../../godmode/massive/massive_edit_agents.php:358
+#: ../../godmode/agentes/agent_manager.php:348
+#: ../../godmode/massive/massive_edit_agents.php:413
 msgid "Learning mode"
 msgstr "学習モード"
 
-#: ../../godmode/agentes/agent_manager.php:332
-#: ../../godmode/massive/massive_edit_agents.php:359
+#: ../../godmode/agentes/agent_manager.php:351
+#: ../../godmode/massive/massive_edit_agents.php:414
 msgid "Normal mode"
 msgstr "通常モード"
 
-#: ../../godmode/agentes/agent_manager.php:335
+#: ../../godmode/agentes/agent_manager.php:354
+#: ../../godmode/massive/massive_edit_agents.php:415
 msgid "Autodisable mode"
 msgstr "自動無効化モード"
 
-#: ../../godmode/agentes/agent_manager.php:341
-#: ../../godmode/agentes/modificar_agente.php:562
+#: ../../godmode/agentes/agent_manager.php:360
+#: ../../godmode/agentes/modificar_agente.php:547
 #: ../../godmode/agentes/module_manager_editor_common.php:172
-#: ../../godmode/agentes/module_manager_editor_common.php:471
+#: ../../godmode/agentes/module_manager_editor_common.php:474
+#: ../../godmode/alerts/alert_list.list.php:136
 #: ../../godmode/alerts/alert_view.php:516
-#: ../../godmode/alerts/configure_alert_template.php:663
-#: ../../godmode/massive/massive_edit_agents.php:364
-#: ../../godmode/massive/massive_edit_modules.php:467
-#: ../../include/functions_groups.php:2158
-#: ../../include/functions_reporting.php:3604
-#: ../../include/functions_reporting_html.php:2095
+#: ../../godmode/alerts/configure_alert_template.php:666
+#: ../../godmode/massive/massive_edit_agents.php:420
+#: ../../godmode/massive/massive_edit_modules.php:487
+#: ../../include/functions_reporting.php:3721
 #: ../../include/functions_treeview.php:74
-#: ../../include/functions_treeview.php:551
-#: ../../mobile/operation/agent.php:124 ../../mobile/operation/alerts.php:40
+#: ../../include/functions_treeview.php:557
+#: ../../include/functions_groups.php:2152
+#: ../../include/functions_reporting_html.php:2098
+#: ../../mobile/operation/agent.php:151 ../../mobile/operation/alerts.php:40
 #: ../../operation/agentes/alerts_status.functions.php:76
-#: ../../operation/agentes/estado_generalagente.php:79
-#: ../../operation/agentes/estado_generalagente.php:294
+#: ../../operation/agentes/estado_generalagente.php:86
+#: ../../operation/agentes/estado_generalagente.php:89
+#: ../../operation/agentes/estado_generalagente.php:323
 #: ../../operation/search_agents.php:91
 #: ../../enterprise/extensions/vmware/functions.php:20
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:86
 #: ../../enterprise/godmode/modules/configure_local_component.php:287
+#: ../../enterprise/godmode/policies/policy_agents.php:479
+#: ../../enterprise/godmode/policies/policy_agents.php:498
+#: ../../enterprise/godmode/policies/policy_agents.php:1085
+#: ../../enterprise/godmode/policies/policy_agents.php:1102
 #: ../../enterprise/godmode/setup/edit_skin.php:248
-#: ../../enterprise/include/functions_reporting_pdf.php:2347
-#: ../../enterprise/meta/agentsearch.php:160
-#: ../../enterprise/meta/agentsearch.php:168
+#: ../../enterprise/include/functions_reporting_pdf.php:2428
+#: ../../enterprise/meta/agentsearch.php:211
+#: ../../enterprise/meta/agentsearch.php:219
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:408
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:680
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:890
@@ -6422,83 +6798,85 @@ msgstr "自動無効化モード"
 msgid "Disabled"
 msgstr "無効"
 
-#: ../../godmode/agentes/agent_manager.php:343
-#: ../../godmode/massive/massive_edit_agents.php:365
+#: ../../godmode/agentes/agent_manager.php:362
+#: ../../godmode/massive/massive_edit_agents.php:421
 msgid "Active"
 msgstr "有効"
 
-#: ../../godmode/agentes/agent_manager.php:347
-#: ../../godmode/agentes/configurar_agente.php:441
-#: ../../godmode/agentes/configurar_agente.php:553
-#: ../../godmode/massive/massive_edit_agents.php:368
-#: ../../godmode/servers/servers.build_table.php:165
-#: ../../operation/agentes/estado_generalagente.php:292
-#: ../../enterprise/godmode/policies/policy_agents.php:378
+#: ../../godmode/agentes/agent_manager.php:366
+#: ../../godmode/agentes/configurar_agente.php:464
+#: ../../godmode/agentes/configurar_agente.php:580
+#: ../../godmode/massive/massive_edit_agents.php:424
+#: ../../godmode/servers/servers.build_table.php:173
+#: ../../operation/agentes/estado_generalagente.php:321
+#: ../../enterprise/godmode/policies/policy_agents.php:573
 msgid "Remote configuration"
 msgstr "リモート設定"
 
-#: ../../godmode/agentes/agent_manager.php:350
-#: ../../godmode/agentes/agent_manager.php:372
-#: ../../godmode/massive/massive_edit_agents.php:375
+#: ../../godmode/agentes/agent_manager.php:369
+#: ../../godmode/agentes/agent_manager.php:391
+#: ../../godmode/massive/massive_edit_agents.php:431
 msgid "Not available"
 msgstr "利用できません"
 
-#: ../../godmode/agentes/agent_manager.php:363
+#: ../../godmode/agentes/agent_manager.php:382
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:207
 #: ../../enterprise/godmode/servers/server_disk_conf_editor.php:163
 msgid "Delete remote configuration file"
 msgstr "リモート設定ファイル削除"
 
-#: ../../godmode/agentes/agent_manager.php:366
+#: ../../godmode/agentes/agent_manager.php:385
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:208
 msgid ""
 "Delete this conf file implies that for restore you must reactive remote "
 "config in the local agent."
 msgstr "この設定を削除した場合、元に戻すにはローカルエージェントのリモート設定を再有効化する必要があります。"
 
-#: ../../godmode/agentes/agent_manager.php:381
-#: ../../godmode/massive/massive_edit_agents.php:401
+#: ../../godmode/agentes/agent_manager.php:400
+#: ../../godmode/massive/massive_edit_agents.php:457
 msgid "Agent icon"
 msgstr "エージェントアイコン"
 
-#: ../../godmode/agentes/agent_manager.php:381
+#: ../../godmode/agentes/agent_manager.php:400
 msgid "Agent icon for GIS Maps."
 msgstr "GISマップのエージェントアイコン"
 
-#: ../../godmode/agentes/agent_manager.php:419
-#: ../../include/functions_treeview.php:668
-#: ../../operation/agentes/estado_generalagente.php:329
-#: ../../operation/agentes/ver_agente.php:1035
+#: ../../godmode/agentes/agent_manager.php:438
+#: ../../include/functions_treeview.php:674
+#: ../../operation/agentes/estado_generalagente.php:358
+#: ../../operation/agentes/ver_agente.php:1129
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1144
 msgid "Url address"
 msgstr "URLアドレス"
 
-#: ../../godmode/agentes/agent_manager.php:423
-#: ../../godmode/agentes/modificar_agente.php:541
-#: ../../godmode/agentes/module_manager.php:643
-#: ../../godmode/agentes/module_manager_editor_common.php:565
-#: ../../godmode/agentes/planned_downtime.editor.php:488
+#: ../../godmode/agentes/agent_manager.php:442
+#: ../../godmode/agentes/modificar_agente.php:556
+#: ../../godmode/agentes/module_manager.php:646
+#: ../../godmode/agentes/module_manager_editor_common.php:568
+#: ../../godmode/agentes/planned_downtime.editor.php:503
 #: ../../godmode/agentes/planned_downtime.list.php:427
-#: ../../godmode/massive/massive_edit_agents.php:416
-#: ../../godmode/massive/massive_edit_modules.php:601
-#: ../../include/ajax/module.php:879 ../../include/class/Tree.class.php:1796
-#: ../../mobile/operation/agent.php:129
-#: ../../operation/agentes/estado_agente.php:572
-#: ../../operation/agentes/estado_generalagente.php:82
+#: ../../godmode/massive/massive_edit_agents.php:472
+#: ../../godmode/massive/massive_edit_modules.php:633
+#: ../../include/ajax/module.php:916 ../../include/class/Tree.class.php:1837
+#: ../../mobile/operation/agent.php:156
+#: ../../operation/agentes/estado_agente.php:631
+#: ../../operation/agentes/estado_generalagente.php:94
+#: ../../operation/agentes/estado_generalagente.php:97
+#: ../../operation/search_agents.php:100
 msgid "Quiet"
 msgstr "静観"
 
-#: ../../godmode/agentes/agent_manager.php:425
-#: ../../godmode/massive/massive_edit_agents.php:417
+#: ../../godmode/agentes/agent_manager.php:444
+#: ../../godmode/massive/massive_edit_agents.php:473
 msgid "The agent still runs but the alerts and events will be stop"
 msgstr "エージェントは実行しますが、アラートとイベントは停止します"
 
-#: ../../godmode/agentes/agent_manager.php:428
-#: ../../godmode/agentes/module_manager_editor.php:515
+#: ../../godmode/agentes/agent_manager.php:447
+#: ../../godmode/agentes/module_manager_editor.php:522
 #: ../../godmode/massive/massive_add_action_alerts.php:181
-#: ../../godmode/massive/massive_edit_agents.php:422
-#: ../../include/functions_visual_map_editor.php:486
-#: ../../operation/events/events_list.php:591
+#: ../../godmode/massive/massive_edit_agents.php:478
+#: ../../include/functions_visual_map_editor.php:644
+#: ../../operation/events/events_list.php:656
 #: ../../enterprise/godmode/alerts/alert_events_list.php:597
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:276
 #: ../../enterprise/godmode/policies/policy_modules.php:341
@@ -6507,27 +6885,27 @@ msgstr "エージェントは実行しますが、アラートとイベントは
 msgid "Advanced options"
 msgstr "拡張オプション"
 
-#: ../../godmode/agentes/agent_manager.php:448
-#: ../../godmode/massive/massive_edit_agents.php:446
+#: ../../godmode/agentes/agent_manager.php:467
+#: ../../godmode/massive/massive_edit_agents.php:502
 msgid "This field allows url insertion using the BBCode's url tag"
 msgstr "このフィールドには、BBコードの url タグを使うことにより URL を挿入することができます"
 
-#: ../../godmode/agentes/agent_manager.php:450
-#: ../../godmode/massive/massive_edit_agents.php:448
+#: ../../godmode/agentes/agent_manager.php:469
+#: ../../godmode/massive/massive_edit_agents.php:504
 msgid "The format is: [url='url to navigate']'text to show'[/url]"
 msgstr "フォーマット: [url='url to navigate']'表示するテキスト'[/url]"
 
-#: ../../godmode/agentes/agent_manager.php:452
-#: ../../godmode/massive/massive_edit_agents.php:450
+#: ../../godmode/agentes/agent_manager.php:471
+#: ../../godmode/massive/massive_edit_agents.php:506
 msgid "e.g.: [url=pandorafms.org]Pandora FMS Community[/url]"
 msgstr "例: [url=pandorafms.org]Pandora FMS コミュニティ[/url]"
 
-#: ../../godmode/agentes/agent_manager.php:470
+#: ../../godmode/agentes/agent_manager.php:495
 #: ../../godmode/events/events.php:53 ../../godmode/events/events.php:58
 #: ../../godmode/events/events.php:69
-#: ../../godmode/massive/massive_edit_agents.php:465 ../../godmode/menu.php:36
-#: ../../include/functions_events.php:2048
-#: ../../operation/agentes/ver_agente.php:1046
+#: ../../godmode/massive/massive_edit_agents.php:527 ../../godmode/menu.php:36
+#: ../../include/functions_events.php:2149
+#: ../../operation/agentes/ver_agente.php:1140
 #: ../../enterprise/meta/event/custom_events.php:53
 #: ../../enterprise/meta/event/custom_events.php:58
 #: ../../enterprise/meta/event/custom_events.php:69
@@ -6535,25 +6913,25 @@ msgstr "例: [url=pandorafms.org]Pandora FMS コミュニティ[/url]"
 msgid "Custom fields"
 msgstr "カスタムフィールド"
 
-#: ../../godmode/agentes/agent_manager.php:495
-#: ../../godmode/agentes/configure_field.php:65
-#: ../../godmode/agentes/module_manager.php:136
-#: ../../godmode/agentes/module_manager_editor.php:540
+#: ../../godmode/agentes/agent_manager.php:520
+#: ../../godmode/agentes/configure_field.php:70
+#: ../../godmode/agentes/module_manager.php:139
+#: ../../godmode/agentes/module_manager_editor.php:549
 #: ../../godmode/agentes/planned_downtime.list.php:366
 #: ../../godmode/agentes/planned_downtime.list.php:516
 #: ../../godmode/alerts/alert_actions.php:403
-#: ../../godmode/alerts/alert_commands.php:377
-#: ../../godmode/alerts/alert_list.list.php:742
+#: ../../godmode/alerts/alert_commands.php:395
+#: ../../godmode/alerts/alert_list.list.php:743
 #: ../../godmode/alerts/alert_list.php:329
 #: ../../godmode/alerts/alert_special_days.php:464
 #: ../../godmode/alerts/alert_special_days.php:482
-#: ../../godmode/alerts/alert_templates.php:363
+#: ../../godmode/alerts/alert_templates.php:364
 #: ../../godmode/alerts/configure_alert_action.php:227
 #: ../../godmode/alerts/configure_alert_command.php:202
 #: ../../godmode/alerts/configure_alert_special_days.php:106
 #: ../../godmode/category/edit_category.php:174
 #: ../../godmode/events/event_edit_filter.php:405
-#: ../../godmode/events/event_responses.editor.php:134
+#: ../../godmode/events/event_responses.editor.php:156
 #: ../../godmode/groups/configure_group.php:225
 #: ../../godmode/groups/configure_modu_group.php:87
 #: ../../godmode/massive/massive_add_profiles.php:117
@@ -6564,9 +6942,10 @@ msgstr "カスタムフィールド"
 #: ../../godmode/modules/manage_network_templates.php:237
 #: ../../godmode/modules/manage_network_templates_form.php:159
 #: ../../godmode/netflow/nf_edit_form.php:244
-#: ../../godmode/reporting/graph_builder.main.php:186
-#: ../../godmode/reporting/map_builder.php:312
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1191
+#: ../../godmode/reporting/create_container.php:280
+#: ../../godmode/reporting/graph_builder.main.php:207
+#: ../../godmode/reporting/map_builder.php:408
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1242
 #: ../../godmode/servers/manage_recontask.php:397
 #: ../../godmode/servers/plugin.php:542
 #: ../../godmode/servers/recon_script.php:220 ../../godmode/setup/gis.php:93
@@ -6574,20 +6953,21 @@ msgstr "カスタムフィールド"
 #: ../../godmode/setup/os.php:52 ../../godmode/setup/os.php:76
 #: ../../godmode/snmpconsole/snmp_alert.php:980
 #: ../../godmode/snmpconsole/snmp_alert.php:1339
-#: ../../godmode/snmpconsole/snmp_filters.php:108
-#: ../../godmode/snmpconsole/snmp_filters.php:156
+#: ../../godmode/snmpconsole/snmp_filters.php:200
+#: ../../godmode/snmpconsole/snmp_filters.php:276
 #: ../../godmode/tag/edit_tag.php:232
-#: ../../godmode/users/configure_user.php:588
+#: ../../godmode/users/configure_user.php:702
 #: ../../godmode/users/profile_list.php:404
-#: ../../include/functions_visual_map_editor.php:473
+#: ../../include/functions_visual_map_editor.php:631
 #: ../../include/functions_filemanager.php:617
 #: ../../include/functions_filemanager.php:654
 #: ../../operation/gis_maps/gis_map.php:182
 #: ../../operation/incidents/incident_detail.php:379
 #: ../../enterprise/extensions/backup/main.php:227
-#: ../../enterprise/extensions/cron/main.php:354
+#: ../../enterprise/extensions/cron/main.php:500
 #: ../../enterprise/extensions/ipam/ipam_editor.php:121
 #: ../../enterprise/extensions/ipam/ipam_list.php:257
+#: ../../enterprise/extensions/vmware/vmware_admin.php:412
 #: ../../enterprise/godmode/agentes/collections.agents.php:40
 #: ../../enterprise/godmode/agentes/collections.data.php:56
 #: ../../enterprise/godmode/agentes/collections.data.php:127
@@ -6595,7 +6975,7 @@ msgstr "カスタムフィールド"
 #: ../../enterprise/godmode/agentes/collections.data.php:161
 #: ../../enterprise/godmode/agentes/collections.data.php:183
 #: ../../enterprise/godmode/agentes/collections.data.php:225
-#: ../../enterprise/godmode/agentes/collections.editor.php:117
+#: ../../enterprise/godmode/agentes/collections.editor.php:111
 #: ../../enterprise/godmode/agentes/collections.php:287
 #: ../../enterprise/godmode/alerts/alert_events_list.php:671
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:511
@@ -6608,16 +6988,19 @@ msgstr "カスタムフィールド"
 #: ../../enterprise/godmode/policies/policies.php:478
 #: ../../enterprise/godmode/policies/policy_modules.php:369
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:232
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:293
 #: ../../enterprise/godmode/servers/manage_export.php:125
 #: ../../enterprise/godmode/servers/manage_export.php:157
-#: ../../enterprise/godmode/services/services.elements.php:426
-#: ../../enterprise/godmode/services/services.service.php:372
+#: ../../enterprise/godmode/services/services.elements.php:423
+#: ../../enterprise/godmode/services/services.service.php:417
 #: ../../enterprise/godmode/setup/edit_skin.php:270
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:365
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:23
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:90
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1215
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1430
+#: ../../enterprise/meta/include/functions_autoprovision.php:492
+#: ../../enterprise/meta/include/functions_autoprovision.php:677
 #: ../../enterprise/meta/monitoring/wizard/wizard.create_module.php:275
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:309
 msgid "Create"
@@ -6647,49 +7030,55 @@ msgstr "割当"
 #: ../../godmode/alerts/alert_list.list.php:86
 #: ../../godmode/modules/manage_network_components.php:565
 #: ../../godmode/modules/manage_network_templates_form.php:198
-#: ../../include/ajax/module.php:741 ../../mobile/operation/modules.php:489
+#: ../../include/ajax/module.php:777 ../../mobile/operation/modules.php:489
 #: ../../mobile/operation/modules.php:752
-#: ../../operation/agentes/status_monitor.php:332
-#: ../../operation/agentes/status_monitor.php:958
-#: ../../enterprise/include/functions_reporting_pdf.php:2361
+#: ../../operation/agentes/status_monitor.php:330
+#: ../../operation/agentes/status_monitor.php:966
+#: ../../enterprise/include/ajax/clustermap.php:64
+#: ../../enterprise/include/ajax/clustermap.php:274
+#: ../../enterprise/include/functions_reporting_pdf.php:2442
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1361
+#: ../../enterprise/operation/agentes/tag_view.php:135
 msgid "Module name"
 msgstr "モジュール名"
 
 #: ../../godmode/agentes/agent_template.php:229
-#: ../../godmode/agentes/module_manager.php:131
-#: ../../godmode/agentes/module_manager.php:557
+#: ../../godmode/agentes/modificar_agente.php:472
+#: ../../godmode/agentes/module_manager.php:134
+#: ../../godmode/agentes/module_manager.php:560
 #: ../../godmode/agentes/module_manager_editor_common.php:186
-#: ../../godmode/agentes/planned_downtime.editor.php:485
+#: ../../godmode/agentes/planned_downtime.editor.php:500
 #: ../../godmode/agentes/planned_downtime.list.php:394
 #: ../../godmode/alerts/alert_templates.php:38
-#: ../../godmode/alerts/alert_templates.php:253
-#: ../../godmode/alerts/alert_templates.php:301
-#: ../../godmode/events/event_responses.editor.php:115
+#: ../../godmode/alerts/alert_templates.php:254
+#: ../../godmode/alerts/alert_templates.php:302
+#: ../../godmode/events/event_responses.editor.php:116
 #: ../../godmode/modules/manage_network_components.php:566
 #: ../../godmode/modules/manage_network_components_form_common.php:69
 #: ../../godmode/modules/manage_network_templates_form.php:199
-#: ../../godmode/reporting/reporting_builder.item_editor.php:620
+#: ../../godmode/reporting/reporting_builder.item_editor.php:637
 #: ../../godmode/reporting/reporting_builder.list_items.php:169
 #: ../../godmode/reporting/reporting_builder.list_items.php:196
 #: ../../godmode/reporting/reporting_builder.list_items.php:289
 #: ../../godmode/reporting/visual_console_builder.wizard.php:111
 #: ../../godmode/reporting/visual_console_builder.wizard.php:216
+#: ../../godmode/servers/modificar_server.php:60
 #: ../../godmode/servers/plugin.php:736
 #: ../../godmode/servers/servers.build_table.php:66
 #: ../../godmode/setup/gis_step_2.php:171 ../../godmode/setup/news.php:221
-#: ../../include/ajax/module.php:738 ../../include/functions_events.php:901
-#: ../../include/functions_events.php:2367
-#: ../../include/functions_visual_map_editor.php:400
-#: ../../include/functions_visual_map_editor.php:419
-#: ../../include/functions_reporting_html.php:809
-#: ../../include/functions_reporting_html.php:818
-#: ../../include/functions_reporting_html.php:1023
-#: ../../include/functions_reporting_html.php:1033
-#: ../../include/functions_reporting_html.php:1647
-#: ../../include/functions_reporting_html.php:2111
-#: ../../include/functions_reporting_html.php:3105
-#: ../../include/functions_snmp_browser.php:410
+#: ../../include/ajax/module.php:774 ../../include/functions_events.php:901
+#: ../../include/functions_events.php:2479
+#: ../../include/functions_visual_map_editor.php:521
+#: ../../include/functions_visual_map_editor.php:537
+#: ../../include/functions_visual_map_editor.php:609
+#: ../../include/functions_snmp_browser.php:456
+#: ../../include/functions_reporting_html.php:812
+#: ../../include/functions_reporting_html.php:821
+#: ../../include/functions_reporting_html.php:1026
+#: ../../include/functions_reporting_html.php:1036
+#: ../../include/functions_reporting_html.php:1650
+#: ../../include/functions_reporting_html.php:2114
+#: ../../include/functions_reporting_html.php:3218
 #: ../../mobile/operation/events.php:352 ../../mobile/operation/events.php:353
 #: ../../mobile/operation/events.php:481 ../../mobile/operation/events.php:622
 #: ../../mobile/operation/events.php:623
@@ -6700,28 +7089,31 @@ msgstr "モジュール名"
 #: ../../mobile/operation/networkmaps.php:196
 #: ../../mobile/operation/visualmaps.php:61
 #: ../../mobile/operation/visualmaps.php:62
-#: ../../operation/agentes/ver_agente.php:806
+#: ../../operation/agentes/estado_agente.php:567
+#: ../../operation/agentes/ver_agente.php:881
 #: ../../operation/events/events.php:72
 #: ../../operation/events/sound_events.php:82
 #: ../../operation/netflow/nf_live_view.php:254
 #: ../../operation/search_modules.php:49
 #: ../../enterprise/godmode/modules/configure_local_component.php:184
-#: ../../enterprise/godmode/policies/policy_modules.php:1204
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:82
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1194
+#: ../../enterprise/godmode/policies/policy_modules.php:1235
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:83
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1264
 #: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:220
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:80
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:99
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:98
-#: ../../enterprise/godmode/services/services.elements.php:338
-#: ../../enterprise/include/functions_reporting_csv.php:1030
-#: ../../enterprise/include/functions_reporting_csv.php:1143
-#: ../../enterprise/include/functions_reporting_csv.php:1290
-#: ../../enterprise/include/functions_reporting_csv.php:1355
-#: ../../enterprise/include/functions_reporting_pdf.php:2362
-#: ../../enterprise/include/functions_services.php:1412
+#: ../../enterprise/godmode/reporting/cluster_list.php:166
+#: ../../enterprise/godmode/services/services.elements.php:349
+#: ../../enterprise/include/functions_reporting_csv.php:1142
+#: ../../enterprise/include/functions_reporting_csv.php:1255
+#: ../../enterprise/include/functions_reporting_csv.php:1402
+#: ../../enterprise/include/functions_reporting_csv.php:1467
+#: ../../enterprise/include/functions_reporting_pdf.php:2443
+#: ../../enterprise/include/functions_services.php:1501
 #: ../../enterprise/meta/advanced/servers.build_table.php:61
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:93
 #: ../../enterprise/operation/agentes/policy_view.php:306
+#: ../../enterprise/operation/agentes/tag_view.php:468
 #: ../../enterprise/operation/agentes/ver_agente.php:30
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:159
 msgid "Type"
@@ -6732,465 +7124,488 @@ msgstr "種類"
 msgid "No modules"
 msgstr "モジュールがありません"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:65
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:60
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:66
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:61
 msgid "The SNMP remote plugin doesnt seem to be installed"
 msgstr "SNMP リモートプラグインがインストールされていません"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:65
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:60
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:66
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:61
 msgid "It is necessary to use some features"
 msgstr "いくつかの機能を利用するために必要です"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:65
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:60
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:66
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:61
 msgid ""
 "Please, install the SNMP remote plugin (The name of the plugin must be "
 "snmp_remote.pl)"
 msgstr "SNMP リモートプラグインをインストールしてください (プラグインの名前は snmp_remote.pl である必要があります)"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:253
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:248
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:258
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:253
 msgid "Remote system doesnt support host SNMP information"
 msgstr "リモートシステムは、ホスト SNMP 情報をサポートしていません。"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:298
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:179
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:303
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:183
 msgid "No agent selected or the agent does not exist"
 msgstr "エージェントが選択されてないか、存在しません。"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:338
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:330
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:343
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:335
 msgid "The number of bytes read from this device since boot"
 msgstr "起動以降このデバイスから読み込んだバイト数"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:340
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:332
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:345
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:337
 msgid "The number of bytes written to this device since boot"
 msgstr "起動以降このデバイスへ書き込んだバイト数"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:342
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:334
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:347
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:339
 msgid "The number of read accesses from this device since boot"
 msgstr "起動以降このデバイスからの読み込みアクセス数"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:344
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:336
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:349
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:341
 msgid "The number of write accesses from this device since boot"
 msgstr "起動以降このデバイスへの書き込みアクセス数"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:519
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:511
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:524
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:516
 #, php-format
 msgid "Check if the process %s is running or not"
 msgstr "プロセス %s が動作しているかどうか確認してください"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:590
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:582
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:595
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:587
 msgid "Disk use information"
 msgstr "ディスク利用情報"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:661
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:651
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:666
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:656
 #, php-format
 msgid "%s modules created succesfully"
 msgstr "%s 個のモジュールを作成しました"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:666
 #: ../../godmode/agentes/agent_wizard.snmp_explorer.php:671
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:656
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:676
 #: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:661
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:666
 #, php-format
 msgid "Error creating %s modules"
 msgstr "%s 個のモジュール作成エラー"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:676
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:234
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:666
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:232
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:681
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:277
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:671
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:276
 #, php-format
 msgid "%s modules already exist"
 msgstr "%s 個のモジュールはすでに存在します"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:685
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:675
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:690
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:680
 msgid "Modules created succesfully"
 msgstr "モジュールを作成しました"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:703
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:342
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:708
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:426
 #: ../../godmode/agentes/module_manager_editor_network.php:106
+#: ../../godmode/massive/massive_edit_modules.php:653
 #: ../../godmode/modules/manage_network_components_form_network.php:38
-#: ../../include/functions_config.php:695
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:692
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:339
+#: ../../include/functions_config.php:755
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:697
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:415
 #: ../../enterprise/godmode/servers/manage_export_form.php:105
 #: ../../enterprise/godmode/setup/setup_history.php:56
 msgid "Port"
 msgstr "ポート番号"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:706
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:345
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:711
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:429
 msgid "Use agent ip"
 msgstr "エージェントのIPを使う"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:714
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:353
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:715
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:433
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:314
+#: ../../godmode/events/event_responses.editor.php:126
+#: ../../include/functions_snmp_browser.php:568
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:715
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:433
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:313
+msgid "Local console"
+msgstr "ローカルコンソール"
+
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:731
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:449
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:330
+#: ../../godmode/events/event_responses.editor.php:144
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:731
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:449
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:329
+msgid "Server to execute command"
+msgstr "コマンドを実行するサーバ"
+
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:739
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:457
 #: ../../godmode/agentes/module_manager_editor_network.php:119
 #: ../../godmode/modules/manage_network_components_form_network.php:50
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:700
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:347
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:705
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:423
 msgid "SNMP community"
 msgstr "SNMPコミュニティ"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:717
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:356
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:742
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:460
 #: ../../godmode/agentes/module_manager_editor_network.php:132
-#: ../../godmode/massive/massive_edit_modules.php:494
+#: ../../godmode/massive/massive_edit_modules.php:520
 #: ../../godmode/modules/manage_network_components_form_network.php:40
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:703
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:350
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:708
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:426
 msgid "SNMP version"
 msgstr "SNMPバージョン"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:731
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:369
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:756
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:473
 #: ../../godmode/agentes/module_manager_editor_network.php:216
-#: ../../godmode/massive/massive_edit_modules.php:497
+#: ../../godmode/massive/massive_edit_modules.php:523
 #: ../../godmode/modules/manage_network_components_form_network.php:57
-#: ../../include/functions_snmp_browser.php:530
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:716
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:363
+#: ../../include/functions_snmp_browser.php:597
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:741
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:459
 msgid "Auth user"
 msgstr "認証ユーザ"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:733
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:371
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:758
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:475
 #: ../../godmode/agentes/module_manager_editor_network.php:219
-#: ../../godmode/massive/massive_edit_modules.php:500
+#: ../../godmode/massive/massive_edit_modules.php:526
 #: ../../godmode/modules/manage_network_components_form_network.php:59
-#: ../../include/functions_snmp_browser.php:532
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:718
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:365
+#: ../../include/functions_snmp_browser.php:599
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:743
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:461
 msgid "Auth password"
 msgstr "認証パスワード"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:737
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:375
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:762
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:479
 #: ../../godmode/agentes/module_manager_editor_network.php:227
-#: ../../godmode/massive/massive_edit_modules.php:503
+#: ../../godmode/massive/massive_edit_modules.php:529
 #: ../../godmode/modules/manage_network_components_form_network.php:65
-#: ../../include/functions_snmp_browser.php:536
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:722
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:369
+#: ../../include/functions_snmp_browser.php:603
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:747
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:465
 msgid "Privacy method"
 msgstr "暗号化方式"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:738
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:376
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:763
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:480
 #: ../../godmode/agentes/module_manager_editor_network.php:228
-#: ../../godmode/massive/massive_edit_modules.php:504
+#: ../../godmode/massive/massive_edit_modules.php:530
 #: ../../godmode/modules/manage_network_components_form_network.php:66
-#: ../../include/functions_snmp_browser.php:537
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:723
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:370
+#: ../../include/functions_snmp_browser.php:604
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:748
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:466
 msgid "DES"
 msgstr "DES"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:738
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:376
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:763
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:480
 #: ../../godmode/agentes/module_manager_editor_network.php:228
-#: ../../godmode/massive/massive_edit_modules.php:504
+#: ../../godmode/massive/massive_edit_modules.php:530
 #: ../../godmode/modules/manage_network_components_form_network.php:66
-#: ../../include/functions_snmp_browser.php:537
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:723
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:370
+#: ../../include/functions_snmp_browser.php:604
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:748
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:466
 msgid "AES"
 msgstr "AES"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:739
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:377
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:724
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:371
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:764
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:481
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:749
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:467
 msgid "privacy pass"
 msgstr "暗号化パスワード"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:742
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:380
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:767
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:484
 #: ../../godmode/agentes/module_manager_editor_network.php:237
-#: ../../godmode/massive/massive_edit_modules.php:507
+#: ../../godmode/massive/massive_edit_modules.php:533
 #: ../../godmode/modules/manage_network_components_form_network.php:72
-#: ../../include/functions_snmp_browser.php:541
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:727
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:374
+#: ../../include/functions_snmp_browser.php:608
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:752
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:470
 msgid "Auth method"
 msgstr "認証方式"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:743
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:381
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:768
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:485
 #: ../../godmode/agentes/module_manager_editor_network.php:238
-#: ../../godmode/massive/massive_edit_modules.php:508
+#: ../../godmode/massive/massive_edit_modules.php:534
 #: ../../godmode/modules/manage_network_components_form_network.php:73
-#: ../../include/functions_snmp_browser.php:542
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:728
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:375
+#: ../../include/functions_snmp_browser.php:609
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:753
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:471
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:743
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:381
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:768
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:485
 #: ../../godmode/agentes/module_manager_editor_network.php:238
-#: ../../godmode/massive/massive_edit_modules.php:508
+#: ../../godmode/massive/massive_edit_modules.php:534
 #: ../../godmode/modules/manage_network_components_form_network.php:73
-#: ../../include/functions_snmp_browser.php:542
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:728
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:375
+#: ../../include/functions_snmp_browser.php:609
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:753
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:471
 msgid "SHA"
 msgstr "SHA"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:744
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:382
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:769
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:486
 #: ../../godmode/agentes/module_manager_editor_network.php:239
-#: ../../godmode/massive/massive_edit_modules.php:509
+#: ../../godmode/massive/massive_edit_modules.php:535
 #: ../../godmode/modules/manage_network_components_form_network.php:74
-#: ../../include/functions_snmp_browser.php:543
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:729
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:376
+#: ../../include/functions_snmp_browser.php:610
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:754
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:472
 msgid "Security level"
 msgstr "セキュリティレベル"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:745
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:383
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:770
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:487
 #: ../../godmode/agentes/module_manager_editor_network.php:240
-#: ../../godmode/massive/massive_edit_modules.php:510
+#: ../../godmode/massive/massive_edit_modules.php:536
 #: ../../godmode/modules/manage_network_components_form_network.php:75
-#: ../../include/functions_snmp_browser.php:544
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:730
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:377
+#: ../../include/functions_snmp_browser.php:611
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:755
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:473
 msgid "Not auth and not privacy method"
 msgstr "認証なし、暗号化なし"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:746
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:384
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:771
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:488
 #: ../../godmode/agentes/module_manager_editor_network.php:241
-#: ../../godmode/massive/massive_edit_modules.php:511
+#: ../../godmode/massive/massive_edit_modules.php:537
 #: ../../godmode/modules/manage_network_components_form_network.php:76
-#: ../../include/functions_snmp_browser.php:545
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:731
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:378
+#: ../../include/functions_snmp_browser.php:612
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:756
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:474
 msgid "Auth and not privacy method"
 msgstr "認証あり、暗号化なし"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:746
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:384
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:771
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:488
 #: ../../godmode/agentes/module_manager_editor_network.php:241
-#: ../../godmode/massive/massive_edit_modules.php:511
+#: ../../godmode/massive/massive_edit_modules.php:537
 #: ../../godmode/modules/manage_network_components_form_network.php:76
-#: ../../include/functions_snmp_browser.php:545
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:731
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:378
+#: ../../include/functions_snmp_browser.php:612
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:756
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:474
 msgid "Auth and privacy method"
 msgstr "認証あり、暗号化あり"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:759
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:397
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:744
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:391
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:784
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:501
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:769
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:487
 msgid "SNMP Walk"
 msgstr "snmpwalk"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:763
-#: ../../operation/tree.php:264
-#: ../../enterprise/dashboard/widgets/tree_view.php:188
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:748
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:788
+#: ../../operation/tree.php:285
+#: ../../enterprise/dashboard/widgets/tree_view.php:197
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:773
 #: ../../enterprise/include/functions_inventory.php:166
 msgid "No data found"
 msgstr "データがありません"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:763
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:748
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:788
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:773
 msgid ""
 "If the device is a network device, try with the SNMP Interfaces wizard"
 msgstr "ネットワークデバイスの場合は、SNMP インタフェースウィザードを試してください"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:792
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:776
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:817
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:801
 msgid "Devices"
 msgstr "デバイス"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:793
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:301
-#: ../../operation/agentes/ver_agente.php:1106
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:777
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:299
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:818
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:365
+#: ../../operation/agentes/ver_agente.php:1200
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:802
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:364
 msgid "Processes"
 msgstr "プロセス"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:794
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:302
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:778
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:300
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:819
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:366
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:803
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:365
 msgid "Free space on disk"
 msgstr "ディスク空き容量"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:795
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:779
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:820
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:804
 msgid "Temperature sensors"
 msgstr "温度センサー"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:796
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:780
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:821
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:805
 msgid "Other SNMP data"
 msgstr "他の SNMP データ"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:798
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:305
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:782
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:303
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:823
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:369
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:807
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:368
 msgid "Wizard mode"
 msgstr "ウィザードモード"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:817
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:822
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:801
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:806
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:842
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:847
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:826
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:831
 msgid "SNMP remote plugin is necessary for this feature"
 msgstr "この機能には、SNMP リモートプラグインが必要です"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:854
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:856
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:858
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:860
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:863
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:348
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:350
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:352
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:354
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:838
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:840
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:842
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:844
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:847
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:346
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:348
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:350
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:352
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:879
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:881
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:883
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:885
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:888
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:412
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:414
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:416
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:418
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:863
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:865
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:867
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:869
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:872
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:411
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:413
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:415
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:417
 msgid "Add to modules list"
 msgstr "モジュール一覧に追加"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:865
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:358
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:849
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:356
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:890
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:422
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:874
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:421
 msgid "Remove from modules list"
 msgstr "モジュール一覧から削除"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:875
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:447
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:369
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:859
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:440
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:367
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:900
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:552
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:433
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:884
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:537
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:432
 msgid "Create modules"
 msgstr "モジュール作成"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:932
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:916
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:957
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:941
 msgid "Device"
 msgstr "デバイス"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:938
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:954
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:970
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:986
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1002
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:421
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:437
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:453
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:469
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:963
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:979
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:995
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1011
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1027
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:485
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:501
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:517
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:533
 #: ../../godmode/events/event_edit_filter.php:301
-#: ../../include/functions_events.php:2372
+#: ../../include/functions_events.php:2484
 #: ../../mobile/operation/events.php:485
-#: ../../operation/events/events_list.php:581
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:922
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:938
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:954
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:970
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:986
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:419
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:435
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:451
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:467
+#: ../../operation/events/events_list.php:646
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:947
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:963
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:979
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:995
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:1011
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:484
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:500
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:516
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:532
 #: ../../enterprise/include/functions_events.php:149
 msgid "Repeated"
 msgstr "複数回発生イベント"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:948
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:431
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:973
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:495
 #: ../../godmode/reporting/visual_console_builder.wizard.php:193
-#: ../../include/functions_visual_map_editor.php:348
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:932
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:429
+#: ../../include/functions_visual_map_editor.php:462
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:957
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:494
 msgid "Process"
 msgstr "処理"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:980
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:964
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1005
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:989
 msgid "Temperature"
 msgstr "温度"
 
-#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1027
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:491
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:1011
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:489
+#: ../../godmode/agentes/agent_wizard.snmp_explorer.php:1052
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:555
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_explorer.php:1036
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:554
 msgid "Modules list is empty"
 msgstr "モジュール一覧が空です"
 
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:174
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:178
 #: ../../godmode/massive/massive_add_action_alerts.php:116
 #: ../../godmode/massive/massive_add_tags.php:38
 #: ../../godmode/massive/massive_delete_action_alerts.php:119
 #: ../../godmode/massive/massive_delete_tags.php:102
-#: ../../godmode/massive/massive_edit_modules.php:1073
-#: ../../godmode/reporting/visual_console_builder.php:486
-#: ../../include/functions_visual_map.php:1749
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:166
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:404
+#: ../../godmode/massive/massive_edit_modules.php:1361
+#: ../../godmode/reporting/visual_console_builder.php:488
+#: ../../include/functions_visual_map.php:2644
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:170
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:573
 #: ../../enterprise/include/functions_massive.php:15
 msgid "No modules selected"
 msgstr "モジュールが選択されていません。"
 
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:286
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:283
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:370
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:359
 msgid "Successfully modules created"
 msgstr "モジュールを作成しました。"
 
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:290
-#: ../../godmode/agentes/configurar_agente.php:266
-#: ../../godmode/agentes/configurar_agente.php:617
-#: ../../godmode/agentes/planned_downtime.editor.php:356
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:374
+#: ../../godmode/agentes/configurar_agente.php:289
+#: ../../godmode/agentes/configurar_agente.php:644
+#: ../../godmode/agentes/planned_downtime.editor.php:371
 #: ../../godmode/alerts/alert_actions.php:185
-#: ../../godmode/alerts/alert_commands.php:294
+#: ../../godmode/alerts/alert_commands.php:312
 #: ../../godmode/alerts/alert_list.php:104
 #: ../../godmode/alerts/alert_special_days.php:149
-#: ../../godmode/alerts/configure_alert_template.php:119
-#: ../../godmode/alerts/configure_alert_template.php:432
+#: ../../godmode/alerts/configure_alert_template.php:122
+#: ../../godmode/alerts/configure_alert_template.php:435
 #: ../../godmode/modules/manage_nc_groups.php:74
 #: ../../godmode/modules/manage_network_components.php:162
 #: ../../godmode/modules/manage_network_components.php:256
-#: ../../godmode/reporting/reporting_builder.item_editor.php:2436
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2646
 #: ../../godmode/setup/gis.php:47 ../../godmode/setup/news.php:57
-#: ../../godmode/users/configure_user.php:237
+#: ../../godmode/users/configure_user.php:256
 #: ../../include/functions_planned_downtimes.php:110
 #: ../../include/functions_planned_downtimes.php:727
-#: ../../operation/agentes/pandora_networkmap.php:153
+#: ../../operation/agentes/pandora_networkmap.php:112
+#: ../../operation/agentes/pandora_networkmap.php:305
 #: ../../enterprise/extensions/ipam/ipam_action.php:92
 #: ../../enterprise/extensions/ipam/ipam_action.php:100
 #: ../../enterprise/godmode/alerts/alert_events.php:350
 #: ../../enterprise/godmode/modules/local_components.php:107
 #: ../../enterprise/godmode/modules/local_components.php:247
 #: ../../enterprise/godmode/policies/policies.php:128
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:287
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:363
 #: ../../enterprise/godmode/policies/policy_alerts.php:148
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:74
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:77
@@ -7204,8 +7619,8 @@ msgstr "モジュールを作成しました。"
 msgid "Could not be created"
 msgstr "作成に失敗しました。"
 
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:296
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:293
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:380
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:369
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1855
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1955
 #: ../../enterprise/meta/include/functions_wizard_meta.php:2428
@@ -7215,236 +7630,236 @@ msgstr "作成に失敗しました。"
 msgid "Another module already exists with the same name"
 msgstr "同じ名前のモジュールが既に存在します"
 
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:299
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:296
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:383
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:372
 msgid "Some required fields are missed"
 msgstr "必須フィールドが設定されていません"
 
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:299
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:296
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:383
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:372
 msgid "name"
 msgstr "名前"
 
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:304
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:301
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:388
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:377
 msgid "Processing error"
 msgstr "処理エラー"
 
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:401
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:395
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:505
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:491
 msgid "Unable to do SNMP walk"
 msgstr "snmpwalk を実行できません。"
 
-#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:435
-#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:428
+#: ../../godmode/agentes/agent_wizard.snmp_interfaces_explorer.php:540
+#: ../../enterprise/godmode/policies/policy_agent_wizard.snmp_interfaces_explorer.php:525
 msgid "Interfaces"
 msgstr "インタフェース"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:111
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:110
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:145
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:144
 #, php-format
 msgid "Free space on %s"
 msgstr "%s の空き容量"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:204
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:202
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:247
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:246
 #, php-format
 msgid "%s service modules created succesfully"
 msgstr "%s 個のサービスモジュールを作成しました"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:207
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:205
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:250
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:249
 #, php-format
 msgid "Error creating %s service modules"
 msgstr "%s 個のサービスモジュール作成エラー"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:212
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:210
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:255
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:254
 #, php-format
 msgid "%s process modules created succesfully"
 msgstr "%s 個のプロセスモジュールを作成しました"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:215
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:213
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:258
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:257
 #, php-format
 msgid "Error creating %s process modules"
 msgstr "%s 個のプロセスモジュール作成エラー"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:220
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:218
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:263
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:262
 #, php-format
 msgid "%s disk space modules created succesfully"
 msgstr "%s 個のディスクスペースモジュールを作成しました"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:223
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:221
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:266
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:265
 #, php-format
 msgid "Error creating %s disk space modules"
 msgstr "%s 個のディスクスペースモジュール作成エラー"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:228
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:226
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:271
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:270
 #, php-format
 msgid "%s modules created from components succesfully"
 msgstr "コンポーネントから %s 個のモジュールを作成しました"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:231
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:229
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:274
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:273
 #, php-format
 msgid "Error creating %s modules from components"
 msgstr "コンポーネントから %s 個のモジュールの作成エラー"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:257
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:300
 #: ../../godmode/agentes/module_manager_editor_wmi.php:47
 #: ../../godmode/modules/manage_network_components_form_wmi.php:42
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:255
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:299
 msgid "Namespace"
 msgstr "名前空間"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:261
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:304
 #: ../../godmode/agentes/module_manager_editor_wmi.php:54
-#: ../../godmode/massive/massive_edit_modules.php:526
+#: ../../godmode/massive/massive_edit_modules.php:552
 #: ../../godmode/modules/manage_network_components_form_wmi.php:48
 #: ../../enterprise/godmode/agentes/inventory_manager.php:188
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:259
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:303
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:201
 msgid "Username"
 msgstr "ユーザ名"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:274
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:272
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:337
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:336
 msgid "WMI Explore"
 msgstr "WMIエクスプローラ"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:278
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:276
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:341
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:340
 msgid "Unable to do WMI explorer"
 msgstr "WMIエクスプローラを実行できません"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:303
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:301
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:367
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:366
 msgid "WMI components"
 msgstr "WMIコンポーネント"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:316
-#: ../../godmode/agentes/planned_downtime.editor.php:708
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:314
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:380
+#: ../../godmode/agentes/planned_downtime.editor.php:721
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:379
 msgid "Filter by group"
 msgstr "グループでフィルタする"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:336
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:400
 #: ../../godmode/agentes/module_manager_editor_common.php:81
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:60
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:334
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:67
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:399
 msgid "No component was found"
 msgstr "コンポーネントが見つかりません。"
 
-#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:415
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1547
+#: ../../godmode/agentes/agent_wizard.wmi_explorer.php:479
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1713
 #: ../../enterprise/dashboard/widgets/service_map.php:46
 #: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:22
 #: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:157
-#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:413
-#: ../../enterprise/godmode/services/services.elements.php:336
-#: ../../enterprise/godmode/services/services.elements.php:377
-#: ../../enterprise/include/functions_reporting.php:4425
-#: ../../enterprise/include/functions_reporting.php:4726
-#: ../../enterprise/include/functions_reporting_pdf.php:2039
-#: ../../enterprise/include/functions_services.php:1458
-#: ../../enterprise/include/functions_visual_map.php:496
+#: ../../enterprise/godmode/policies/policy_agent_wizard.wmi_explorer.php:478
+#: ../../enterprise/godmode/services/services.elements.php:347
+#: ../../enterprise/godmode/services/services.elements.php:380
 #: ../../enterprise/include/functions_visual_map_editor.php:17
 #: ../../enterprise/include/functions_visual_map_editor.php:24
 #: ../../enterprise/include/functions_visual_map_editor.php:47
+#: ../../enterprise/include/functions_visual_map.php:496
+#: ../../enterprise/include/functions_reporting.php:4843
+#: ../../enterprise/include/functions_reporting.php:5144
+#: ../../enterprise/include/functions_reporting_pdf.php:2120
+#: ../../enterprise/include/functions_services.php:1547
 msgid "Service"
 msgstr "サービス"
 
-#: ../../godmode/agentes/configurar_agente.php:187
-#: ../../godmode/agentes/configurar_agente.php:733
+#: ../../godmode/agentes/configurar_agente.php:200
+#: ../../godmode/agentes/configurar_agente.php:780
 msgid "No agent alias specified"
 msgstr "エージェントの別名が定義されていません"
 
-#: ../../godmode/agentes/configurar_agente.php:268
+#: ../../godmode/agentes/configurar_agente.php:291
 msgid "Could not be created, because name already exists"
 msgstr "名前がすでに存在するため、作成できませんでした。"
 
-#: ../../godmode/agentes/configurar_agente.php:281
-#: ../../godmode/agentes/modificar_agente.php:52
+#: ../../godmode/agentes/configurar_agente.php:304
+#: ../../godmode/agentes/modificar_agente.php:53
 #: ../../godmode/agentes/modificar_agente.php:582
-#: ../../godmode/reporting/visual_console_builder.php:687
+#: ../../godmode/reporting/visual_console_builder.php:689
 #: ../../godmode/servers/manage_recontask.php:32
-#: ../../godmode/setup/setup_visuals.php:165
-#: ../../godmode/setup/setup_visuals.php:185
-#: ../../godmode/setup/setup_visuals.php:204
-#: ../../godmode/setup/setup_visuals.php:220
-#: ../../godmode/setup/setup_visuals.php:231
-#: ../../godmode/setup/setup_visuals.php:318
-#: ../../operation/agentes/estado_agente.php:578
+#: ../../godmode/setup/setup_visuals.php:166
+#: ../../godmode/setup/setup_visuals.php:186
+#: ../../godmode/setup/setup_visuals.php:205
+#: ../../godmode/setup/setup_visuals.php:221
+#: ../../godmode/setup/setup_visuals.php:232
+#: ../../godmode/setup/setup_visuals.php:339
+#: ../../operation/agentes/estado_agente.php:640
 #: ../../operation/visual_console/pure_ajax.php:130
 #: ../../operation/visual_console/render_view.php:133
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:79
-#: ../../enterprise/meta/screens/screens.visualmap.php:149
-#: ../../enterprise/meta/screens/screens.visualmap.php:165
+#: ../../enterprise/meta/screens/screens.visualmap.php:89
+#: ../../enterprise/meta/screens/screens.visualmap.php:105
 #: ../../enterprise/operation/agentes/policy_view.php:51
 msgid "View"
 msgstr "表示"
 
-#: ../../godmode/agentes/configurar_agente.php:293
-#: ../../godmode/agentes/configurar_agente.php:520 ../../godmode/menu.php:231
-#: ../../godmode/menu.php:238 ../../operation/agentes/estado_agente.php:135
+#: ../../godmode/agentes/configurar_agente.php:316
+#: ../../godmode/agentes/configurar_agente.php:543 ../../godmode/menu.php:231
+#: ../../godmode/menu.php:238 ../../operation/agentes/estado_agente.php:163
 #: ../../operation/gis_maps/render_view.php:119
 #: ../../enterprise/godmode/policies/configure_policy.php:38
-#: ../../enterprise/include/functions_policies.php:3203
+#: ../../enterprise/include/functions_policies.php:3382
 msgid "Setup"
 msgstr "設定"
 
-#: ../../godmode/agentes/configurar_agente.php:322 ../../godmode/menu.php:101
+#: ../../godmode/agentes/configurar_agente.php:345 ../../godmode/menu.php:101
 msgid "Module templates"
 msgstr "モジュールテンプレート"
 
-#: ../../godmode/agentes/configurar_agente.php:374
-#: ../../operation/agentes/ver_agente.php:1008
+#: ../../godmode/agentes/configurar_agente.php:397
+#: ../../operation/agentes/ver_agente.php:1102
 msgid "GIS data"
 msgstr "GIS データ"
 
-#: ../../godmode/agentes/configurar_agente.php:385
+#: ../../godmode/agentes/configurar_agente.php:408
 #: ../../enterprise/godmode/policies/policy.php:58
-#: ../../enterprise/include/functions_policies.php:3221
+#: ../../enterprise/include/functions_policies.php:3400
 msgid "Agent wizard"
 msgstr "エージェントウィザード"
 
-#: ../../godmode/agentes/configurar_agente.php:392
-#: ../../godmode/agentes/configurar_agente.php:558
+#: ../../godmode/agentes/configurar_agente.php:415
+#: ../../godmode/agentes/configurar_agente.php:585
 #: ../../godmode/setup/snmp_wizard.php:30
-#: ../../enterprise/include/functions_policies.php:3228
+#: ../../enterprise/include/functions_policies.php:3407
 msgid "SNMP Wizard"
 msgstr "SNMPウィザード"
 
-#: ../../godmode/agentes/configurar_agente.php:397
-#: ../../godmode/agentes/configurar_agente.php:561
-#: ../../enterprise/include/functions_policies.php:3233
+#: ../../godmode/agentes/configurar_agente.php:420
+#: ../../godmode/agentes/configurar_agente.php:588
+#: ../../enterprise/include/functions_policies.php:3412
 msgid "SNMP Interfaces wizard"
 msgstr "SNMP インタフェースウィザード"
 
-#: ../../godmode/agentes/configurar_agente.php:402
-#: ../../godmode/agentes/configurar_agente.php:564
-#: ../../enterprise/include/functions_policies.php:3238
+#: ../../godmode/agentes/configurar_agente.php:425
+#: ../../godmode/agentes/configurar_agente.php:591
+#: ../../enterprise/include/functions_policies.php:3417
 msgid "WMI Wizard"
 msgstr "WMIウィザード"
 
-#: ../../godmode/agentes/configurar_agente.php:523
+#: ../../godmode/agentes/configurar_agente.php:546
 #: ../../enterprise/godmode/agentes/collections.php:229
 #: ../../enterprise/include/functions_groups.php:75
 #: ../../enterprise/operation/agentes/ver_agente.php:190
 msgid "Collection"
 msgstr "コレクション"
 
-#: ../../godmode/agentes/configurar_agente.php:527
-#: ../../include/functions_reports.php:628
+#: ../../godmode/agentes/configurar_agente.php:550
+#: ../../include/functions_reporting.php:1679
 #: ../../include/functions_reports.php:629
-#: ../../include/functions_reports.php:631
-#: ../../include/functions_reporting.php:1590
+#: ../../include/functions_reports.php:630
+#: ../../include/functions_reports.php:632
 #: ../../enterprise/godmode/agentes/configurar_agente.php:33
-#: ../../enterprise/include/functions_reporting_csv.php:304
+#: ../../enterprise/include/functions_reporting_csv.php:314
 #: ../../enterprise/operation/agentes/ver_agente.php:174
 #: ../../enterprise/operation/inventory/inventory.php:112
 #: ../../enterprise/operation/menu.php:19
@@ -7452,82 +7867,84 @@ msgstr "コレクション"
 msgid "Inventory"
 msgstr "インベントリ"
 
-#: ../../godmode/agentes/configurar_agente.php:531
+#: ../../godmode/agentes/configurar_agente.php:554
 #: ../../enterprise/godmode/agentes/configurar_agente.php:49
 #: ../../enterprise/godmode/policies/policy.php:54
-#: ../../enterprise/include/functions_policies.php:3316
+#: ../../enterprise/include/functions_policies.php:3495
 msgid "Agent plugins"
 msgstr "エージェントプラグイン"
 
-#: ../../godmode/agentes/configurar_agente.php:538
+#: ../../godmode/agentes/configurar_agente.php:565
 #: ../../godmode/events/custom_events.php:95
 #: ../../godmode/events/custom_events.php:161
 #: ../../include/functions_events.php:43
 #: ../../include/functions_events.php:991
-#: ../../include/functions_events.php:3573
-#: ../../operation/agentes/estado_monitores.php:449
+#: ../../include/functions_events.php:3672
+#: ../../include/functions_snmp.php:296
+#: ../../operation/agentes/estado_monitores.php:462
 #: ../../operation/events/events.build_table.php:204
 #: ../../operation/events/events_rss.php:185
-#: ../../operation/snmpconsole/snmp_view.php:382
-#: ../../operation/snmpconsole/snmp_view.php:627
-#: ../../operation/snmpconsole/snmp_view.php:921
+#: ../../operation/snmpconsole/snmp_view.php:439
+#: ../../operation/snmpconsole/snmp_view.php:735
+#: ../../operation/snmpconsole/snmp_view.php:1033
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:169
 #: ../../enterprise/meta/include/functions_events_meta.php:82
 msgid "Alert"
 msgstr "アラート"
 
-#: ../../godmode/agentes/configurar_agente.php:542 ../../godmode/menu.php:151
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:137
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:251
-#: ../../enterprise/include/functions_reporting.php:81
-#: ../../enterprise/include/functions_reporting.php:6156
-#: ../../enterprise/include/functions_reporting.php:6180
-#: ../../enterprise/include/functions_reporting.php:6234
+#: ../../godmode/agentes/configurar_agente.php:569 ../../godmode/menu.php:151
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:140
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:252
+#: ../../enterprise/include/functions_reporting.php:82
+#: ../../enterprise/include/functions_reporting.php:6717
+#: ../../enterprise/include/functions_reporting.php:6741
+#: ../../enterprise/include/functions_reporting.php:6795
 #: ../../enterprise/meta/include/functions_alerts_meta.php:107
 #: ../../enterprise/meta/include/functions_alerts_meta.php:125
 msgid "Templates"
 msgstr "テンプレート"
 
-#: ../../godmode/agentes/configurar_agente.php:546
+#: ../../godmode/agentes/configurar_agente.php:573
 msgid "Gis"
 msgstr "GIS"
 
-#: ../../godmode/agentes/configurar_agente.php:572
+#: ../../godmode/agentes/configurar_agente.php:599
 msgid "SNMP explorer"
 msgstr "SNMPエクスプローラ"
 
-#: ../../godmode/agentes/configurar_agente.php:587
+#: ../../godmode/agentes/configurar_agente.php:614
 msgid "Agent manager"
 msgstr "エージェントマネージャ"
 
-#: ../../godmode/agentes/configurar_agente.php:610
-#: ../../godmode/servers/modificar_server.php:135
+#: ../../godmode/agentes/configurar_agente.php:637
+#: ../../godmode/servers/modificar_server.php:155
 msgid "Conf file deleted successfully"
 msgstr "conf ファイルを削除しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:611
-#: ../../godmode/servers/modificar_server.php:136
+#: ../../godmode/agentes/configurar_agente.php:638
+#: ../../godmode/servers/modificar_server.php:156
 msgid "Could not delete conf file"
 msgstr "conf ファイルの削除に失敗しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:621
-#: ../../godmode/agentes/planned_downtime.editor.php:365
+#: ../../godmode/agentes/configurar_agente.php:648
+#: ../../godmode/agentes/planned_downtime.editor.php:380
 #: ../../godmode/alerts/alert_actions.php:184
-#: ../../godmode/alerts/alert_commands.php:293
+#: ../../godmode/alerts/alert_commands.php:311
 #: ../../godmode/alerts/alert_list.php:104
 #: ../../godmode/alerts/alert_special_days.php:148
-#: ../../godmode/alerts/configure_alert_template.php:431
+#: ../../godmode/alerts/configure_alert_template.php:434
 #: ../../godmode/modules/manage_nc_groups.php:73
 #: ../../godmode/setup/gis.php:45 ../../godmode/setup/links.php:41
 #: ../../godmode/setup/news.php:56
 #: ../../godmode/snmpconsole/snmp_alert.php:247
-#: ../../godmode/snmpconsole/snmp_filters.php:66
-#: ../../godmode/users/configure_user.php:236
+#: ../../godmode/snmpconsole/snmp_filters.php:110
+#: ../../godmode/users/configure_user.php:255
 #: ../../godmode/users/profile_list.php:241
 #: ../../include/functions_planned_downtimes.php:113
 #: ../../include/functions_planned_downtimes.php:731
-#: ../../enterprise/extensions/cron/main.php:83
-#: ../../enterprise/extensions/cron/main.php:142
+#: ../../enterprise/extensions/cron/main.php:91
+#: ../../enterprise/extensions/cron/main.php:123
+#: ../../enterprise/extensions/cron/main.php:183
 #: ../../enterprise/extensions/ipam/ipam_action.php:96
 #: ../../enterprise/godmode/alerts/alert_events.php:350
 #: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:35
@@ -7541,44 +7958,44 @@ msgstr "conf ファイルの削除に失敗しました。"
 msgid "Successfully created"
 msgstr "作成しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:647
-#: ../../godmode/agentes/configurar_agente.php:652
+#: ../../godmode/agentes/configurar_agente.php:678
+#: ../../godmode/agentes/configurar_agente.php:683
 msgid "No data to normalize"
 msgstr "正規化するデータがありません。"
 
-#: ../../godmode/agentes/configurar_agente.php:656
+#: ../../godmode/agentes/configurar_agente.php:687
 #, php-format
 msgid "Deleted data above %f"
 msgstr "%f を超えるデータを削除しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:657
+#: ../../godmode/agentes/configurar_agente.php:688
 #, php-format
 msgid "Error normalizing module %s"
 msgstr "モジュール %s において正規化に失敗しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:782
+#: ../../godmode/agentes/configurar_agente.php:836
 msgid "There was a problem updating the agent"
 msgstr "エージェントの更新に失敗しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:804
-#: ../../godmode/agentes/planned_downtime.editor.php:368
+#: ../../godmode/agentes/configurar_agente.php:899
+#: ../../godmode/agentes/planned_downtime.editor.php:383
 #: ../../godmode/alerts/alert_actions.php:262
 #: ../../godmode/alerts/alert_list.php:196
 #: ../../godmode/alerts/alert_special_days.php:206
-#: ../../godmode/alerts/alert_templates.php:151
+#: ../../godmode/alerts/alert_templates.php:152
 #: ../../godmode/alerts/configure_alert_command.php:93
-#: ../../godmode/alerts/configure_alert_template.php:444
+#: ../../godmode/alerts/configure_alert_template.php:447
 #: ../../godmode/events/event_edit_filter.php:173
-#: ../../godmode/massive/massive_edit_modules.php:152
+#: ../../godmode/massive/massive_edit_modules.php:162
 #: ../../godmode/modules/manage_nc_groups.php:98
 #: ../../godmode/netflow/nf_edit_form.php:131 ../../godmode/setup/gis.php:39
 #: ../../godmode/setup/links.php:58 ../../godmode/setup/news.php:87
 #: ../../godmode/snmpconsole/snmp_alert.php:318
-#: ../../godmode/snmpconsole/snmp_filters.php:54
+#: ../../godmode/snmpconsole/snmp_filters.php:80
 #: ../../godmode/users/profile_list.php:223
 #: ../../include/functions_planned_downtimes.php:125
 #: ../../operation/incidents/incident.php:110
-#: ../../operation/snmpconsole/snmp_view.php:114
+#: ../../operation/snmpconsole/snmp_view.php:134
 #: ../../enterprise/extensions/ipam/ipam_action.php:131
 #: ../../enterprise/extensions/ipam/ipam_massive.php:41
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:98
@@ -7586,87 +8003,87 @@ msgstr "エージェントの更新に失敗しました。"
 #: ../../enterprise/godmode/alerts/alert_events_list.php:94
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:158
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:104
-#: ../../enterprise/godmode/policies/policy_modules.php:1038
+#: ../../enterprise/godmode/policies/policy_modules.php:1069
 #: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:66
-#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:51
+#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:52
 #: ../../enterprise/godmode/servers/server_disk_conf_editor.php:120
 #: ../../enterprise/operation/agentes/transactional_map.php:117
 msgid "Successfully updated"
 msgstr "更新しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:826
+#: ../../godmode/agentes/configurar_agente.php:921
 msgid "There was a problem loading the agent"
 msgstr "エージェントのロードに失敗しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:1227
+#: ../../godmode/agentes/configurar_agente.php:1380
 msgid ""
 "There was a problem updating module. Another module already exists with the "
 "same name."
 msgstr "モジュールの更新で問題が発生しました。同じ名前のモジュールがすでに存在します。"
 
-#: ../../godmode/agentes/configurar_agente.php:1230
+#: ../../godmode/agentes/configurar_agente.php:1383
 msgid ""
 "There was a problem updating module. Some required fields are missed: (name)"
 msgstr "モジュールの更新で問題が発生しました。必須フィールドが入力されていません: (名前)"
 
-#: ../../godmode/agentes/configurar_agente.php:1233
+#: ../../godmode/agentes/configurar_agente.php:1386
 msgid "There was a problem updating module. \"No change\""
 msgstr "モジュールの更新で問題が発生しました。\"変更点がありません\""
 
-#: ../../godmode/agentes/configurar_agente.php:1238
+#: ../../godmode/agentes/configurar_agente.php:1391
 msgid "There was a problem updating module. Processing error"
 msgstr "モジュールの更新で問題が発生しました。処理エラー"
 
-#: ../../godmode/agentes/configurar_agente.php:1258
+#: ../../godmode/agentes/configurar_agente.php:1411
 msgid "Module successfully updated"
 msgstr "モジュールの更新が完了しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:1367
+#: ../../godmode/agentes/configurar_agente.php:1542
 msgid ""
 "There was a problem adding module. Another module already exists with the "
 "same name."
 msgstr "モジュールの追加で問題が発生しました。同じ名前のモジュールがすでに存在します。"
 
-#: ../../godmode/agentes/configurar_agente.php:1370
+#: ../../godmode/agentes/configurar_agente.php:1545
 msgid ""
 "There was a problem adding module. Some required fields are missed : (name)"
 msgstr "モジュールの追加で問題が発生しました。必須フィールドが入力されていません: (名前)"
 
-#: ../../godmode/agentes/configurar_agente.php:1375
+#: ../../godmode/agentes/configurar_agente.php:1550
 msgid "There was a problem adding module. Processing error"
 msgstr "モジュールの追加で問題が発生しました。処理エラー"
 
-#: ../../godmode/agentes/configurar_agente.php:1393
-#: ../../godmode/reporting/graph_builder.php:258
+#: ../../godmode/agentes/configurar_agente.php:1568
+#: ../../godmode/reporting/graph_builder.php:277
 msgid "Module added successfully"
 msgstr "モジュールを追加しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:1511
+#: ../../godmode/agentes/configurar_agente.php:1687
 msgid "There was a problem deleting the module"
 msgstr "モジュールの削除に失敗しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:1514
+#: ../../godmode/agentes/configurar_agente.php:1690
 msgid "Module deleted succesfully"
 msgstr "モジュールを削除しました。"
 
-#: ../../godmode/agentes/configurar_agente.php:1528
-#: ../../enterprise/godmode/policies/policy_modules.php:1143
+#: ../../godmode/agentes/configurar_agente.php:1704
+#: ../../enterprise/godmode/policies/policy_modules.php:1174
 #, php-format
 msgid "copy of %s"
 msgstr "%s のコピー"
 
-#: ../../godmode/agentes/configurar_agente.php:1538
-#: ../../enterprise/godmode/policies/policy_modules.php:1155
+#: ../../godmode/agentes/configurar_agente.php:1714
+#: ../../enterprise/godmode/policies/policy_modules.php:1186
 #, php-format
 msgid "copy of %s (%d)"
 msgstr "%s のコピー (%d)"
 
-#: ../../godmode/agentes/configurar_agente.php:1571
-#: ../../godmode/agentes/modificar_agente.php:116
+#: ../../godmode/agentes/configurar_agente.php:1747
+#: ../../godmode/agentes/modificar_agente.php:126
 #: ../../godmode/alerts/alert_list.php:230
 #: ../../godmode/massive/massive_enable_disable_alerts.php:78
 #: ../../godmode/users/user_list.php:208
-#: ../../include/ajax/alert_list.ajax.php:80
+#: ../../include/ajax/alert_list.ajax.php:86
 #: ../../enterprise/godmode/alerts/alert_events_list.php:221
 #: ../../enterprise/godmode/policies/policy_alerts.php:88
 #: ../../enterprise/godmode/policies/policy_modules.php:422
@@ -7675,11 +8092,11 @@ msgstr "%s のコピー (%d)"
 msgid "Successfully enabled"
 msgstr "有効にしました。"
 
-#: ../../godmode/agentes/configurar_agente.php:1571
-#: ../../godmode/agentes/modificar_agente.php:116
+#: ../../godmode/agentes/configurar_agente.php:1747
+#: ../../godmode/agentes/modificar_agente.php:126
 #: ../../godmode/alerts/alert_list.php:230
 #: ../../godmode/massive/massive_enable_disable_alerts.php:78
-#: ../../include/ajax/alert_list.ajax.php:82
+#: ../../include/ajax/alert_list.ajax.php:88
 #: ../../enterprise/godmode/alerts/alert_events_list.php:222
 #: ../../enterprise/godmode/policies/policy_alerts.php:88
 #: ../../enterprise/godmode/policies/policy_modules.php:422
@@ -7688,12 +8105,12 @@ msgstr "有効にしました。"
 msgid "Could not be enabled"
 msgstr "有効にできませんでした。"
 
-#: ../../godmode/agentes/configurar_agente.php:1586
-#: ../../godmode/agentes/modificar_agente.php:135
+#: ../../godmode/agentes/configurar_agente.php:1762
+#: ../../godmode/agentes/modificar_agente.php:146
 #: ../../godmode/alerts/alert_list.php:247
 #: ../../godmode/massive/massive_enable_disable_alerts.php:96
 #: ../../godmode/users/user_list.php:203
-#: ../../include/ajax/alert_list.ajax.php:91
+#: ../../include/ajax/alert_list.ajax.php:102
 #: ../../enterprise/godmode/alerts/alert_events_list.php:238
 #: ../../enterprise/godmode/policies/policy_alerts.php:105
 #: ../../enterprise/godmode/policies/policy_modules.php:436
@@ -7702,11 +8119,11 @@ msgstr "有効にできませんでした。"
 msgid "Successfully disabled"
 msgstr "無効にしました。"
 
-#: ../../godmode/agentes/configurar_agente.php:1586
-#: ../../godmode/agentes/modificar_agente.php:135
+#: ../../godmode/agentes/configurar_agente.php:1762
+#: ../../godmode/agentes/modificar_agente.php:146
 #: ../../godmode/alerts/alert_list.php:247
 #: ../../godmode/massive/massive_enable_disable_alerts.php:96
-#: ../../include/ajax/alert_list.ajax.php:93
+#: ../../include/ajax/alert_list.ajax.php:104
 #: ../../enterprise/godmode/alerts/alert_events_list.php:239
 #: ../../enterprise/godmode/policies/policy_alerts.php:105
 #: ../../enterprise/godmode/policies/policy_modules.php:436
@@ -7715,42 +8132,52 @@ msgstr "無効にしました。"
 msgid "Could not be disabled"
 msgstr "無効にできませんでした。"
 
-#: ../../godmode/agentes/configurar_agente.php:1614
-#: ../../include/functions_api.php:7659
+#: ../../godmode/agentes/configurar_agente.php:1790
+#: ../../include/functions_api.php:7721
 msgid "Save by Pandora Console"
 msgstr "Pandora コンソールによる保存"
 
-#: ../../godmode/agentes/configurar_agente.php:1629
-#: ../../include/functions_api.php:7660
+#: ../../godmode/agentes/configurar_agente.php:1805
+#: ../../include/functions_api.php:7722
 msgid "Update by Pandora Console"
 msgstr "Pandora コンソールによる更新"
 
-#: ../../godmode/agentes/configurar_agente.php:1642
-#: ../../include/functions_api.php:7661
+#: ../../godmode/agentes/configurar_agente.php:1818
+#: ../../include/functions_api.php:7723
 msgid "Insert by Pandora Console"
 msgstr "Pandora コンソールによる挿入"
 
-#: ../../godmode/agentes/configurar_agente.php:1696
-#: ../../godmode/agentes/configurar_agente.php:1706
+#: ../../godmode/agentes/configurar_agente.php:1872
+#: ../../godmode/agentes/configurar_agente.php:1882
 msgid "Invalid tab specified"
 msgstr "不正なタブが指定されました"
 
-#: ../../godmode/agentes/configure_field.php:36
+#: ../../godmode/agentes/configure_field.php:38
 msgid "Update agent custom field"
 msgstr "エージェントカスタムフィールドの更新"
 
-#: ../../godmode/agentes/configure_field.php:39
+#: ../../godmode/agentes/configure_field.php:41
 msgid "Create agent custom field"
 msgstr "エージェントカスタムフィールドの作成"
 
-#: ../../godmode/agentes/configure_field.php:51
-#: ../../godmode/agentes/fields_manager.php:96
+#: ../../godmode/agentes/configure_field.php:53
+msgid "Pass type"
+msgstr "パスタイプ"
+
+#: ../../godmode/agentes/configure_field.php:53
+msgid ""
+"The fields with pass type enabled will be displayed like html input type "
+"pass in html"
+msgstr "パスタイプを有効化すると、html 内の入力パスタイプのように表示されます。"
+
+#: ../../godmode/agentes/configure_field.php:56
+#: ../../godmode/agentes/fields_manager.php:98
 #: ../../operation/agentes/custom_fields.php:61
 msgid "Display on front"
 msgstr "前面に表示"
 
-#: ../../godmode/agentes/configure_field.php:51
-#: ../../godmode/agentes/fields_manager.php:96
+#: ../../godmode/agentes/configure_field.php:56
+#: ../../godmode/agentes/fields_manager.php:98
 #: ../../operation/agentes/custom_fields.php:62
 msgid ""
 "The fields with display on front enabled will be displayed into the agent "
@@ -7761,117 +8188,130 @@ msgstr "前面表示が有効になっていると、エージェント詳細に
 msgid "Agents custom fields manager"
 msgstr "エージェントカスタムフィールド管理"
 
-#: ../../godmode/agentes/fields_manager.php:44
+#: ../../godmode/agentes/fields_manager.php:45
 msgid "The name must not be empty"
 msgstr "名前は空ではいけません"
 
-#: ../../godmode/agentes/fields_manager.php:47
+#: ../../godmode/agentes/fields_manager.php:48
 msgid "The name must be unique"
 msgstr "名前はユニークである必要があります"
 
-#: ../../godmode/agentes/fields_manager.php:52
+#: ../../godmode/agentes/fields_manager.php:54
 msgid "Field successfully created"
 msgstr "フィールドを作成しました。"
 
-#: ../../godmode/agentes/fields_manager.php:69
+#: ../../godmode/agentes/fields_manager.php:71
 msgid "Field successfully updated"
 msgstr "フィールドを更新しました。"
 
-#: ../../godmode/agentes/fields_manager.php:72
+#: ../../godmode/agentes/fields_manager.php:74
 msgid "There was a problem modifying field"
 msgstr "フィールドの修正で問題が発生しました。"
 
-#: ../../godmode/agentes/fields_manager.php:82
+#: ../../godmode/agentes/fields_manager.php:84
 msgid "There was a problem deleting field"
 msgstr "フィールドの削除で問題が発生しました。"
 
-#: ../../godmode/agentes/fields_manager.php:84
+#: ../../godmode/agentes/fields_manager.php:86
 msgid "Field successfully deleted"
 msgstr "フィールドを削除しました。"
 
-#: ../../godmode/agentes/fields_manager.php:95
+#: ../../godmode/agentes/fields_manager.php:97
 #: ../../godmode/alerts/alert_view.php:441
 #: ../../godmode/alerts/alert_view.php:531
 #: ../../operation/agentes/custom_fields.php:59
 msgid "Field"
 msgstr "フィールド"
 
-#: ../../godmode/agentes/fields_manager.php:138
+#: ../../godmode/agentes/fields_manager.php:140
 msgid "Create field"
 msgstr "フィールド作成"
 
-#: ../../godmode/agentes/modificar_agente.php:62
+#: ../../godmode/agentes/modificar_agente.php:63
 msgid "Agents defined in Pandora"
 msgstr "Pandora 内エージェント"
 
-#: ../../godmode/agentes/modificar_agente.php:87
+#: ../../godmode/agentes/modificar_agente.php:96
 msgid "Success deleted agent."
 msgstr "エージェントを削除しました"
 
-#: ../../godmode/agentes/modificar_agente.php:87
+#: ../../godmode/agentes/modificar_agente.php:96
 msgid "Could not be deleted."
 msgstr "削除できませんでした。"
 
-#: ../../godmode/agentes/modificar_agente.php:94
+#: ../../godmode/agentes/modificar_agente.php:103
 msgid "Maybe the files conf or md5 could not be deleted"
 msgstr "confまたはmd5ファイルを削除できませんでした"
 
-#: ../../godmode/agentes/modificar_agente.php:154
+#: ../../godmode/agentes/modificar_agente.php:165
 msgid "Show Agents"
 msgstr "エージェント表示"
 
-#: ../../godmode/agentes/modificar_agente.php:156
+#: ../../godmode/agentes/modificar_agente.php:167
 msgid "Everyone"
 msgstr "全て"
 
-#: ../../godmode/agentes/modificar_agente.php:157
-#: ../../operation/agentes/status_monitor.php:398
+#: ../../godmode/agentes/modificar_agente.php:168
+#: ../../operation/agentes/status_monitor.php:402
+#: ../../enterprise/operation/agentes/tag_view.php:201
 msgid "Only disabled"
 msgstr "無効のもののみ"
 
-#: ../../godmode/agentes/modificar_agente.php:158
-#: ../../operation/agentes/status_monitor.php:398
+#: ../../godmode/agentes/modificar_agente.php:169
+#: ../../operation/agentes/status_monitor.php:402
+#: ../../enterprise/operation/agentes/tag_view.php:201
 msgid "Only enabled"
 msgstr "有効のもののみ"
 
-#: ../../godmode/agentes/modificar_agente.php:165
-#: ../../godmode/agentes/planned_downtime.editor.php:706
-#: ../../operation/agentes/estado_agente.php:175
-#: ../../enterprise/godmode/policies/policies.php:233
-msgid "Recursion"
-msgstr "子を含める"
+#: ../../godmode/agentes/modificar_agente.php:176
+msgid "Operative System"
+msgstr "オペレーションシステム"
 
-#: ../../godmode/agentes/modificar_agente.php:481
+#: ../../godmode/agentes/modificar_agente.php:197
+msgid ""
+"Search filter by alias, name, description, IP address or custom fields "
+"content"
+msgstr "別名、名前、説明、IPドレス、カスタムフィールドの内容による検索フィルタ"
+
+#: ../../godmode/agentes/modificar_agente.php:464
 msgid "Remote agent configuration"
 msgstr "リモートエージェント設定"
 
-#: ../../godmode/agentes/modificar_agente.php:481
+#: ../../godmode/agentes/modificar_agente.php:464
 msgid "R"
 msgstr "R"
 
+#: ../../godmode/agentes/modificar_agente.php:560
+#: ../../operation/agentes/estado_agente.php:635
+#: ../../operation/agentes/estado_generalagente.php:105
+#: ../../operation/agentes/estado_generalagente.php:108
+#: ../../operation/search_agents.php:110
+msgid "Agent in planned downtime"
+msgstr "計画停止内のエージェント"
+
 #: ../../godmode/agentes/modificar_agente.php:597
 msgid "Edit remote config"
 msgstr "リモート設定"
 
-#: ../../godmode/agentes/modificar_agente.php:624
+#: ../../godmode/agentes/modificar_agente.php:632
 msgid "Enable agent"
 msgstr "エージェントの有効化"
 
-#: ../../godmode/agentes/modificar_agente.php:629
+#: ../../godmode/agentes/modificar_agente.php:637
 msgid "Disable agent"
 msgstr "エージェントの無効化"
 
-#: ../../godmode/agentes/modificar_agente.php:646
-#: ../../operation/agentes/estado_agente.php:643
-#: ../../operation/agentes/group_view.php:430
+#: ../../godmode/agentes/modificar_agente.php:654
+#: ../../operation/agentes/estado_agente.php:708
+#: ../../operation/agentes/group_view.php:436
 msgid "There are no defined agents"
 msgstr "定義されたエージェントがありません"
 
-#: ../../godmode/agentes/modificar_agente.php:654
-#: ../../operation/agentes/estado_agente.php:627
-#: ../../operation/agentes/estado_agente.php:647
+#: ../../godmode/agentes/modificar_agente.php:662
+#: ../../operation/agentes/estado_agente.php:692
+#: ../../operation/agentes/estado_agente.php:712
 #: ../../operation/snmpconsole/snmp_statistics.php:151
-#: ../../operation/snmpconsole/snmp_view.php:674
+#: ../../operation/snmpconsole/snmp_view.php:782
 #: ../../enterprise/meta/monitoring/wizard/wizard.agent.php:75
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:199
 msgid "Create agent"
@@ -7897,86 +8337,91 @@ msgstr "WMI サーバモジュールの新規作成"
 msgid "Create a new prediction server module"
 msgstr "予測サーバモジュールの新規作成"
 
-#: ../../godmode/agentes/module_manager.php:120
-#: ../../operation/agentes/estado_monitores.php:472
+#: ../../godmode/agentes/module_manager.php:123
+#: ../../operation/agentes/estado_monitores.php:485
 msgid "Show in hierachy mode"
 msgstr "階層モードで表示"
 
-#: ../../godmode/agentes/module_manager.php:148
+#: ../../godmode/agentes/module_manager.php:151
 msgid "Get more modules in Pandora FMS Library"
 msgstr "Pandora FMS モジュールライブラリから新しいモジュールを手に入れる"
 
-#: ../../godmode/agentes/module_manager.php:175
+#: ../../godmode/agentes/module_manager.php:178
 msgid "Nice try buddy"
 msgstr "問題が発生しました"
 
-#: ../../godmode/agentes/module_manager.php:272
+#: ../../godmode/agentes/module_manager.php:275
 #, php-format
 msgid "There was a problem deleting %s modules, none deleted."
 msgstr "%s 個のモジュール削除に失敗しました。いずれのモジュールも削除されていません。"
 
-#: ../../godmode/agentes/module_manager.php:277
+#: ../../godmode/agentes/module_manager.php:280
 msgid "All Modules deleted succesfully"
 msgstr "すべてのモジュールを削除しました"
 
-#: ../../godmode/agentes/module_manager.php:281
+#: ../../godmode/agentes/module_manager.php:284
 #, php-format
 msgid "There was a problem only deleted %s modules of %s total."
 msgstr "%s 個(全 %s 個中)のモジュール削除に失敗しました。"
 
-#: ../../godmode/agentes/module_manager.php:523
-#: ../../include/ajax/module.php:345
+#: ../../godmode/agentes/module_manager.php:526
+#: ../../godmode/reporting/map_builder.php:327
+#: ../../godmode/reporting/map_builder.php:341
+#: ../../include/ajax/module.php:370
 #: ../../operation/agentes/datos_agente.php:286
 msgid "No available data to show"
 msgstr "表示するデータがありません。"
 
-#: ../../godmode/agentes/module_manager.php:551
-#: ../../godmode/alerts/alert_view.php:123 ../../include/ajax/module.php:735
-#: ../../operation/agentes/alerts_status.php:412
-#: ../../operation/agentes/alerts_status.php:459
-#: ../../operation/agentes/status_monitor.php:946
+#: ../../godmode/agentes/module_manager.php:554
+#: ../../godmode/alerts/alert_view.php:123 ../../include/ajax/module.php:771
+#: ../../operation/agentes/alerts_status.php:445
+#: ../../operation/agentes/alerts_status.php:492
+#: ../../operation/agentes/status_monitor.php:954
 #: ../../enterprise/extensions/resource_exportation/functions.php:17
 #: ../../enterprise/godmode/agentes/collection_manager.php:162
 #: ../../enterprise/godmode/agentes/inventory_manager.php:231
 #: ../../enterprise/godmode/agentes/plugins_manager.php:144
 #: ../../enterprise/godmode/massive/massive_add_alerts_policy.php:91
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:161
 #: ../../enterprise/godmode/massive/massive_delete_alerts_policy.php:90
 #: ../../enterprise/godmode/massive/massive_edit_tags_policy.php:83
 #: ../../enterprise/godmode/massive/massive_tags_edit_policy.php:82
-#: ../../enterprise/godmode/policies/policy_queue.php:331
-#: ../../enterprise/godmode/policies/policy_queue.php:374
-#: ../../enterprise/include/functions_policies.php:3789
+#: ../../enterprise/godmode/policies/policy_queue.php:351
+#: ../../enterprise/godmode/policies/policy_queue.php:394
+#: ../../enterprise/include/functions_policies.php:3968
 #: ../../enterprise/meta/advanced/policymanager.queue.php:212
 #: ../../enterprise/meta/advanced/policymanager.queue.php:256
-#: ../../enterprise/meta/advanced/policymanager.sync.php:306
+#: ../../enterprise/meta/advanced/policymanager.sync.php:302
 #: ../../enterprise/operation/agentes/collection_view.php:62
 #: ../../enterprise/operation/agentes/policy_view.php:48
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:201
 msgid "Policy"
 msgstr "ポリシー"
 
-#: ../../godmode/agentes/module_manager.php:551
+#: ../../godmode/agentes/module_manager.php:554
+#: ../../godmode/reporting/graph_builder.graph_editor.php:203
 #: ../../godmode/reporting/reporting_builder.list_items.php:288
 #: ../../godmode/snmpconsole/snmp_alert.php:1148
-#: ../../include/ajax/module.php:735
-#: ../../operation/agentes/alerts_status.php:413
-#: ../../operation/agentes/alerts_status.php:459
-#: ../../operation/agentes/status_monitor.php:946
+#: ../../include/ajax/module.php:771
+#: ../../operation/agentes/alerts_status.php:446
+#: ../../operation/agentes/alerts_status.php:492
+#: ../../operation/agentes/status_monitor.php:954
 #: ../../enterprise/godmode/agentes/collection_manager.php:162
 #: ../../enterprise/godmode/agentes/inventory_manager.php:232
 #: ../../enterprise/operation/agentes/collection_view.php:62
 msgid "P."
 msgstr "P."
 
-#: ../../godmode/agentes/module_manager.php:554
+#: ../../godmode/agentes/module_manager.php:557
 #: ../../include/functions_events.php:898
-#: ../../mobile/operation/agents.php:322
-#: ../../operation/agentes/alerts_status.php:417
-#: ../../operation/agentes/alerts_status.php:462
-#: ../../operation/agentes/alerts_status.php:497
-#: ../../operation/agentes/alerts_status.php:532
+#: ../../mobile/operation/agents.php:345
+#: ../../operation/agentes/alerts_status.php:450
+#: ../../operation/agentes/alerts_status.php:495
+#: ../../operation/agentes/alerts_status.php:530
+#: ../../operation/agentes/alerts_status.php:565
 #: ../../enterprise/godmode/admin_access_logs.php:22
-#: ../../enterprise/godmode/policies/policy_agents.php:379
+#: ../../enterprise/godmode/policies/policy_agents.php:574
+#: ../../enterprise/godmode/policies/policy_agents.php:819
 #: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:217
 #: ../../enterprise/operation/agentes/policy_view.php:47
 #: ../../enterprise/operation/agentes/policy_view.php:134
@@ -7985,84 +8430,86 @@ msgstr "P."
 msgid "S."
 msgstr "S."
 
-#: ../../godmode/agentes/module_manager.php:565
-#: ../../include/ajax/module.php:748
-#: ../../operation/agentes/status_monitor.php:980
+#: ../../godmode/agentes/module_manager.php:568
+#: ../../operation/agentes/status_monitor.php:988
+#: ../../enterprise/operation/agentes/tag_view.php:536
 msgid "Warn"
 msgstr "警告"
 
-#: ../../godmode/agentes/module_manager.php:569
-#: ../../enterprise/godmode/policies/policy_agents.php:383
+#: ../../godmode/agentes/module_manager.php:572
+#: ../../enterprise/godmode/policies/policy_agents.php:579
+#: ../../enterprise/godmode/policies/policy_agents.php:823
 msgid "D."
 msgstr "削除"
 
-#: ../../godmode/agentes/module_manager.php:679
-#: ../../godmode/agentes/module_manager.php:689
-#: ../../include/ajax/module.php:836 ../../include/ajax/module.php:846
+#: ../../godmode/agentes/module_manager.php:682
+#: ../../godmode/agentes/module_manager.php:692
+#: ../../include/ajax/module.php:873 ../../include/ajax/module.php:883
 msgid "Adopted"
-msgstr "採用"
+msgstr "適用"
 
-#: ../../godmode/agentes/module_manager.php:689
-#: ../../godmode/agentes/module_manager.php:693
-#: ../../godmode/massive/massive_edit_modules.php:572
-#: ../../include/ajax/module.php:846 ../../include/ajax/module.php:850
+#: ../../godmode/agentes/module_manager.php:692
+#: ../../godmode/agentes/module_manager.php:696
+#: ../../godmode/massive/massive_edit_modules.php:604
+#: ../../include/ajax/module.php:883 ../../include/ajax/module.php:887
 msgid "Unlinked"
 msgstr "未リンク"
 
-#: ../../godmode/agentes/module_manager.php:716
+#: ../../godmode/agentes/module_manager.php:719
 #: ../../enterprise/operation/agentes/policy_view.php:355
 msgid "Non initialized module"
 msgstr "未初期化モジュール"
 
-#: ../../godmode/agentes/module_manager.php:733
-#: ../../godmode/agentes/module_manager_editor_common.php:398
+#: ../../godmode/agentes/module_manager.php:736
+#: ../../godmode/agentes/module_manager_editor_common.php:401
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:190
 msgid ""
 "The policy modules of data type will only update their intervals when policy "
 "is applied."
 msgstr "データタイプのポリシーモジュールは、ポリシーが適用されたときに、それ自身の間隔でのみ更新されます。"
 
-#: ../../godmode/agentes/module_manager.php:749
-#: ../../enterprise/godmode/policies/policy_modules.php:1241
-#: ../../enterprise/godmode/policies/policy_modules.php:1242
+#: ../../godmode/agentes/module_manager.php:757
+#: ../../enterprise/godmode/policies/policy_modules.php:1272
+#: ../../enterprise/godmode/policies/policy_modules.php:1273
 msgid "Enable module"
 msgstr "モジュールを有効化"
 
-#: ../../godmode/agentes/module_manager.php:754
-#: ../../enterprise/godmode/policies/policy_modules.php:1247
-#: ../../enterprise/godmode/policies/policy_modules.php:1248
+#: ../../godmode/agentes/module_manager.php:762
+#: ../../enterprise/godmode/policies/policy_modules.php:1278
+#: ../../enterprise/godmode/policies/policy_modules.php:1279
 msgid "Disable module"
 msgstr "モジュールを無効化"
 
-#: ../../godmode/agentes/module_manager.php:761
-#: ../../godmode/alerts/alert_templates.php:338
+#: ../../godmode/agentes/module_manager.php:769
+#: ../../godmode/alerts/alert_templates.php:339
 #: ../../godmode/modules/manage_network_components.php:613
 #: ../../godmode/snmpconsole/snmp_alert.php:1226
 #: ../../enterprise/godmode/modules/local_components.php:525
-#: ../../enterprise/godmode/policies/policy_modules.php:1255
+#: ../../enterprise/godmode/policies/policy_modules.php:1286
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:365
 msgid "Duplicate"
 msgstr "複製"
 
-#: ../../godmode/agentes/module_manager.php:769
+#: ../../godmode/agentes/module_manager.php:777
 msgid "Normalize"
 msgstr "正規化"
 
-#: ../../godmode/agentes/module_manager.php:775
+#: ../../godmode/agentes/module_manager.php:783
 msgid "Normalize (Disabled)"
 msgstr "正規化 (無効)"
 
-#: ../../godmode/agentes/module_manager.php:784
-#: ../../include/functions_snmp_browser.php:475
+#: ../../godmode/agentes/module_manager.php:792
+#: ../../include/functions_snmp_browser.php:521
 msgid "Create network component"
 msgstr "ネットワークコンポーネントの作成"
 
-#: ../../godmode/agentes/module_manager.php:789
+#: ../../godmode/agentes/module_manager.php:797
 msgid "Create network component (Disabled)"
 msgstr "ネットワークコンポーネントの作成 (無効)"
 
-#: ../../godmode/agentes/module_manager_editor.php:390
+#: ../../godmode/agentes/module_manager_editor.php:396
 #: ../../enterprise/godmode/policies/policies.php:191
-#: ../../enterprise/godmode/policies/policy_agents.php:80
+#: ../../enterprise/godmode/policies/policy_agents.php:85
 #: ../../enterprise/godmode/policies/policy_alerts.php:60
 #: ../../enterprise/godmode/policies/policy_collections.php:37
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:52
@@ -8072,22 +8519,22 @@ msgstr "ネットワークコンポーネントの作成 (無効)"
 msgid "This policy is applying and cannot be modified"
 msgstr "このポリシーを摘要すると変更できません。"
 
-#: ../../godmode/agentes/module_manager_editor.php:394
-#: ../../enterprise/include/functions_policies.php:3050
+#: ../../godmode/agentes/module_manager_editor.php:400
+#: ../../enterprise/include/functions_policies.php:3229
 msgid "Module will be linked in the next application"
 msgstr "モジュールは次回適用時にリンクされます。"
 
-#: ../../godmode/agentes/module_manager_editor.php:402
-#: ../../enterprise/include/functions_policies.php:3055
+#: ../../godmode/agentes/module_manager_editor.php:408
+#: ../../enterprise/include/functions_policies.php:3234
 msgid "Module will be unlinked in the next application"
 msgstr "モジュールは次回適用時にリンク解除されます。"
 
-#: ../../godmode/agentes/module_manager_editor.php:490
+#: ../../godmode/agentes/module_manager_editor.php:496
 #, php-format
 msgid "DEBUG: Invalid module type specified in %s:%s"
 msgstr "DEBUG: %s:%s に不正なモジュールタイプが指定されています"
 
-#: ../../godmode/agentes/module_manager_editor.php:491
+#: ../../godmode/agentes/module_manager_editor.php:497
 msgid ""
 "Most likely you have recently upgraded from an earlier version of Pandora "
 "and either <br />\n"
@@ -8101,67 +8548,91 @@ msgstr ""
 "\t\t\t\t2) 正しくないバージョンのデータベース変換の利用 (解決方法はバグレポート #2124706  を参照)<br />\n"
 "\t\t\t\t3) 新たなバグ - このエラーを再現する方法をレポートしてください"
 
-#: ../../godmode/agentes/module_manager_editor.php:517
+#: ../../godmode/agentes/module_manager_editor.php:524
 #: ../../godmode/agentes/module_manager_editor_common.php:667
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:231
 msgid "Custom macros"
 msgstr "カスタムマクロ"
 
-#: ../../godmode/agentes/module_manager_editor.php:519
+#: ../../godmode/agentes/module_manager_editor.php:528
 msgid "Module relations"
 msgstr "モジュール関係"
 
-#: ../../godmode/agentes/module_manager_editor.php:565
-#: ../../enterprise/godmode/policies/policy_modules.php:1357
+#: ../../godmode/agentes/module_manager_editor.php:574
+#: ../../enterprise/godmode/policies/policy_modules.php:1388
 msgid "No module name provided"
 msgstr "モジュール名がありません。"
 
-#: ../../godmode/agentes/module_manager_editor.php:566
-#: ../../enterprise/godmode/policies/policy_modules.php:1358
+#: ../../godmode/agentes/module_manager_editor.php:575
+#: ../../enterprise/godmode/policies/policy_modules.php:1389
 msgid "No target IP provided"
 msgstr "対象 IP がありません。"
 
-#: ../../godmode/agentes/module_manager_editor.php:567
-#: ../../enterprise/godmode/policies/policy_modules.php:1359
+#: ../../godmode/agentes/module_manager_editor.php:576
+#: ../../enterprise/godmode/policies/policy_modules.php:1390
 msgid "No SNMP OID provided"
 msgstr "SNMP OID がありません。"
 
-#: ../../godmode/agentes/module_manager_editor.php:568
+#: ../../godmode/agentes/module_manager_editor.php:577
 msgid "No module to predict"
 msgstr "予測モジュールがありません。"
 
-#: ../../godmode/agentes/module_manager_editor.php:569
+#: ../../godmode/agentes/module_manager_editor.php:578
 msgid "No plug-in provided"
 msgstr "プラグインがありません"
 
-#: ../../godmode/agentes/module_manager_editor.php:592
+#: ../../godmode/agentes/module_manager_editor.php:579
+msgid "No server provided"
+msgstr "サーバがありません"
+
+#: ../../godmode/agentes/module_manager_editor.php:605
 msgid ""
 "Error, The field name and name in module_name in data configuration are "
 "different."
 msgstr "エラー、データ設定におけるフィールド名と module_name 内の名前が異なります。"
 
+#: ../../godmode/agentes/module_manager_editor.php:644
+msgid "The File APIs are not fully supported in this browser."
+msgstr "このブラウザでは、ファイル API は完全にはサポートされていません。"
+
+#: ../../godmode/agentes/module_manager_editor.php:645
+msgid "Couldn`t find the fileinput element."
+msgstr "ファイル入力要素がみつかりません。"
+
+#: ../../godmode/agentes/module_manager_editor.php:646
+msgid ""
+"This browser doesn`t seem to support the files property of file inputs."
+msgstr "このブラウザは、ファイル入力におけるファイルのプロパティをサポートしていません。"
+
+#: ../../godmode/agentes/module_manager_editor.php:647
+msgid "Please select a file before clicking Load"
+msgstr "読み込みをクリックする前にファイルを選択してください。"
+
 #: ../../godmode/agentes/module_manager_editor_common.php:70
 msgid "Using module component"
 msgstr "モジュールコンポーネント"
 
 #: ../../godmode/agentes/module_manager_editor_common.php:76
 #: ../../godmode/agentes/module_manager_editor_common.php:85
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:54
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:64
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:61
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:71
 msgid "Manual setup"
 msgstr "個別設定"
 
 #: ../../godmode/agentes/module_manager_editor_common.php:161
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:75
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1423
 msgid "Delete module"
 msgstr "モジュール削除"
 
 #: ../../godmode/agentes/module_manager_editor_common.php:176
 #: ../../godmode/agentes/module_manager_editor_common.php:182
-#: ../../godmode/massive/massive_edit_modules.php:521
-#: ../../include/functions_graph.php:5310
+#: ../../godmode/massive/massive_edit_modules.php:547
 #: ../../include/functions_treeview.php:118
-#: ../../operation/agentes/status_monitor.php:312
+#: ../../include/functions_graph.php:6186
+#: ../../operation/agentes/status_monitor.php:310
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1382
+#: ../../enterprise/operation/agentes/tag_view.php:95
 msgid "Not assigned"
 msgstr "未割当"
 
@@ -8191,8 +8662,8 @@ msgstr "最大動的しきい値 "
 msgid "Dynamic Threshold Two Tailed: "
 msgstr "2つの動的しきい値を使う: "
 
-#: ../../godmode/agentes/module_manager_editor_common.php:278
-#: ../../godmode/massive/massive_edit_modules.php:368
+#: ../../godmode/agentes/module_manager_editor_common.php:277
+#: ../../godmode/massive/massive_edit_modules.php:388
 #: ../../godmode/modules/manage_network_components_form_common.php:118
 #: ../../include/functions_alerts.php:573
 #: ../../include/functions_treeview.php:98
@@ -8201,24 +8672,24 @@ msgstr "2つの動的しきい値を使う: "
 msgid "Warning status"
 msgstr "警告状態"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:280
-#: ../../godmode/agentes/module_manager_editor_common.php:301
+#: ../../godmode/agentes/module_manager_editor_common.php:279
+#: ../../godmode/agentes/module_manager_editor_common.php:300
 msgid "Min. "
 msgstr "最小 "
 
-#: ../../godmode/agentes/module_manager_editor_common.php:283
-#: ../../godmode/agentes/module_manager_editor_common.php:304
-#: ../../godmode/alerts/configure_alert_template.php:625
-#: ../../godmode/massive/massive_edit_modules.php:381
-#: ../../godmode/massive/massive_edit_modules.php:427
-#: ../../godmode/massive/massive_edit_modules.php:516
+#: ../../godmode/agentes/module_manager_editor_common.php:282
+#: ../../godmode/agentes/module_manager_editor_common.php:303
+#: ../../godmode/alerts/configure_alert_template.php:628
+#: ../../godmode/massive/massive_edit_modules.php:401
+#: ../../godmode/massive/massive_edit_modules.php:447
+#: ../../godmode/massive/massive_edit_modules.php:542
 #: ../../godmode/modules/manage_network_components_form_common.php:122
 #: ../../godmode/modules/manage_network_components_form_common.php:139
 #: ../../include/functions_alerts.php:569
-#: ../../include/functions_graph.php:4322
-#: ../../include/functions_reporting_html.php:3141
 #: ../../include/functions_treeview.php:94
 #: ../../include/functions_treeview.php:107
+#: ../../include/functions_graph.php:5162
+#: ../../include/functions_reporting_html.php:3254
 #: ../../enterprise/dashboard/widgets/top_n.php:78
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:250
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:279
@@ -8227,10 +8698,10 @@ msgstr "最小 "
 msgid "Max."
 msgstr "最大"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:288
-#: ../../godmode/agentes/module_manager_editor_common.php:309
-#: ../../godmode/massive/massive_edit_modules.php:390
-#: ../../godmode/massive/massive_edit_modules.php:436
+#: ../../godmode/agentes/module_manager_editor_common.php:287
+#: ../../godmode/agentes/module_manager_editor_common.php:308
+#: ../../godmode/massive/massive_edit_modules.php:410
+#: ../../godmode/massive/massive_edit_modules.php:456
 #: ../../godmode/modules/manage_network_components_form_common.php:125
 #: ../../godmode/modules/manage_network_components_form_common.php:142
 #: ../../include/functions_treeview.php:91
@@ -8242,10 +8713,10 @@ msgstr "最大"
 msgid "Str."
 msgstr "文字列"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:292
-#: ../../godmode/agentes/module_manager_editor_common.php:314
-#: ../../godmode/massive/massive_edit_modules.php:400
-#: ../../godmode/massive/massive_edit_modules.php:446
+#: ../../godmode/agentes/module_manager_editor_common.php:291
+#: ../../godmode/agentes/module_manager_editor_common.php:313
+#: ../../godmode/massive/massive_edit_modules.php:420
+#: ../../godmode/massive/massive_edit_modules.php:466
 #: ../../godmode/modules/manage_network_components_form_common.php:128
 #: ../../godmode/modules/manage_network_components_form_common.php:145
 #: ../../enterprise/godmode/modules/configure_local_component.php:247
@@ -8266,8 +8737,8 @@ msgstr "文字列"
 msgid "Inverse interval"
 msgstr "条件の反転"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:299
-#: ../../godmode/massive/massive_edit_modules.php:414
+#: ../../godmode/agentes/module_manager_editor_common.php:298
+#: ../../godmode/massive/massive_edit_modules.php:434
 #: ../../godmode/modules/manage_network_components_form_common.php:135
 #: ../../include/functions_alerts.php:574
 #: ../../include/functions_treeview.php:110
@@ -8276,60 +8747,61 @@ msgstr "条件の反転"
 msgid "Critical status"
 msgstr "障害状態"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:318
-#: ../../godmode/massive/massive_edit_modules.php:543
+#: ../../godmode/agentes/module_manager_editor_common.php:317
+#: ../../godmode/massive/massive_edit_modules.php:575
 #: ../../godmode/modules/manage_network_components_form_common.php:148
 #: ../../enterprise/godmode/modules/configure_local_component.php:267
 msgid "FF threshold"
 msgstr "連続抑制回数"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:321
-#: ../../godmode/massive/massive_edit_modules.php:545
-#: ../../godmode/massive/massive_edit_modules.php:546
+#: ../../godmode/agentes/module_manager_editor_common.php:320
+#: ../../godmode/massive/massive_edit_modules.php:577
+#: ../../godmode/massive/massive_edit_modules.php:578
 #: ../../godmode/modules/manage_network_components_form_common.php:150
 #: ../../enterprise/godmode/modules/configure_local_component.php:269
 msgid "All state changing"
 msgstr "全状態変化"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:324
-#: ../../godmode/massive/massive_edit_modules.php:545
-#: ../../godmode/massive/massive_edit_modules.php:547
+#: ../../godmode/agentes/module_manager_editor_common.php:323
+#: ../../godmode/massive/massive_edit_modules.php:577
+#: ../../godmode/massive/massive_edit_modules.php:579
 #: ../../godmode/modules/manage_network_components_form_common.php:153
 #: ../../enterprise/godmode/modules/configure_local_component.php:272
 msgid "Each state changing"
 msgstr "個別状態変化"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:325
-#: ../../godmode/massive/massive_edit_modules.php:548
+#: ../../godmode/agentes/module_manager_editor_common.php:324
+#: ../../godmode/massive/massive_edit_modules.php:580
 #: ../../godmode/modules/manage_network_components_form_common.php:154
 #: ../../enterprise/godmode/modules/configure_local_component.php:273
 msgid "To normal"
 msgstr "正常移行時"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:328
-#: ../../godmode/massive/massive_edit_modules.php:549
+#: ../../godmode/agentes/module_manager_editor_common.php:327
+#: ../../godmode/massive/massive_edit_modules.php:581
 #: ../../godmode/modules/manage_network_components_form_common.php:156
 #: ../../enterprise/godmode/modules/configure_local_component.php:275
 msgid "To warning"
 msgstr "警告移行時"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:331
-#: ../../godmode/massive/massive_edit_modules.php:550
+#: ../../godmode/agentes/module_manager_editor_common.php:330
+#: ../../godmode/massive/massive_edit_modules.php:582
 #: ../../godmode/modules/manage_network_components_form_common.php:158
 #: ../../enterprise/godmode/modules/configure_local_component.php:277
 msgid "To critical"
 msgstr "障害移行時"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:334
-#: ../../godmode/massive/massive_edit_modules.php:557
+#: ../../godmode/agentes/module_manager_editor_common.php:333
+#: ../../godmode/massive/massive_edit_modules.php:589
 #: ../../godmode/modules/manage_network_components_form_common.php:161
-#: ../../include/functions_reporting.php:2346
+#: ../../include/functions_reporting.php:2435
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:110
 #: ../../enterprise/godmode/modules/configure_local_component.php:281
 msgid "Historical data"
 msgstr "データの保存"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:366
-#: ../../godmode/massive/massive_edit_modules.php:538
+#: ../../godmode/agentes/module_manager_editor_common.php:365
+#: ../../godmode/massive/massive_edit_modules.php:570
 #: ../../godmode/modules/manage_network_components_form_common.php:168
 #: ../../include/functions_netflow.php:1131
 #: ../../include/functions_netflow.php:1141
@@ -8339,9 +8811,9 @@ msgstr "データの保存"
 #: ../../include/functions_netflow.php:1248
 #: ../../include/functions_netflow.php:1254
 #: ../../include/functions_netflow.php:1286
-#: ../../include/functions_reporting_html.php:2117
+#: ../../include/functions_reporting_html.php:2120
 #: ../../enterprise/godmode/modules/configure_local_component.php:296
-#: ../../enterprise/include/functions_reporting_pdf.php:2368
+#: ../../enterprise/include/functions_reporting_pdf.php:2449
 #: ../../enterprise/meta/include/functions_wizard_meta.php:786
 #: ../../enterprise/meta/include/functions_wizard_meta.php:904
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1082
@@ -8351,15 +8823,17 @@ msgstr "データの保存"
 msgid "Unit"
 msgstr "単位"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:385
 #: ../../godmode/agentes/module_manager_editor_common.php:388
+#: ../../godmode/agentes/module_manager_editor_common.php:391
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:177
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:180
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:113
 #, php-format
 msgid "Agent interval x %s"
 msgstr "エージェント実行間隔 x %s"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:412
-#: ../../godmode/massive/massive_edit_modules.php:475
+#: ../../godmode/agentes/module_manager_editor_common.php:415
+#: ../../godmode/massive/massive_edit_modules.php:495
 #: ../../godmode/modules/manage_network_components_form_network.php:80
 #: ../../godmode/modules/manage_network_components_form_plugin.php:27
 #: ../../godmode/modules/manage_network_components_form_wmi.php:56
@@ -8368,237 +8842,234 @@ msgstr "エージェント実行間隔 x %s"
 msgid "Post process"
 msgstr "データ保存倍率"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:419
+#: ../../godmode/agentes/module_manager_editor_common.php:422
 #: ../../godmode/modules/manage_network_components_form_common.php:164
+#: ../../include/functions_reporting.php:3822
+#: ../../include/functions_graph.php:806
+#: ../../include/functions_graph.php:4618
 #: ../../include/functions_reports.php:568
-#: ../../include/functions_graph.php:705
-#: ../../include/functions_graph.php:3934
-#: ../../include/functions_reporting.php:3705
 #: ../../enterprise/godmode/modules/configure_local_component.php:289
-#: ../../enterprise/include/functions_reporting_csv.php:723
-#: ../../enterprise/include/functions_reporting_csv.php:739
-#: ../../enterprise/include/functions_reporting_csv.php:746
+#: ../../enterprise/include/functions_reporting_csv.php:772
+#: ../../enterprise/include/functions_reporting_csv.php:788
+#: ../../enterprise/include/functions_reporting_csv.php:795
 msgid "Min. Value"
 msgstr "最小値"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:422
+#: ../../godmode/agentes/module_manager_editor_common.php:425
 msgid "Any value below this number is discarted."
 msgstr "この値より小さい値は破棄されます。"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:423
+#: ../../godmode/agentes/module_manager_editor_common.php:426
 #: ../../godmode/modules/manage_network_components_form_common.php:166
+#: ../../include/functions_reporting.php:3819
+#: ../../include/functions_graph.php:804
+#: ../../include/functions_graph.php:4617
 #: ../../include/functions_reports.php:566
-#: ../../include/functions_graph.php:703
-#: ../../include/functions_graph.php:3933
-#: ../../include/functions_reporting.php:3702
 #: ../../enterprise/godmode/modules/configure_local_component.php:294
-#: ../../enterprise/include/functions_reporting_csv.php:759
-#: ../../enterprise/include/functions_reporting_csv.php:775
-#: ../../enterprise/include/functions_reporting_csv.php:782
+#: ../../enterprise/include/functions_reporting_csv.php:809
+#: ../../enterprise/include/functions_reporting_csv.php:825
+#: ../../enterprise/include/functions_reporting_csv.php:832
 msgid "Max. Value"
 msgstr "最大値"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:424
+#: ../../godmode/agentes/module_manager_editor_common.php:427
 msgid "Any value over this number is discarted."
 msgstr "この値より大きい値は破棄されます。"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:427
-#: ../../godmode/massive/massive_edit_modules.php:532
+#: ../../godmode/agentes/module_manager_editor_common.php:430
+#: ../../godmode/massive/massive_edit_modules.php:558
 msgid "Export target"
 msgstr "データのエクスポート"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:433
+#: ../../godmode/agentes/module_manager_editor_common.php:436
 msgid "Not needed"
 msgstr "不要です。"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:437
+#: ../../godmode/agentes/module_manager_editor_common.php:440
 msgid ""
 "In case you use an Export server you can link this module and export data to "
 "one these."
 msgstr "エクスポートサーバを利用している場合は、このモジュールをリンクしエクスポートできます。"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:451
-#: ../../godmode/massive/massive_edit_modules.php:581
+#: ../../godmode/agentes/module_manager_editor_common.php:454
+#: ../../godmode/massive/massive_edit_modules.php:613
 #: ../../godmode/modules/manage_network_components_form_common.php:171
 msgid "Discard unknown events"
 msgstr "不明イベントを削除"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:456
-#: ../../godmode/massive/massive_edit_modules.php:552
+#: ../../godmode/agentes/module_manager_editor_common.php:459
+#: ../../godmode/massive/massive_edit_modules.php:584
 msgid "FF interval"
 msgstr "連続抑制時の間隔"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:459
-#: ../../godmode/massive/massive_edit_modules.php:553
+#: ../../godmode/agentes/module_manager_editor_common.php:462
+#: ../../godmode/massive/massive_edit_modules.php:585
 msgid "Module execution flip flop time interval (in secs)."
 msgstr "連続抑制時のモジュールの実行間隔(秒単位)です。"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:462
-#: ../../godmode/massive/massive_edit_modules.php:554
+#: ../../godmode/agentes/module_manager_editor_common.php:465
+#: ../../godmode/massive/massive_edit_modules.php:586
 #: ../../enterprise/godmode/modules/configure_local_component.php:284
 msgid "FF timeout"
 msgstr "連続抑制タイムアウト"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:468
-#: ../../godmode/massive/massive_edit_modules.php:555
+#: ../../godmode/agentes/module_manager_editor_common.php:471
+#: ../../godmode/massive/massive_edit_modules.php:587
 #: ../../enterprise/godmode/modules/configure_local_component.php:286
 msgid ""
 "Timeout in secs from start of flip flop counting. If this value is exceeded, "
 "FF counter is reset. Set to 0 for no timeout."
 msgstr "連続抑制開始からのタイムアウト秒数です。この値を超えると連続抑制のカウンタがリセットされます。0に設定するとタイムアウトしません。"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:471
+#: ../../godmode/agentes/module_manager_editor_common.php:474
 #: ../../enterprise/godmode/modules/configure_local_component.php:287
 msgid "This value can be set only in the async modules."
 msgstr "この値は非同期モジュールでのみ設定可能です。"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:478
+#: ../../godmode/agentes/module_manager_editor_common.php:481
 #: ../../godmode/modules/manage_network_components_form_common.php:212
 #: ../../enterprise/godmode/modules/configure_local_component.php:387
 msgid "Tags available"
 msgstr "利用可能なタグ"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:540
+#: ../../godmode/agentes/module_manager_editor_common.php:543
 #: ../../godmode/modules/manage_network_components_form_common.php:219
 #: ../../enterprise/godmode/modules/configure_local_component.php:394
 msgid "Add tags to module"
 msgstr "モジュールへのタグ追加"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:541
+#: ../../godmode/agentes/module_manager_editor_common.php:544
 #: ../../godmode/modules/manage_network_components_form_common.php:220
 #: ../../enterprise/godmode/modules/configure_local_component.php:396
 msgid "Delete tags to module"
 msgstr "モジュールのタグ削除"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:543
+#: ../../godmode/agentes/module_manager_editor_common.php:546
 #: ../../godmode/modules/manage_network_components_form_common.php:222
 #: ../../enterprise/godmode/modules/configure_local_component.php:398
 msgid "Tags selected"
 msgstr "選択タグ"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:554
+#: ../../godmode/agentes/module_manager_editor_common.php:557
 msgid "Tags from policy"
 msgstr "ポリシーからのタグ"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:567
+#: ../../godmode/agentes/module_manager_editor_common.php:570
 msgid "The module still stores data but the alerts and events will be stop"
 msgstr "モジュールはデータの保存を行いますが、アラートとイベントは停止します"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:572
-#: ../../godmode/massive/massive_edit_modules.php:589
+#: ../../godmode/agentes/module_manager_editor_common.php:575
+#: ../../godmode/massive/massive_edit_modules.php:621
 #: ../../godmode/modules/manage_network_components_form_common.php:175
 #: ../../enterprise/godmode/modules/configure_local_component.php:344
 msgid "Critical instructions"
 msgstr "障害時手順"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:573
-#: ../../godmode/massive/massive_edit_modules.php:589
+#: ../../godmode/agentes/module_manager_editor_common.php:576
+#: ../../godmode/massive/massive_edit_modules.php:621
 #: ../../godmode/modules/manage_network_components_form_common.php:175
 #: ../../enterprise/godmode/modules/configure_local_component.php:345
 msgid "Instructions when the status is critical"
 msgstr "障害状態になった時の手順"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:578
-#: ../../godmode/massive/massive_edit_modules.php:593
+#: ../../godmode/agentes/module_manager_editor_common.php:581
+#: ../../godmode/massive/massive_edit_modules.php:625
 #: ../../godmode/modules/manage_network_components_form_common.php:179
 #: ../../enterprise/godmode/modules/configure_local_component.php:350
 msgid "Warning instructions"
 msgstr "警告時手順"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:579
-#: ../../godmode/massive/massive_edit_modules.php:593
+#: ../../godmode/agentes/module_manager_editor_common.php:582
+#: ../../godmode/massive/massive_edit_modules.php:625
 #: ../../godmode/modules/manage_network_components_form_common.php:179
 #: ../../enterprise/godmode/modules/configure_local_component.php:351
 msgid "Instructions when the status is warning"
 msgstr "警告状態になった時の手順"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:583
-#: ../../godmode/massive/massive_edit_modules.php:597
+#: ../../godmode/agentes/module_manager_editor_common.php:586
+#: ../../godmode/massive/massive_edit_modules.php:629
 #: ../../godmode/modules/manage_network_components_form_common.php:183
 #: ../../enterprise/godmode/modules/configure_local_component.php:356
 msgid "Unknown instructions"
 msgstr "不明状態時手順"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:583
-#: ../../godmode/massive/massive_edit_modules.php:597
+#: ../../godmode/agentes/module_manager_editor_common.php:586
+#: ../../godmode/massive/massive_edit_modules.php:629
 #: ../../godmode/modules/manage_network_components_form_common.php:183
 #: ../../enterprise/godmode/modules/configure_local_component.php:357
 msgid "Instructions when the status is unknown"
 msgstr "不明状態になった時の手順"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:590
-#: ../../godmode/agentes/module_manager_editor_common.php:600
-#: ../../godmode/agentes/module_manager_editor_common.php:611
+#: ../../godmode/agentes/module_manager_editor_common.php:593
+#: ../../godmode/agentes/module_manager_editor_common.php:602
+#: ../../godmode/agentes/module_manager_editor_common.php:612
 msgid "Cron from"
 msgstr "Cron 開始"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:591
-#: ../../godmode/agentes/module_manager_editor_common.php:601
-#: ../../godmode/agentes/module_manager_editor_common.php:612
-msgid ""
-"If cron is set the module interval is ignored and the module runs on the "
-"specified date and time"
-msgstr "cron が設定されている場合、モジュールの実行間隔は無視され、モジュールは指定された日時に実行されます。"
-
-#: ../../godmode/agentes/module_manager_editor_common.php:595
-#: ../../godmode/agentes/module_manager_editor_common.php:605
+#: ../../godmode/agentes/module_manager_editor_common.php:597
+#: ../../godmode/agentes/module_manager_editor_common.php:606
 #: ../../godmode/agentes/module_manager_editor_common.php:616
 msgid "Cron to"
 msgstr "Cron 終了"
 
 #: ../../godmode/agentes/module_manager_editor_common.php:621
-#: ../../godmode/massive/massive_edit_modules.php:606
+#: ../../godmode/massive/massive_edit_modules.php:638
 #: ../../enterprise/operation/agentes/manage_transmap_creation_phases_data.php:68
 msgid "Timeout"
 msgstr "タイムアウト"
 
 #: ../../godmode/agentes/module_manager_editor_common.php:622
-#: ../../godmode/massive/massive_edit_modules.php:610
+#: ../../godmode/massive/massive_edit_modules.php:642
 msgid "Seconds that agent will wait for the execution of the module."
 msgstr "エージェントがモジュールの実行完了を待つ秒数。"
 
 #: ../../godmode/agentes/module_manager_editor_common.php:624
+#: ../../godmode/massive/massive_edit_modules.php:644
 #: ../../enterprise/operation/agentes/manage_transmap_creation_phases_data.php:65
 msgid "Retries"
 msgstr "リトライ"
 
 #: ../../godmode/agentes/module_manager_editor_common.php:625
+#: ../../godmode/massive/massive_edit_modules.php:647
 msgid "Number of retries that the module will attempt to run."
 msgstr "モジュールを再実行する回数。"
 
 #: ../../godmode/agentes/module_manager_editor_common.php:629
-#: ../../godmode/massive/massive_edit_modules.php:565
+#: ../../godmode/massive/massive_edit_modules.php:597
 #: ../../godmode/modules/manage_network_components_form_common.php:190
 #: ../../enterprise/godmode/modules/configure_local_component.php:366
 msgid "Category"
 msgstr "操作"
 
 #: ../../godmode/agentes/module_manager_editor_common.php:657
-#: ../../godmode/alerts/configure_alert_template.php:602
-#: ../../godmode/massive/massive_edit_modules.php:513
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1317
+#: ../../godmode/alerts/configure_alert_template.php:605
+#: ../../godmode/massive/massive_edit_modules.php:539
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1383
 #: ../../godmode/reporting/visual_console_builder.wizard.php:237
-#: ../../godmode/setup/setup_visuals.php:703
+#: ../../godmode/setup/setup_visuals.php:769
 #: ../../godmode/snmpconsole/snmp_trap_generator.php:75
-#: ../../include/functions_graph.php:5454
-#: ../../include/functions_reporting_html.php:732
-#: ../../include/functions_reporting_html.php:1488
-#: ../../include/functions_reporting_html.php:2594
-#: ../../include/functions_reporting_html.php:3107
-#: ../../include/functions_snmp_browser.php:406
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:271
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1611
-#: ../../enterprise/include/functions_reporting_csv.php:523
-#: ../../enterprise/include/functions_reporting_csv.php:558
-#: ../../enterprise/include/functions_reporting_csv.php:594
-#: ../../enterprise/include/functions_reporting_csv.php:631
-#: ../../enterprise/include/functions_reporting_csv.php:699
-#: ../../enterprise/include/functions_reporting_csv.php:735
-#: ../../enterprise/include/functions_reporting_csv.php:771
-#: ../../enterprise/include/functions_reporting_csv.php:807
-#: ../../enterprise/include/functions_reporting_pdf.php:776
-#: ../../enterprise/include/functions_reporting_pdf.php:837
-#: ../../enterprise/include/functions_reporting_pdf.php:929
+#: ../../include/functions_visual_map_editor.php:516
+#: ../../include/functions_graph.php:6331
+#: ../../include/functions_snmp_browser.php:452
+#: ../../include/functions_reporting_html.php:735
+#: ../../include/functions_reporting_html.php:1491
+#: ../../include/functions_reporting_html.php:2661
+#: ../../include/functions_reporting_html.php:3220
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:221
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:285
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1717
+#: ../../enterprise/include/functions_reporting_csv.php:567
+#: ../../enterprise/include/functions_reporting_csv.php:603
+#: ../../enterprise/include/functions_reporting_csv.php:640
+#: ../../enterprise/include/functions_reporting_csv.php:678
+#: ../../enterprise/include/functions_reporting_csv.php:747
+#: ../../enterprise/include/functions_reporting_csv.php:784
+#: ../../enterprise/include/functions_reporting_csv.php:821
+#: ../../enterprise/include/functions_reporting_csv.php:916
+#: ../../enterprise/include/functions_reporting_pdf.php:822
+#: ../../enterprise/include/functions_reporting_pdf.php:886
+#: ../../enterprise/include/functions_reporting_pdf.php:1010
+#: ../../enterprise/meta/include/functions_autoprovision.php:541
 #: ../../enterprise/operation/services/services.list.php:341
 #: ../../enterprise/operation/services/services.service.php:137
 msgid "Value"
@@ -8616,55 +9087,57 @@ msgstr "変更"
 msgid "Activate this to prevent the relation from being updated or deleted"
 msgstr "更新や削除に対しても関係を維持するには、これを有効にしてください"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:1248
-#: ../../godmode/modules/manage_network_components_form_common.php:379
-#: ../../enterprise/godmode/modules/configure_local_component.php:740
+#: ../../godmode/agentes/module_manager_editor_common.php:1204
+#: ../../godmode/modules/manage_network_components_form_common.php:357
+#: ../../enterprise/godmode/modules/configure_local_component.php:717
 msgid "Normal Status"
 msgstr "正常状態"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:1249
-#: ../../godmode/modules/manage_network_components_form_common.php:380
-#: ../../enterprise/godmode/modules/configure_local_component.php:741
+#: ../../godmode/agentes/module_manager_editor_common.php:1205
+#: ../../godmode/modules/manage_network_components_form_common.php:358
+#: ../../enterprise/godmode/modules/configure_local_component.php:718
 msgid "Warning Status"
 msgstr "警告状態"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:1250
-#: ../../godmode/modules/manage_network_components_form_common.php:381
-#: ../../enterprise/godmode/modules/configure_local_component.php:742
+#: ../../godmode/agentes/module_manager_editor_common.php:1206
+#: ../../godmode/modules/manage_network_components_form_common.php:359
+#: ../../enterprise/godmode/modules/configure_local_component.php:719
 msgid "Critical Status"
 msgstr "障害状態"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:1471
-#: ../../godmode/modules/manage_network_components_form_common.php:602
-#: ../../enterprise/godmode/modules/configure_local_component.php:963
+#: ../../godmode/agentes/module_manager_editor_common.php:1208
+#: ../../godmode/modules/manage_network_components_form_common.php:361
+#: ../../enterprise/godmode/modules/configure_local_component.php:721
 msgid "Please introduce a maximum warning higher than the minimun warning"
 msgstr "警告の最大値は、警告の最小値よりも大きくしてください"
 
-#: ../../godmode/agentes/module_manager_editor_common.php:1472
-#: ../../godmode/modules/manage_network_components_form_common.php:603
-#: ../../enterprise/godmode/modules/configure_local_component.php:964
+#: ../../godmode/agentes/module_manager_editor_common.php:1209
+#: ../../godmode/modules/manage_network_components_form_common.php:362
+#: ../../enterprise/godmode/modules/configure_local_component.php:722
 msgid "Please introduce a maximum critical higher than the minimun critical"
 msgstr "障害の最大値は、障害の最小値よりも大きくしてください"
 
 #: ../../godmode/agentes/module_manager_editor_data.php:17
-#: ../../operation/agentes/status_monitor.php:380
+#: ../../operation/agentes/status_monitor.php:381
+#: ../../enterprise/operation/agentes/tag_view.php:180
 msgid "Data server module"
 msgstr "データサーバモジュール"
 
 #: ../../godmode/agentes/module_manager_editor_network.php:27
-#: ../../include/functions_snmp_browser.php:603
+#: ../../include/functions_snmp_browser.php:670
 msgid "Search matches"
 msgstr "検索マッチ"
 
 #: ../../godmode/agentes/module_manager_editor_network.php:64
-#: ../../operation/agentes/status_monitor.php:382
+#: ../../operation/agentes/status_monitor.php:383
+#: ../../enterprise/operation/agentes/tag_view.php:182
 msgid "Network server module"
 msgstr "ネットワークサーバモジュール"
 
 #: ../../godmode/agentes/module_manager_editor_network.php:85
-#: ../../godmode/massive/massive_edit_modules.php:484
-#: ../../include/ajax/events.php:481
-#: ../../enterprise/godmode/services/services.service.php:258
+#: ../../godmode/massive/massive_edit_modules.php:510
+#: ../../include/ajax/events.php:529
+#: ../../enterprise/godmode/services/services.service.php:298
 #: ../../enterprise/meta/include/functions_wizard_meta.php:390
 #: ../../enterprise/operation/services/services.list.php:190
 #: ../../enterprise/operation/services/services.table_services.php:159
@@ -8672,59 +9145,66 @@ msgid "Auto"
 msgstr "自動"
 
 #: ../../godmode/agentes/module_manager_editor_network.php:86
-#: ../../godmode/massive/massive_edit_modules.php:485
+#: ../../godmode/massive/massive_edit_modules.php:511
 #: ../../enterprise/meta/include/functions_wizard_meta.php:391
 msgid "Force primary key"
 msgstr "プライマリを利用"
 
 #: ../../godmode/agentes/module_manager_editor_network.php:87
-#: ../../godmode/massive/massive_edit_modules.php:486
-#: ../../include/functions_html.php:647 ../../include/functions_html.php:648
-#: ../../include/functions_html.php:771 ../../include/functions_html.php:772
-#: ../../enterprise/extensions/cron/functions.php:227
-#: ../../enterprise/godmode/setup/setup_acl.php:146
-#: ../../enterprise/godmode/setup/setup_acl.php:390
+#: ../../godmode/massive/massive_edit_modules.php:512
+#: ../../include/functions_html.php:666 ../../include/functions_html.php:667
+#: ../../include/functions_html.php:745 ../../include/functions_html.php:746
+#: ../../include/functions_html.php:860 ../../include/functions_html.php:861
+#: ../../enterprise/extensions/cron/functions.php:236
+#: ../../enterprise/godmode/setup/setup_acl.php:355
+#: ../../enterprise/godmode/setup/setup_acl.php:599
 #: ../../enterprise/include/functions_backup.php:483
 #: ../../enterprise/include/functions_backup.php:484
 #: ../../enterprise/meta/include/functions_wizard_meta.php:392
+#: ../../enterprise/meta/include/functions_autoprovision.php:314
 msgid "Custom"
 msgstr "カスタム"
 
 #: ../../godmode/agentes/module_manager_editor_network.php:152
+#: ../../godmode/massive/massive_edit_modules.php:505
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
 #: ../../godmode/agentes/module_manager_editor_network.php:171
+#: ../../godmode/massive/massive_edit_modules.php:656
 #: ../../godmode/modules/manage_network_components_form_network.php:90
 msgid "TCP send"
 msgstr "TCP 送信文字列"
 
 #: ../../godmode/agentes/module_manager_editor_network.php:177
+#: ../../godmode/massive/massive_edit_modules.php:659
 #: ../../godmode/modules/manage_network_components_form_network.php:97
 msgid "TCP receive"
 msgstr "TCP 受信文字列"
 
 #: ../../godmode/agentes/module_manager_editor_network.php:219
 #: ../../godmode/agentes/module_manager_editor_network.php:229
-#: ../../godmode/massive/massive_edit_modules.php:501
-#: ../../godmode/massive/massive_edit_modules.php:505
+#: ../../godmode/massive/massive_edit_modules.php:527
+#: ../../godmode/massive/massive_edit_modules.php:531
 msgid "The pass length must be eight character minimum."
 msgstr "パスワード長は、最低8文字以上必要です。"
 
 #: ../../godmode/agentes/module_manager_editor_network.php:229
-#: ../../godmode/massive/massive_edit_modules.php:505
+#: ../../godmode/massive/massive_edit_modules.php:531
 #: ../../godmode/modules/manage_network_components_form_network.php:67
-#: ../../include/functions_snmp_browser.php:538
+#: ../../include/functions_snmp_browser.php:605
 msgid "Privacy pass"
 msgstr "暗号化パスワード"
 
 #: ../../godmode/agentes/module_manager_editor_plugin.php:47
-#: ../../operation/agentes/status_monitor.php:384
+#: ../../operation/agentes/status_monitor.php:385
+#: ../../enterprise/operation/agentes/tag_view.php:185
 msgid "Plugin server module"
 msgstr "プラグインサーバモジュール"
 
 #: ../../godmode/agentes/module_manager_editor_prediction.php:88
-#: ../../operation/agentes/status_monitor.php:388
+#: ../../operation/agentes/status_monitor.php:389
+#: ../../enterprise/operation/agentes/tag_view.php:191
 msgid "Prediction server module"
 msgstr "予測サーバモジュール"
 
@@ -8738,97 +9218,102 @@ msgid "Select Module"
 msgstr "モジュールの選択"
 
 #: ../../godmode/agentes/module_manager_editor_prediction.php:150
-#: ../../godmode/reporting/graph_builder.main.php:147
-#: ../../godmode/reporting/reporting_builder.item_editor.php:748
+#: ../../godmode/reporting/graph_builder.main.php:158
+#: ../../godmode/reporting/reporting_builder.item_editor.php:787
 #: ../../godmode/reporting/visual_console_builder.elements.php:80
 #: ../../godmode/reporting/visual_console_builder.wizard.php:185
-#: ../../include/functions_visual_map_editor.php:438
+#: ../../include/functions_visual_map_editor.php:576
 #: ../../enterprise/dashboard/widgets/custom_graph.php:36
-#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:70
-#: ../../enterprise/dashboard/widgets/single_graph.php:72
+#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:68
+#: ../../enterprise/dashboard/widgets/single_graph.php:69
 #: ../../enterprise/dashboard/widgets/sla_percent.php:67
 #: ../../enterprise/dashboard/widgets/top_n.php:59
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:198
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:97
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1273
-#: ../../enterprise/include/functions_reporting_csv.php:257
-#: ../../enterprise/include/functions_reporting_csv.php:260
-#: ../../enterprise/include/functions_reporting_csv.php:376
-#: ../../enterprise/include/functions_reporting_csv.php:403
-#: ../../enterprise/include/functions_reporting_csv.php:429
-#: ../../enterprise/include/functions_reporting_csv.php:495
-#: ../../enterprise/include/functions_reporting_csv.php:523
-#: ../../enterprise/include/functions_reporting_csv.php:558
-#: ../../enterprise/include/functions_reporting_csv.php:594
-#: ../../enterprise/include/functions_reporting_csv.php:631
-#: ../../enterprise/include/functions_reporting_csv.php:699
-#: ../../enterprise/include/functions_reporting_csv.php:735
-#: ../../enterprise/include/functions_reporting_csv.php:771
-#: ../../enterprise/include/functions_reporting_csv.php:807
-#: ../../enterprise/include/functions_reporting_csv.php:843
-#: ../../enterprise/include/functions_reporting_csv.php:920
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:98
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1343
+#: ../../enterprise/include/functions_reporting_csv.php:267
+#: ../../enterprise/include/functions_reporting_csv.php:270
+#: ../../enterprise/include/functions_reporting_csv.php:389
+#: ../../enterprise/include/functions_reporting_csv.php:416
+#: ../../enterprise/include/functions_reporting_csv.php:442
+#: ../../enterprise/include/functions_reporting_csv.php:509
+#: ../../enterprise/include/functions_reporting_csv.php:567
+#: ../../enterprise/include/functions_reporting_csv.php:603
+#: ../../enterprise/include/functions_reporting_csv.php:640
+#: ../../enterprise/include/functions_reporting_csv.php:678
+#: ../../enterprise/include/functions_reporting_csv.php:747
+#: ../../enterprise/include/functions_reporting_csv.php:784
+#: ../../enterprise/include/functions_reporting_csv.php:821
+#: ../../enterprise/include/functions_reporting_csv.php:916
+#: ../../enterprise/include/functions_reporting_csv.php:953
+#: ../../enterprise/include/functions_reporting_csv.php:1032
 msgid "Period"
 msgstr "更新間隔"
 
 #: ../../godmode/agentes/module_manager_editor_prediction.php:152
-#: ../../godmode/agentes/planned_downtime.editor.php:533
-#: ../../enterprise/extensions/cron/functions.php:195
+#: ../../godmode/agentes/planned_downtime.editor.php:548
+#: ../../enterprise/extensions/cron/functions.php:204
 #: ../../enterprise/extensions/vmware/functions.php:27
 msgid "Weekly"
 msgstr "週次"
 
 #: ../../godmode/agentes/module_manager_editor_prediction.php:153
-#: ../../godmode/agentes/planned_downtime.editor.php:534
-#: ../../enterprise/extensions/cron/functions.php:196
+#: ../../godmode/agentes/planned_downtime.editor.php:549
+#: ../../enterprise/extensions/cron/functions.php:205
 #: ../../enterprise/extensions/vmware/functions.php:28
 msgid "Monthly"
 msgstr "月次"
 
 #: ../../godmode/agentes/module_manager_editor_prediction.php:154
-#: ../../enterprise/extensions/cron/functions.php:194
+#: ../../enterprise/extensions/cron/functions.php:203
 #: ../../enterprise/extensions/vmware/functions.php:26
 msgid "Daily"
 msgstr "日次"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:32
-#: ../../operation/agentes/status_monitor.php:386
+#: ../../operation/agentes/status_monitor.php:387
+#: ../../enterprise/operation/agentes/tag_view.php:188
 msgid "WMI server module"
 msgstr "WMI サーバモジュール"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:64
+#: ../../godmode/massive/massive_edit_modules.php:662
 #: ../../godmode/modules/manage_network_components_form_wmi.php:32
 msgid "WMI query"
 msgstr "WMI クエリ"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:73
+#: ../../godmode/massive/massive_edit_modules.php:665
 #: ../../godmode/modules/manage_network_components_form_wmi.php:34
 msgid "Key string"
 msgstr "Key 文字列"
 
 #: ../../godmode/agentes/module_manager_editor_wmi.php:77
+#: ../../godmode/massive/massive_edit_modules.php:668
 #: ../../godmode/modules/manage_network_components_form_wmi.php:40
 msgid "Field number"
 msgstr "フィールド番号"
 
 #: ../../godmode/agentes/planned_downtime.editor.php:38
 #: ../../godmode/alerts/alert_list.php:326
-#: ../../godmode/category/category.php:58 ../../include/functions_html.php:660
-#: ../../include/functions_html.php:661 ../../include/functions_html.php:786
-#: ../../include/functions_html.php:787 ../../operation/events/events.php:405
+#: ../../godmode/category/category.php:58 ../../include/functions_html.php:679
+#: ../../include/functions_html.php:680 ../../include/functions_html.php:758
+#: ../../include/functions_html.php:759 ../../include/functions_html.php:876
+#: ../../include/functions_html.php:877 ../../operation/events/events.php:431
 #: ../../operation/snmpconsole/snmp_statistics.php:55
-#: ../../operation/snmpconsole/snmp_view.php:74
+#: ../../operation/snmpconsole/snmp_view.php:82
 #: ../../enterprise/include/functions_backup.php:496
 #: ../../enterprise/include/functions_backup.php:497
 msgid "List"
 msgstr "一覧"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:115
-#: ../../godmode/agentes/planned_downtime.editor.php:187
-#: ../../godmode/agentes/planned_downtime.editor.php:942
+#: ../../godmode/agentes/planned_downtime.editor.php:117
+#: ../../godmode/agentes/planned_downtime.editor.php:202
+#: ../../godmode/agentes/planned_downtime.editor.php:970
 msgid "This elements cannot be modified while the downtime is being executed"
 msgstr "計画停止実行中は、この要素は変更できません。"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:212
+#: ../../godmode/agentes/planned_downtime.editor.php:227
 #: ../../include/functions_planned_downtimes.php:42
 #: ../../include/functions_planned_downtimes.php:678
 msgid ""
@@ -8836,10 +9321,10 @@ msgid ""
 "current time"
 msgstr "作成できませんでした。データ挿入エラーです。開始時刻は現在時刻よりも後でなければいけません。"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:215
-#: ../../godmode/agentes/planned_downtime.editor.php:218
-#: ../../godmode/agentes/planned_downtime.editor.php:223
-#: ../../godmode/agentes/planned_downtime.editor.php:226
+#: ../../godmode/agentes/planned_downtime.editor.php:230
+#: ../../godmode/agentes/planned_downtime.editor.php:233
+#: ../../godmode/agentes/planned_downtime.editor.php:238
+#: ../../godmode/agentes/planned_downtime.editor.php:241
 #: ../../include/functions_planned_downtimes.php:45
 #: ../../include/functions_planned_downtimes.php:50
 #: ../../include/functions_planned_downtimes.php:53
@@ -8850,63 +9335,63 @@ msgstr "作成できませんでした。データ挿入エラーです。開始
 msgid "Not created. Error inserting data"
 msgstr "設定できませんでした。入力データエラーです。"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:215
+#: ../../godmode/agentes/planned_downtime.editor.php:230
 #: ../../include/functions_planned_downtimes.php:45
 #: ../../include/functions_planned_downtimes.php:683
 msgid "The end date must be higher than the start date"
 msgstr "終了日は開始日より後でなければいけません"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:218
+#: ../../godmode/agentes/planned_downtime.editor.php:233
 #: ../../include/functions_planned_downtimes.php:688
 msgid "The end date must be higher than the current time"
 msgstr "終了日時は開始日時より後でなければいけません"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:223
-#: ../../godmode/agentes/planned_downtime.editor.php:592
-#: ../../godmode/agentes/planned_downtime.editor.php:600
+#: ../../godmode/agentes/planned_downtime.editor.php:238
+#: ../../godmode/agentes/planned_downtime.editor.php:607
+#: ../../godmode/agentes/planned_downtime.editor.php:615
 #: ../../include/functions_planned_downtimes.php:50
 #: ../../include/functions_planned_downtimes.php:696
 msgid "The end time must be higher than the start time"
 msgstr "終了時刻は開始時刻より後でなければいけません"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:226
-#: ../../godmode/agentes/planned_downtime.editor.php:581
+#: ../../godmode/agentes/planned_downtime.editor.php:241
+#: ../../godmode/agentes/planned_downtime.editor.php:596
 #: ../../include/functions_planned_downtimes.php:53
 #: ../../include/functions_planned_downtimes.php:703
 msgid "The end day must be higher than the start day"
 msgstr "終了日は開始日より後でなければいけません"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:275
+#: ../../godmode/agentes/planned_downtime.editor.php:290
 #: ../../include/functions_planned_downtimes.php:94
 #: ../../include/functions_planned_downtimes.php:717
 msgid "Each planned downtime must have a different name"
 msgstr "それぞれの計画停止は異なる名前でなければいけません"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:280
-#: ../../godmode/agentes/planned_downtime.editor.php:307
+#: ../../godmode/agentes/planned_downtime.editor.php:295
+#: ../../godmode/agentes/planned_downtime.editor.php:322
 #: ../../include/functions_planned_downtimes.php:100
 #: ../../include/functions_planned_downtimes.php:722
 msgid "Planned downtime must have a name"
 msgstr "計画停止には名前が必要です"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:318
+#: ../../godmode/agentes/planned_downtime.editor.php:333
 msgid "Cannot be modified while the downtime is being executed"
 msgstr "計画停止実行中は編集できません"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:359
+#: ../../godmode/agentes/planned_downtime.editor.php:374
 #: ../../godmode/alerts/alert_actions.php:263
 #: ../../godmode/alerts/alert_list.php:196
 #: ../../godmode/alerts/alert_special_days.php:207
-#: ../../godmode/alerts/alert_templates.php:152
+#: ../../godmode/alerts/alert_templates.php:153
 #: ../../godmode/alerts/configure_alert_command.php:94
-#: ../../godmode/alerts/configure_alert_template.php:445
-#: ../../godmode/massive/massive_edit_modules.php:153
+#: ../../godmode/alerts/configure_alert_template.php:448
 #: ../../godmode/modules/manage_network_components.php:346
 #: ../../godmode/setup/gis.php:41
 #: ../../include/functions_planned_downtimes.php:122
-#: ../../operation/agentes/pandora_networkmap.php:247
+#: ../../operation/agentes/pandora_networkmap.php:166
+#: ../../operation/agentes/pandora_networkmap.php:401
 #: ../../operation/incidents/incident.php:111
-#: ../../operation/snmpconsole/snmp_view.php:115
+#: ../../operation/snmpconsole/snmp_view.php:135
 #: ../../enterprise/extensions/ipam/ipam_action.php:128
 #: ../../enterprise/extensions/ipam/ipam_massive.php:42
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:99
@@ -8916,253 +9401,255 @@ msgstr "計画停止実行中は編集できません"
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:106
 #: ../../enterprise/godmode/modules/local_components.php:309
 #: ../../enterprise/godmode/policies/policies.php:159
-#: ../../enterprise/godmode/policies/policy_modules.php:1039
+#: ../../enterprise/godmode/policies/policy_modules.php:1070
 #: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:67
-#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:52
+#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:53
 #: ../../enterprise/godmode/servers/credential_boxes_satellite.php:130
 #: ../../enterprise/godmode/servers/server_disk_conf_editor.php:121
 #: ../../enterprise/operation/agentes/transactional_map.php:112
 msgid "Could not be updated"
 msgstr "更新に失敗しました。"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:485
+#: ../../godmode/agentes/planned_downtime.editor.php:500
 msgid "Quiet: Modules will not generate events or fire alerts."
 msgstr "静観: モジュールはイベント生成やアラートの発報を行いません"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:486
+#: ../../godmode/agentes/planned_downtime.editor.php:501
 msgid "Disable Agents: Disables the selected agents."
 msgstr "エージェント無効化: 選択したエージェントを無効化します。"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:487
+#: ../../godmode/agentes/planned_downtime.editor.php:502
 msgid "Disable Alerts: Disable alerts for the selected agents."
 msgstr "アラートのみ無効化: 選択したエージェントのアラートを無効化します。"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:489
+#: ../../godmode/agentes/planned_downtime.editor.php:504
 #: ../../godmode/agentes/planned_downtime.list.php:428
 msgid "Disabled Agents"
 msgstr "エージェント無効化"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:490
+#: ../../godmode/agentes/planned_downtime.editor.php:505
 #: ../../godmode/agentes/planned_downtime.list.php:429
 msgid "Disabled only Alerts"
 msgstr "アラートのみ無効化"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:493
+#: ../../godmode/agentes/planned_downtime.editor.php:508
 #: ../../godmode/agentes/planned_downtime.list.php:395
-#: ../../include/functions_reporting_html.php:3821
-#: ../../enterprise/include/functions_reporting.php:4560
-#: ../../enterprise/include/functions_reporting_pdf.php:2422
+#: ../../include/functions_reporting_html.php:4100
+#: ../../enterprise/include/functions_reporting.php:4978
+#: ../../enterprise/include/functions_reporting_pdf.php:2503
 msgid "Execution"
 msgstr "実行"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:494
+#: ../../godmode/agentes/planned_downtime.editor.php:509
 #: ../../godmode/agentes/planned_downtime.list.php:153
 msgid "Once"
 msgstr "一回のみ"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:495
+#: ../../godmode/agentes/planned_downtime.editor.php:510
 #: ../../godmode/agentes/planned_downtime.list.php:153
 #: ../../godmode/agentes/planned_downtime.list.php:434
 msgid "Periodically"
 msgstr "定期的"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:500
+#: ../../godmode/agentes/planned_downtime.editor.php:515
 msgid "Configure the time"
 msgstr "時間設定"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:506
+#: ../../godmode/agentes/planned_downtime.editor.php:521
 #: ../../include/functions_reporting_html.php:63
-#: ../../include/functions_reporting_html.php:3394
+#: ../../include/functions_reporting_html.php:3507
 msgid "From:"
 msgstr "開始日時:"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:510
-#: ../../godmode/agentes/planned_downtime.editor.php:521
+#: ../../godmode/agentes/planned_downtime.editor.php:525
+#: ../../godmode/agentes/planned_downtime.editor.php:536
 #: ../../operation/netflow/nf_live_view.php:240
-#: ../../enterprise/extensions/cron/main.php:331
-#: ../../enterprise/operation/log/log_viewer.php:218
-#: ../../enterprise/operation/log/log_viewer.php:226
+#: ../../enterprise/extensions/cron/main.php:477
+#: ../../enterprise/operation/log/log_viewer.php:234
+#: ../../enterprise/operation/log/log_viewer.php:242
 msgid "Date format in Pandora is year/month/day"
 msgstr "Pandora での日付フォーマットは、年/月/日 です"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:512
-#: ../../godmode/agentes/planned_downtime.editor.php:523
-#: ../../godmode/agentes/planned_downtime.editor.php:591
-#: ../../godmode/agentes/planned_downtime.editor.php:599
-#: ../../godmode/alerts/configure_alert_template.php:540
-#: ../../godmode/alerts/configure_alert_template.php:544
-#: ../../godmode/reporting/reporting_builder.item_editor.php:848
-#: ../../godmode/reporting/reporting_builder.item_editor.php:857
+#: ../../godmode/agentes/planned_downtime.editor.php:527
+#: ../../godmode/agentes/planned_downtime.editor.php:538
+#: ../../godmode/agentes/planned_downtime.editor.php:606
+#: ../../godmode/agentes/planned_downtime.editor.php:614
+#: ../../godmode/alerts/configure_alert_template.php:543
+#: ../../godmode/alerts/configure_alert_template.php:547
+#: ../../godmode/reporting/reporting_builder.item_editor.php:887
+#: ../../godmode/reporting/reporting_builder.item_editor.php:896
 #: ../../operation/netflow/nf_live_view.php:242
-#: ../../enterprise/extensions/cron/main.php:333
-#: ../../enterprise/operation/log/log_viewer.php:220
-#: ../../enterprise/operation/log/log_viewer.php:228
+#: ../../enterprise/extensions/cron/main.php:479
+#: ../../enterprise/operation/log/log_viewer.php:236
+#: ../../enterprise/operation/log/log_viewer.php:244
 msgid "Time format in Pandora is hours(24h):minutes:seconds"
 msgstr "Pandora での時間フォーマットは、時(24時間表記):分:秒 です"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:517
+#: ../../godmode/agentes/planned_downtime.editor.php:532
 #: ../../include/functions_reporting_html.php:64
-#: ../../include/functions_reporting_html.php:3395
+#: ../../include/functions_reporting_html.php:3508
 msgid "To:"
 msgstr "終了日時:"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:531
+#: ../../godmode/agentes/planned_downtime.editor.php:546
 msgid "Type Periodicity:"
 msgstr "定期実行タイプ:"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:544
+#: ../../godmode/agentes/planned_downtime.editor.php:559
 #: ../../godmode/alerts/alert_special_days.php:327
 #: ../../godmode/alerts/alert_view.php:208
-#: ../../godmode/alerts/configure_alert_template.php:521
-#: ../../include/functions.php:913 ../../include/functions_reporting.php:10006
+#: ../../godmode/alerts/configure_alert_template.php:524
+#: ../../include/functions.php:913 ../../include/functions_reporting.php:10670
 #: ../../enterprise/godmode/alerts/alert_events.php:431
-#: ../../enterprise/include/functions_reporting.php:4596
+#: ../../enterprise/include/functions_reporting.php:5014
 msgid "Mon"
 msgstr "月"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:547
+#: ../../godmode/agentes/planned_downtime.editor.php:562
 #: ../../godmode/alerts/alert_special_days.php:328
 #: ../../godmode/alerts/alert_view.php:209
-#: ../../godmode/alerts/configure_alert_template.php:523
-#: ../../include/functions.php:915 ../../include/functions_reporting.php:10010
+#: ../../godmode/alerts/configure_alert_template.php:526
+#: ../../include/functions.php:915 ../../include/functions_reporting.php:10674
 #: ../../enterprise/godmode/alerts/alert_events.php:433
-#: ../../enterprise/include/functions_reporting.php:4600
+#: ../../enterprise/include/functions_reporting.php:5018
 msgid "Tue"
 msgstr "火"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:550
+#: ../../godmode/agentes/planned_downtime.editor.php:565
 #: ../../godmode/alerts/alert_special_days.php:329
 #: ../../godmode/alerts/alert_view.php:210
-#: ../../godmode/alerts/configure_alert_template.php:525
-#: ../../include/functions.php:917 ../../include/functions_reporting.php:10014
+#: ../../godmode/alerts/configure_alert_template.php:528
+#: ../../include/functions.php:917 ../../include/functions_reporting.php:10678
 #: ../../enterprise/godmode/alerts/alert_events.php:435
-#: ../../enterprise/include/functions_reporting.php:4604
+#: ../../enterprise/include/functions_reporting.php:5022
 msgid "Wed"
 msgstr "水"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:553
+#: ../../godmode/agentes/planned_downtime.editor.php:568
 #: ../../godmode/alerts/alert_special_days.php:330
 #: ../../godmode/alerts/alert_view.php:211
-#: ../../godmode/alerts/configure_alert_template.php:527
-#: ../../include/functions.php:919 ../../include/functions_reporting.php:10018
+#: ../../godmode/alerts/configure_alert_template.php:530
+#: ../../include/functions.php:919 ../../include/functions_reporting.php:10682
 #: ../../enterprise/godmode/alerts/alert_events.php:437
-#: ../../enterprise/include/functions_reporting.php:4608
+#: ../../enterprise/include/functions_reporting.php:5026
 msgid "Thu"
 msgstr "木"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:556
+#: ../../godmode/agentes/planned_downtime.editor.php:571
 #: ../../godmode/alerts/alert_special_days.php:331
 #: ../../godmode/alerts/alert_view.php:212
-#: ../../godmode/alerts/configure_alert_template.php:529
-#: ../../include/functions.php:921 ../../include/functions_reporting.php:10022
+#: ../../godmode/alerts/configure_alert_template.php:532
+#: ../../include/functions.php:921 ../../include/functions_reporting.php:10686
 #: ../../enterprise/godmode/alerts/alert_events.php:439
-#: ../../enterprise/include/functions_reporting.php:4612
+#: ../../enterprise/include/functions_reporting.php:5030
 msgid "Fri"
 msgstr "金"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:559
+#: ../../godmode/agentes/planned_downtime.editor.php:574
 #: ../../godmode/alerts/alert_special_days.php:332
 #: ../../godmode/alerts/alert_view.php:213
-#: ../../godmode/alerts/configure_alert_template.php:531
-#: ../../include/functions.php:923 ../../include/functions_reporting.php:10026
+#: ../../godmode/alerts/configure_alert_template.php:534
+#: ../../include/functions.php:923 ../../include/functions_reporting.php:10690
 #: ../../enterprise/godmode/alerts/alert_events.php:441
-#: ../../enterprise/include/functions_reporting.php:4616
+#: ../../enterprise/include/functions_reporting.php:5034
 msgid "Sat"
 msgstr "土"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:562
+#: ../../godmode/agentes/planned_downtime.editor.php:577
 #: ../../godmode/alerts/alert_special_days.php:326
 #: ../../godmode/alerts/alert_view.php:214
-#: ../../godmode/alerts/configure_alert_template.php:533
-#: ../../include/functions.php:925 ../../include/functions_reporting.php:10030
+#: ../../godmode/alerts/configure_alert_template.php:536
+#: ../../include/functions.php:925 ../../include/functions_reporting.php:10694
 #: ../../enterprise/godmode/alerts/alert_events.php:443
-#: ../../enterprise/include/functions_reporting.php:4620
+#: ../../enterprise/include/functions_reporting.php:5038
 msgid "Sun"
 msgstr "日"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:569
+#: ../../godmode/agentes/planned_downtime.editor.php:584
 msgid "From day:"
 msgstr "開始日:"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:575
+#: ../../godmode/agentes/planned_downtime.editor.php:590
 msgid "To day:"
 msgstr "終了日:"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:586
+#: ../../godmode/agentes/planned_downtime.editor.php:601
 msgid "From hour:"
 msgstr "開始時間:"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:594
+#: ../../godmode/agentes/planned_downtime.editor.php:609
 msgid "To hour:"
 msgstr "終了時間:"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:637
+#: ../../godmode/agentes/planned_downtime.editor.php:724
 msgid "Available agents"
 msgstr "エージェント"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:714
+#: ../../godmode/agentes/planned_downtime.editor.php:738
 msgid "Available modules:"
 msgstr "存在するモジュール:"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:715
+#: ../../godmode/agentes/planned_downtime.editor.php:739
 msgid "Only for type Quiet for downtimes."
 msgstr "静観タイプの場合のみ"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:729
+#: ../../godmode/agentes/planned_downtime.editor.php:755
 msgid "Agents planned for this downtime"
 msgstr "この計画停止が予定される対象エージェント"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:744
+#: ../../godmode/agentes/planned_downtime.editor.php:770
 msgid "There are no agents"
 msgstr "エージェントがありません"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:756
-#: ../../godmode/users/user_list.php:272 ../../include/ajax/module.php:751
-#: ../../include/functions_events.php:2038
-#: ../../include/functions_treeview.php:602
-#: ../../mobile/operation/agent.php:161 ../../mobile/operation/agents.php:85
-#: ../../mobile/operation/agents.php:337 ../../mobile/operation/agents.php:339
-#: ../../mobile/operation/agents.php:341 ../../mobile/operation/agents.php:342
-#: ../../operation/agentes/estado_agente.php:531
-#: ../../operation/agentes/estado_generalagente.php:205
-#: ../../operation/agentes/ver_agente.php:696
+#: ../../godmode/agentes/planned_downtime.editor.php:782
+#: ../../godmode/users/user_list.php:269 ../../include/ajax/module.php:788
+#: ../../include/functions_treeview.php:608
+#: ../../include/functions_events.php:2139
+#: ../../mobile/operation/agent.php:188 ../../mobile/operation/agents.php:85
+#: ../../mobile/operation/agents.php:360 ../../mobile/operation/agents.php:362
+#: ../../mobile/operation/agents.php:364 ../../mobile/operation/agents.php:365
+#: ../../operation/agentes/estado_agente.php:579
+#: ../../operation/agentes/estado_generalagente.php:234
+#: ../../operation/agentes/ver_agente.php:771
 #: ../../operation/gis_maps/ajax.php:219 ../../operation/gis_maps/ajax.php:321
 #: ../../operation/search_agents.php:66 ../../operation/search_users.php:47
-#: ../../enterprise/meta/agentsearch.php:100
+#: ../../enterprise/extensions/vmware/ajax.php:101
+#: ../../enterprise/meta/agentsearch.php:109
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1149
 #: ../../enterprise/operation/agentes/policy_view.php:309
+#: ../../enterprise/operation/agentes/tag_view.php:472
 #: ../../enterprise/operation/agentes/ver_agente.php:75
 msgid "Last contact"
 msgstr "最近の接続"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:780
+#: ../../godmode/agentes/planned_downtime.editor.php:806
 msgid "All alerts"
 msgstr "全アラート"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:783
+#: ../../godmode/agentes/planned_downtime.editor.php:809
 msgid "Entire agent"
 msgstr "全エージェント"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:787
-#: ../../godmode/agentes/planned_downtime.editor.php:892
+#: ../../godmode/agentes/planned_downtime.editor.php:813
+#: ../../godmode/agentes/planned_downtime.editor.php:918
 msgid "All modules"
 msgstr "全モジュール"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:790
-#: ../../godmode/agentes/planned_downtime.editor.php:884
-#: ../../godmode/agentes/planned_downtime.editor.php:888
+#: ../../godmode/agentes/planned_downtime.editor.php:816
+#: ../../godmode/agentes/planned_downtime.editor.php:910
+#: ../../godmode/agentes/planned_downtime.editor.php:914
 msgid "Some modules"
 msgstr "いくつかのモジュール"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:856
+#: ../../godmode/agentes/planned_downtime.editor.php:882
 msgid "Add Module:"
 msgstr "モジュール追加:"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:1072
+#: ../../godmode/agentes/planned_downtime.editor.php:1100
 msgid "Please select a module."
 msgstr "モジュールを選択してください。"
 
-#: ../../godmode/agentes/planned_downtime.editor.php:1204
+#: ../../godmode/agentes/planned_downtime.editor.php:1233
 msgid ""
 "WARNING: If you edit this planned downtime, the data of future SLA reports "
 "may be altered"
@@ -9196,15 +9683,17 @@ msgstr "この計画停止は実行中です"
 #: ../../godmode/netflow/nf_edit.php:77 ../../godmode/netflow/nf_edit.php:101
 #: ../../godmode/netflow/nf_item_list.php:106
 #: ../../godmode/netflow/nf_item_list.php:127
-#: ../../godmode/reporting/graphs.php:88 ../../godmode/reporting/graphs.php:98
-#: ../../godmode/reporting/graphs.php:137
-#: ../../godmode/reporting/map_builder.php:94
+#: ../../godmode/reporting/graphs.php:91
+#: ../../godmode/reporting/graphs.php:101
+#: ../../godmode/reporting/graphs.php:140
+#: ../../godmode/reporting/map_builder.php:101
 #: ../../operation/reporting/graph_viewer.php:46
 #: ../../operation/reporting/graph_viewer.php:53
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:99
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:120
-#: ../../enterprise/godmode/reporting/graph_template_list.php:87
-#: ../../enterprise/godmode/reporting/graph_template_list.php:107
+#: ../../enterprise/godmode/reporting/graph_template_list.php:90
+#: ../../enterprise/godmode/reporting/graph_template_list.php:110
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:226
 msgid "Not deleted. Error deleting data"
 msgstr "データの削除に失敗しました。"
 
@@ -9212,22 +9701,30 @@ msgstr "データの削除に失敗しました。"
 #: ../../godmode/alerts/alert_list.list.php:532
 #: ../../godmode/alerts/alert_list.list.php:536
 #: ../../godmode/alerts/alert_templates.php:94
-#: ../../operation/agentes/gis_view.php:181
+#: ../../include/functions_reporting_html.php:2234
+#: ../../include/functions_snmp.php:348 ../../include/functions_snmp.php:354
+#: ../../operation/agentes/gis_view.php:201
 #: ../../operation/reporting/reporting_viewer.php:194
 #: ../../enterprise/godmode/alerts/alert_events_list.php:559
 #: ../../enterprise/godmode/policies/policy_alerts.php:336
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:222
-#: ../../enterprise/include/functions_reporting_pdf.php:2217
-#: ../../enterprise/include/functions_reporting_pdf.php:2253
-#: ../../enterprise/include/functions_reporting_pdf.php:2291
+#: ../../enterprise/include/functions_reporting_csv.php:857
+#: ../../enterprise/include/functions_reporting_pdf.php:359
+#: ../../enterprise/include/functions_reporting_pdf.php:2298
+#: ../../enterprise/include/functions_reporting_pdf.php:2334
+#: ../../enterprise/include/functions_reporting_pdf.php:2372
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:148
 msgid "From"
 msgstr "開始"
 
 #: ../../godmode/agentes/planned_downtime.list.php:145
-#: ../../operation/agentes/gis_view.php:182
-#: ../../enterprise/include/functions_reporting_pdf.php:2254
-#: ../../enterprise/include/functions_reporting_pdf.php:2292
+#: ../../include/functions_reporting_html.php:2235
+#: ../../include/functions_snmp.php:363 ../../include/functions_snmp.php:369
+#: ../../operation/agentes/gis_view.php:202
+#: ../../enterprise/include/functions_reporting_csv.php:857
+#: ../../enterprise/include/functions_reporting_pdf.php:360
+#: ../../enterprise/include/functions_reporting_pdf.php:2335
+#: ../../enterprise/include/functions_reporting_pdf.php:2373
 msgid "To"
 msgstr "終了"
 
@@ -9245,8 +9742,8 @@ msgstr "名前"
 
 #: ../../godmode/agentes/planned_downtime.list.php:396
 #: ../../godmode/menu.php:131 ../../godmode/setup/setup.php:138
-#: ../../include/functions_reports.php:637
-#: ../../include/functions_reports.php:639
+#: ../../include/functions_reports.php:638
+#: ../../include/functions_reports.php:640
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:210
 #: ../../enterprise/godmode/modules/configure_local_component.php:311
 #: ../../enterprise/godmode/servers/server_disk_conf_editor.php:166
@@ -9260,6 +9757,7 @@ msgstr "設定"
 #: ../../godmode/agentes/planned_downtime.list.php:397
 #: ../../godmode/agentes/planned_downtime.list.php:446
 #: ../../enterprise/extensions/backup/main.php:136
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:416
 #: ../../enterprise/operation/agentes/transactional_map.php:197
 msgid "Running"
 msgstr "実行中"
@@ -9282,66 +9780,70 @@ msgstr "停止中"
 #: ../../godmode/extensions.php:209
 #: ../../godmode/modules/manage_network_components.php:583
 #: ../../include/functions.php:946 ../../include/functions.php:952
-#: ../../include/functions.php:955 ../../include/functions_db.php:156
-#: ../../include/functions_events.php:1778
-#: ../../include/functions_events.php:1946
-#: ../../include/functions_events.php:2013
-#: ../../include/functions_events.php:2029
-#: ../../include/functions_events.php:2039
-#: ../../include/functions_events.php:2044
-#: ../../include/functions_events.php:2062
-#: ../../include/functions_events.php:2141
-#: ../../include/functions_events.php:2195
-#: ../../include/functions_events.php:2207
-#: ../../include/functions_events.php:2219
-#: ../../include/functions_events.php:2241
-#: ../../include/functions_events.php:2256
-#: ../../include/functions_events.php:2266
-#: ../../include/functions_events.php:2355
-#: ../../include/functions_events.php:2432
-#: ../../include/functions_events.php:2454
-#: ../../include/functions_events.php:2464
-#: ../../include/functions_reporting_html.php:488
-#: ../../include/functions_reporting_html.php:567
-#: ../../include/functions_reporting_html.php:3173
-#: ../../include/functions_reporting_html.php:3211
-#: ../../include/functions_treeview.php:158
-#: ../../include/functions_treeview.php:392
-#: ../../include/functions_ui.php:2007 ../../include/functions_ui.php:2017
-#: ../../mobile/operation/agent.php:153 ../../mobile/operation/agent.php:167
+#: ../../include/functions.php:955 ../../include/functions_treeview.php:158
+#: ../../include/functions_treeview.php:398
+#: ../../include/functions_ui.php:2063 ../../include/functions_ui.php:2073
+#: ../../include/functions_db.php:171 ../../include/functions_events.php:1770
+#: ../../include/functions_events.php:1872
+#: ../../include/functions_events.php:1874
+#: ../../include/functions_events.php:1885
+#: ../../include/functions_events.php:1886
+#: ../../include/functions_events.php:1896
+#: ../../include/functions_events.php:1936
+#: ../../include/functions_events.php:1958
+#: ../../include/functions_events.php:1975
+#: ../../include/functions_events.php:2046
+#: ../../include/functions_events.php:2113
+#: ../../include/functions_events.php:2129
+#: ../../include/functions_events.php:2140
+#: ../../include/functions_events.php:2145
+#: ../../include/functions_events.php:2163
+#: ../../include/functions_events.php:2242
+#: ../../include/functions_events.php:2300
+#: ../../include/functions_events.php:2310
+#: ../../include/functions_events.php:2419
+#: ../../include/functions_events.php:2467
+#: ../../include/functions_events.php:2531
+#: ../../include/functions_events.php:2553
+#: ../../include/functions_events.php:2563
+#: ../../include/functions_reporting_html.php:491
+#: ../../include/functions_reporting_html.php:570
+#: ../../include/functions_reporting_html.php:3286
+#: ../../include/functions_reporting_html.php:3324
+#: ../../mobile/operation/agent.php:180 ../../mobile/operation/agent.php:194
 #: ../../mobile/operation/events.php:148 ../../mobile/operation/events.php:159
 #: ../../mobile/operation/events.php:167 ../../mobile/operation/events.php:240
 #: ../../mobile/operation/events.php:267 ../../mobile/operation/events.php:275
-#: ../../operation/agentes/estado_generalagente.php:151
-#: ../../operation/agentes/estado_generalagente.php:163
-#: ../../operation/agentes/estado_generalagente.php:176
-#: ../../operation/agentes/estado_generalagente.php:280
-#: ../../operation/agentes/estado_generalagente.php:359
-#: ../../operation/snmpconsole/snmp_view.php:691
-#: ../../operation/snmpconsole/snmp_view.php:710
+#: ../../operation/agentes/estado_generalagente.php:180
+#: ../../operation/agentes/estado_generalagente.php:192
+#: ../../operation/agentes/estado_generalagente.php:205
+#: ../../operation/agentes/estado_generalagente.php:309
+#: ../../operation/agentes/estado_generalagente.php:388
+#: ../../operation/snmpconsole/snmp_view.php:799
+#: ../../operation/snmpconsole/snmp_view.php:818
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:159
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:181
 #: ../../enterprise/extensions/ipam/ipam_network.php:559
 #: ../../enterprise/extensions/ipam/ipam_network.php:594
-#: ../../enterprise/include/functions_reporting.php:4444
-#: ../../enterprise/include/functions_reporting.php:4776
-#: ../../enterprise/include/functions_reporting_pdf.php:1314
-#: ../../enterprise/include/functions_reporting_pdf.php:1395
-#: ../../enterprise/include/functions_reporting_pdf.php:2060
-#: ../../enterprise/include/functions_servicemap.php:265
-#: ../../enterprise/include/functions_services.php:1012
-#: ../../enterprise/include/functions_services.php:1219
-#: ../../enterprise/include/functions_services.php:1697
 #: ../../enterprise/include/functions_visual_map.php:277
+#: ../../enterprise/include/functions_reporting.php:4862
+#: ../../enterprise/include/functions_reporting.php:5194
+#: ../../enterprise/include/functions_reporting_pdf.php:1395
+#: ../../enterprise/include/functions_reporting_pdf.php:1476
+#: ../../enterprise/include/functions_reporting_pdf.php:2141
+#: ../../enterprise/include/functions_servicemap.php:265
+#: ../../enterprise/include/functions_services.php:1101
+#: ../../enterprise/include/functions_services.php:1308
+#: ../../enterprise/include/functions_services.php:1786
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:437
 msgid "N/A"
 msgstr "N/A"
 
 #: ../../godmode/agentes/planned_downtime.list.php:508
 #: ../../godmode/modules/manage_network_templates.php:216
-#: ../../include/graphs/functions_flot.php:259
+#: ../../include/graphs/functions_flot.php:265
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:350
-#: ../../enterprise/operation/log/log_viewer.php:239
+#: ../../enterprise/operation/log/log_viewer.php:255
 #: ../../enterprise/operation/reporting/custom_reporting.php:59
 msgid "Export to CSV"
 msgstr "CSVにエクスポート"
@@ -9373,9 +9875,9 @@ msgid "Alert actions"
 msgstr "アクション"
 
 #: ../../godmode/alerts/alert_actions.php:140
-#: ../../godmode/reporting/map_builder.php:183
-#: ../../godmode/reporting/map_builder.php:192
-#: ../../include/functions_agents.php:684
+#: ../../godmode/reporting/map_builder.php:190
+#: ../../godmode/reporting/map_builder.php:199
+#: ../../include/functions_agents.php:702
 #: ../../enterprise/godmode/policies/policies.php:180
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:254
 msgid "Successfully copied"
@@ -9388,14 +9890,15 @@ msgid "Could not be copied"
 msgstr "コピーできませんでした。"
 
 #: ../../godmode/alerts/alert_actions.php:342
-#: ../../godmode/massive/massive_copy_modules.php:224
-#: ../../godmode/reporting/map_builder.php:214
-#: ../../operation/agentes/pandora_networkmap.php:406
-#: ../../operation/agentes/pandora_networkmap.php:483
-#: ../../enterprise/dashboard/dashboards.php:96
-#: ../../enterprise/dashboard/dashboards.php:134
+#: ../../godmode/massive/massive_copy_modules.php:229
+#: ../../godmode/reporting/map_builder.php:261
+#: ../../operation/agentes/pandora_networkmap.php:569
+#: ../../operation/agentes/pandora_networkmap.php:653
+#: ../../enterprise/dashboard/dashboards.php:92
+#: ../../enterprise/dashboard/dashboards.php:149
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:184
 #: ../../enterprise/godmode/policies/policies.php:434
-#: ../../enterprise/godmode/policies/policy_modules.php:1333
+#: ../../enterprise/godmode/policies/policy_modules.php:1364
 msgid "Copy"
 msgstr "コピー"
 
@@ -9409,7 +9912,7 @@ msgstr "アクションが設定されていません。"
 #: ../../godmode/alerts/alert_commands.php:135
 #: ../../godmode/alerts/alert_view.php:471
 #: ../../godmode/alerts/alert_view.php:548
-#: ../../godmode/alerts/configure_alert_template.php:684
+#: ../../godmode/alerts/configure_alert_template.php:687
 #: ../../enterprise/godmode/alerts/alert_events.php:474
 #, php-format
 msgid "Field %s"
@@ -9417,24 +9920,32 @@ msgstr "フィールド %s"
 
 #: ../../godmode/alerts/alert_commands.php:149
 #: ../../godmode/alerts/alert_commands.php:159
-#: ../../godmode/alerts/configure_alert_template.php:689
-#: ../../godmode/alerts/configure_alert_template.php:703
-#: ../../godmode/alerts/configure_alert_template.php:775
+#: ../../godmode/alerts/configure_alert_template.php:692
+#: ../../godmode/alerts/configure_alert_template.php:706
+#: ../../godmode/alerts/configure_alert_template.php:778
 #: ../../godmode/modules/manage_network_components_form_common.php:59
-#: ../../godmode/users/configure_user.php:532
+#: ../../godmode/users/configure_user.php:640
 #: ../../enterprise/godmode/modules/configure_local_component.php:157
 #: ../../enterprise/meta/advanced/metasetup.setup.php:107
 msgid "Basic"
 msgstr "基本"
 
+#: ../../godmode/alerts/alert_commands.php:149
+msgid ""
+"For sending emails, text must be HTML format, if you want to use plain text, "
+"type it between the following labels: <pre></pre>"
+msgstr ""
+"メール送信には、テキストが HTML フォーマットである必要があります。プレーンテキストを使いたい場合は、ラベル <pre></pre> "
+"の間に入力してください。"
+
 #: ../../godmode/alerts/alert_commands.php:152
 #: ../../godmode/alerts/alert_commands.php:162
-#: ../../godmode/alerts/configure_alert_template.php:693
-#: ../../godmode/alerts/configure_alert_template.php:707
-#: ../../godmode/alerts/configure_alert_template.php:776
+#: ../../godmode/alerts/configure_alert_template.php:696
+#: ../../godmode/alerts/configure_alert_template.php:710
+#: ../../godmode/alerts/configure_alert_template.php:779
 #: ../../godmode/modules/manage_network_components_form_common.php:60
 #: ../../godmode/netflow/nf_edit_form.php:208
-#: ../../godmode/users/configure_user.php:533
+#: ../../godmode/users/configure_user.php:641
 #: ../../operation/netflow/nf_live_view.php:323
 #: ../../enterprise/godmode/modules/configure_local_component.php:158
 #: ../../enterprise/meta/general/logon_ok.php:64
@@ -9444,11 +9955,26 @@ msgstr "基本"
 msgid "Advanced"
 msgstr "拡張"
 
-#: ../../godmode/alerts/alert_commands.php:249
+#: ../../godmode/alerts/alert_commands.php:170
+#: ../../godmode/alerts/alert_commands.php:179
+msgid "Text/plain"
+msgstr "Text/plain"
+
+#: ../../godmode/alerts/alert_commands.php:170
+#: ../../godmode/alerts/alert_commands.php:179
+msgid "For sending emails only text plain"
+msgstr "プレーンテキストのみでのメール送信"
+
+#: ../../godmode/alerts/alert_commands.php:173
+#: ../../godmode/alerts/alert_commands.php:182
+msgid "Text/html"
+msgstr "Text/html"
+
+#: ../../godmode/alerts/alert_commands.php:267
 msgid "Alert commands"
 msgstr "アラートコマンド"
 
-#: ../../godmode/alerts/alert_commands.php:372
+#: ../../godmode/alerts/alert_commands.php:390
 msgid "No alert commands configured"
 msgstr "アラートコマンドが設定されていません"
 
@@ -9456,154 +9982,95 @@ msgstr "アラートコマンドが設定されていません"
 msgid "Latest value"
 msgstr "最新の値"
 
-#: ../../godmode/alerts/alert_list.builder.php:94
-#: ../../godmode/alerts/configure_alert_template.php:564
-msgid "Default action"
-msgstr "通常のアクション"
-
-#: ../../godmode/alerts/alert_list.builder.php:97
-#: ../../godmode/alerts/alert_list.list.php:615
-#: ../../godmode/massive/massive_add_action_alerts.php:183
-#: ../../include/ajax/alert_list.ajax.php:155
-#: ../../enterprise/godmode/alerts/alert_events_list.php:599
-#: ../../enterprise/godmode/policies/policy_alerts.php:465
-#: ../../enterprise/godmode/policies/policy_external_alerts.php:278
-msgid "Number of alerts match from"
-msgstr "アクションを起こすアラート数: 開始"
-
-#: ../../godmode/alerts/alert_list.builder.php:99
-#: ../../godmode/alerts/alert_list.list.php:533
-#: ../../godmode/alerts/alert_list.list.php:619
-#: ../../godmode/alerts/alert_templates.php:96
-#: ../../godmode/massive/massive_add_action_alerts.php:185
-#: ../../include/ajax/alert_list.ajax.php:159
-#: ../../include/functions_reporting.php:9994
-#: ../../operation/reporting/reporting_viewer.php:198
-#: ../../enterprise/godmode/agentes/manage_config_remote.php:107
-#: ../../enterprise/godmode/alerts/alert_events_list.php:560
-#: ../../enterprise/godmode/alerts/alert_events_list.php:601
-#: ../../enterprise/godmode/policies/policy_alerts.php:337
-#: ../../enterprise/godmode/policies/policy_alerts.php:469
-#: ../../enterprise/godmode/policies/policy_external_alerts.php:223
-#: ../../enterprise/godmode/policies/policy_external_alerts.php:280
-#: ../../enterprise/include/functions_reporting.php:4587
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:150
-msgid "to"
-msgstr "終了"
-
-#: ../../godmode/alerts/alert_list.builder.php:109
-#: ../../godmode/alerts/configure_alert_action.php:101
-#: ../../enterprise/godmode/alerts/alert_events.php:517
-msgid "Create Action"
-msgstr "アクションの作成"
-
-#: ../../godmode/alerts/alert_list.builder.php:131
-#: ../../godmode/alerts/configure_alert_template.php:499
-msgid "Create Template"
-msgstr "テンプレートの作成"
-
-#: ../../godmode/alerts/alert_list.builder.php:134
-#: ../../godmode/alerts/alert_list.list.php:539
-#: ../../godmode/alerts/alert_list.list.php:625
-#: ../../godmode/alerts/alert_view.php:391
-#: ../../godmode/alerts/configure_alert_action.php:142
-#: ../../include/ajax/alert_list.ajax.php:165
-#: ../../include/functions_reporting_html.php:2113
-#: ../../include/functions_reporting_html.php:3108
-#: ../../enterprise/godmode/alerts/alert_events_list.php:563
-#: ../../enterprise/godmode/alerts/alert_events_list.php:604
-#: ../../enterprise/include/functions_reporting_pdf.php:2364
-msgid "Threshold"
-msgstr "しきい値"
-
-#: ../../godmode/alerts/alert_list.builder.php:144
-msgid "Add alert"
-msgstr "アラートの追加"
-
 #: ../../godmode/alerts/alert_list.builder.php:209
 #: ../../godmode/massive/massive_copy_modules.php:80
-#: ../../godmode/massive/massive_copy_modules.php:193
+#: ../../godmode/massive/massive_copy_modules.php:198
 #: ../../godmode/massive/massive_delete_agents.php:116
-#: ../../godmode/massive/massive_delete_modules.php:456
-#: ../../godmode/massive/massive_delete_modules.php:470
-#: ../../godmode/massive/massive_edit_agents.php:219
-#: ../../godmode/massive/massive_edit_modules.php:299
-#: ../../godmode/massive/massive_edit_modules.php:330
-#: ../../include/ajax/module.php:824 ../../include/functions.php:1032
-#: ../../include/functions_reports.php:426
-#: ../../include/functions_alerts.php:593
-#: ../../include/functions_visual_map.php:1580
-#: ../../include/functions_visual_map.php:1601
-#: ../../include/functions_visual_map.php:1617
-#: ../../include/functions_visual_map.php:1633
-#: ../../include/functions_events.php:1392
-#: ../../include/functions_events.php:2855
+#: ../../godmode/massive/massive_delete_modules.php:477
+#: ../../godmode/massive/massive_delete_modules.php:491
+#: ../../godmode/massive/massive_edit_agents.php:272
+#: ../../godmode/massive/massive_edit_modules.php:308
+#: ../../godmode/massive/massive_edit_modules.php:346
+#: ../../include/ajax/module.php:861 ../../include/functions.php:1032
+#: ../../include/functions_reporting.php:3558
+#: ../../include/functions_alerts.php:593 ../../include/functions_ui.php:454
+#: ../../include/functions_ui.php:455 ../../include/functions_events.php:1396
+#: ../../include/functions_events.php:2954
+#: ../../include/functions_visual_map.php:2457
+#: ../../include/functions_visual_map.php:2488
+#: ../../include/functions_visual_map.php:2504
+#: ../../include/functions_visual_map.php:2520
 #: ../../include/functions_filemanager.php:706
-#: ../../include/functions_graph.php:773
-#: ../../include/functions_graph.php:2189
-#: ../../include/functions_graph.php:3959
-#: ../../include/functions_groups.php:803
-#: ../../include/functions_groups.php:805
-#: ../../include/functions_groups.php:807
-#: ../../include/functions_groups.php:808
-#: ../../include/functions_groups.php:809 ../../include/functions_maps.php:46
-#: ../../include/graphs/functions_flot.php:461
-#: ../../include/functions_reporting.php:3441
-#: ../../include/functions_reporting_html.php:490
-#: ../../include/functions_reporting_html.php:569
-#: ../../include/functions_reporting_html.php:1558
-#: ../../include/functions_reporting_html.php:1579
-#: ../../include/functions_reporting_html.php:2042
-#: ../../include/functions_reporting_html.php:2204
-#: ../../include/functions_ui.php:449 ../../include/functions_ui.php:450
+#: ../../include/functions_graph.php:882
+#: ../../include/functions_graph.php:2667
+#: ../../include/functions_graph.php:4638
+#: ../../include/functions_groups.php:797
+#: ../../include/functions_groups.php:799
+#: ../../include/functions_groups.php:801
+#: ../../include/functions_groups.php:802
+#: ../../include/functions_groups.php:803 ../../include/functions_maps.php:46
+#: ../../include/functions_reporting_html.php:493
+#: ../../include/functions_reporting_html.php:572
+#: ../../include/functions_reporting_html.php:1561
+#: ../../include/functions_reporting_html.php:1582
+#: ../../include/functions_reporting_html.php:2045
+#: ../../include/functions_reporting_html.php:2207
+#: ../../include/functions_reports.php:426
+#: ../../include/graphs/functions_flot.php:489
 #: ../../mobile/operation/agents.php:36 ../../mobile/operation/modules.php:42
-#: ../../operation/agentes/estado_agente.php:189
-#: ../../operation/agentes/estado_monitores.php:453
+#: ../../operation/agentes/estado_agente.php:217
+#: ../../operation/agentes/estado_monitores.php:466
 #: ../../operation/agentes/group_view.php:166
 #: ../../operation/agentes/group_view.php:169
-#: ../../operation/agentes/pandora_networkmap.view.php:245
-#: ../../operation/agentes/status_monitor.php:302
-#: ../../operation/agentes/tactical.php:153 ../../operation/tree.php:134
-#: ../../operation/tree.php:159 ../../operation/tree.php:293
+#: ../../operation/agentes/pandora_networkmap.view.php:261
+#: ../../operation/agentes/status_monitor.php:300
+#: ../../operation/agentes/tactical.php:153 ../../operation/tree.php:140
+#: ../../operation/tree.php:172 ../../operation/tree.php:315
 #: ../../enterprise/dashboard/widgets/events_list.php:185
 #: ../../enterprise/dashboard/widgets/service_map.php:87
-#: ../../enterprise/dashboard/widgets/tree_view.php:56
-#: ../../enterprise/dashboard/widgets/tree_view.php:69
-#: ../../enterprise/dashboard/widgets/tree_view.php:217
-#: ../../enterprise/extensions/cron/functions.php:229
-#: ../../enterprise/include/functions_reporting.php:1288
-#: ../../enterprise/include/functions_reporting.php:2080
-#: ../../enterprise/include/functions_reporting.php:2857
-#: ../../enterprise/include/functions_reporting.php:3759
-#: ../../enterprise/include/functions_reporting.php:4446
-#: ../../enterprise/include/functions_reporting.php:4777
-#: ../../enterprise/include/functions_reporting_pdf.php:331
-#: ../../enterprise/include/functions_reporting_pdf.php:692
-#: ../../enterprise/include/functions_reporting_pdf.php:710
-#: ../../enterprise/include/functions_reporting_pdf.php:1316
+#: ../../enterprise/dashboard/widgets/tree_view.php:58
+#: ../../enterprise/dashboard/widgets/tree_view.php:71
+#: ../../enterprise/dashboard/widgets/tree_view.php:227
+#: ../../enterprise/extensions/cron/functions.php:238
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:89
+#: ../../enterprise/godmode/reporting/cluster_view.php:320
+#: ../../enterprise/godmode/reporting/cluster_view.php:397
+#: ../../enterprise/godmode/reporting/cluster_list.php:118
+#: ../../enterprise/godmode/reporting/cluster_list.php:235
+#: ../../enterprise/include/functions_reporting.php:1674
+#: ../../enterprise/include/functions_reporting.php:2482
+#: ../../enterprise/include/functions_reporting.php:3259
+#: ../../enterprise/include/functions_reporting.php:4177
+#: ../../enterprise/include/functions_reporting.php:4864
+#: ../../enterprise/include/functions_reporting.php:5195
+#: ../../enterprise/include/functions_reporting_pdf.php:334
+#: ../../enterprise/include/functions_reporting_pdf.php:738
+#: ../../enterprise/include/functions_reporting_pdf.php:756
 #: ../../enterprise/include/functions_reporting_pdf.php:1397
-#: ../../enterprise/include/functions_reporting_pdf.php:1641
-#: ../../enterprise/include/functions_reporting_pdf.php:2062
-#: ../../enterprise/include/functions_reporting_pdf.php:2097
+#: ../../enterprise/include/functions_reporting_pdf.php:1478
+#: ../../enterprise/include/functions_reporting_pdf.php:1722
+#: ../../enterprise/include/functions_reporting_pdf.php:2143
+#: ../../enterprise/include/functions_reporting_pdf.php:2178
 #: ../../enterprise/meta/monitoring/group_view.php:146
 #: ../../enterprise/meta/monitoring/group_view.php:150
 #: ../../enterprise/meta/monitoring/tactical.php:281
+#: ../../enterprise/operation/agentes/tag_view.php:85
 #: ../../enterprise/operation/agentes/transactional_map.php:270
 #: ../../enterprise/operation/agentes/transactional_map.php:287
 #: ../../enterprise/operation/services/services.list.php:173
 #: ../../enterprise/operation/services/services.list.php:415
 #: ../../enterprise/operation/services/services.service.php:193
-#: ../../enterprise/operation/services/services.service_map.php:129
+#: ../../enterprise/operation/services/services.service_map.php:127
 #: ../../enterprise/operation/services/services.table_services.php:142
 msgid "Unknown"
 msgstr "不明"
 
 #: ../../godmode/alerts/alert_list.builder.php:212
-#: ../../godmode/alerts/configure_alert_template.php:915
+#: ../../godmode/alerts/configure_alert_template.php:918
 #: ../../godmode/modules/manage_network_components_form_network.php:82
 #: ../../godmode/modules/manage_network_components_form_plugin.php:29
 #: ../../godmode/modules/manage_network_components_form_wmi.php:58
-#: ../../include/functions.php:2036
+#: ../../include/functions.php:2071
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:464
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:744
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:951
@@ -9615,7 +10082,7 @@ msgid "Empty"
 msgstr "空"
 
 #: ../../godmode/alerts/alert_list.list.php:58
-#: ../../enterprise/godmode/reporting/graph_template_list.php:124
+#: ../../enterprise/godmode/reporting/graph_template_list.php:127
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:285
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1484
 msgid "Template name"
@@ -9630,39 +10097,31 @@ msgid "Enabled / Disabled"
 msgstr "有効 / 無効"
 
 #: ../../godmode/alerts/alert_list.list.php:135
-#: ../../godmode/alerts/alert_list.list.php:793
-#: ../../godmode/extensions.php:273 ../../godmode/users/user_list.php:466
-#: ../../enterprise/godmode/agentes/plugins_manager.php:146
-#: ../../enterprise/godmode/agentes/plugins_manager.php:193
-#: ../../enterprise/godmode/alerts/alert_events_list.php:715
-#: ../../enterprise/godmode/policies/policy_alerts.php:564
-msgid "Enable"
+#: ../../godmode/alerts/configure_alert_template.php:666
+#: ../../include/functions_groups.php:2152
+#: ../../include/functions_reporting_html.php:2095
+#: ../../operation/agentes/estado_generalagente.php:326
+#: ../../enterprise/extensions/ipam/ipam_ajax.php:196
+#: ../../enterprise/extensions/ipam/ipam_massive.php:79
+#: ../../enterprise/extensions/ipam/ipam_network.php:542
+#: ../../enterprise/include/functions_reporting_pdf.php:2425
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:892
+msgid "Enabled"
 msgstr "有効"
 
-#: ../../godmode/alerts/alert_list.list.php:136
-#: ../../godmode/alerts/alert_list.list.php:784
-#: ../../godmode/extensions.php:277 ../../godmode/users/user_list.php:463
-#: ../../include/functions.php:2582
-#: ../../enterprise/godmode/agentes/plugins_manager.php:146
-#: ../../enterprise/godmode/agentes/plugins_manager.php:206
-#: ../../enterprise/godmode/alerts/alert_events_list.php:707
-#: ../../enterprise/godmode/policies/policy_alerts.php:556
-msgid "Disable"
-msgstr "無効"
-
 #: ../../godmode/alerts/alert_list.list.php:138
 #: ../../operation/agentes/alerts_status.functions.php:103
-#: ../../operation/agentes/alerts_status.php:416
-#: ../../operation/agentes/alerts_status.php:462
-#: ../../operation/agentes/alerts_status.php:497
-#: ../../operation/agentes/alerts_status.php:532
+#: ../../operation/agentes/alerts_status.php:449
+#: ../../operation/agentes/alerts_status.php:495
+#: ../../operation/agentes/alerts_status.php:530
+#: ../../operation/agentes/alerts_status.php:565
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1487
 #: ../../enterprise/operation/agentes/policy_view.php:193
 msgid "Standby"
 msgstr "スタンバイ"
 
 #: ../../godmode/alerts/alert_list.list.php:140
-#: ../../include/functions_ui.php:826 ../../mobile/operation/alerts.php:44
+#: ../../include/functions_ui.php:853 ../../mobile/operation/alerts.php:44
 #: ../../operation/agentes/alerts_status.functions.php:80
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:898
 #: ../../enterprise/operation/agentes/policy_view.php:221
@@ -9677,23 +10136,24 @@ msgid "Standby off"
 msgstr "非スタンバイ状態"
 
 #: ../../godmode/alerts/alert_list.list.php:163
-#: ../../operation/agentes/alerts_status.php:396
+#: ../../operation/agentes/alerts_status.php:429
 msgid "Alert control filter"
 msgstr "アラートフィルタ"
 
 #: ../../godmode/alerts/alert_list.list.php:163
 #: ../../godmode/snmpconsole/snmp_alert.php:1019
-#: ../../godmode/users/user_list.php:249
-#: ../../operation/agentes/alerts_status.php:396
-#: ../../operation/agentes/graphs.php:163
-#: ../../operation/snmpconsole/snmp_view.php:559
-#: ../../enterprise/godmode/policies/policy_queue.php:277
-#: ../../enterprise/godmode/policies/policy_queue.php:364
+#: ../../godmode/users/user_list.php:247
+#: ../../operation/agentes/alerts_status.php:429
+#: ../../operation/agentes/graphs.php:198
+#: ../../operation/snmpconsole/snmp_view.php:555
+#: ../../operation/snmpconsole/snmp_view.php:661
+#: ../../enterprise/godmode/policies/policy_queue.php:297
+#: ../../enterprise/godmode/policies/policy_queue.php:384
 msgid "Toggle filter(s)"
 msgstr "フィルタ設定"
 
 #: ../../godmode/alerts/alert_list.list.php:412
-#: ../../godmode/massive/massive_copy_modules.php:133
+#: ../../godmode/massive/massive_copy_modules.php:138
 #: ../../enterprise/godmode/agentes/module_manager_editor_prediction.php:129
 #: ../../enterprise/godmode/alerts/alert_events_list.php:427
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:412
@@ -9703,15 +10163,16 @@ msgid "Operations"
 msgstr "操作"
 
 #: ../../godmode/alerts/alert_list.list.php:412
-#: ../../godmode/alerts/alert_templates.php:302
-#: ../../godmode/reporting/graphs.php:163
+#: ../../godmode/alerts/alert_templates.php:303
+#: ../../godmode/reporting/graphs.php:168
 #: ../../godmode/reporting/reporting_builder.list_items.php:308
-#: ../../godmode/reporting/reporting_builder.php:567
-#: ../../godmode/reporting/reporting_builder.php:687
+#: ../../godmode/reporting/reporting_builder.php:603
+#: ../../godmode/reporting/reporting_builder.php:725
 #: ../../godmode/servers/plugin.php:739
 #: ../../godmode/servers/servers.build_table.php:76
 #: ../../godmode/users/profile_list.php:327
-#: ../../godmode/users/user_list.php:278
+#: ../../godmode/users/user_list.php:275
+#: ../../include/functions_container.php:140
 #: ../../operation/gis_maps/gis_map.php:94
 #: ../../enterprise/godmode/alerts/alert_events_list.php:427
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:412
@@ -9720,6 +10181,7 @@ msgstr "操作"
 #: ../../enterprise/godmode/policies/policy_alerts.php:242
 #: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:255
 #: ../../enterprise/meta/advanced/servers.build_table.php:71
+#: ../../enterprise/meta/include/functions_autoprovision.php:542
 msgid "Op."
 msgstr "操作"
 
@@ -9758,13 +10220,13 @@ msgid "Delete action"
 msgstr "アクションの削除"
 
 #: ../../godmode/alerts/alert_list.list.php:559
-#: ../../godmode/alerts/alert_list.list.php:871
+#: ../../godmode/alerts/alert_list.list.php:872
 msgid "Update action"
 msgstr "アクションの更新"
 
-#: ../../godmode/alerts/alert_list.list.php:703
-#: ../../godmode/alerts/alert_list.list.php:707
-#: ../../godmode/alerts/alert_list.list.php:841
+#: ../../godmode/alerts/alert_list.list.php:704
+#: ../../godmode/alerts/alert_list.list.php:708
+#: ../../godmode/alerts/alert_list.list.php:842
 #: ../../godmode/snmpconsole/snmp_alert.php:1234
 #: ../../enterprise/godmode/alerts/alert_events_list.php:582
 #: ../../enterprise/godmode/alerts/alert_events_list.php:584
@@ -9773,21 +10235,40 @@ msgstr "アクションの更新"
 msgid "Add action"
 msgstr "アクションの追加"
 
-#: ../../godmode/alerts/alert_list.list.php:718
+#: ../../godmode/alerts/alert_list.list.php:719
 msgid "View alert advanced details"
 msgstr "アラートの拡張詳細表示"
 
-#: ../../godmode/alerts/alert_list.list.php:729
+#: ../../godmode/alerts/alert_list.list.php:730
 msgid "No alerts defined"
 msgstr "アラートが定義されていません"
 
-#: ../../godmode/alerts/alert_list.list.php:802
+#: ../../godmode/alerts/alert_list.list.php:785
+#: ../../godmode/extensions.php:277 ../../godmode/users/user_list.php:460
+#: ../../include/functions.php:2606
+#: ../../enterprise/godmode/agentes/plugins_manager.php:146
+#: ../../enterprise/godmode/agentes/plugins_manager.php:206
+#: ../../enterprise/godmode/alerts/alert_events_list.php:707
+#: ../../enterprise/godmode/policies/policy_alerts.php:556
+msgid "Disable"
+msgstr "無効"
+
+#: ../../godmode/alerts/alert_list.list.php:794
+#: ../../godmode/extensions.php:273 ../../godmode/users/user_list.php:463
+#: ../../enterprise/godmode/agentes/plugins_manager.php:146
+#: ../../enterprise/godmode/agentes/plugins_manager.php:193
+#: ../../enterprise/godmode/alerts/alert_events_list.php:715
+#: ../../enterprise/godmode/policies/policy_alerts.php:564
+msgid "Enable"
+msgstr "有効"
+
+#: ../../godmode/alerts/alert_list.list.php:803
 #: ../../enterprise/godmode/alerts/alert_events_list.php:724
 #: ../../enterprise/godmode/policies/policy_alerts.php:573
 msgid "Set off standby"
 msgstr "非スタンバイ状態にする"
 
-#: ../../godmode/alerts/alert_list.list.php:811
+#: ../../godmode/alerts/alert_list.list.php:812
 #: ../../enterprise/godmode/alerts/alert_events_list.php:733
 #: ../../enterprise/godmode/policies/policy_alerts.php:582
 msgid "Set standby"
@@ -9803,7 +10284,7 @@ msgstr "すでに追加されています。"
 #: ../../godmode/massive/massive_add_tags.php:88
 #: ../../operation/incidents/incident_detail.php:67
 #: ../../enterprise/godmode/alerts/alert_events_list.php:186
-#: ../../enterprise/godmode/policies/policy_agents.php:144
+#: ../../enterprise/godmode/policies/policy_agents.php:182
 msgid "Successfully added"
 msgstr "追加されました。"
 
@@ -9818,7 +10299,7 @@ msgstr "追加されました。"
 #: ../../godmode/massive/massive_delete_action_alerts.php:119
 #: ../../operation/incidents/incident_detail.php:68
 #: ../../enterprise/godmode/alerts/alert_events_list.php:187
-#: ../../enterprise/godmode/policies/policy_agents.php:145
+#: ../../enterprise/godmode/policies/policy_agents.php:183
 #: ../../enterprise/godmode/policies/policy_alerts.php:188
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:121
 msgid "Could not be added"
@@ -9900,15 +10381,15 @@ msgstr "同一の曜日"
 #: ../../godmode/alerts/alert_special_days.php:425
 #: ../../godmode/alerts/alert_templates.php:65
 #: ../../godmode/alerts/configure_alert_special_days.php:81
-#: ../../godmode/reporting/reporting_builder.item_editor.php:803
-#: ../../include/functions_html.php:849
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1336
-#: ../../enterprise/include/functions_reporting.php:1175
-#: ../../enterprise/include/functions_reporting.php:1666
-#: ../../enterprise/include/functions_reporting.php:1969
-#: ../../enterprise/include/functions_reporting.php:2391
-#: ../../enterprise/include/functions_reporting.php:3173
-#: ../../enterprise/include/functions_reporting_pdf.php:1525
+#: ../../godmode/reporting/reporting_builder.item_editor.php:842
+#: ../../include/functions_html.php:939
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1406
+#: ../../enterprise/include/functions_reporting.php:1561
+#: ../../enterprise/include/functions_reporting.php:2068
+#: ../../enterprise/include/functions_reporting.php:2371
+#: ../../enterprise/include/functions_reporting.php:2793
+#: ../../enterprise/include/functions_reporting.php:3575
+#: ../../enterprise/include/functions_reporting_pdf.php:1606
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:120
 msgid "Monday"
 msgstr "月曜日"
@@ -9917,15 +10398,15 @@ msgstr "月曜日"
 #: ../../godmode/alerts/alert_special_days.php:428
 #: ../../godmode/alerts/alert_templates.php:66
 #: ../../godmode/alerts/configure_alert_special_days.php:82
-#: ../../godmode/reporting/reporting_builder.item_editor.php:809
-#: ../../include/functions_html.php:850
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1342
-#: ../../enterprise/include/functions_reporting.php:1176
-#: ../../enterprise/include/functions_reporting.php:1667
-#: ../../enterprise/include/functions_reporting.php:1970
-#: ../../enterprise/include/functions_reporting.php:2392
-#: ../../enterprise/include/functions_reporting.php:3174
-#: ../../enterprise/include/functions_reporting_pdf.php:1526
+#: ../../godmode/reporting/reporting_builder.item_editor.php:848
+#: ../../include/functions_html.php:940
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1412
+#: ../../enterprise/include/functions_reporting.php:1562
+#: ../../enterprise/include/functions_reporting.php:2069
+#: ../../enterprise/include/functions_reporting.php:2372
+#: ../../enterprise/include/functions_reporting.php:2794
+#: ../../enterprise/include/functions_reporting.php:3576
+#: ../../enterprise/include/functions_reporting_pdf.php:1607
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:121
 msgid "Tuesday"
 msgstr "火曜日"
@@ -9934,15 +10415,15 @@ msgstr "火曜日"
 #: ../../godmode/alerts/alert_special_days.php:431
 #: ../../godmode/alerts/alert_templates.php:67
 #: ../../godmode/alerts/configure_alert_special_days.php:83
-#: ../../godmode/reporting/reporting_builder.item_editor.php:815
-#: ../../include/functions_html.php:851
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1348
-#: ../../enterprise/include/functions_reporting.php:1177
-#: ../../enterprise/include/functions_reporting.php:1668
-#: ../../enterprise/include/functions_reporting.php:1971
-#: ../../enterprise/include/functions_reporting.php:2393
-#: ../../enterprise/include/functions_reporting.php:3175
-#: ../../enterprise/include/functions_reporting_pdf.php:1527
+#: ../../godmode/reporting/reporting_builder.item_editor.php:854
+#: ../../include/functions_html.php:941
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1418
+#: ../../enterprise/include/functions_reporting.php:1563
+#: ../../enterprise/include/functions_reporting.php:2070
+#: ../../enterprise/include/functions_reporting.php:2373
+#: ../../enterprise/include/functions_reporting.php:2795
+#: ../../enterprise/include/functions_reporting.php:3577
+#: ../../enterprise/include/functions_reporting_pdf.php:1608
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:122
 msgid "Wednesday"
 msgstr "水曜日"
@@ -9951,15 +10432,15 @@ msgstr "水曜日"
 #: ../../godmode/alerts/alert_special_days.php:434
 #: ../../godmode/alerts/alert_templates.php:68
 #: ../../godmode/alerts/configure_alert_special_days.php:84
-#: ../../godmode/reporting/reporting_builder.item_editor.php:821
-#: ../../include/functions_html.php:852
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1354
-#: ../../enterprise/include/functions_reporting.php:1178
-#: ../../enterprise/include/functions_reporting.php:1669
-#: ../../enterprise/include/functions_reporting.php:1972
-#: ../../enterprise/include/functions_reporting.php:2394
-#: ../../enterprise/include/functions_reporting.php:3176
-#: ../../enterprise/include/functions_reporting_pdf.php:1528
+#: ../../godmode/reporting/reporting_builder.item_editor.php:860
+#: ../../include/functions_html.php:942
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1424
+#: ../../enterprise/include/functions_reporting.php:1564
+#: ../../enterprise/include/functions_reporting.php:2071
+#: ../../enterprise/include/functions_reporting.php:2374
+#: ../../enterprise/include/functions_reporting.php:2796
+#: ../../enterprise/include/functions_reporting.php:3578
+#: ../../enterprise/include/functions_reporting_pdf.php:1609
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:123
 msgid "Thursday"
 msgstr "木曜日"
@@ -9968,15 +10449,15 @@ msgstr "木曜日"
 #: ../../godmode/alerts/alert_special_days.php:437
 #: ../../godmode/alerts/alert_templates.php:69
 #: ../../godmode/alerts/configure_alert_special_days.php:85
-#: ../../godmode/reporting/reporting_builder.item_editor.php:827
-#: ../../include/functions_html.php:853
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1360
-#: ../../enterprise/include/functions_reporting.php:1179
-#: ../../enterprise/include/functions_reporting.php:1670
-#: ../../enterprise/include/functions_reporting.php:1973
-#: ../../enterprise/include/functions_reporting.php:2395
-#: ../../enterprise/include/functions_reporting.php:3177
-#: ../../enterprise/include/functions_reporting_pdf.php:1529
+#: ../../godmode/reporting/reporting_builder.item_editor.php:866
+#: ../../include/functions_html.php:943
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1430
+#: ../../enterprise/include/functions_reporting.php:1565
+#: ../../enterprise/include/functions_reporting.php:2072
+#: ../../enterprise/include/functions_reporting.php:2375
+#: ../../enterprise/include/functions_reporting.php:2797
+#: ../../enterprise/include/functions_reporting.php:3579
+#: ../../enterprise/include/functions_reporting_pdf.php:1610
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:124
 msgid "Friday"
 msgstr "金曜日"
@@ -9985,15 +10466,15 @@ msgstr "金曜日"
 #: ../../godmode/alerts/alert_special_days.php:440
 #: ../../godmode/alerts/alert_templates.php:70
 #: ../../godmode/alerts/configure_alert_special_days.php:86
-#: ../../godmode/reporting/reporting_builder.item_editor.php:833
-#: ../../include/functions_html.php:854
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1366
-#: ../../enterprise/include/functions_reporting.php:1180
-#: ../../enterprise/include/functions_reporting.php:1671
-#: ../../enterprise/include/functions_reporting.php:1974
-#: ../../enterprise/include/functions_reporting.php:2396
-#: ../../enterprise/include/functions_reporting.php:3178
-#: ../../enterprise/include/functions_reporting_pdf.php:1530
+#: ../../godmode/reporting/reporting_builder.item_editor.php:872
+#: ../../include/functions_html.php:944
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1436
+#: ../../enterprise/include/functions_reporting.php:1566
+#: ../../enterprise/include/functions_reporting.php:2073
+#: ../../enterprise/include/functions_reporting.php:2376
+#: ../../enterprise/include/functions_reporting.php:2798
+#: ../../enterprise/include/functions_reporting.php:3580
+#: ../../enterprise/include/functions_reporting_pdf.php:1611
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:125
 msgid "Saturday"
 msgstr "土曜日"
@@ -10002,15 +10483,15 @@ msgstr "土曜日"
 #: ../../godmode/alerts/alert_special_days.php:443
 #: ../../godmode/alerts/alert_templates.php:71
 #: ../../godmode/alerts/configure_alert_special_days.php:87
-#: ../../godmode/reporting/reporting_builder.item_editor.php:839
-#: ../../include/functions_html.php:848
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1372
-#: ../../enterprise/include/functions_reporting.php:1181
-#: ../../enterprise/include/functions_reporting.php:1672
-#: ../../enterprise/include/functions_reporting.php:1975
-#: ../../enterprise/include/functions_reporting.php:2397
-#: ../../enterprise/include/functions_reporting.php:3179
-#: ../../enterprise/include/functions_reporting_pdf.php:1531
+#: ../../godmode/reporting/reporting_builder.item_editor.php:878
+#: ../../include/functions_html.php:938
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1442
+#: ../../enterprise/include/functions_reporting.php:1567
+#: ../../enterprise/include/functions_reporting.php:2074
+#: ../../enterprise/include/functions_reporting.php:2377
+#: ../../enterprise/include/functions_reporting.php:2799
+#: ../../enterprise/include/functions_reporting.php:3581
+#: ../../enterprise/include/functions_reporting_pdf.php:1612
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:126
 msgid "Sunday"
 msgstr "日曜日"
@@ -10028,98 +10509,98 @@ msgid "Display range: "
 msgstr "表示範囲: "
 
 #: ../../godmode/alerts/alert_special_days.php:347
-#: ../../enterprise/include/functions_reporting.php:1213
-#: ../../enterprise/include/functions_reporting.php:2010
-#: ../../enterprise/include/functions_reporting.php:2788
-#: ../../enterprise/include/functions_reporting_pdf.php:1562
+#: ../../enterprise/include/functions_reporting.php:1599
+#: ../../enterprise/include/functions_reporting.php:2412
+#: ../../enterprise/include/functions_reporting.php:3190
+#: ../../enterprise/include/functions_reporting_pdf.php:1643
 msgid "January"
 msgstr "1月"
 
 #: ../../godmode/alerts/alert_special_days.php:350
-#: ../../enterprise/include/functions_reporting.php:1216
-#: ../../enterprise/include/functions_reporting.php:2013
-#: ../../enterprise/include/functions_reporting.php:2791
-#: ../../enterprise/include/functions_reporting_pdf.php:1565
+#: ../../enterprise/include/functions_reporting.php:1602
+#: ../../enterprise/include/functions_reporting.php:2415
+#: ../../enterprise/include/functions_reporting.php:3193
+#: ../../enterprise/include/functions_reporting_pdf.php:1646
 msgid "February"
 msgstr "2月"
 
 #: ../../godmode/alerts/alert_special_days.php:353
-#: ../../enterprise/include/functions_reporting.php:1219
-#: ../../enterprise/include/functions_reporting.php:2016
-#: ../../enterprise/include/functions_reporting.php:2794
-#: ../../enterprise/include/functions_reporting_pdf.php:1568
+#: ../../enterprise/include/functions_reporting.php:1605
+#: ../../enterprise/include/functions_reporting.php:2418
+#: ../../enterprise/include/functions_reporting.php:3196
+#: ../../enterprise/include/functions_reporting_pdf.php:1649
 msgid "March"
 msgstr "3月"
 
 #: ../../godmode/alerts/alert_special_days.php:356
-#: ../../enterprise/include/functions_reporting.php:1222
-#: ../../enterprise/include/functions_reporting.php:2019
-#: ../../enterprise/include/functions_reporting.php:2797
-#: ../../enterprise/include/functions_reporting_pdf.php:1571
+#: ../../enterprise/include/functions_reporting.php:1608
+#: ../../enterprise/include/functions_reporting.php:2421
+#: ../../enterprise/include/functions_reporting.php:3199
+#: ../../enterprise/include/functions_reporting_pdf.php:1652
 msgid "April"
 msgstr "4月"
 
 #: ../../godmode/alerts/alert_special_days.php:359
-#: ../../enterprise/include/functions_reporting.php:1225
-#: ../../enterprise/include/functions_reporting.php:2022
-#: ../../enterprise/include/functions_reporting.php:2800
-#: ../../enterprise/include/functions_reporting_pdf.php:1574
+#: ../../enterprise/include/functions_reporting.php:1611
+#: ../../enterprise/include/functions_reporting.php:2424
+#: ../../enterprise/include/functions_reporting.php:3202
+#: ../../enterprise/include/functions_reporting_pdf.php:1655
 msgid "May"
 msgstr "5月"
 
 #: ../../godmode/alerts/alert_special_days.php:362
-#: ../../enterprise/include/functions_reporting.php:1228
-#: ../../enterprise/include/functions_reporting.php:2025
-#: ../../enterprise/include/functions_reporting.php:2803
-#: ../../enterprise/include/functions_reporting_pdf.php:1577
+#: ../../enterprise/include/functions_reporting.php:1614
+#: ../../enterprise/include/functions_reporting.php:2427
+#: ../../enterprise/include/functions_reporting.php:3205
+#: ../../enterprise/include/functions_reporting_pdf.php:1658
 msgid "June"
 msgstr "6月"
 
 #: ../../godmode/alerts/alert_special_days.php:365
-#: ../../enterprise/include/functions_reporting.php:1231
-#: ../../enterprise/include/functions_reporting.php:2028
-#: ../../enterprise/include/functions_reporting.php:2806
-#: ../../enterprise/include/functions_reporting_pdf.php:1580
+#: ../../enterprise/include/functions_reporting.php:1617
+#: ../../enterprise/include/functions_reporting.php:2430
+#: ../../enterprise/include/functions_reporting.php:3208
+#: ../../enterprise/include/functions_reporting_pdf.php:1661
 msgid "July"
 msgstr "7月"
 
 #: ../../godmode/alerts/alert_special_days.php:368
-#: ../../enterprise/include/functions_reporting.php:1234
-#: ../../enterprise/include/functions_reporting.php:2031
-#: ../../enterprise/include/functions_reporting.php:2809
-#: ../../enterprise/include/functions_reporting_pdf.php:1583
+#: ../../enterprise/include/functions_reporting.php:1620
+#: ../../enterprise/include/functions_reporting.php:2433
+#: ../../enterprise/include/functions_reporting.php:3211
+#: ../../enterprise/include/functions_reporting_pdf.php:1664
 msgid "August"
 msgstr "8月"
 
 #: ../../godmode/alerts/alert_special_days.php:371
-#: ../../enterprise/include/functions_reporting.php:1237
-#: ../../enterprise/include/functions_reporting.php:2034
-#: ../../enterprise/include/functions_reporting.php:2812
-#: ../../enterprise/include/functions_reporting_pdf.php:1586
+#: ../../enterprise/include/functions_reporting.php:1623
+#: ../../enterprise/include/functions_reporting.php:2436
+#: ../../enterprise/include/functions_reporting.php:3214
+#: ../../enterprise/include/functions_reporting_pdf.php:1667
 msgid "September"
 msgstr "9月"
 
 #: ../../godmode/alerts/alert_special_days.php:374
-#: ../../enterprise/include/functions_reporting.php:1240
-#: ../../enterprise/include/functions_reporting.php:2037
-#: ../../enterprise/include/functions_reporting.php:2815
-#: ../../enterprise/include/functions_reporting_pdf.php:1589
+#: ../../enterprise/include/functions_reporting.php:1626
+#: ../../enterprise/include/functions_reporting.php:2439
+#: ../../enterprise/include/functions_reporting.php:3217
+#: ../../enterprise/include/functions_reporting_pdf.php:1670
 msgid "October"
 msgstr "10月"
 
 #: ../../godmode/alerts/alert_special_days.php:377
-#: ../../enterprise/include/functions_reporting.php:1243
-#: ../../enterprise/include/functions_reporting.php:2040
-#: ../../enterprise/include/functions_reporting.php:2818
-#: ../../enterprise/include/functions_reporting_pdf.php:1592
+#: ../../enterprise/include/functions_reporting.php:1629
+#: ../../enterprise/include/functions_reporting.php:2442
+#: ../../enterprise/include/functions_reporting.php:3220
+#: ../../enterprise/include/functions_reporting_pdf.php:1673
 msgid "November"
 msgstr "11月"
 
 #: ../../godmode/alerts/alert_special_days.php:380
-#: ../../enterprise/include/functions_reporting.php:1246
-#: ../../enterprise/include/functions_reporting.php:2043
-#: ../../enterprise/include/functions_reporting.php:2821
-#: ../../enterprise/include/functions_reporting_pdf.php:1595
+#: ../../enterprise/include/functions_reporting.php:1632
+#: ../../enterprise/include/functions_reporting.php:2445
+#: ../../enterprise/include/functions_reporting.php:3223
+#: ../../enterprise/include/functions_reporting_pdf.php:1676
 msgid "December"
 msgstr "12月"
 
@@ -10130,8 +10611,8 @@ msgstr "同じ日: "
 #: ../../godmode/alerts/alert_special_days.php:452
 #: ../../godmode/events/event_edit_filter.php:361
 #: ../../godmode/events/event_edit_filter.php:376
-#: ../../operation/events/events_list.php:338
-#: ../../operation/events/events_list.php:365
+#: ../../operation/events/events_list.php:407
+#: ../../operation/events/events_list.php:434
 #: ../../enterprise/godmode/agentes/collection_manager.php:167
 #: ../../enterprise/godmode/massive/massive_edit_tags_policy.php:115
 #: ../../enterprise/godmode/massive/massive_tags_edit_policy.php:113
@@ -10145,7 +10626,7 @@ msgid "Everyday"
 msgstr "毎日"
 
 #: ../../godmode/alerts/alert_templates.php:73
-#: ../../include/functions_config.php:703
+#: ../../include/functions_config.php:763
 #: ../../enterprise/extensions/ipam/ipam_editor.php:95
 #: ../../enterprise/godmode/setup/setup_history.php:68
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:128
@@ -10165,7 +10646,7 @@ msgstr "と"
 
 #: ../../godmode/alerts/alert_templates.php:89
 #: ../../godmode/alerts/alert_view.php:306
-#: ../../godmode/alerts/configure_alert_template.php:549
+#: ../../godmode/alerts/configure_alert_template.php:552
 #: ../../godmode/snmpconsole/snmp_alert.php:919
 #: ../../enterprise/godmode/alerts/alert_events.php:453
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:257
@@ -10173,29 +10654,28 @@ msgstr "と"
 msgid "Time threshold"
 msgstr "再通知間隔"
 
-#: ../../godmode/alerts/alert_templates.php:268
+#: ../../godmode/alerts/alert_templates.php:269
 #: ../../godmode/modules/manage_network_components.php:532
 #: ../../godmode/reporting/reporting_builder.list_items.php:209
 #: ../../godmode/tag/tag.php:176 ../../godmode/tag/tag.php:281
-#: ../../godmode/users/user_list.php:243
-#: ../../operation/agentes/alerts_status.php:390
-#: ../../operation/agentes/status_monitor.php:533
-#: ../../operation/events/events_list.php:640 ../../operation/tree.php:184
+#: ../../godmode/users/user_list.php:241
+#: ../../operation/agentes/alerts_status.php:423
+#: ../../operation/agentes/status_monitor.php:542
+#: ../../operation/events/events_list.php:708 ../../operation/tree.php:197
 #: ../../enterprise/godmode/alerts/alert_events_list.php:382
 #: ../../enterprise/godmode/modules/local_components.php:457
-#: ../../enterprise/meta/advanced/metasetup.translate_string.php:148
 #: ../../enterprise/meta/advanced/policymanager.queue.php:244
-#: ../../enterprise/meta/agentsearch.php:72
+#: ../../enterprise/meta/agentsearch.php:81
 msgid "Show Options"
 msgstr "オプション表示"
 
-#: ../../godmode/alerts/alert_templates.php:359
+#: ../../godmode/alerts/alert_templates.php:360
 msgid "No alert templates defined"
 msgstr "アラートテンプレートが定義されていません"
 
 #: ../../godmode/alerts/alert_view.php:49
 #: ../../godmode/alerts/alert_view.php:324
-#: ../../include/functions_events.php:2140
+#: ../../include/functions_events.php:2241
 msgid "Alert details"
 msgstr "アラート詳細"
 
@@ -10206,32 +10686,32 @@ msgid "Stand by"
 msgstr "スタンバイ"
 
 #: ../../godmode/alerts/alert_view.php:144
-#: ../../godmode/alerts/configure_alert_template.php:844
-#: ../../include/functions_ui.php:1012
+#: ../../godmode/alerts/configure_alert_template.php:847
+#: ../../include/functions_ui.php:1039
 msgid ""
 "The alert would fire when the value matches <span id=\"value\"></span>"
 msgstr "取得した値が <span id=\"value\"></span> にマッチした場合、アラートを発生させます。"
 
-#: ../../godmode/alerts/alert_view.php:147 ../../include/functions_ui.php:1015
+#: ../../godmode/alerts/alert_view.php:147 ../../include/functions_ui.php:1042
 msgid ""
 "The alert would fire when the value doesn't match <span id=\"value\"></span>"
 msgstr "取得した値が <span id=\"value\"></span> にマッチしない場合、アラートを発生させます。"
 
 #: ../../godmode/alerts/alert_view.php:152
-#: ../../godmode/alerts/configure_alert_template.php:846
-#: ../../include/functions_ui.php:1003
+#: ../../godmode/alerts/configure_alert_template.php:849
+#: ../../include/functions_ui.php:1030
 msgid "The alert would fire when the value is <span id=\"value\"></span>"
 msgstr "取得した値が <span id=\"value\"></span> の場合、アラートを発生させます。"
 
 #: ../../godmode/alerts/alert_view.php:156
-#: ../../godmode/alerts/configure_alert_template.php:847
-#: ../../include/functions_ui.php:1007
+#: ../../godmode/alerts/configure_alert_template.php:850
+#: ../../include/functions_ui.php:1034
 msgid "The alert would fire when the value is not <span id=\"value\"></span>"
 msgstr "取得した値が <span id=\"value\"></span> 以外の場合、アラートを発生させます。"
 
 #: ../../godmode/alerts/alert_view.php:161
-#: ../../godmode/alerts/configure_alert_template.php:848
-#: ../../include/functions_ui.php:1021
+#: ../../godmode/alerts/configure_alert_template.php:851
+#: ../../include/functions_ui.php:1048
 msgid ""
 "The alert would fire when the value is between <span id=\"min\"></span> and "
 "<span id=\"max\"></span>"
@@ -10239,7 +10719,7 @@ msgstr ""
 "取得した値が <span id=\"min\"></span> と <span id=\"max\"></span> "
 "の間になったら、アラートを発生させます。"
 
-#: ../../godmode/alerts/alert_view.php:164 ../../include/functions_ui.php:1024
+#: ../../godmode/alerts/alert_view.php:164 ../../include/functions_ui.php:1051
 msgid ""
 "The alert would fire when the value is not between <span id=\"min\"></span> "
 "and <span id=\"max\"></span>"
@@ -10248,44 +10728,44 @@ msgstr ""
 "の間を外れたら、アラートを発生させます。"
 
 #: ../../godmode/alerts/alert_view.php:170
-#: ../../godmode/alerts/configure_alert_template.php:850
+#: ../../godmode/alerts/configure_alert_template.php:853
 msgid "The alert would fire when the value is below <span id=\"min\"></span>"
 msgstr "値が <span id=\"min\"></span> より小さかったときにアラートが発報します"
 
 #: ../../godmode/alerts/alert_view.php:174
-#: ../../godmode/alerts/configure_alert_template.php:851
+#: ../../godmode/alerts/configure_alert_template.php:854
 msgid "The alert would fire when the value is above <span id=\"max\"></span>"
 msgstr "値が <span id=\"max\"></span> を超えたときにアラートが発報されます"
 
 #: ../../godmode/alerts/alert_view.php:179
-#: ../../godmode/alerts/configure_alert_template.php:854
+#: ../../godmode/alerts/configure_alert_template.php:857
 msgid "The alert would fire when the module value changes"
 msgstr "モジュールの値が変化したときにアラートが上がります。"
 
 #: ../../godmode/alerts/alert_view.php:182
-#: ../../godmode/alerts/configure_alert_template.php:855
+#: ../../godmode/alerts/configure_alert_template.php:858
 msgid "The alert would fire when the module value does not change"
 msgstr "モジュールの値が変化しなかったときにアラートが上がります。"
 
 #: ../../godmode/alerts/alert_view.php:186
-#: ../../godmode/alerts/configure_alert_template.php:852
-#: ../../include/functions_ui.php:1038
+#: ../../godmode/alerts/configure_alert_template.php:855
+#: ../../include/functions_ui.php:1065
 msgid "The alert would fire when the module is in warning status"
 msgstr "該当モジュールが警告状態になったら、アラートを発生させます。"
 
 #: ../../godmode/alerts/alert_view.php:189
-#: ../../godmode/alerts/configure_alert_template.php:853
-#: ../../include/functions_ui.php:1043
+#: ../../godmode/alerts/configure_alert_template.php:856
+#: ../../include/functions_ui.php:1070
 msgid "The alert would fire when the module is in critical status"
 msgstr "該当モジュールが障害になったら、アラートを発生させます。"
 
 #: ../../godmode/alerts/alert_view.php:192
-#: ../../godmode/alerts/configure_alert_template.php:856
+#: ../../godmode/alerts/configure_alert_template.php:859
 msgid "The alert would fire when the module is in unknown status"
 msgstr "モジュールが不明状態になるとアラートが発生します。"
 
 #: ../../godmode/alerts/alert_view.php:298
-#: ../../godmode/alerts/configure_alert_template.php:536
+#: ../../godmode/alerts/configure_alert_template.php:539
 msgid "Use special days list"
 msgstr "特別日一覧を利用する"
 
@@ -10294,25 +10774,30 @@ msgid "Number of alerts"
 msgstr "アラート数"
 
 #: ../../godmode/alerts/alert_view.php:310
-#: ../../godmode/reporting/reporting_builder.item_editor.php:779
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1291
-#: ../../include/functions_graph.php:758 ../../include/functions_graph.php:759
-#: ../../include/functions_graph.php:760 ../../include/functions_graph.php:763
-#: ../../include/functions_graph.php:1435
-#: ../../include/functions_graph.php:3949
-#: ../../include/functions_graph.php:3954
-#: ../../include/functions_graph.php:4672
-#: ../../include/functions_graph.php:4675
-#: ../../include/functions_graph.php:4678
-#: ../../include/graphs/functions_pchart.php:208
-#: ../../include/graphs/functions_pchart.php:1182
-#: ../../include/functions_reporting.php:956
-#: ../../include/functions_ui.php:2001
+#: ../../godmode/reporting/reporting_builder.item_editor.php:818
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1352
+#: ../../include/functions_reporting.php:1039
+#: ../../include/functions_ui.php:2057 ../../include/functions_graph.php:860
+#: ../../include/functions_graph.php:861 ../../include/functions_graph.php:862
+#: ../../include/functions_graph.php:870 ../../include/functions_graph.php:871
+#: ../../include/functions_graph.php:872 ../../include/functions_graph.php:878
+#: ../../include/functions_graph.php:903
+#: ../../include/functions_graph.php:1601
+#: ../../include/functions_graph.php:4631
+#: ../../include/functions_graph.php:5515
+#: ../../include/functions_graph.php:5518
+#: ../../include/functions_graph.php:5521
+#: ../../include/functions_reporting_html.php:2707
+#: ../../include/graphs/functions_pchart.php:203
+#: ../../include/graphs/functions_pchart.php:1465
 #: ../../enterprise/dashboard/widgets/top_n.php:477
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:199
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:261
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1314
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1592
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:200
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:275
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1384
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1693
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:476
+#: ../../enterprise/include/functions_reporting_csv.php:531
+#: ../../enterprise/include/functions_reporting_pdf.php:912
 #: ../../enterprise/meta/include/functions_wizard_meta.php:840
 #: ../../enterprise/meta/include/functions_wizard_meta.php:849
 #: ../../enterprise/meta/include/functions_wizard_meta.php:926
@@ -10329,25 +10814,30 @@ msgid "Min"
 msgstr "最小"
 
 #: ../../godmode/alerts/alert_view.php:310
-#: ../../godmode/reporting/reporting_builder.item_editor.php:781
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1289
-#: ../../include/functions_graph.php:758 ../../include/functions_graph.php:759
-#: ../../include/functions_graph.php:760 ../../include/functions_graph.php:763
-#: ../../include/functions_graph.php:1433
-#: ../../include/functions_graph.php:3949
-#: ../../include/functions_graph.php:3954
-#: ../../include/functions_graph.php:4672
-#: ../../include/functions_graph.php:4675
-#: ../../include/functions_graph.php:4678
-#: ../../include/graphs/functions_pchart.php:202
-#: ../../include/graphs/functions_pchart.php:1184
-#: ../../include/functions_reporting.php:953
-#: ../../include/functions_ui.php:2001
+#: ../../godmode/reporting/reporting_builder.item_editor.php:820
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1350
+#: ../../include/functions_reporting.php:1036
+#: ../../include/functions_ui.php:2057 ../../include/functions_graph.php:860
+#: ../../include/functions_graph.php:861 ../../include/functions_graph.php:862
+#: ../../include/functions_graph.php:870 ../../include/functions_graph.php:871
+#: ../../include/functions_graph.php:872 ../../include/functions_graph.php:878
+#: ../../include/functions_graph.php:900
+#: ../../include/functions_graph.php:1599
+#: ../../include/functions_graph.php:4631
+#: ../../include/functions_graph.php:5515
+#: ../../include/functions_graph.php:5518
+#: ../../include/functions_graph.php:5521
+#: ../../include/functions_reporting_html.php:2706
+#: ../../include/graphs/functions_pchart.php:197
+#: ../../include/graphs/functions_pchart.php:1467
 #: ../../enterprise/dashboard/widgets/top_n.php:474
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:204
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:258
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1312
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1590
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:205
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:272
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1382
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1691
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:478
+#: ../../enterprise/include/functions_reporting_csv.php:531
+#: ../../enterprise/include/functions_reporting_pdf.php:911
 #: ../../enterprise/meta/include/functions_wizard_meta.php:842
 #: ../../enterprise/meta/include/functions_wizard_meta.php:851
 #: ../../enterprise/meta/include/functions_wizard_meta.php:928
@@ -10392,10 +10882,10 @@ msgid "Recovering"
 msgstr "リカバリ中"
 
 #: ../../godmode/alerts/alert_view.php:423
-#: ../../godmode/massive/massive_edit_modules.php:545
+#: ../../godmode/massive/massive_edit_modules.php:577
 #: ../../godmode/servers/manage_recontask.php:296
 #: ../../godmode/servers/manage_recontask_form.php:243
-#: ../../enterprise/godmode/services/services.service.php:253
+#: ../../enterprise/godmode/services/services.service.php:293
 #: ../../enterprise/operation/services/services.list.php:192
 #: ../../enterprise/operation/services/services.table_services.php:161
 msgid "Mode"
@@ -10403,7 +10893,7 @@ msgstr "モード"
 
 #: ../../godmode/alerts/alert_view.php:438
 #: ../../godmode/alerts/alert_view.php:532
-#: ../../godmode/alerts/configure_alert_template.php:670
+#: ../../godmode/alerts/configure_alert_template.php:673
 msgid "Firing fields"
 msgstr "発報フィールド"
 
@@ -10498,9 +10988,8 @@ msgstr "アクションの更新"
 
 #: ../../godmode/alerts/configure_alert_action.php:128
 #: ../../godmode/alerts/configure_alert_command.php:150
-#: ../../godmode/events/event_responses.editor.php:114
+#: ../../godmode/events/event_responses.editor.php:115
 #: ../../godmode/events/event_responses.editor.php:121
-#: ../../godmode/events/event_responses.editor.php:124
 #: ../../godmode/massive/massive_edit_plugins.php:437
 #: ../../godmode/servers/plugin.php:388 ../../godmode/servers/plugin.php:394
 #: ../../godmode/servers/plugin.php:737
@@ -10539,47 +11028,67 @@ msgstr "フィールド %s の値"
 msgid "Configure special day"
 msgstr "特別日設定"
 
-#: ../../godmode/alerts/configure_alert_template.php:63
-#: ../../godmode/alerts/configure_alert_template.php:82
-#: ../../godmode/alerts/configure_alert_template.php:100
-#: ../../include/functions_menu.php:483
+#: ../../godmode/alerts/configure_alert_template.php:66
+#: ../../godmode/alerts/configure_alert_template.php:85
+#: ../../godmode/alerts/configure_alert_template.php:103
+#: ../../include/functions_menu.php:494
 msgid "Configure alert template"
 msgstr "アラートテンプレート設定"
 
-#: ../../godmode/alerts/configure_alert_template.php:118
+#: ../../godmode/alerts/configure_alert_template.php:121
 #: ../../godmode/modules/manage_network_components.php:160
 #: ../../enterprise/godmode/modules/local_components.php:106
 #, php-format
 msgid "Successfully created from %s"
 msgstr "%s から作成しました。"
 
-#: ../../godmode/alerts/configure_alert_template.php:147
-#: ../../godmode/alerts/configure_alert_template.php:152
-#: ../../godmode/alerts/configure_alert_template.php:167
-#: ../../godmode/alerts/configure_alert_template.php:172
-#: ../../godmode/alerts/configure_alert_template.php:187
-#: ../../godmode/alerts/configure_alert_template.php:192
-#: ../../include/functions_config.php:707
+#: ../../godmode/alerts/configure_alert_template.php:150
+#: ../../godmode/alerts/configure_alert_template.php:155
+#: ../../godmode/alerts/configure_alert_template.php:170
+#: ../../godmode/alerts/configure_alert_template.php:175
+#: ../../godmode/alerts/configure_alert_template.php:190
+#: ../../godmode/alerts/configure_alert_template.php:195
+#: ../../include/functions_config.php:767
 #: ../../enterprise/godmode/alerts/alert_events.php:96
 #: ../../enterprise/godmode/alerts/alert_events.php:101
 #: ../../enterprise/godmode/alerts/alert_events.php:116
 #: ../../enterprise/godmode/alerts/alert_events.php:121
 #: ../../enterprise/godmode/alerts/alert_events.php:136
 #: ../../enterprise/godmode/alerts/alert_events.php:141
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:45
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:51
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:56
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:75
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:81
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:86
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:106
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:112
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:117
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:139
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:145
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:150
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:175
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:181
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:186
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:207
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:213
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:218
 #: ../../enterprise/godmode/setup/setup_history.php:71
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:356
 msgid "Step"
 msgstr "ステップ"
 
-#: ../../godmode/alerts/configure_alert_template.php:148
-#: ../../godmode/alerts/configure_alert_template.php:153
+#: ../../godmode/alerts/configure_alert_template.php:151
+#: ../../godmode/alerts/configure_alert_template.php:156
 #: ../../godmode/servers/plugin.php:326 ../../godmode/servers/plugin.php:332
 #: ../../godmode/setup/setup.php:74 ../../godmode/setup/setup.php:112
-#: ../../include/ajax/events.php:299 ../../include/functions_reports.php:581
-#: ../../include/functions_reporting.php:5483
+#: ../../include/ajax/events.php:344
+#: ../../include/functions_reporting.php:6118
+#: ../../include/functions_reports.php:582
 #: ../../enterprise/godmode/alerts/alert_events.php:97
 #: ../../enterprise/godmode/alerts/alert_events.php:102
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:46
-#: ../../enterprise/include/functions_reporting_csv.php:483
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:47
+#: ../../enterprise/include/functions_reporting_csv.php:496
 #: ../../enterprise/meta/include/functions_wizard_meta.php:184
 #: ../../enterprise/meta/include/functions_wizard_meta.php:416
 #: ../../enterprise/meta/include/functions_wizard_meta.php:485
@@ -10587,96 +11096,96 @@ msgstr "ステップ"
 msgid "General"
 msgstr "一般"
 
-#: ../../godmode/alerts/configure_alert_template.php:168
-#: ../../godmode/alerts/configure_alert_template.php:173
+#: ../../godmode/alerts/configure_alert_template.php:171
+#: ../../godmode/alerts/configure_alert_template.php:176
 #: ../../enterprise/godmode/alerts/alert_events.php:117
 #: ../../enterprise/godmode/alerts/alert_events.php:122
 msgid "Conditions"
 msgstr "状態"
 
-#: ../../godmode/alerts/configure_alert_template.php:188
-#: ../../godmode/alerts/configure_alert_template.php:193
+#: ../../godmode/alerts/configure_alert_template.php:191
+#: ../../godmode/alerts/configure_alert_template.php:196
 #: ../../enterprise/godmode/alerts/alert_events.php:137
 #: ../../enterprise/godmode/alerts/alert_events.php:142
 msgid "Advanced fields"
 msgstr "拡張フィールド"
 
-#: ../../godmode/alerts/configure_alert_template.php:520
+#: ../../godmode/alerts/configure_alert_template.php:523
 #: ../../enterprise/godmode/alerts/alert_events.php:430
 msgid "Days of week"
 msgstr "曜日"
 
-#: ../../godmode/alerts/configure_alert_template.php:539
-#: ../../godmode/reporting/reporting_builder.item_editor.php:847
+#: ../../godmode/alerts/configure_alert_template.php:542
+#: ../../godmode/reporting/reporting_builder.item_editor.php:886
 #: ../../enterprise/godmode/alerts/alert_events.php:446
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1380
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1450
 msgid "Time from"
 msgstr "開始時間"
 
-#: ../../godmode/alerts/configure_alert_template.php:543
-#: ../../godmode/reporting/reporting_builder.item_editor.php:856
+#: ../../godmode/alerts/configure_alert_template.php:546
+#: ../../godmode/reporting/reporting_builder.item_editor.php:895
 #: ../../enterprise/godmode/alerts/alert_events.php:449
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1388
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1458
 msgid "Time to"
 msgstr "終了時間"
 
-#: ../../godmode/alerts/configure_alert_template.php:553
+#: ../../godmode/alerts/configure_alert_template.php:556
 #: ../../godmode/snmpconsole/snmp_alert.php:911
 #: ../../enterprise/godmode/alerts/alert_events.php:457
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:253
 msgid "Min. number of alerts"
 msgstr "最小アラート数"
 
-#: ../../godmode/alerts/configure_alert_template.php:557
+#: ../../godmode/alerts/configure_alert_template.php:560
 msgid "Reset counter for non-sustained alerts"
 msgstr "アラートが継続しない場合にカウンターをリセット"
 
-#: ../../godmode/alerts/configure_alert_template.php:557
+#: ../../godmode/alerts/configure_alert_template.php:560
 msgid ""
 "Enable this option if you want the counter to be reset when the alert is not "
 "being fired consecutively, even if it's within the time threshold"
 msgstr "再通知間隔内であっても、アラートが継続していない場合は最小アラート数のカウンタをリセットしたい場合にこのオプションを有効化します。"
 
-#: ../../godmode/alerts/configure_alert_template.php:560
+#: ../../godmode/alerts/configure_alert_template.php:563
 #: ../../godmode/snmpconsole/snmp_alert.php:914
 #: ../../enterprise/godmode/alerts/alert_events.php:460
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:255
 msgid "Max. number of alerts"
 msgstr "最大アラート数"
 
-#: ../../godmode/alerts/configure_alert_template.php:588
+#: ../../godmode/alerts/configure_alert_template.php:591
 msgid ""
 "Unless they're left blank, the fields from the action will override those "
 "set on the template."
 msgstr "空白のままにしない限り、テンプレートにおける設定よりもアクションにおける設定が優先されます。"
 
-#: ../../godmode/alerts/configure_alert_template.php:590
+#: ../../godmode/alerts/configure_alert_template.php:593
 msgid "Condition type"
 msgstr "条件種別"
 
-#: ../../godmode/alerts/configure_alert_template.php:597
+#: ../../godmode/alerts/configure_alert_template.php:600
 msgid "Trigger when matches the value"
 msgstr "以下の値にマッチしたら、条件を満たしたと判断する。"
 
-#: ../../godmode/alerts/configure_alert_template.php:609
+#: ../../godmode/alerts/configure_alert_template.php:612
 msgid "The regular expression is valid"
 msgstr "この正規表現は正しいです。"
 
-#: ../../godmode/alerts/configure_alert_template.php:614
+#: ../../godmode/alerts/configure_alert_template.php:617
 msgid "The regular expression is not valid"
 msgstr "この正規表現は間違っています。"
 
-#: ../../godmode/alerts/configure_alert_template.php:620
-#: ../../godmode/massive/massive_edit_modules.php:372
-#: ../../godmode/massive/massive_edit_modules.php:418
-#: ../../godmode/massive/massive_edit_modules.php:514
+#: ../../godmode/alerts/configure_alert_template.php:623
+#: ../../godmode/massive/massive_edit_modules.php:392
+#: ../../godmode/massive/massive_edit_modules.php:438
+#: ../../godmode/massive/massive_edit_modules.php:540
 #: ../../godmode/modules/manage_network_components_form_common.php:119
 #: ../../godmode/modules/manage_network_components_form_common.php:136
 #: ../../include/functions_alerts.php:570
-#: ../../include/functions_graph.php:4322
-#: ../../include/functions_reporting_html.php:3140
 #: ../../include/functions_treeview.php:94
 #: ../../include/functions_treeview.php:107
+#: ../../include/functions_graph.php:5162
+#: ../../include/functions_reporting_html.php:3253
 #: ../../enterprise/dashboard/widgets/top_n.php:79
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:241
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:270
@@ -10685,41 +11194,28 @@ msgstr "この正規表現は間違っています。"
 msgid "Min."
 msgstr "最小"
 
-#: ../../godmode/alerts/configure_alert_template.php:662
+#: ../../godmode/alerts/configure_alert_template.php:665
 msgid "Alert recovery"
 msgstr "復旧アラート"
 
-#: ../../godmode/alerts/configure_alert_template.php:663
-#: ../../include/functions_groups.php:2158
-#: ../../include/functions_reporting_html.php:2092
-#: ../../operation/agentes/estado_generalagente.php:297
-#: ../../enterprise/extensions/ipam/ipam_ajax.php:196
-#: ../../enterprise/extensions/ipam/ipam_massive.php:79
-#: ../../enterprise/extensions/ipam/ipam_network.php:542
-#: ../../enterprise/include/functions_reporting_pdf.php:2344
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:892
-msgid "Enabled"
-msgstr "有効"
-
-#: ../../godmode/alerts/configure_alert_template.php:671
+#: ../../godmode/alerts/configure_alert_template.php:674
 msgid "Recovery fields"
 msgstr "復旧フィールド"
 
-#: ../../godmode/alerts/configure_alert_template.php:772
+#: ../../godmode/alerts/configure_alert_template.php:775
 #: ../../godmode/modules/manage_network_components_form_common.php:58
 #: ../../enterprise/godmode/modules/configure_local_component.php:155
 msgid "Wizard level"
 msgstr "ウィザードレベル"
 
-#: ../../godmode/alerts/configure_alert_template.php:774
+#: ../../godmode/alerts/configure_alert_template.php:777
 msgid "No wizard"
 msgstr "ウィザードがありません"
 
-#: ../../godmode/alerts/configure_alert_template.php:821
-#: ../../godmode/alerts/configure_alert_template.php:825
-#: ../../enterprise/dashboard/full_dashboard.php:210
-#: ../../enterprise/dashboard/public_dashboard.php:226
+#: ../../godmode/alerts/configure_alert_template.php:824
+#: ../../godmode/alerts/configure_alert_template.php:828
 #: ../../enterprise/godmode/alerts/alert_events.php:552
+#: ../../enterprise/include/functions_dashboard.php:831
 #: ../../enterprise/meta/monitoring/wizard/wizard.agent.php:163
 #: ../../enterprise/meta/monitoring/wizard/wizard.module.local.php:183
 #: ../../enterprise/meta/monitoring/wizard/wizard.module.network.php:212
@@ -10728,19 +11224,19 @@ msgstr "ウィザードがありません"
 msgid "Next"
 msgstr "次"
 
-#: ../../godmode/alerts/configure_alert_template.php:845
+#: ../../godmode/alerts/configure_alert_template.php:848
 #, php-format
 msgid "The alert would fire when the value doesn\\'t match %s"
 msgstr "値が %s にマッチしなかったときにアラートが発報します"
 
-#: ../../godmode/alerts/configure_alert_template.php:849
+#: ../../godmode/alerts/configure_alert_template.php:852
 msgid ""
 "The alert would fire when the value is not between <span id=\\'min\\"
 "'></span> and <span id=\\'max\\'></span>"
 msgstr ""
 "値が<span id=\\'最小\\'></span> と <span id=\\'最大\\'></span>の間に無い場合に、アラートを発報します。"
 
-#: ../../godmode/alerts/configure_alert_template.php:857
+#: ../../godmode/alerts/configure_alert_template.php:860
 msgid ""
 "The alert template cannot have the same value for min and max thresholds."
 msgstr "アラートテンプレートは最小と最大の閾値に同じ値を設定できません。"
@@ -10804,139 +11300,6 @@ msgstr "カテゴリを作成しました"
 msgid "Update category"
 msgstr "カテゴリ更新"
 
-#: ../../godmode/db/db_audit.php:19 ../../godmode/db/db_event.php:21
-#: ../../godmode/db/db_info.php:32 ../../godmode/db/db_purge.php:37
-#: ../../godmode/db/db_refine.php:33
-msgid "Database maintenance"
-msgstr "データベースメンテナンス"
-
-#: ../../godmode/db/db_audit.php:19
-msgid "Database audit purge"
-msgstr "監査DB削除"
-
-#: ../../godmode/db/db_audit.php:70
-msgid "Success data deleted"
-msgstr "データを削除しました"
-
-#: ../../godmode/db/db_audit.php:72
-msgid "Error deleting data"
-msgstr "データ削除エラー"
-
-#: ../../godmode/db/db_audit.php:80 ../../godmode/db/db_event.php:61
-#: ../../include/functions_reporting_html.php:1556
-#: ../../include/functions_reporting_html.php:1571
-#: ../../operation/agentes/gis_view.php:194
-#: ../../operation/agentes/group_view.php:165 ../../operation/tree.php:273
-#: ../../enterprise/dashboard/widgets/tree_view.php:197
-#: ../../enterprise/include/functions_inventory.php:323
-#: ../../enterprise/include/functions_reporting_pdf.php:691
-#: ../../enterprise/include/functions_reporting_pdf.php:706
-#: ../../enterprise/meta/monitoring/group_view.php:145
-#: ../../enterprise/operation/agentes/agent_inventory.php:230
-msgid "Total"
-msgstr "合計"
-
-#: ../../godmode/db/db_audit.php:81 ../../godmode/db/db_event.php:62
-msgid "Records"
-msgstr "レコード"
-
-#: ../../godmode/db/db_audit.php:84 ../../godmode/db/db_event.php:64
-msgid "First date"
-msgstr "開始日時"
-
-#: ../../godmode/db/db_audit.php:88
-msgid "Latest date"
-msgstr "最新日時"
-
-#: ../../godmode/db/db_audit.php:92 ../../godmode/db/db_event.php:73
-#: ../../godmode/db/db_purge.php:335
-msgid "Purge data"
-msgstr "データ削除"
-
-#: ../../godmode/db/db_audit.php:97
-msgid "Purge audit data over 90 days"
-msgstr "90日より古い監査データ削除"
-
-#: ../../godmode/db/db_audit.php:98
-msgid "Purge audit data over 30 days"
-msgstr "30日より古い監査データ削除"
-
-#: ../../godmode/db/db_audit.php:99
-msgid "Purge audit data over 14 days"
-msgstr "14日より古い監査データ削除"
-
-#: ../../godmode/db/db_audit.php:100
-msgid "Purge audit data over 7 days"
-msgstr "7日より古い監査データ削除"
-
-#: ../../godmode/db/db_audit.php:101
-msgid "Purge audit data over 3 days"
-msgstr "3日より古い監査データ削除"
-
-#: ../../godmode/db/db_audit.php:102
-msgid "Purge audit data over 1 day"
-msgstr "1日より古い監査データ削除"
-
-#: ../../godmode/db/db_audit.php:103
-msgid "Purge all audit data"
-msgstr "すべての監査データ削除"
-
-#: ../../godmode/db/db_audit.php:107 ../../godmode/db/db_event.php:92
-msgid "Do it!"
-msgstr "実行"
-
-#: ../../godmode/db/db_event.php:22
-msgid "Event database cleanup"
-msgstr "イベントDB削除"
-
-#: ../../godmode/db/db_event.php:40
-msgid "Successfully deleted old events"
-msgstr "古いイベントを削除しました。"
-
-#: ../../godmode/db/db_event.php:43
-msgid "Error deleting old events"
-msgstr "古いイベントの削除に失敗しました。"
-
-#: ../../godmode/db/db_event.php:67
-msgid "Latest data"
-msgstr "最新日時"
-
-#: ../../godmode/db/db_event.php:81
-msgid "Purge event data over 90 days"
-msgstr "90日より古いイベントデータ削除"
-
-#: ../../godmode/db/db_event.php:82
-msgid "Purge event data over 30 days"
-msgstr "30日より古いイベントデータ削除"
-
-#: ../../godmode/db/db_event.php:83
-msgid "Purge event data over 14 days"
-msgstr "14日より古いイベントデータ削除"
-
-#: ../../godmode/db/db_event.php:84
-msgid "Purge event data over 7 days"
-msgstr "7日より古いイベントデータ削除"
-
-#: ../../godmode/db/db_event.php:85
-msgid "Purge event data over 3 days"
-msgstr "3日より古いイベントデータ削除"
-
-#: ../../godmode/db/db_event.php:86
-msgid "Purge event data over 1 day"
-msgstr "1日より古いイベントデータ削除"
-
-#: ../../godmode/db/db_event.php:87
-msgid "Purge all event data"
-msgstr "すべてのイベントデータ削除"
-
-#: ../../godmode/db/db_info.php:32
-msgid "Database information"
-msgstr "データベース情報"
-
-#: ../../godmode/db/db_info.php:34
-msgid "Module data received"
-msgstr "データ受信モジュール"
-
 #: ../../godmode/db/db_main.php:69
 msgid "Current database maintenance setup"
 msgstr "現在のデータベース設定"
@@ -10950,9 +11313,9 @@ msgid "Max. time before compact data"
 msgstr "データ保持日数(未圧縮)"
 
 #: ../../godmode/db/db_main.php:82 ../../godmode/db/db_main.php:88
-#: ../../godmode/setup/setup_visuals.php:740 ../../include/functions.php:431
-#: ../../include/functions.php:565 ../../include/functions_html.php:731
-#: ../../enterprise/meta/advanced/metasetup.visual.php:143
+#: ../../godmode/setup/setup_visuals.php:806 ../../include/functions.php:431
+#: ../../include/functions.php:565 ../../include/functions_html.php:834
+#: ../../enterprise/meta/advanced/metasetup.visual.php:165
 msgid "days"
 msgstr "日"
 
@@ -10960,19 +11323,16 @@ msgstr "日"
 msgid "Max. time before purge"
 msgstr "データ保持日数"
 
-#: ../../godmode/db/db_main.php:95
-msgid "Database size stats"
-msgstr "データベースサイズ"
-
-#: ../../godmode/db/db_main.php:99 ../../include/functions_reporting.php:7248
-#: ../../include/functions_reporting_html.php:3469
-#: ../../mobile/operation/groups.php:125 ../../operation/tree.php:271
-#: ../../enterprise/dashboard/widgets/tree_view.php:195
-#: ../../enterprise/include/functions_reporting_csv.php:456
+#: ../../godmode/db/db_main.php:99 ../../include/functions_reporting.php:7912
+#: ../../include/functions_reporting_html.php:3582
+#: ../../mobile/operation/groups.php:125 ../../operation/tree.php:293
+#: ../../enterprise/dashboard/widgets/tree_view.php:205
+#: ../../enterprise/include/functions_reporting_csv.php:469
 msgid "Total agents"
 msgstr "エージェント数"
 
-#: ../../godmode/db/db_main.php:105 ../../include/functions_reporting.php:9898
+#: ../../godmode/db/db_main.php:105
+#: ../../include/functions_reporting.php:10562
 msgid "Total events"
 msgstr "イベント数"
 
@@ -10996,10 +11356,6 @@ msgstr "定義済モジュール数"
 msgid "Total agent access records"
 msgstr "エージェントアクセス数"
 
-#: ../../godmode/db/db_main.php:160
-msgid "Database sanity"
-msgstr "データベースの健全性"
-
 #: ../../godmode/db/db_main.php:164
 msgid "Total uknown agents"
 msgstr "不明なエージェント数"
@@ -11014,10 +11370,10 @@ msgstr "最終 DB メンテナンス日時"
 
 #: ../../godmode/db/db_main.php:183
 #: ../../godmode/snmpconsole/snmp_alert.php:1217
-#: ../../include/functions_treeview.php:595 ../../include/functions_ui.php:449
-#: ../../operation/agentes/estado_generalagente.php:210
+#: ../../include/functions_treeview.php:601 ../../include/functions_ui.php:454
+#: ../../operation/agentes/estado_generalagente.php:239
 #: ../../operation/gis_maps/ajax.php:323 ../../operation/gis_maps/ajax.php:334
-#: ../../enterprise/extensions/cron/main.php:291
+#: ../../enterprise/extensions/cron/main.php:408
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:229
 #: ../../enterprise/extensions/ipam/ipam_list.php:223
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1155
@@ -11033,189 +11389,9 @@ msgstr ""
 "Pandoraサーバの設定とデータベースメンテナンスデーモンの動作に注意をしてください。パフォーマンスを維持するためには、データベースを日々整理することが"
 "重要です。"
 
-#: ../../godmode/db/db_purge.php:38 ../../godmode/menu.php:316
-msgid "Database purge"
-msgstr "収集データ"
-
-#: ../../godmode/db/db_purge.php:43
-msgid "Get data from agent"
-msgstr "エージェントから収集したデータ"
-
-#: ../../godmode/db/db_purge.php:75
-#, php-format
-msgid "Purge task launched for agent %s :: Data older than %s"
-msgstr "エージェント %s の削除タスクを起動しました。%s より古いデータが対象です。"
-
-#: ../../godmode/db/db_purge.php:78
-msgid ""
-"Please be patient. This operation can take a long time depending on the "
-"amount of modules."
-msgstr "しばらくお待ちください。この操作は、モジュール数によりしばらく時間がかかることがあります。"
-
-#: ../../godmode/db/db_purge.php:92
-#, php-format
-msgid "Deleting records for module %s"
-msgstr "モジュール %s のレコードを削除しています"
-
-#: ../../godmode/db/db_purge.php:140
-#, php-format
-msgid "Total errors: %s"
-msgstr "全エラー数: %s"
-
-#: ../../godmode/db/db_purge.php:141 ../../godmode/db/db_purge.php:144
-#, php-format
-msgid "Total records deleted: %s"
-msgstr "全削除レコード数: %s"
-
-#: ../../godmode/db/db_purge.php:149
-msgid "Deleting records for all agents"
-msgstr "全エージェントのレコードの削除中"
-
-#: ../../godmode/db/db_purge.php:166
-msgid "Choose agent"
-msgstr "エージェントの選択"
-
-#: ../../godmode/db/db_purge.php:167
-#: ../../operation/incidents/incident.php:279
-msgid "All agents"
-msgstr "全エージェント"
-
-#: ../../godmode/db/db_purge.php:172
-msgid "Select the agent you want information about"
-msgstr "情報を見たいエージェントを選択してください。"
-
-#: ../../godmode/db/db_purge.php:174
-msgid "Get data"
-msgstr "データ取得"
-
-#: ../../godmode/db/db_purge.php:175
-msgid "Click here to get the data from the agent specified in the select box"
-msgstr "選択したエージェントからデータを取得するためには、ここをクリックしてください。"
-
-#: ../../godmode/db/db_purge.php:179
-#, php-format
-msgid "Information on agent %s in the database"
-msgstr "エージェント %s に関するデータベース内の情報"
-
-#: ../../godmode/db/db_purge.php:182
-msgid "Information on all agents in the database"
-msgstr "データベース内の全エージェントの情報"
-
-#: ../../godmode/db/db_purge.php:317
-msgid "Packets less than three months old"
-msgstr "過去3ヵ月のパケット数"
-
-#: ../../godmode/db/db_purge.php:319
-msgid "Packets less than one month old"
-msgstr "過去1ヵ月のパケット数"
-
-#: ../../godmode/db/db_purge.php:321
-msgid "Packets less than two weeks old"
-msgstr "過去2週間のパケット数"
-
-#: ../../godmode/db/db_purge.php:323
-msgid "Packets less than one week old"
-msgstr "過去1週間のパケット数"
-
-#: ../../godmode/db/db_purge.php:325
-msgid "Packets less than three days old"
-msgstr "過去3日間のパケット数"
-
-#: ../../godmode/db/db_purge.php:327
-msgid "Packets less than one day old"
-msgstr "過去1日間のパケット数"
-
-#: ../../godmode/db/db_purge.php:329
-msgid "Total number of packets"
-msgstr "全パケット数"
-
-#: ../../godmode/db/db_purge.php:340
-msgid "Purge data over 3 months"
-msgstr "3ヵ月より古いデータの削除"
-
-#: ../../godmode/db/db_purge.php:341
-msgid "Purge data over 1 month"
-msgstr "1ヵ月より古いデータの削除"
-
-#: ../../godmode/db/db_purge.php:342
-msgid "Purge data over 2 weeks"
-msgstr "2週間より古いデータの削除"
-
-#: ../../godmode/db/db_purge.php:343
-msgid "Purge data over 1 week"
-msgstr "1週間より古いデータの削除"
-
-#: ../../godmode/db/db_purge.php:344
-msgid "Purge data over 3 days"
-msgstr "3日より古いデータの削除"
-
-#: ../../godmode/db/db_purge.php:345
-msgid "Purge data over 1 day"
-msgstr "1日より古いデータの削除"
-
-#: ../../godmode/db/db_purge.php:346
-msgid "All data until now"
-msgstr "現在より古いデータ全ての削除"
-
-#: ../../godmode/db/db_purge.php:350
-msgid "Purge"
-msgstr "削除"
-
-#: ../../godmode/db/db_refine.php:33 ../../godmode/menu.php:317
-#: ../../include/functions_db.php:1499
-msgid "Database debug"
-msgstr "DBのデバッグ"
-
-#: ../../godmode/db/db_refine.php:42
-msgid "Maximum is equal to minimum"
-msgstr "最大値と最小値が同じです。"
-
-#: ../../godmode/db/db_refine.php:47
-#: ../../godmode/massive/massive_copy_modules.php:447
-#: ../../include/functions_agents.php:565
-msgid "No modules have been selected"
-msgstr "モジュールが選択されていません。"
-
-#: ../../godmode/db/db_refine.php:56
-msgid "Filtering data module"
-msgstr "データモジュールのフィルタ中"
-
-#: ../../godmode/db/db_refine.php:76
-msgid "Filtering completed"
-msgstr "フィルタリングが完了しました。"
-
-#: ../../godmode/db/db_refine.php:83
-#: ../../operation/agentes/exportdata.php:244
-#: ../../enterprise/godmode/agentes/manage_config_remote.php:154
-msgid "Source agent"
-msgstr "対象エージェント"
-
-#: ../../godmode/db/db_refine.php:88
-msgid "No agent selected"
-msgstr "エージェント選択なし"
-
-#: ../../godmode/db/db_refine.php:92
-msgid "Get Info"
-msgstr "情報取得"
-
-#: ../../godmode/db/db_refine.php:105
-msgid "Purge data out of these limits"
-msgstr "以下の範囲外のデータ削除"
-
-#: ../../godmode/db/db_refine.php:107 ../../godmode/db/db_refine.php:109
-#: ../../include/functions_reporting.php:5704
-msgid "Minimum"
-msgstr "最小"
-
-#: ../../godmode/db/db_refine.php:112 ../../godmode/db/db_refine.php:114
-#: ../../include/functions_reporting.php:5707
-msgid "Maximum"
-msgstr "最大"
-
 #: ../../godmode/events/custom_events.php:68
 #: ../../godmode/events/custom_events.php:152
 #: ../../include/functions_events.php:34
-#: ../../include/functions_events.php:1581
 #: ../../enterprise/meta/include/functions_events_meta.php:55
 msgid "Event id"
 msgstr "イベント ID"
@@ -11224,45 +11400,47 @@ msgstr "イベント ID"
 #: ../../godmode/events/custom_events.php:153
 #: ../../include/functions_events.php:35
 #: ../../include/functions_events.php:905
-#: ../../include/functions_events.php:2338
-#: ../../include/functions_reporting_html.php:1022
-#: ../../include/functions_reporting_html.php:1032
-#: ../../include/functions_reporting_html.php:2825
+#: ../../include/functions_events.php:2448
+#: ../../include/functions_reporting_html.php:1025
+#: ../../include/functions_reporting_html.php:1035
+#: ../../include/functions_reporting_html.php:2938
 #: ../../enterprise/meta/include/functions_events_meta.php:58
 msgid "Event name"
 msgstr "イベント名"
 
 #: ../../godmode/events/custom_events.php:86
 #: ../../godmode/events/custom_events.php:158 ../../godmode/setup/news.php:223
-#: ../../include/ajax/events.php:466 ../../include/functions_events.php:40
+#: ../../include/ajax/events.php:514 ../../include/functions_events.php:40
 #: ../../include/functions_events.php:912
-#: ../../include/functions_events.php:2343
-#: ../../include/functions_events.php:3542
+#: ../../include/functions_events.php:2453
+#: ../../include/functions_events.php:3641
 #: ../../include/functions_netflow.php:287
-#: ../../include/functions_reporting_html.php:813
-#: ../../include/functions_reporting_html.php:822
-#: ../../include/functions_reporting_html.php:1026
-#: ../../include/functions_reporting_html.php:1035
-#: ../../include/functions_reporting_html.php:1650
-#: ../../include/functions_reporting_html.php:2827
+#: ../../include/functions_reporting_html.php:816
+#: ../../include/functions_reporting_html.php:825
+#: ../../include/functions_reporting_html.php:1029
+#: ../../include/functions_reporting_html.php:1038
+#: ../../include/functions_reporting_html.php:1653
+#: ../../include/functions_reporting_html.php:2940
 #: ../../mobile/operation/events.php:473
 #: ../../mobile/operation/modules.php:548
 #: ../../mobile/operation/modules.php:756
-#: ../../operation/agentes/estado_generalagente.php:402
+#: ../../operation/agentes/estado_generalagente.php:431
 #: ../../operation/agentes/exportdata.csv.php:77
 #: ../../operation/agentes/exportdata.excel.php:76
 #: ../../operation/agentes/exportdata.php:99
-#: ../../operation/agentes/status_monitor.php:990
+#: ../../operation/agentes/status_monitor.php:998
 #: ../../operation/events/events.build_table.php:167
 #: ../../operation/events/events.php:87
 #: ../../operation/messages/message_list.php:127
 #: ../../operation/search_modules.php:54
-#: ../../operation/snmpconsole/snmp_view.php:623
+#: ../../operation/snmpconsole/snmp_view.php:731
 #: ../../enterprise/include/functions_inventory.php:65
-#: ../../enterprise/include/functions_inventory.php:241
-#: ../../enterprise/include/functions_reporting_csv.php:349
-#: ../../enterprise/include/functions_reporting_csv.php:879
+#: ../../enterprise/include/functions_inventory.php:242
+#: ../../enterprise/include/functions_inventory.php:392
+#: ../../enterprise/include/functions_reporting_csv.php:361
+#: ../../enterprise/include/functions_reporting_csv.php:990
 #: ../../enterprise/meta/include/functions_events_meta.php:73
+#: ../../enterprise/operation/agentes/tag_view.php:539
 msgid "Timestamp"
 msgstr "タイムスタンプ"
 
@@ -11270,15 +11448,15 @@ msgstr "タイムスタンプ"
 #: ../../godmode/events/custom_events.php:159
 #: ../../godmode/events/event_edit_filter.php:235
 #: ../../godmode/events/event_filter.php:110
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1413
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1479
 #: ../../include/functions_events.php:41
-#: ../../include/functions_events.php:3562
+#: ../../include/functions_events.php:3661
 #: ../../operation/events/events.build_table.php:191
-#: ../../operation/events/events_list.php:563
+#: ../../operation/events/events_list.php:628
 #: ../../enterprise/dashboard/widgets/events_list.php:36
 #: ../../enterprise/godmode/alerts/configure_alert_rule.php:210
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1683
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:296
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1789
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:414
 #: ../../enterprise/include/functions_events.php:97
 #: ../../enterprise/meta/include/functions_events_meta.php:76
 msgid "Event type"
@@ -11295,31 +11473,31 @@ msgstr "エージェントモジュール"
 #: ../../godmode/events/custom_events.php:162
 #: ../../godmode/events/event_edit_filter.php:239
 #: ../../godmode/events/event_filter.php:112
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1401
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1467
 #: ../../include/functions_events.php:44
 #: ../../include/functions_events.php:898
-#: ../../include/functions_events.php:2387
-#: ../../include/functions_events.php:3579
-#: ../../include/functions_reporting_html.php:811
-#: ../../include/functions_reporting_html.php:820
-#: ../../include/functions_reporting_html.php:1024
-#: ../../include/functions_reporting_html.php:1034
-#: ../../include/functions_reporting_html.php:1648
-#: ../../mobile/operation/events.php:373 ../../mobile/operation/events.php:374
-#: ../../mobile/operation/events.php:489 ../../mobile/operation/events.php:632
-#: ../../mobile/operation/events.php:633
+#: ../../include/functions_events.php:2499
+#: ../../include/functions_events.php:3678
+#: ../../include/functions_reporting_html.php:814
+#: ../../include/functions_reporting_html.php:823
+#: ../../include/functions_reporting_html.php:1027
+#: ../../include/functions_reporting_html.php:1037
+#: ../../include/functions_reporting_html.php:1651
+#: ../../include/functions_snmp.php:303 ../../mobile/operation/events.php:373
+#: ../../mobile/operation/events.php:374 ../../mobile/operation/events.php:489
+#: ../../mobile/operation/events.php:632 ../../mobile/operation/events.php:633
 #: ../../operation/events/events.build_table.php:211
-#: ../../operation/events/events_list.php:569
-#: ../../operation/snmpconsole/snmp_view.php:399
+#: ../../operation/events/events_list.php:634
+#: ../../operation/snmpconsole/snmp_view.php:456
 #: ../../enterprise/dashboard/widgets/events_list.php:54
 #: ../../enterprise/godmode/alerts/configure_alert_rule.php:158
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1671
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:285
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1777
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:403
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:320
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:74
 #: ../../enterprise/include/functions_events.php:104
-#: ../../enterprise/include/functions_reporting.php:1397
-#: ../../enterprise/include/functions_reporting_pdf.php:1761
+#: ../../enterprise/include/functions_reporting.php:1783
+#: ../../enterprise/include/functions_reporting_pdf.php:1842
 #: ../../enterprise/meta/include/functions_events_meta.php:85
 msgid "Severity"
 msgstr "重要度"
@@ -11327,9 +11505,9 @@ msgstr "重要度"
 #: ../../godmode/events/custom_events.php:101
 #: ../../godmode/events/custom_events.php:163
 #: ../../include/functions_events.php:45
-#: ../../include/functions_events.php:1751
-#: ../../include/functions_events.php:3584
-#: ../../include/functions_events.php:3929
+#: ../../include/functions_events.php:1743
+#: ../../include/functions_events.php:3683
+#: ../../include/functions_events.php:4028
 #: ../../operation/events/events.build_table.php:217
 #: ../../operation/events/events.build_table.php:583
 #: ../../enterprise/meta/include/functions_events_meta.php:88
@@ -11339,7 +11517,7 @@ msgstr "コメント"
 #: ../../godmode/events/custom_events.php:110
 #: ../../godmode/events/custom_events.php:166
 #: ../../include/functions_events.php:48
-#: ../../include/functions_events.php:2251
+#: ../../include/functions_events.php:2295
 #: ../../enterprise/meta/include/functions_events_meta.php:97
 msgid "Extra id"
 msgstr "拡張 ID"
@@ -11347,7 +11525,7 @@ msgstr "拡張 ID"
 #: ../../godmode/events/custom_events.php:116
 #: ../../godmode/events/custom_events.php:168
 #: ../../include/functions_events.php:50
-#: ../../include/functions_events.php:3604
+#: ../../include/functions_events.php:3703
 #: ../../operation/events/events.build_table.php:241
 #: ../../enterprise/meta/include/functions_events_meta.php:103
 msgid "ACK Timestamp"
@@ -11356,14 +11534,8 @@ msgstr "ACK タイムスタンプ"
 #: ../../godmode/events/custom_events.php:119
 #: ../../godmode/events/custom_events.php:169
 #: ../../include/functions_events.php:51
-#: ../../include/functions_events.php:2190
-#: ../../include/functions_events.php:2202
-#: ../../include/functions_events.php:2214
-#: ../../include/functions_events.php:2226
-#: ../../include/functions_events.php:2231
-#: ../../include/functions_events.php:2236
-#: ../../include/functions_events.php:2240
-#: ../../include/functions_events.php:3609
+#: ../../include/functions_events.php:2290
+#: ../../include/functions_events.php:3708
 #: ../../operation/events/events.build_table.php:247
 #: ../../enterprise/meta/include/functions_events_meta.php:106
 msgid "Instructions"
@@ -11386,12 +11558,12 @@ msgid "Show event fields"
 msgstr "イベントフィールド表示"
 
 #: ../../godmode/events/custom_events.php:133
-msgid "Load default event fields"
-msgstr "デフォルトイベントフィールドの読み込み"
+msgid "Load the fields from previous events"
+msgstr "前のイベントからフィールドをロード"
 
 #: ../../godmode/events/custom_events.php:133
-msgid "Default event fields will be loaded. Do you want to continue?"
-msgstr "デフォルトのイベントフィールドを読み込みます。続けますか?"
+msgid "Event fields will be loaded. Do you want to continue?"
+msgstr "イベントフィールドが読み込まれます。続けますか?"
 
 #: ../../godmode/events/custom_events.php:181
 #: ../../enterprise/meta/event/custom_events.php:169
@@ -11435,7 +11607,7 @@ msgid "Create Filter"
 msgstr "フィルタ作成"
 
 #: ../../godmode/events/event_edit_filter.php:215
-#: ../../operation/events/events_list.php:225
+#: ../../operation/events/events_list.php:291
 msgid "Filter name"
 msgstr "フィルタ名"
 
@@ -11450,49 +11622,51 @@ msgstr "このグループは、ACL でフィルタの表示を制限するの
 
 #: ../../godmode/events/event_edit_filter.php:233
 #: ../../godmode/massive/massive_copy_modules.php:81
-#: ../../godmode/massive/massive_copy_modules.php:194
+#: ../../godmode/massive/massive_copy_modules.php:199
 #: ../../godmode/massive/massive_delete_agents.php:117
-#: ../../godmode/massive/massive_delete_modules.php:457
-#: ../../godmode/massive/massive_delete_modules.php:471
-#: ../../godmode/massive/massive_edit_agents.php:220
-#: ../../godmode/massive/massive_edit_modules.php:300
-#: ../../godmode/massive/massive_edit_modules.php:331
-#: ../../include/functions.php:1083 ../../include/functions_events.php:1428
+#: ../../godmode/massive/massive_delete_modules.php:478
+#: ../../godmode/massive/massive_delete_modules.php:492
+#: ../../godmode/massive/massive_edit_agents.php:273
+#: ../../godmode/massive/massive_edit_modules.php:309
+#: ../../godmode/massive/massive_edit_modules.php:347
+#: ../../include/functions.php:1083 ../../include/functions_events.php:1432
 #: ../../mobile/operation/modules.php:43
-#: ../../operation/agentes/estado_agente.php:190
-#: ../../operation/agentes/status_monitor.php:303
-#: ../../operation/events/events_list.php:566
+#: ../../operation/agentes/estado_agente.php:218
+#: ../../operation/agentes/status_monitor.php:301
+#: ../../operation/events/events_list.php:631
 #: ../../enterprise/dashboard/widgets/events_list.php:34
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:90
+#: ../../enterprise/operation/agentes/tag_view.php:86
 msgid "Not normal"
 msgstr "正常ではない"
 
 #: ../../godmode/events/event_edit_filter.php:245
 #: ../../godmode/events/event_filter.php:111
-#: ../../operation/events/events_list.php:576
+#: ../../operation/events/events_list.php:641
 #: ../../enterprise/dashboard/widgets/events_list.php:46
 #: ../../enterprise/include/functions_events.php:83
 msgid "Event status"
 msgstr "状態"
 
 #: ../../godmode/events/event_edit_filter.php:249
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1499
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1593
 #: ../../godmode/snmpconsole/snmp_alert.php:999
-#: ../../mobile/operation/agents.php:194 ../../mobile/operation/alerts.php:188
-#: ../../mobile/operation/events.php:642
+#: ../../include/ajax/module.php:185 ../../mobile/operation/agents.php:215
+#: ../../mobile/operation/alerts.php:188 ../../mobile/operation/events.php:642
 #: ../../mobile/operation/modules.php:254
-#: ../../operation/events/events_list.php:409
-#: ../../operation/snmpconsole/snmp_view.php:413
+#: ../../operation/events/events_list.php:477
+#: ../../operation/snmpconsole/snmp_view.php:470
 #: ../../enterprise/extensions/ipam/ipam_network.php:281
 #: ../../enterprise/godmode/massive/massive_delete_alerts_snmp.php:165
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:216
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1889
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:347
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2007
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:465
 #: ../../enterprise/include/functions_events.php:90
 msgid "Free search"
 msgstr "検索語"
 
 #: ../../godmode/events/event_edit_filter.php:253
-#: ../../operation/events/events_list.php:411
+#: ../../operation/events/events_list.php:479
 #: ../../enterprise/meta/agentsearch.php:28
 #: ../../enterprise/meta/agentsearch.php:32
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:242
@@ -11505,18 +11679,18 @@ msgstr "エージェント"
 
 #: ../../godmode/events/event_edit_filter.php:276
 #: ../../godmode/setup/setup_visuals.php:62
-#: ../../godmode/users/configure_user.php:519
-#: ../../include/functions_config.php:457
-#: ../../operation/events/events_list.php:469
-#: ../../operation/snmpconsole/snmp_view.php:388
-#: ../../operation/users/user_edit.php:238
-#: ../../enterprise/meta/advanced/metasetup.visual.php:117
-#: ../../enterprise/meta/include/functions_meta.php:1071
+#: ../../godmode/users/configure_user.php:627
+#: ../../include/functions_config.php:489
+#: ../../operation/events/events_list.php:537
+#: ../../operation/snmpconsole/snmp_view.php:445
+#: ../../operation/users/user_edit.php:240
+#: ../../enterprise/meta/advanced/metasetup.visual.php:121
+#: ../../enterprise/meta/include/functions_meta.php:1165
 msgid "Block size for pagination"
 msgstr "ページ毎の表示件数"
 
 #: ../../godmode/events/event_edit_filter.php:285
-#: ../../operation/events/events_list.php:431
+#: ../../operation/events/events_list.php:499
 #: ../../enterprise/include/functions_events.php:128
 msgid "User ack."
 msgstr "承諾したユーザ"
@@ -11526,113 +11700,121 @@ msgid "Choose between the users who have validated an event. "
 msgstr "イベントを承諾したユーザを選択します。 "
 
 #: ../../godmode/events/event_edit_filter.php:299
-#: ../../operation/events/events_list.php:582
+#: ../../operation/events/events_list.php:647
 #: ../../enterprise/godmode/setup/setup.php:90
 msgid "All events"
 msgstr "全イベント一覧表示"
 
 #: ../../godmode/events/event_edit_filter.php:300
-#: ../../operation/events/events_list.php:583
+#: ../../operation/events/events_list.php:648
 msgid "Group events"
 msgstr "グルーピング・回数表示"
 
 #: ../../godmode/events/event_edit_filter.php:305
-#: ../../operation/events/events_list.php:480
-#: ../../enterprise/include/functions_events.php:142
+#: ../../operation/events/events_list.php:548
+#: ../../enterprise/include/functions_events.php:135
 msgid "Date from"
 msgstr "開始日"
 
 #: ../../godmode/events/event_edit_filter.php:308
-#: ../../operation/events/events_list.php:486
-#: ../../enterprise/include/functions_events.php:135
+#: ../../operation/events/events_list.php:552
+#: ../../enterprise/include/functions_events.php:142
 msgid "Date to"
 msgstr "終了日"
 
 #: ../../godmode/events/event_edit_filter.php:350
-#: ../../operation/events/events_list.php:506
-#: ../../operation/events/events_list.php:520
+#: ../../operation/events/events_list.php:572
+#: ../../operation/events/events_list.php:586
 #: ../../enterprise/include/functions_events.php:180
 msgid "Events with following tags"
 msgstr "次のタグを含むイベント"
 
 #: ../../godmode/events/event_edit_filter.php:365
-#: ../../operation/events/events_list.php:512
-#: ../../operation/events/events_list.php:526
+#: ../../operation/events/events_list.php:578
+#: ../../operation/events/events_list.php:592
 #: ../../enterprise/include/functions_events.php:197
 msgid "Events without following tags"
 msgstr "次のタグを含まないイベント"
 
 #: ../../godmode/events/event_edit_filter.php:379
-#: ../../operation/events/events_list.php:462
+#: ../../operation/events/events_list.php:530
 #: ../../enterprise/include/functions_events.php:156
 msgid "Alert events"
 msgstr "アラートイベント"
 
 #: ../../godmode/events/event_edit_filter.php:383
-#: ../../operation/events/events_list.php:465
+#: ../../operation/events/events_list.php:533
 msgid "Filter alert events"
 msgstr "アラートイベントフィルター"
 
 #: ../../godmode/events/event_edit_filter.php:384
-#: ../../operation/events/events_list.php:466
+#: ../../operation/events/events_list.php:534
 msgid "Only alert events"
 msgstr "アラートイベントのみ"
 
 #: ../../godmode/events/event_edit_filter.php:388
-#: ../../operation/events/events_list.php:443
+#: ../../operation/events/events_list.php:511
 msgid "Module search"
 msgstr "モジュール検索"
 
 #: ../../godmode/events/event_filter.php:167
-#: ../../godmode/netflow/nf_edit.php:162
+#: ../../godmode/netflow/nf_edit.php:163
 msgid "There are no defined filters"
 msgstr "定義済のフィルタがありません"
 
 #: ../../godmode/events/event_filter.php:175
-#: ../../godmode/netflow/nf_edit.php:167
+#: ../../godmode/netflow/nf_edit.php:168
 #: ../../godmode/netflow/nf_edit_form.php:182
 #: ../../godmode/snmpconsole/snmp_filters.php:38
 #: ../../enterprise/meta/event/custom_events.php:43
 msgid "Create filter"
 msgstr "フィルタの作成"
 
-#: ../../godmode/events/event_responses.editor.php:63
+#: ../../godmode/events/event_responses.editor.php:64
 msgid "Edit event responses"
 msgstr "イベント応答の編集"
 
-#: ../../godmode/events/event_responses.editor.php:93
+#: ../../godmode/events/event_responses.editor.php:94
+#: ../../enterprise/extensions/ipam/ipam_editor.php:89
+#: ../../enterprise/extensions/ipam/ipam_list.php:161
+#: ../../enterprise/extensions/ipam/ipam_network.php:140
+msgid "Location"
+msgstr "場所"
+
+#: ../../godmode/events/event_responses.editor.php:94
 msgid "For Command type Modal Window mode is enforced"
 msgstr "種類がコマンドの場合は、専用ウインドウになります。"
 
-#: ../../godmode/events/event_responses.editor.php:94
+#: ../../godmode/events/event_responses.editor.php:95
 msgid "Modal window"
 msgstr "専用ウインドウ"
 
-#: ../../godmode/events/event_responses.editor.php:94
+#: ../../godmode/events/event_responses.editor.php:95
 msgid "New window"
 msgstr "新しいウィンドウ"
 
-#: ../../godmode/events/event_responses.editor.php:104
-#: ../../godmode/reporting/graph_builder.main.php:137
+#: ../../godmode/events/event_responses.editor.php:105
+#: ../../godmode/reporting/graph_builder.main.php:148
 #: ../../godmode/reporting/visual_console_builder.wizard.php:134
 #: ../../godmode/setup/gis_step_2.php:257
-#: ../../include/functions_visual_map_editor.php:84
-#: ../../include/functions_visual_map_editor.php:386
+#: ../../include/functions_visual_map_editor.php:86
+#: ../../include/functions_visual_map_editor.php:500
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:172
 msgid "Width"
 msgstr "幅"
 
-#: ../../godmode/events/event_responses.editor.php:106
-#: ../../godmode/reporting/graph_builder.main.php:141
+#: ../../godmode/events/event_responses.editor.php:107
+#: ../../godmode/reporting/graph_builder.main.php:152
 #: ../../godmode/reporting/visual_console_builder.wizard.php:137
 #: ../../godmode/setup/gis_step_2.php:259
+#: ../../include/functions_visual_map_editor.php:506
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:176
 msgid "Height"
 msgstr "高さ"
 
-#: ../../godmode/events/event_responses.editor.php:111
-#: ../../include/functions_events.php:1817
-#: ../../enterprise/extensions/cron/main.php:334
+#: ../../godmode/events/event_responses.editor.php:112
+#: ../../include/functions_events.php:1809
+#: ../../enterprise/extensions/cron/main.php:480
 msgid "Parameters"
 msgstr "パラメータ"
 
@@ -11644,32 +11826,34 @@ msgstr "応答がありません"
 msgid "Create response"
 msgstr "応答の作成"
 
-#: ../../godmode/events/event_responses.php:52
+#: ../../godmode/events/event_responses.php:63
 msgid "Response added succesfully"
 msgstr "応答を追加しました"
 
-#: ../../godmode/events/event_responses.php:55
+#: ../../godmode/events/event_responses.php:66
 msgid "Response cannot be added"
 msgstr "応答を追加できません"
 
-#: ../../godmode/events/event_responses.php:81
+#: ../../godmode/events/event_responses.php:103
 msgid "Response updated succesfully"
 msgstr "応答を更新しました"
 
-#: ../../godmode/events/event_responses.php:84
+#: ../../godmode/events/event_responses.php:106
 msgid "Response cannot be updated"
 msgstr "応答を更新できません"
 
-#: ../../godmode/events/event_responses.php:93
+#: ../../godmode/events/event_responses.php:115
 msgid "Response deleted succesfully"
 msgstr "応答を削除しました"
 
-#: ../../godmode/events/event_responses.php:96
+#: ../../godmode/events/event_responses.php:118
 msgid "Response cannot be deleted"
 msgstr "応答を削除できません"
 
-#: ../../godmode/events/events.php:37 ../../operation/events/events.php:334
-#: ../../operation/users/user_edit.php:278
+#: ../../godmode/events/events.php:37
+#: ../../godmode/users/configure_user.php:588
+#: ../../operation/events/events.php:360
+#: ../../operation/users/user_edit.php:280
 msgid "Event list"
 msgstr "イベント一覧"
 
@@ -11691,14 +11875,14 @@ msgstr "イベント応答"
 msgid "Filters"
 msgstr "フィルタ"
 
-#: ../../godmode/events/events.php:73 ../../include/ajax/events.php:306
+#: ../../godmode/events/events.php:73 ../../include/ajax/events.php:351
 #: ../../enterprise/meta/event/custom_events.php:73
 msgid "Responses"
 msgstr "応答"
 
 #: ../../godmode/events/events.php:85 ../../godmode/events/events.php:88
 #: ../../godmode/users/configure_profile.php:283
-#: ../../operation/events/events.php:365
+#: ../../operation/events/events.php:391
 msgid "Manage events"
 msgstr "イベント管理"
 
@@ -11715,7 +11899,7 @@ msgstr "定義されている拡張"
 msgid "There are no extensions defined"
 msgstr "「拡張」が定義されていません。"
 
-#: ../../godmode/extensions.php:145 ../../enterprise/godmode/menu.php:162
+#: ../../godmode/extensions.php:145 ../../enterprise/godmode/menu.php:165
 #: ../../enterprise/include/functions_setup.php:27
 #: ../../enterprise/include/functions_setup.php:55
 msgid "Enterprise"
@@ -11917,7 +12101,7 @@ msgid "Update group"
 msgstr "グループ情報の更新"
 
 #: ../../godmode/groups/configure_group.php:94
-#: ../../godmode/groups/group_list.php:396
+#: ../../godmode/groups/group_list.php:433
 msgid "Create group"
 msgstr "グループの作成"
 
@@ -11930,15 +12114,15 @@ msgid "Create Group"
 msgstr "グループの作成"
 
 #: ../../godmode/groups/configure_group.php:119
-#: ../../godmode/groups/group_list.php:338
+#: ../../godmode/groups/group_list.php:375
 #: ../../godmode/modules/module_list.php:57
-#: ../../godmode/reporting/visual_console_builder.elements.php:183
+#: ../../godmode/reporting/visual_console_builder.elements.php:188
 #: ../../godmode/setup/os.builder.php:39
-#: ../../include/functions_visual_map.php:2765
-#: ../../include/functions_visual_map_editor.php:60
-#: ../../include/functions_visual_map_editor.php:655
+#: ../../include/functions_visual_map.php:3947
+#: ../../include/functions_visual_map_editor.php:61
+#: ../../include/functions_visual_map_editor.php:872
 #: ../../enterprise/dashboard/widgets/module_icon.php:84
-#: ../../enterprise/dashboard/widgets/module_status.php:84
+#: ../../enterprise/dashboard/widgets/module_status.php:73
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:76
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1283
 msgid "Icon"
@@ -11973,8 +12157,8 @@ msgid "Information accessible through the _group_other_ macro"
 msgstr "_group_other_ マクロで参照可能な情報"
 
 #: ../../godmode/groups/configure_group.php:196
-#: ../../godmode/users/configure_user.php:509
-#: ../../operation/users/user_edit.php:322
+#: ../../godmode/users/configure_user.php:572
+#: ../../operation/users/user_edit.php:325
 msgid "Skin"
 msgstr "スキン"
 
@@ -11993,58 +12177,58 @@ msgstr ""
 msgid "Module group management"
 msgstr "モジュールグループ管理"
 
-#: ../../godmode/groups/group_list.php:158
+#: ../../godmode/groups/group_list.php:190
 msgid "Edit or delete groups can cause problems with synchronization"
 msgstr "グループの編集や削除は、同期で問題が発生する可能性があります。"
 
-#: ../../godmode/groups/group_list.php:164
+#: ../../godmode/groups/group_list.php:196
 msgid "Groups defined in Pandora"
 msgstr "定義済みグループ"
 
-#: ../../godmode/groups/group_list.php:210
+#: ../../godmode/groups/group_list.php:242
 #: ../../godmode/groups/modu_group_list.php:75
 msgid "Group successfully created"
 msgstr "グループを作成しました。"
 
-#: ../../godmode/groups/group_list.php:213
+#: ../../godmode/groups/group_list.php:245
 #: ../../godmode/groups/modu_group_list.php:78
 msgid "There was a problem creating group"
 msgstr "グループの作成に失敗しました。"
 
-#: ../../godmode/groups/group_list.php:217
+#: ../../godmode/groups/group_list.php:249
 msgid "Each group must have a different name"
 msgstr "各グループは異なる名前でなければいけません"
 
-#: ../../godmode/groups/group_list.php:222
+#: ../../godmode/groups/group_list.php:254
 msgid "Group must have a name"
 msgstr "グループには名前が必要です"
 
-#: ../../godmode/groups/group_list.php:266
+#: ../../godmode/groups/group_list.php:298
 #: ../../godmode/groups/modu_group_list.php:106
 msgid "Group successfully updated"
 msgstr "グループを更新しました。"
 
-#: ../../godmode/groups/group_list.php:269
+#: ../../godmode/groups/group_list.php:301
 #: ../../godmode/groups/modu_group_list.php:109
 msgid "There was a problem modifying group"
 msgstr "グループの更新に失敗しました。"
 
-#: ../../godmode/groups/group_list.php:294
+#: ../../godmode/groups/group_list.php:326
 #, php-format
 msgid "The group is not empty. It is use in %s."
 msgstr "グループが空ではありません。%s で利用されています。"
 
-#: ../../godmode/groups/group_list.php:298
-#: ../../godmode/groups/modu_group_list.php:138
+#: ../../godmode/groups/group_list.php:330
+#: ../../godmode/groups/modu_group_list.php:145
 msgid "Group successfully deleted"
 msgstr "グループを削除しました。"
 
-#: ../../godmode/groups/group_list.php:301
-#: ../../godmode/groups/modu_group_list.php:136
+#: ../../godmode/groups/group_list.php:333
+#: ../../godmode/groups/modu_group_list.php:143
 msgid "There was a problem deleting group"
 msgstr "グループの削除に失敗しました。"
 
-#: ../../godmode/groups/group_list.php:390
+#: ../../godmode/groups/group_list.php:427
 msgid "There are no defined groups"
 msgstr "グループが定義されていません"
 
@@ -12062,11 +12246,11 @@ msgstr "各モジュールグループは、異なる名前でなければいけ
 msgid "Module group must have a name"
 msgstr "モジュールグループには名前が必要です"
 
-#: ../../godmode/groups/modu_group_list.php:208
+#: ../../godmode/groups/modu_group_list.php:215
 msgid "There are no defined module groups"
 msgstr "定義済のモジュールグループがありません"
 
-#: ../../godmode/groups/modu_group_list.php:213
+#: ../../godmode/groups/modu_group_list.php:220
 msgid "Create module group"
 msgstr "モジュールグループの作成"
 
@@ -12078,9 +12262,9 @@ msgstr "モジュールグループの作成"
 #: ../../godmode/massive/massive_delete_modules.php:61
 #: ../../godmode/massive/massive_delete_tags.php:97
 #: ../../godmode/massive/massive_edit_agents.php:92
-#: ../../include/functions_visual_map.php:1665
-#: ../../include/functions_visual_map.php:1898
-#: ../../enterprise/godmode/policies/policy_agents.php:520
+#: ../../include/functions_visual_map.php:2552
+#: ../../include/functions_visual_map.php:2883
+#: ../../enterprise/godmode/policies/policy_agents.php:731
 msgid "No agents selected"
 msgstr "エージェントが選択されていません。"
 
@@ -12095,18 +12279,20 @@ msgstr "アクションが選択されていません"
 #: ../../godmode/massive/massive_add_action_alerts.php:154
 #: ../../godmode/massive/massive_add_alerts.php:154
 #: ../../godmode/massive/massive_copy_modules.php:74
-#: ../../godmode/massive/massive_copy_modules.php:185
+#: ../../godmode/massive/massive_copy_modules.php:190
 #: ../../godmode/massive/massive_delete_action_alerts.php:154
 #: ../../godmode/massive/massive_delete_agents.php:108
 #: ../../godmode/massive/massive_delete_alerts.php:215
-#: ../../godmode/massive/massive_delete_modules.php:441
-#: ../../godmode/massive/massive_edit_agents.php:210
-#: ../../godmode/massive/massive_edit_modules.php:285
+#: ../../godmode/massive/massive_delete_modules.php:457
+#: ../../godmode/massive/massive_edit_agents.php:263
+#: ../../godmode/massive/massive_edit_modules.php:295
 #: ../../godmode/massive/massive_enable_disable_alerts.php:138
 #: ../../godmode/massive/massive_standby_alerts.php:139
-#: ../../enterprise/godmode/policies/policy_agents.php:243
-#: ../../enterprise/godmode/policies/policy_agents.php:259
-#: ../../enterprise/godmode/policies/policy_agents.php:363
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:82
+#: ../../enterprise/godmode/policies/policy_agents.php:378
+#: ../../enterprise/godmode/policies/policy_agents.php:394
+#: ../../enterprise/godmode/policies/policy_agents.php:428
+#: ../../enterprise/godmode/policies/policy_agents.php:558
 msgid "Group recursion"
 msgstr "子グループを含める"
 
@@ -12119,27 +12305,28 @@ msgstr "テンプレートがあるエージェント"
 #: ../../godmode/massive/massive_add_alerts.php:167
 #: ../../godmode/massive/massive_delete_action_alerts.php:169
 #: ../../godmode/massive/massive_delete_alerts.php:227
-#: ../../godmode/massive/massive_delete_modules.php:499
-#: ../../godmode/massive/massive_edit_modules.php:346
+#: ../../godmode/massive/massive_delete_modules.php:525
+#: ../../godmode/massive/massive_edit_modules.php:366
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:225
 msgid "When select agents"
 msgstr "エージェント選択時の動作"
 
 #: ../../godmode/massive/massive_add_action_alerts.php:172
 #: ../../godmode/massive/massive_delete_action_alerts.php:173
-#: ../../godmode/massive/massive_delete_modules.php:501
-#: ../../godmode/massive/massive_edit_modules.php:350
+#: ../../godmode/massive/massive_delete_modules.php:527
+#: ../../godmode/massive/massive_edit_modules.php:370
 msgid "Show unknown and not init modules"
 msgstr "不明および未初期化モジュールを表示"
 
 #: ../../godmode/massive/massive_add_action_alerts.php:228
 #: ../../godmode/massive/massive_add_alerts.php:213
-#: ../../godmode/massive/massive_copy_modules.php:424
+#: ../../godmode/massive/massive_copy_modules.php:443
 #: ../../godmode/massive/massive_delete_agents.php:163
 #: ../../godmode/massive/massive_delete_alerts.php:266
-#: ../../godmode/massive/massive_delete_modules.php:727
-#: ../../godmode/massive/massive_edit_agents.php:553
-#: ../../godmode/massive/massive_edit_modules.php:653
+#: ../../godmode/massive/massive_delete_modules.php:769
+#: ../../godmode/massive/massive_edit_agents.php:583
+#: ../../godmode/massive/massive_edit_modules.php:734
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:313
 msgid ""
 "Unsucessful sending the data, please contact with your administrator or make "
 "with less elements."
@@ -12161,17 +12348,17 @@ msgstr "プロファイルの追加ができませんでした。"
 #: ../../godmode/massive/massive_add_profiles.php:88
 #: ../../godmode/massive/massive_delete_profiles.php:102
 #: ../../godmode/users/configure_profile.php:242
-#: ../../godmode/users/configure_user.php:623
-#: ../../operation/users/user_edit.php:504
-#: ../../enterprise/godmode/setup/setup_acl.php:223
+#: ../../godmode/users/configure_user.php:737
+#: ../../operation/users/user_edit.php:515
+#: ../../enterprise/godmode/setup/setup_acl.php:432
 msgid "Profile name"
 msgstr "プロファイル名"
 
 #: ../../godmode/massive/massive_add_profiles.php:90
 #: ../../godmode/massive/massive_delete_profiles.php:104
-#: ../../include/functions_reporting.php:7312
+#: ../../include/functions_reporting.php:7976
 #: ../../operation/search_results.php:84
-#: ../../enterprise/meta/advanced/synchronizing.user.php:520
+#: ../../enterprise/meta/advanced/synchronizing.user.php:531
 msgid "Users"
 msgstr "ユーザ"
 
@@ -12180,88 +12367,99 @@ msgid "No tags selected"
 msgstr "タグが選択されていません"
 
 #: ../../godmode/massive/massive_copy_modules.php:77
-#: ../../godmode/massive/massive_copy_modules.php:190
+#: ../../godmode/massive/massive_copy_modules.php:195
 #: ../../godmode/massive/massive_delete_agents.php:113
-#: ../../godmode/massive/massive_delete_modules.php:453
-#: ../../godmode/massive/massive_delete_modules.php:467
-#: ../../godmode/massive/massive_edit_agents.php:216
-#: ../../godmode/massive/massive_edit_modules.php:296
-#: ../../godmode/massive/massive_edit_modules.php:327
+#: ../../godmode/massive/massive_delete_modules.php:474
+#: ../../godmode/massive/massive_delete_modules.php:488
+#: ../../godmode/massive/massive_edit_agents.php:269
+#: ../../godmode/massive/massive_edit_modules.php:305
+#: ../../godmode/massive/massive_edit_modules.php:343
 #: ../../godmode/netflow/nf_edit_form.php:207 ../../include/functions.php:873
 #: ../../include/functions.php:1077 ../../include/functions.php:1084
-#: ../../include/functions.php:1114 ../../include/functions_events.php:1465
-#: ../../include/functions_graph.php:2188
-#: ../../include/functions_graph.php:3286
-#: ../../include/functions_graph.php:3287
-#: ../../include/functions_graph.php:5233
+#: ../../include/functions.php:1114 ../../include/functions_events.php:1469
+#: ../../include/functions_graph.php:2666
+#: ../../include/functions_graph.php:3767
+#: ../../include/functions_graph.php:3768
+#: ../../include/functions_graph.php:6079
+#: ../../include/functions_groups.php:815
+#: ../../include/functions_groups.php:817
+#: ../../include/functions_groups.php:819
+#: ../../include/functions_groups.php:820
 #: ../../include/functions_groups.php:821
-#: ../../include/functions_groups.php:823
-#: ../../include/functions_groups.php:825
-#: ../../include/functions_groups.php:826
-#: ../../include/functions_groups.php:827
-#: ../../include/functions_groups.php:835
-#: ../../include/functions_reporting_html.php:1573
+#: ../../include/functions_groups.php:829
+#: ../../include/functions_reporting_html.php:1576
 #: ../../mobile/operation/agents.php:34 ../../mobile/operation/modules.php:39
-#: ../../operation/agentes/estado_agente.php:186
-#: ../../operation/agentes/estado_monitores.php:450
+#: ../../operation/agentes/estado_agente.php:214
+#: ../../operation/agentes/estado_monitores.php:463
 #: ../../operation/agentes/group_view.php:171
-#: ../../operation/agentes/status_monitor.php:299
+#: ../../operation/agentes/status_monitor.php:297
 #: ../../operation/agentes/tactical.php:152
-#: ../../operation/netflow/nf_live_view.php:322 ../../operation/tree.php:131
-#: ../../operation/tree.php:156 ../../operation/tree.php:303
-#: ../../enterprise/dashboard/widgets/tree_view.php:53
-#: ../../enterprise/dashboard/widgets/tree_view.php:66
-#: ../../enterprise/dashboard/widgets/tree_view.php:227
-#: ../../enterprise/include/functions_reporting_pdf.php:707
-#: ../../enterprise/include/functions_services.php:1258
+#: ../../operation/netflow/nf_live_view.php:322 ../../operation/tree.php:137
+#: ../../operation/tree.php:169 ../../operation/tree.php:325
+#: ../../enterprise/dashboard/widgets/tree_view.php:55
+#: ../../enterprise/dashboard/widgets/tree_view.php:68
+#: ../../enterprise/dashboard/widgets/tree_view.php:237
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:86
+#: ../../enterprise/godmode/reporting/cluster_view.php:335
+#: ../../enterprise/godmode/reporting/cluster_view.php:412
+#: ../../enterprise/godmode/reporting/cluster_list.php:115
+#: ../../enterprise/godmode/reporting/cluster_list.php:250
+#: ../../enterprise/include/functions_reporting_pdf.php:753
+#: ../../enterprise/include/functions_services.php:1347
 #: ../../enterprise/meta/monitoring/group_view.php:152
 #: ../../enterprise/meta/monitoring/tactical.php:280
+#: ../../enterprise/operation/agentes/tag_view.php:82
 msgid "Normal"
 msgstr "正常"
 
 #: ../../godmode/massive/massive_copy_modules.php:78
-#: ../../godmode/massive/massive_copy_modules.php:191
+#: ../../godmode/massive/massive_copy_modules.php:196
 #: ../../godmode/massive/massive_delete_agents.php:114
-#: ../../godmode/massive/massive_delete_modules.php:454
-#: ../../godmode/massive/massive_delete_modules.php:468
-#: ../../godmode/massive/massive_edit_agents.php:217
-#: ../../godmode/massive/massive_edit_agents.php:407
-#: ../../godmode/massive/massive_edit_modules.php:297
-#: ../../godmode/massive/massive_edit_modules.php:328
+#: ../../godmode/massive/massive_delete_modules.php:475
+#: ../../godmode/massive/massive_delete_modules.php:489
+#: ../../godmode/massive/massive_edit_agents.php:270
+#: ../../godmode/massive/massive_edit_agents.php:463
+#: ../../godmode/massive/massive_edit_modules.php:306
+#: ../../godmode/massive/massive_edit_modules.php:344
 #: ../../godmode/servers/manage_recontask_form.php:193
 #: ../../godmode/setup/setup_netflow.php:70 ../../include/functions.php:876
 #: ../../include/functions.php:1079 ../../include/functions.php:1082
-#: ../../include/functions.php:1117 ../../include/functions_events.php:1468
-#: ../../include/functions_graph.php:2187
-#: ../../include/functions_graph.php:3294
-#: ../../include/functions_graph.php:3295
-#: ../../include/functions_graph.php:5236
+#: ../../include/functions.php:1117 ../../include/functions_ui.php:239
+#: ../../include/functions_ui.php:2057 ../../include/functions_events.php:1472
+#: ../../include/functions_graph.php:2665
+#: ../../include/functions_graph.php:3775
+#: ../../include/functions_graph.php:3776
+#: ../../include/functions_graph.php:6082
+#: ../../include/functions_groups.php:824
+#: ../../include/functions_groups.php:826
+#: ../../include/functions_groups.php:828
+#: ../../include/functions_groups.php:829
 #: ../../include/functions_groups.php:830
-#: ../../include/functions_groups.php:832
-#: ../../include/functions_groups.php:834
-#: ../../include/functions_groups.php:835
-#: ../../include/functions_groups.php:836
-#: ../../include/functions_reporting_html.php:1577
-#: ../../include/functions_ui.php:234 ../../include/functions_ui.php:2001
+#: ../../include/functions_reporting_html.php:1580
 #: ../../mobile/operation/agents.php:35 ../../mobile/operation/modules.php:40
-#: ../../operation/agentes/estado_agente.php:187
-#: ../../operation/agentes/estado_monitores.php:452
+#: ../../operation/agentes/estado_agente.php:215
+#: ../../operation/agentes/estado_monitores.php:465
 #: ../../operation/agentes/group_view.php:172
-#: ../../operation/agentes/status_monitor.php:300
+#: ../../operation/agentes/status_monitor.php:298
 #: ../../operation/agentes/tactical.php:151
 #: ../../operation/gis_maps/render_view.php:150
-#: ../../operation/netflow/nf_live_view.php:273 ../../operation/tree.php:132
-#: ../../operation/tree.php:157 ../../operation/tree.php:288
+#: ../../operation/netflow/nf_live_view.php:273 ../../operation/tree.php:138
+#: ../../operation/tree.php:170 ../../operation/tree.php:310
 #: ../../enterprise/dashboard/widgets/service_map.php:85
-#: ../../enterprise/dashboard/widgets/tree_view.php:54
-#: ../../enterprise/dashboard/widgets/tree_view.php:67
-#: ../../enterprise/dashboard/widgets/tree_view.php:212
-#: ../../enterprise/godmode/services/services.service.php:274
-#: ../../enterprise/include/functions_login.php:23
-#: ../../enterprise/include/functions_reporting.php:3749
-#: ../../enterprise/include/functions_reporting_pdf.php:709
-#: ../../enterprise/include/functions_reporting_pdf.php:2363
-#: ../../enterprise/include/functions_services.php:1267
+#: ../../enterprise/dashboard/widgets/tree_view.php:56
+#: ../../enterprise/dashboard/widgets/tree_view.php:69
+#: ../../enterprise/dashboard/widgets/tree_view.php:222
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:87
+#: ../../enterprise/godmode/reporting/cluster_view.php:315
+#: ../../enterprise/godmode/reporting/cluster_view.php:392
+#: ../../enterprise/godmode/reporting/cluster_list.php:116
+#: ../../enterprise/godmode/reporting/cluster_list.php:230
+#: ../../enterprise/godmode/services/services.service.php:314
+#: ../../enterprise/include/functions_login.php:22
+#: ../../enterprise/include/functions_reporting.php:4167
+#: ../../enterprise/include/functions_reporting_pdf.php:755
+#: ../../enterprise/include/functions_reporting_pdf.php:2444
+#: ../../enterprise/include/functions_services.php:1356
 #: ../../enterprise/meta/include/functions_wizard_meta.php:839
 #: ../../enterprise/meta/include/functions_wizard_meta.php:925
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1126
@@ -12272,64 +12470,70 @@ msgstr "正常"
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1559
 #: ../../enterprise/meta/monitoring/group_view.php:153
 #: ../../enterprise/meta/monitoring/tactical.php:279
+#: ../../enterprise/operation/agentes/tag_view.php:83
 #: ../../enterprise/operation/agentes/transactional_map.php:265
 #: ../../enterprise/operation/services/services.list.php:171
 #: ../../enterprise/operation/services/services.list.php:340
 #: ../../enterprise/operation/services/services.list.php:409
 #: ../../enterprise/operation/services/services.service.php:136
 #: ../../enterprise/operation/services/services.service.php:188
-#: ../../enterprise/operation/services/services.service_map.php:127
+#: ../../enterprise/operation/services/services.service_map.php:125
 #: ../../enterprise/operation/services/services.table_services.php:140
 msgid "Warning"
 msgstr "警告"
 
 #: ../../godmode/massive/massive_copy_modules.php:79
-#: ../../godmode/massive/massive_copy_modules.php:192
+#: ../../godmode/massive/massive_copy_modules.php:197
 #: ../../godmode/massive/massive_delete_agents.php:115
-#: ../../godmode/massive/massive_delete_modules.php:455
-#: ../../godmode/massive/massive_delete_modules.php:469
-#: ../../godmode/massive/massive_edit_agents.php:218
-#: ../../godmode/massive/massive_edit_modules.php:298
-#: ../../godmode/massive/massive_edit_modules.php:329
+#: ../../godmode/massive/massive_delete_modules.php:476
+#: ../../godmode/massive/massive_delete_modules.php:490
+#: ../../godmode/massive/massive_edit_agents.php:271
+#: ../../godmode/massive/massive_edit_modules.php:307
+#: ../../godmode/massive/massive_edit_modules.php:345
 #: ../../include/functions.php:879 ../../include/functions.php:1081
 #: ../../include/functions.php:1082 ../../include/functions.php:1084
-#: ../../include/functions.php:1120 ../../include/functions_events.php:1471
-#: ../../include/functions_graph.php:2186
-#: ../../include/functions_graph.php:3302
-#: ../../include/functions_graph.php:3303
-#: ../../include/functions_graph.php:5239
+#: ../../include/functions.php:1120 ../../include/functions_ui.php:2057
+#: ../../include/functions_events.php:1475
+#: ../../include/functions_graph.php:2664
+#: ../../include/functions_graph.php:3783
+#: ../../include/functions_graph.php:3784
+#: ../../include/functions_graph.php:6085
+#: ../../include/functions_groups.php:833
+#: ../../include/functions_groups.php:835
+#: ../../include/functions_groups.php:837
+#: ../../include/functions_groups.php:838
 #: ../../include/functions_groups.php:839
-#: ../../include/functions_groups.php:841
-#: ../../include/functions_groups.php:843
-#: ../../include/functions_groups.php:844
-#: ../../include/functions_groups.php:845
-#: ../../include/functions_reporting_html.php:680
-#: ../../include/functions_reporting_html.php:1575
-#: ../../include/functions_reporting_html.php:2536
-#: ../../include/functions_ui.php:2001 ../../mobile/operation/agents.php:33
-#: ../../mobile/operation/modules.php:41
-#: ../../operation/agentes/estado_agente.php:188
-#: ../../operation/agentes/estado_monitores.php:448
+#: ../../include/functions_reporting_html.php:683
+#: ../../include/functions_reporting_html.php:1578
+#: ../../include/functions_reporting_html.php:2602
+#: ../../mobile/operation/agents.php:33 ../../mobile/operation/modules.php:41
+#: ../../operation/agentes/estado_agente.php:216
+#: ../../operation/agentes/estado_monitores.php:461
 #: ../../operation/agentes/group_view.php:168
 #: ../../operation/agentes/group_view.php:173
-#: ../../operation/agentes/status_monitor.php:301
+#: ../../operation/agentes/status_monitor.php:299
 #: ../../operation/agentes/tactical.php:150
-#: ../../operation/gis_maps/render_view.php:149 ../../operation/tree.php:133
-#: ../../operation/tree.php:158 ../../operation/tree.php:283
+#: ../../operation/gis_maps/render_view.php:149 ../../operation/tree.php:139
+#: ../../operation/tree.php:171 ../../operation/tree.php:305
 #: ../../enterprise/dashboard/widgets/service_map.php:84
-#: ../../enterprise/dashboard/widgets/tree_view.php:55
-#: ../../enterprise/dashboard/widgets/tree_view.php:68
-#: ../../enterprise/dashboard/widgets/tree_view.php:207
-#: ../../enterprise/godmode/services/services.elements.php:410
-#: ../../enterprise/godmode/services/services.service.php:270
-#: ../../enterprise/include/functions_reporting.php:2264
-#: ../../enterprise/include/functions_reporting.php:3033
-#: ../../enterprise/include/functions_reporting.php:3754
-#: ../../enterprise/include/functions_reporting_pdf.php:708
-#: ../../enterprise/include/functions_reporting_pdf.php:1504
-#: ../../enterprise/include/functions_reporting_pdf.php:2363
-#: ../../enterprise/include/functions_services.php:1264
-#: ../../enterprise/include/functions_services.php:1423
+#: ../../enterprise/dashboard/widgets/tree_view.php:57
+#: ../../enterprise/dashboard/widgets/tree_view.php:70
+#: ../../enterprise/dashboard/widgets/tree_view.php:217
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:88
+#: ../../enterprise/godmode/reporting/cluster_view.php:310
+#: ../../enterprise/godmode/reporting/cluster_view.php:387
+#: ../../enterprise/godmode/reporting/cluster_list.php:117
+#: ../../enterprise/godmode/reporting/cluster_list.php:225
+#: ../../enterprise/godmode/services/services.elements.php:406
+#: ../../enterprise/godmode/services/services.service.php:310
+#: ../../enterprise/include/functions_reporting.php:2666
+#: ../../enterprise/include/functions_reporting.php:3435
+#: ../../enterprise/include/functions_reporting.php:4172
+#: ../../enterprise/include/functions_reporting_pdf.php:754
+#: ../../enterprise/include/functions_reporting_pdf.php:1585
+#: ../../enterprise/include/functions_reporting_pdf.php:2444
+#: ../../enterprise/include/functions_services.php:1353
+#: ../../enterprise/include/functions_services.php:1512
 #: ../../enterprise/meta/include/functions_wizard_meta.php:848
 #: ../../enterprise/meta/include/functions_wizard_meta.php:934
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1135
@@ -12340,91 +12544,108 @@ msgstr "警告"
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1566
 #: ../../enterprise/meta/monitoring/group_view.php:154
 #: ../../enterprise/meta/monitoring/tactical.php:278
+#: ../../enterprise/operation/agentes/tag_view.php:84
 #: ../../enterprise/operation/services/services.list.php:172
 #: ../../enterprise/operation/services/services.list.php:339
 #: ../../enterprise/operation/services/services.list.php:404
 #: ../../enterprise/operation/services/services.service.php:135
 #: ../../enterprise/operation/services/services.service.php:183
-#: ../../enterprise/operation/services/services.service_map.php:126
+#: ../../enterprise/operation/services/services.service_map.php:124
 #: ../../enterprise/operation/services/services.table_services.php:141
 msgid "Critical"
 msgstr "障害"
 
 #: ../../godmode/massive/massive_copy_modules.php:82
-#: ../../godmode/massive/massive_copy_modules.php:195
+#: ../../godmode/massive/massive_copy_modules.php:200
 #: ../../godmode/massive/massive_delete_agents.php:118
-#: ../../godmode/massive/massive_delete_modules.php:458
-#: ../../godmode/massive/massive_delete_modules.php:472
-#: ../../godmode/massive/massive_edit_agents.php:221
-#: ../../godmode/massive/massive_edit_modules.php:301
-#: ../../godmode/massive/massive_edit_modules.php:332
-#: ../../include/functions_graph.php:2192
+#: ../../godmode/massive/massive_delete_modules.php:479
+#: ../../godmode/massive/massive_delete_modules.php:493
+#: ../../godmode/massive/massive_edit_agents.php:274
+#: ../../godmode/massive/massive_edit_modules.php:310
+#: ../../godmode/massive/massive_edit_modules.php:348
+#: ../../include/functions_graph.php:2670
+#: ../../include/functions_groups.php:806
+#: ../../include/functions_groups.php:808
+#: ../../include/functions_groups.php:810
+#: ../../include/functions_groups.php:811
 #: ../../include/functions_groups.php:812
-#: ../../include/functions_groups.php:814
-#: ../../include/functions_groups.php:816
-#: ../../include/functions_groups.php:817
-#: ../../include/functions_groups.php:818
-#: ../../include/functions_reporting_html.php:1581
+#: ../../include/functions_reporting_html.php:1584
 #: ../../mobile/operation/modules.php:44
-#: ../../operation/agentes/estado_agente.php:191
+#: ../../operation/agentes/estado_agente.php:219
 #: ../../operation/agentes/group_view.php:167
-#: ../../operation/agentes/status_monitor.php:304
-#: ../../operation/agentes/tactical.php:154 ../../operation/tree.php:135
-#: ../../operation/tree.php:160 ../../operation/tree.php:298
-#: ../../enterprise/dashboard/widgets/tree_view.php:57
-#: ../../enterprise/dashboard/widgets/tree_view.php:70
-#: ../../enterprise/dashboard/widgets/tree_view.php:222
-#: ../../enterprise/include/functions_reporting_pdf.php:711
+#: ../../operation/agentes/status_monitor.php:302
+#: ../../operation/agentes/tactical.php:154 ../../operation/tree.php:141
+#: ../../operation/tree.php:173 ../../operation/tree.php:320
+#: ../../enterprise/dashboard/widgets/tree_view.php:59
+#: ../../enterprise/dashboard/widgets/tree_view.php:72
+#: ../../enterprise/dashboard/widgets/tree_view.php:232
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:91
+#: ../../enterprise/godmode/reporting/cluster_view.php:269
+#: ../../enterprise/godmode/reporting/cluster_view.php:330
+#: ../../enterprise/godmode/reporting/cluster_view.php:407
+#: ../../enterprise/godmode/reporting/cluster_list.php:119
+#: ../../enterprise/godmode/reporting/cluster_list.php:245
+#: ../../enterprise/include/functions_reporting_pdf.php:757
 #: ../../enterprise/meta/monitoring/group_view.php:147
 #: ../../enterprise/meta/monitoring/group_view.php:151
 #: ../../enterprise/meta/monitoring/tactical.php:282
+#: ../../enterprise/operation/agentes/tag_view.php:87
 #: ../../enterprise/operation/agentes/transactional_map.php:275
 msgid "Not init"
 msgstr "未初期化"
 
-#: ../../godmode/massive/massive_copy_modules.php:136
-#: ../../enterprise/godmode/policies/policy_modules.php:1315
+#: ../../godmode/massive/massive_copy_modules.php:141
+#: ../../enterprise/godmode/policies/policy_modules.php:1346
 msgid "Copy modules"
 msgstr "モジュールのコピー"
 
-#: ../../godmode/massive/massive_copy_modules.php:141
+#: ../../godmode/massive/massive_copy_modules.php:146
 msgid "Copy alerts"
 msgstr "アラートのコピー"
 
-#: ../../godmode/massive/massive_copy_modules.php:150
+#: ../../godmode/massive/massive_copy_modules.php:155
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:143
 msgid "No modules for this agent"
 msgstr "このエージェントにはモジュールがありません。"
 
-#: ../../godmode/massive/massive_copy_modules.php:159
+#: ../../godmode/massive/massive_copy_modules.php:164
 msgid "No alerts for this agent"
 msgstr "このエージェントにはアラートが定義されていません。"
 
-#: ../../godmode/massive/massive_copy_modules.php:168
-#: ../../enterprise/meta/advanced/policymanager.sync.php:308
+#: ../../godmode/massive/massive_copy_modules.php:173
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:152
+#: ../../enterprise/meta/advanced/policymanager.sync.php:304
 #: ../../enterprise/meta/advanced/synchronizing.alert.php:344
 #: ../../enterprise/meta/advanced/synchronizing.component.php:320
-#: ../../enterprise/meta/advanced/synchronizing.group.php:157
-#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:101
-#: ../../enterprise/meta/advanced/synchronizing.os.php:101
+#: ../../enterprise/meta/advanced/synchronizing.group.php:194
+#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:85
+#: ../../enterprise/meta/advanced/synchronizing.os.php:85
 #: ../../enterprise/meta/advanced/synchronizing.tag.php:101
 msgid "Targets"
 msgstr "対象"
 
-#: ../../godmode/massive/massive_copy_modules.php:217
+#: ../../godmode/massive/massive_copy_modules.php:222
 msgid "To agent(s)"
 msgstr "適用先エージェント"
 
-#: ../../godmode/massive/massive_copy_modules.php:434
-#: ../../include/functions_agents.php:535
+#: ../../godmode/massive/massive_copy_modules.php:453
+#: ../../include/functions_agents.php:553
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:320
 msgid "No source agent to copy"
 msgstr "コピー元エージェントがありません。"
 
-#: ../../godmode/massive/massive_copy_modules.php:442
+#: ../../godmode/massive/massive_copy_modules.php:461
 msgid "No operation selected"
 msgstr "操作が選択されていません。"
 
-#: ../../godmode/massive/massive_copy_modules.php:452
-#: ../../include/functions_agents.php:540
+#: ../../godmode/massive/massive_copy_modules.php:466
+#: ../../include/functions_agents.php:583
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:325
+msgid "No modules have been selected"
+msgstr "モジュールが選択されていません。"
+
+#: ../../godmode/massive/massive_copy_modules.php:471
+#: ../../include/functions_agents.php:558
 msgid "No destiny agent(s) to copy"
 msgstr "コピー先エージェントがありません。"
 
@@ -12453,7 +12674,7 @@ msgid "Successfully deleted (%s)"
 msgstr "削除しました。(%s)"
 
 #: ../../godmode/massive/massive_delete_agents.php:123
-#: ../../godmode/massive/massive_edit_agents.php:225
+#: ../../godmode/massive/massive_edit_agents.php:278
 msgid "Show agents"
 msgstr "エージェント表示"
 
@@ -12461,66 +12682,66 @@ msgstr "エージェント表示"
 msgid "No module selected"
 msgstr "モジュールが選択されていません。"
 
-#: ../../godmode/massive/massive_delete_modules.php:230
+#: ../../godmode/massive/massive_delete_modules.php:244
 msgid ""
 "There was an error deleting the modules, the operation has been cancelled"
 msgstr "モジュール削除でエラーが発生しました。操作はキャンセルされます。"
 
-#: ../../godmode/massive/massive_delete_modules.php:396
-#: ../../godmode/massive/massive_edit_modules.php:239
+#: ../../godmode/massive/massive_delete_modules.php:412
+#: ../../godmode/massive/massive_edit_modules.php:249
 msgid "Selection mode"
 msgstr "選択モード"
 
-#: ../../godmode/massive/massive_delete_modules.php:397
-#: ../../godmode/massive/massive_edit_modules.php:240
+#: ../../godmode/massive/massive_delete_modules.php:413
+#: ../../godmode/massive/massive_edit_modules.php:250
 msgid "Select modules first "
 msgstr "モジュールを先に選択 "
 
-#: ../../godmode/massive/massive_delete_modules.php:399
-#: ../../godmode/massive/massive_edit_modules.php:242
+#: ../../godmode/massive/massive_delete_modules.php:415
+#: ../../godmode/massive/massive_edit_modules.php:252
 msgid "Select agents first "
 msgstr "エージェントを先に選択 "
 
-#: ../../godmode/massive/massive_delete_modules.php:405
-#: ../../godmode/massive/massive_edit_modules.php:249
+#: ../../godmode/massive/massive_delete_modules.php:421
+#: ../../godmode/massive/massive_edit_modules.php:259
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1387
 #: ../../enterprise/meta/monitoring/wizard/wizard.create_module.php:144
 msgid "Module type"
 msgstr "モジュールタイプ"
 
-#: ../../godmode/massive/massive_delete_modules.php:414
-#: ../../godmode/massive/massive_edit_modules.php:258
+#: ../../godmode/massive/massive_delete_modules.php:430
+#: ../../godmode/massive/massive_edit_modules.php:268
 msgid "Select all modules of this type"
 msgstr "このタイプの全てのモジュールを選択"
 
-#: ../../godmode/massive/massive_delete_modules.php:435
-#: ../../godmode/massive/massive_edit_modules.php:279
+#: ../../godmode/massive/massive_delete_modules.php:451
+#: ../../godmode/massive/massive_edit_modules.php:289
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:202
 msgid "Agent group"
 msgstr "エージェントグループ"
 
-#: ../../godmode/massive/massive_delete_modules.php:443
-#: ../../godmode/massive/massive_edit_modules.php:287
+#: ../../godmode/massive/massive_delete_modules.php:459
+#: ../../godmode/massive/massive_edit_modules.php:297
 msgid "Select all modules of this group"
 msgstr "このグループの全てのモジュールを選択"
 
-#: ../../godmode/massive/massive_delete_modules.php:464
-#: ../../godmode/massive/massive_edit_modules.php:293
+#: ../../godmode/massive/massive_delete_modules.php:485
+#: ../../godmode/massive/massive_edit_modules.php:302
 msgid "Module Status"
 msgstr "モジュールの状態"
 
-#: ../../godmode/massive/massive_delete_modules.php:483
-#: ../../godmode/massive/massive_edit_modules.php:311
+#: ../../godmode/massive/massive_delete_modules.php:504
+#: ../../godmode/massive/massive_edit_modules.php:327
 msgid "When select modules"
 msgstr "モジュール選択時の動作"
 
-#: ../../godmode/massive/massive_delete_modules.php:486
-#: ../../godmode/massive/massive_edit_modules.php:314
+#: ../../godmode/massive/massive_delete_modules.php:507
+#: ../../godmode/massive/massive_edit_modules.php:330
 msgid "Show common agents"
 msgstr "共通エージェントの表示"
 
-#: ../../godmode/massive/massive_delete_modules.php:487
-#: ../../godmode/massive/massive_edit_modules.php:315
+#: ../../godmode/massive/massive_delete_modules.php:508
+#: ../../godmode/massive/massive_edit_modules.php:331
 msgid "Show all agents"
 msgstr "全エージェント表示"
 
@@ -12552,126 +12773,148 @@ msgstr "設定ファイルを削除しました。"
 msgid "Configuration files cannot be deleted"
 msgstr "設定ファイルを削除できませんでした。"
 
-#: ../../godmode/massive/massive_edit_agents.php:185
+#: ../../godmode/massive/massive_edit_agents.php:238
 msgid "Agents updated successfully"
 msgstr "エージェントを更新しました。"
 
-#: ../../godmode/massive/massive_edit_agents.php:186
-msgid "Agents cannot be updated"
-msgstr "エージェントの更新ができませんでした。"
+#: ../../godmode/massive/massive_edit_agents.php:239
+msgid "Agents cannot be updated (maybe there was no field to update)"
+msgstr "エージェントが更新できません (更新するフィールドがない可能性があります)"
 
-#: ../../godmode/massive/massive_edit_agents.php:294
-#: ../../godmode/massive/massive_edit_agents.php:299
-#: ../../godmode/massive/massive_edit_agents.php:303
-#: ../../godmode/massive/massive_edit_agents.php:307
-#: ../../godmode/massive/massive_edit_agents.php:318
-#: ../../godmode/massive/massive_edit_agents.php:357
-#: ../../godmode/massive/massive_edit_agents.php:363
-#: ../../godmode/massive/massive_edit_agents.php:402
-#: ../../godmode/massive/massive_edit_agents.php:411
-#: ../../godmode/massive/massive_edit_agents.php:418
-#: ../../godmode/massive/massive_edit_modules.php:406
-#: ../../godmode/massive/massive_edit_modules.php:451
-#: ../../godmode/massive/massive_edit_modules.php:466
-#: ../../godmode/massive/massive_edit_modules.php:470
+#: ../../godmode/massive/massive_edit_agents.php:349
+#: ../../godmode/massive/massive_edit_agents.php:354
+#: ../../godmode/massive/massive_edit_agents.php:358
+#: ../../godmode/massive/massive_edit_agents.php:362
+#: ../../godmode/massive/massive_edit_agents.php:373
+#: ../../godmode/massive/massive_edit_agents.php:412
+#: ../../godmode/massive/massive_edit_agents.php:419
+#: ../../godmode/massive/massive_edit_agents.php:458
+#: ../../godmode/massive/massive_edit_agents.php:467
+#: ../../godmode/massive/massive_edit_agents.php:474
+#: ../../godmode/massive/massive_edit_modules.php:426
+#: ../../godmode/massive/massive_edit_modules.php:471
+#: ../../godmode/massive/massive_edit_modules.php:486
 #: ../../godmode/massive/massive_edit_modules.php:490
-#: ../../godmode/massive/massive_edit_modules.php:496
-#: ../../godmode/massive/massive_edit_modules.php:504
-#: ../../godmode/massive/massive_edit_modules.php:508
-#: ../../godmode/massive/massive_edit_modules.php:511
-#: ../../godmode/massive/massive_edit_modules.php:524
+#: ../../godmode/massive/massive_edit_modules.php:516
+#: ../../godmode/massive/massive_edit_modules.php:522
+#: ../../godmode/massive/massive_edit_modules.php:530
+#: ../../godmode/massive/massive_edit_modules.php:534
 #: ../../godmode/massive/massive_edit_modules.php:537
-#: ../../godmode/massive/massive_edit_modules.php:545
-#: ../../godmode/massive/massive_edit_modules.php:558
-#: ../../godmode/massive/massive_edit_modules.php:566
-#: ../../godmode/massive/massive_edit_modules.php:572
-#: ../../godmode/massive/massive_edit_modules.php:584
-#: ../../godmode/massive/massive_edit_modules.php:603
+#: ../../godmode/massive/massive_edit_modules.php:550
+#: ../../godmode/massive/massive_edit_modules.php:569
+#: ../../godmode/massive/massive_edit_modules.php:577
+#: ../../godmode/massive/massive_edit_modules.php:590
+#: ../../godmode/massive/massive_edit_modules.php:598
+#: ../../godmode/massive/massive_edit_modules.php:604
+#: ../../godmode/massive/massive_edit_modules.php:616
+#: ../../godmode/massive/massive_edit_modules.php:635
+#: ../../include/functions_html.php:637 ../../include/functions_html.php:715
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:27
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:259
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:278
 msgid "No change"
 msgstr "変更無し"
 
-#: ../../godmode/massive/massive_edit_agents.php:371
+#: ../../godmode/massive/massive_edit_agents.php:427
 msgid "Delete available remote configurations"
 msgstr "リモート設定の削除"
 
-#: ../../godmode/massive/massive_edit_agents.php:403
+#: ../../godmode/massive/massive_edit_agents.php:459
 msgid "Without status"
 msgstr "状態不明"
 
-#: ../../godmode/massive/massive_edit_agents.php:405
-#: ../../godmode/update_manager/update_manager.offline.php:66
-#: ../../include/functions_update_manager.php:366
-#: ../../include/functions_config.php:547
-#: ../../include/functions_config.php:1600
+#: ../../godmode/massive/massive_edit_agents.php:461
+#: ../../godmode/update_manager/update_manager.offline.php:73
+#: ../../include/functions_config.php:596
+#: ../../include/functions_config.php:1793
+#: ../../include/functions_update_manager.php:373
 #: ../../operation/gis_maps/render_view.php:151
 #: ../../enterprise/dashboard/widgets/service_map.php:86
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:355
-#: ../../enterprise/include/functions_update_manager.php:198
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/include/functions_update_manager.php:205
+#: ../../enterprise/load_enterprise.php:386
+#: ../../enterprise/load_enterprise.php:804
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:37
 #: ../../enterprise/operation/agentes/transactional_map.php:255
 #: ../../enterprise/operation/services/services.list.php:170
 #: ../../enterprise/operation/services/services.list.php:399
 #: ../../enterprise/operation/services/services.service.php:177
-#: ../../enterprise/operation/services/services.service_map.php:128
+#: ../../enterprise/operation/services/services.service_map.php:126
 #: ../../enterprise/operation/services/services.table_services.php:139
 msgid "Ok"
 msgstr "正常"
 
-#: ../../godmode/massive/massive_edit_agents.php:406
+#: ../../godmode/massive/massive_edit_agents.php:462
 #: ../../enterprise/dashboard/widgets/maps_status.php:77
 msgid "Bad"
 msgstr "障害"
 
-#: ../../godmode/massive/massive_edit_modules.php:324
+#: ../../godmode/massive/massive_edit_modules.php:115
+msgid "Error updating the modules from a module type"
+msgstr "モジュールタイプからのモジュール更新エラー"
+
+#: ../../godmode/massive/massive_edit_modules.php:137
+msgid "Error updating the modules from an agent group"
+msgstr "エージェントグループからのモジュール更新エラー"
+
+#: ../../godmode/massive/massive_edit_modules.php:157
+msgid "Error updating the modules (maybe there was no field to update)"
+msgstr "モジュール更新エラー (更新するフィールドがない可能性があります)"
+
+#: ../../godmode/massive/massive_edit_modules.php:340
 msgid "Agent Status"
 msgstr "エージェントの状態"
 
-#: ../../godmode/massive/massive_edit_modules.php:357
+#: ../../godmode/massive/massive_edit_modules.php:377
 #: ../../godmode/modules/manage_network_components_form_common.php:107
 #: ../../enterprise/godmode/modules/configure_local_component.php:226
 msgid "Dynamic Interval"
 msgstr "動的間隔"
 
-#: ../../godmode/massive/massive_edit_modules.php:359
+#: ../../godmode/massive/massive_edit_modules.php:379
 msgid "Dynamic Min."
 msgstr "動的最小値"
 
-#: ../../godmode/massive/massive_edit_modules.php:362
+#: ../../godmode/massive/massive_edit_modules.php:382
 #: ../../godmode/modules/manage_network_components_form_common.php:113
 #: ../../enterprise/godmode/modules/configure_local_component.php:232
 msgid "Dynamic Max."
 msgstr "動的最大値"
 
-#: ../../godmode/massive/massive_edit_modules.php:365
+#: ../../godmode/massive/massive_edit_modules.php:385
 #: ../../godmode/modules/manage_network_components_form_common.php:115
 #: ../../enterprise/godmode/modules/configure_local_component.php:234
 msgid "Dynamic Two Tailed: "
 msgstr "2つの動的しきい値 "
 
-#: ../../godmode/massive/massive_edit_modules.php:479
+#: ../../godmode/massive/massive_edit_modules.php:501
 msgid "SMNP community"
 msgstr "SNMPコミュニティ"
 
-#: ../../godmode/massive/massive_edit_modules.php:571
+#: ../../godmode/massive/massive_edit_modules.php:603
 msgid "Policy linking status"
 msgstr "ポリシーリンク状態"
 
-#: ../../godmode/massive/massive_edit_modules.php:571
+#: ../../godmode/massive/massive_edit_modules.php:603
 msgid "This field only has sense in modules adopted by a policy."
 msgstr "このフィールドは、ポリシーに関連づけられたモジュールにのみ影響します。"
 
-#: ../../godmode/massive/massive_edit_modules.php:572
+#: ../../godmode/massive/massive_edit_modules.php:604
 msgid "Linked"
 msgstr "リンク済"
 
-#: ../../godmode/massive/massive_edit_modules.php:602
+#: ../../godmode/massive/massive_edit_modules.php:634
 msgid "The module still store data but the alerts and events will be stop"
 msgstr "モジュールはデータを保存しますが、アラートとイベントは停止します"
 
+#: ../../godmode/massive/massive_edit_modules.php:650
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:60
+#: ../../enterprise/include/functions_enterprise.php:295
+#: ../../enterprise/meta/include/functions_wizard_meta.php:493
+#: ../../enterprise/meta/include/functions_wizard_meta.php:544
+msgid "Web checks"
+msgstr "ウェブチェック"
+
 #: ../../godmode/massive/massive_edit_plugins.php:151
 msgid "Error retrieving the plugin macros"
 msgstr "プラグインマクロ検索エラー"
@@ -12735,11 +12978,29 @@ msgstr "モジュール配列が不正です"
 msgid "Invalid module element"
 msgstr "モジュールの要素が不正です"
 
+#: ../../godmode/massive/massive_edit_plugins.php:813
+#: ../../godmode/massive/massive_edit_plugins.php:814
+#: ../../include/ajax/double_auth.ajax.php:250
+#: ../../include/ajax/double_auth.ajax.php:347
+#: ../../include/ajax/double_auth.ajax.php:392
+#: ../../include/ajax/double_auth.ajax.php:507
+#: ../../include/functions.php:1043 ../../include/functions_ui.php:233
+#: ../../include/functions_events.php:1176
+#: ../../include/functions_events.php:1426
+#: ../../operation/users/user_edit.php:707
+#: ../../operation/users/user_edit.php:772
+#: ../../enterprise/dashboard/main_dashboard.php:380
+#: ../../enterprise/dashboard/main_dashboard.php:476
+#: ../../enterprise/include/functions_login.php:98
+#: ../../enterprise/meta/include/functions_ui_meta.php:779
+msgid "Error"
+msgstr "エラー"
+
 #: ../../godmode/massive/massive_edit_plugins.php:876
 msgid "There are no modules using this plugin"
 msgstr "このプラグインを使っているモジュールはありません"
 
-#: ../../godmode/massive/massive_edit_plugins.php:955
+#: ../../godmode/massive/massive_edit_plugins.php:959
 msgid "There was a problem loading the module plugin macros data"
 msgstr "モジュールプラグインマクロデータのロード中に問題が発生しました"
 
@@ -12843,13 +13104,12 @@ msgstr "モジュール操作"
 msgid "Plugins operations"
 msgstr "プラグイン操作"
 
-#: ../../godmode/massive/massive_operations.php:215
-#: ../../enterprise/extensions/ipam.php:197
-msgid "Massive operations"
+#: ../../godmode/massive/massive_operations.php:215 ../../godmode/menu.php:111
+msgid "Bulk operations"
 msgstr "一括操作"
 
 #: ../../godmode/massive/massive_operations.php:223
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:202
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:203
 msgid ""
 "In order to perform massive operations, PHP needs a correct configuration in "
 "timeout parameters. Please, open your PHP configuration file (php.ini) for "
@@ -12928,7 +13188,7 @@ msgid "Users management"
 msgstr "ユーザ管理"
 
 #: ../../godmode/menu.php:85 ../../godmode/users/configure_profile.php:45
-#: ../../godmode/users/configure_user.php:86
+#: ../../godmode/users/configure_user.php:88
 #: ../../godmode/users/profile_list.php:49
 #: ../../godmode/users/user_list.php:117
 #: ../../enterprise/meta/include/functions_users_meta.php:172
@@ -12937,9 +13197,11 @@ msgid "Profile management"
 msgstr "プロファイル管理"
 
 #: ../../godmode/menu.php:91 ../../godmode/users/profile_list.php:302
-#: ../../enterprise/godmode/setup/setup_auth.php:427
-#: ../../enterprise/godmode/setup/setup_auth.php:468
-#: ../../enterprise/meta/advanced/synchronizing.user.php:564
+#: ../../enterprise/godmode/setup/setup_auth.php:138
+#: ../../enterprise/godmode/setup/setup_auth.php:182
+#: ../../enterprise/godmode/setup/setup_auth.php:737
+#: ../../enterprise/godmode/setup/setup_auth.php:778
+#: ../../enterprise/meta/advanced/synchronizing.user.php:578
 msgid "Profiles"
 msgstr "プロファイル"
 
@@ -12949,10 +13211,6 @@ msgstr "プロファイル"
 msgid "Network components"
 msgstr "コンポーネント管理"
 
-#: ../../godmode/menu.php:111
-msgid "Bulk operations"
-msgstr "一括操作"
-
 #: ../../godmode/menu.php:145
 msgid "List of Alerts"
 msgstr "アラート一覧"
@@ -12963,7 +13221,7 @@ msgstr "アラート一覧"
 msgid "Commands"
 msgstr "コマンド"
 
-#: ../../godmode/menu.php:170 ../../include/functions_menu.php:512
+#: ../../godmode/menu.php:170 ../../include/functions_menu.php:533
 msgid "SNMP alerts"
 msgstr "SNMPアラート"
 
@@ -12975,21 +13233,22 @@ msgstr "イベントフィルタ"
 msgid "Custom events"
 msgstr "カスタムイベント"
 
-#: ../../godmode/menu.php:192 ../../include/functions_reports.php:620
-#: ../../include/functions_reports.php:622
-#: ../../include/functions_reports.php:624
-#: ../../include/functions_graph.php:744
-#: ../../include/functions_graph.php:3938
-#: ../../include/functions_graph.php:4664
-#: ../../include/functions_reporting_html.php:1621
+#: ../../godmode/menu.php:192 ../../include/functions_graph.php:846
+#: ../../include/functions_graph.php:4622
+#: ../../include/functions_graph.php:5507
+#: ../../include/functions_reporting_html.php:1624
+#: ../../include/functions_reports.php:621
+#: ../../include/functions_reports.php:623
+#: ../../include/functions_reports.php:625
 #: ../../mobile/include/functions_web.php:24
 #: ../../mobile/operation/events.php:564 ../../mobile/operation/home.php:44
-#: ../../operation/events/events.php:420 ../../operation/events/events.php:429
-#: ../../operation/menu.php:268
+#: ../../operation/events/events.php:446 ../../operation/events/events.php:455
+#: ../../operation/menu.php:305
 #: ../../enterprise/dashboard/widgets/events_list.php:26
 #: ../../enterprise/extensions/ipam/ipam_massive.php:76
 #: ../../enterprise/extensions/ipam/ipam_network.php:539
-#: ../../enterprise/include/functions_reporting_pdf.php:753
+#: ../../enterprise/godmode/reporting/cluster_view.php:443
+#: ../../enterprise/include/functions_reporting_pdf.php:799
 #: ../../enterprise/meta/general/logon_ok.php:43
 #: ../../enterprise/meta/general/main_header.php:123
 #: ../../enterprise/meta/monitoring/tactical.php:312
@@ -13008,7 +13267,8 @@ msgid "Manage servers"
 msgstr "サーバ管理"
 
 #: ../../godmode/menu.php:212 ../../include/functions_groups.php:92
-#: ../../operation/agentes/pandora_networkmap.editor.php:197
+#: ../../operation/agentes/pandora_networkmap.editor.php:249
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:106
 msgid "Recon task"
 msgstr "自動検出タスク"
 
@@ -13030,7 +13290,7 @@ msgstr "基本設定"
 #: ../../godmode/menu.php:253 ../../godmode/setup/setup.php:82
 #: ../../godmode/setup/setup.php:116
 #: ../../enterprise/meta/advanced/metasetup.php:70
-#: ../../enterprise/meta/advanced/metasetup.php:122
+#: ../../enterprise/meta/advanced/metasetup.php:127
 msgid "Authentication"
 msgstr "認証"
 
@@ -13046,11 +13306,11 @@ msgid "Visual styles"
 msgstr "画面設定"
 
 #: ../../godmode/menu.php:264 ../../godmode/setup/setup.php:96
-#: ../../godmode/setup/setup.php:129 ../../include/functions_reports.php:641
-#: ../../include/functions_reports.php:643
-#: ../../include/functions_reports.php:645
-#: ../../include/functions_reports.php:647
-#: ../../include/functions_reports.php:649
+#: ../../godmode/setup/setup.php:129 ../../include/functions_reports.php:642
+#: ../../include/functions_reports.php:644
+#: ../../include/functions_reports.php:646
+#: ../../include/functions_reports.php:648
+#: ../../include/functions_reports.php:650
 #: ../../enterprise/include/functions_enterprise.php:289
 #: ../../enterprise/meta/general/main_header.php:199
 msgid "Netflow"
@@ -13058,7 +13318,7 @@ msgstr "Netflow"
 
 #: ../../godmode/menu.php:269 ../../godmode/setup/setup.php:102
 #: ../../godmode/setup/setup.php:133
-#: ../../operation/agentes/ver_agente.php:1089
+#: ../../operation/agentes/ver_agente.php:1183
 msgid "eHorus"
 msgstr "eHorus"
 
@@ -13075,69 +13335,61 @@ msgstr "OS の編集"
 msgid "License"
 msgstr "ライセンス"
 
-#: ../../godmode/menu.php:288
+#: ../../godmode/menu.php:289
 msgid "Admin tools"
 msgstr "管理ツール"
 
-#: ../../godmode/menu.php:296
+#: ../../godmode/menu.php:297
 msgid "System audit log"
 msgstr "システム監査ログ"
 
-#: ../../godmode/menu.php:300
+#: ../../godmode/menu.php:301
 msgid "Diagnostic info"
 msgstr "診断情報"
 
-#: ../../godmode/menu.php:302
+#: ../../godmode/menu.php:303
 msgid "Site news"
 msgstr "サイトニュース"
 
-#: ../../godmode/menu.php:304 ../../godmode/setup/file_manager.php:30
+#: ../../godmode/menu.php:305 ../../godmode/setup/file_manager.php:30
 #: ../../enterprise/meta/advanced/metasetup.php:85
-#: ../../enterprise/meta/advanced/metasetup.php:131
+#: ../../enterprise/meta/advanced/metasetup.php:136
 msgid "File manager"
 msgstr "ファイルマネージャ"
 
 #: ../../godmode/menu.php:309
-msgid "DB maintenance"
-msgstr "DBメンテナンス"
+msgid "DB Schema Check"
+msgstr "DB スキーマチェック"
 
-#: ../../godmode/menu.php:315
-msgid "DB information"
-msgstr "DBステータス"
+#: ../../godmode/menu.php:312
+msgid "DB Interface"
+msgstr "DB インタフェース"
 
-#: ../../godmode/menu.php:318
-msgid "Database audit"
-msgstr "監査DB"
-
-#: ../../godmode/menu.php:319
-msgid "Database event"
-msgstr "イベントDB"
-
-#: ../../godmode/menu.php:401
+#: ../../godmode/menu.php:405
 msgid "Extension manager view"
 msgstr "拡張マネージャ表示"
 
-#: ../../godmode/menu.php:405
+#: ../../godmode/menu.php:409
 msgid "Extension manager"
 msgstr "拡張マネージャ"
 
-#: ../../godmode/menu.php:433
+#: ../../godmode/menu.php:439
 msgid "Update manager"
 msgstr "アップデートマネージャ"
 
-#: ../../godmode/menu.php:439
+#: ../../godmode/menu.php:445
 msgid "Update Manager offline"
 msgstr "オフラインアップデートマネージャ"
 
-#: ../../godmode/menu.php:442
+#: ../../godmode/menu.php:448
 msgid "Update Manager online"
 msgstr "オンラインアップデートマネージャ"
 
-#: ../../godmode/menu.php:444
+#: ../../godmode/menu.php:450
 msgid "Update Manager options"
 msgstr "アップデートマネージャオプション"
 
-#: ../../godmode/menu.php:457 ../../operation/menu.php:373
+#: ../../godmode/menu.php:463 ../../operation/menu.php:410
 #: ../../operation/messages/message_edit.php:46
 #: ../../operation/messages/message_list.php:43
 msgid "Messages"
@@ -13368,21 +13620,21 @@ msgstr "Netflow フィルタ管理"
 #: ../../enterprise/extensions/backup/main.php:67
 #: ../../enterprise/godmode/modules/manage_inventory_modules.php:31
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:33
-#: ../../enterprise/operation/log/log_viewer.php:155
+#: ../../enterprise/operation/log/log_viewer.php:167
 msgid "Not supported in Windows systems"
 msgstr "Windows システムでは対応していません"
 
 #: ../../godmode/netflow/nf_edit.php:47
 #: ../../godmode/netflow/nf_edit_form.php:65
 #: ../../godmode/netflow/nf_item_list.php:57
-#: ../../operation/agentes/ver_agente.php:961
+#: ../../operation/agentes/ver_agente.php:1036
 #: ../../operation/netflow/nf_live_view.php:132
 #: ../../enterprise/meta/advanced/agents_setup.php:35
 #: ../../enterprise/meta/advanced/policymanager.php:35
 #: ../../enterprise/meta/advanced/synchronizing.php:33
 #: ../../enterprise/meta/agentsearch.php:26
 #: ../../enterprise/meta/general/logon_ok.php:15
-#: ../../enterprise/meta/index.php:496
+#: ../../enterprise/meta/index.php:698
 #: ../../enterprise/meta/monitoring/group_view.php:32
 #: ../../enterprise/meta/monitoring/tactical.php:35
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:37
@@ -13400,8 +13652,8 @@ msgstr "Netflow フィルタ"
 
 #: ../../godmode/netflow/nf_edit_form.php:180
 #: ../../godmode/snmpconsole/snmp_filters.php:35
-#: ../../operation/events/events_list.php:219
-#: ../../operation/events/events_list.php:250
+#: ../../operation/events/events_list.php:285
+#: ../../operation/events/events_list.php:318
 msgid "Update filter"
 msgstr "フィルタの更新"
 
@@ -13538,23 +13790,24 @@ msgid "Item list"
 msgstr "アイテム一覧"
 
 #: ../../godmode/netflow/nf_item_list.php:147
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1259
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1473
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1320
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1567
 #: ../../enterprise/dashboard/widgets/top_n.php:69
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:228
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1565
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1744
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:242
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1666
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1855
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:221
 msgid "Order"
 msgstr "順番"
 
 #: ../../godmode/netflow/nf_item_list.php:150
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1281
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1342
 #: ../../operation/netflow/nf_live_view.php:258
 msgid "Max. values"
 msgstr "最大値"
 
 #: ../../godmode/netflow/nf_item_list.php:151
+#: ../../operation/agentes/graphs.php:179
 msgid "Chart type"
 msgstr "グラフタイプ"
 
@@ -13575,150 +13828,443 @@ msgid "There are no defined items"
 msgstr "定義済のアイテムがありません"
 
 #: ../../godmode/netflow/nf_item_list.php:260
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1514
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1910
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1680
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2095
 msgid "Create item"
 msgstr "アイテムの作成"
 
-#: ../../godmode/reporting/graph_builder.graph_editor.php:86
-#: ../../godmode/reporting/reporting_builder.item_editor.php:693
+#: ../../godmode/reporting/create_container.php:190
+#: ../../godmode/reporting/graph_container.php:73
+#: ../../godmode/reporting/graph_container.php:75
+#: ../../enterprise/godmode/reporting/graph_template_list.php:70
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:98
+msgid "Graph container"
+msgstr "グラフコンテナ"
+
+#: ../../godmode/reporting/create_container.php:193
+#: ../../godmode/reporting/graph_container.php:84
+msgid "Create container"
+msgstr "コンテナ作成"
+
+#: ../../godmode/reporting/create_container.php:196
+msgid "Container stored successfully"
+msgstr "コンテナを保存しました"
+
+#: ../../godmode/reporting/create_container.php:196
+msgid "There was a problem storing container"
+msgstr "コンテナの保存に問題が発生しました"
+
+#: ../../godmode/reporting/create_container.php:200
+msgid "Update the container"
+msgstr "コンテナの更新"
+
+#: ../../godmode/reporting/create_container.php:200
+msgid "Bad update the container"
+msgstr "コンテナの更新に失敗しました"
+
+#: ../../godmode/reporting/create_container.php:259
+msgid "Parent container"
+msgstr "親コンテナ"
+
+#: ../../godmode/reporting/create_container.php:262
+#: ../../godmode/reporting/create_container.php:265
+#: ../../include/ajax/graph.ajax.php:129 ../../include/functions_html.php:634
+#: ../../operation/events/events_list.php:1174
+#: ../../operation/events/events_list.php:1260
+#: ../../enterprise/godmode/setup/setup.php:257
+msgid "none"
+msgstr "なし"
+
+#: ../../godmode/reporting/create_container.php:292
+#: ../../include/functions.php:2050
+msgid "custom"
+msgstr "カスタム"
+
+#: ../../godmode/reporting/create_container.php:293
+#: ../../godmode/setup/performance.php:105
+#: ../../include/ajax/graph.ajax.php:130 ../../include/ajax/module.php:139
+#: ../../include/functions.php:2057 ../../include/functions.php:2616
+#: ../../include/functions_netflow.php:1052
+#: ../../include/functions_netflow.php:1085
+#: ../../operation/gis_maps/render_view.php:142
+#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:63
+#: ../../enterprise/dashboard/widgets/sla_percent.php:62
+#: ../../enterprise/dashboard/widgets/top_n.php:61
+#: ../../enterprise/godmode/agentes/inventory_manager.php:176
+#: ../../enterprise/godmode/policies/policy_inventory_modules.php:190
+#: ../../enterprise/godmode/reporting/graph_template_editor.php:181
+msgid "1 hour"
+msgstr "1時間"
+
+#: ../../godmode/reporting/create_container.php:294
+#: ../../godmode/reporting/create_container.php:295
+#: ../../godmode/reporting/create_container.php:296
+#: ../../include/ajax/graph.ajax.php:131 ../../include/ajax/graph.ajax.php:132
+#: ../../include/ajax/graph.ajax.php:133 ../../include/functions.php:2058
+#: ../../include/functions.php:2059
+#, php-format
+msgid "%s hours"
+msgstr "%s 時間"
+
+#: ../../godmode/reporting/create_container.php:297
+#: ../../include/ajax/graph.ajax.php:134 ../../include/ajax/module.php:142
+#: ../../include/functions.php:2060 ../../include/functions_netflow.php:1056
+#: ../../include/functions_netflow.php:1089
+#: ../../enterprise/dashboard/widgets/top_n.php:65
+#: ../../enterprise/godmode/agentes/inventory_manager.php:180
+#: ../../enterprise/godmode/policies/policy_inventory_modules.php:194
+#: ../../enterprise/godmode/reporting/graph_template_editor.php:186
+msgid "1 day"
+msgstr "1日"
+
+#: ../../godmode/reporting/create_container.php:298
+#: ../../godmode/reporting/create_container.php:299
+#: ../../include/ajax/graph.ajax.php:135 ../../include/ajax/graph.ajax.php:136
+#, php-format
+msgid "%s days"
+msgstr "%s 日"
+
+#: ../../godmode/reporting/create_container.php:300
+#: ../../include/ajax/graph.ajax.php:137 ../../include/ajax/module.php:143
+#: ../../include/functions.php:2061 ../../include/functions_netflow.php:1093
+msgid "1 week"
+msgstr "1週間"
+
+#: ../../godmode/reporting/create_container.php:301
+#: ../../include/ajax/graph.ajax.php:138 ../../include/ajax/module.php:144
+#: ../../include/functions.php:2062 ../../include/functions_netflow.php:1059
+#: ../../include/functions_netflow.php:1092
+#: ../../enterprise/godmode/agentes/inventory_manager.php:183
+#: ../../enterprise/godmode/policies/policy_inventory_modules.php:197
+#: ../../enterprise/godmode/reporting/graph_template_editor.php:190
+msgid "15 days"
+msgstr "15日"
+
+#: ../../godmode/reporting/create_container.php:302
+#: ../../include/ajax/graph.ajax.php:139 ../../include/ajax/module.php:145
+#: ../../include/functions.php:2063 ../../include/functions_netflow.php:1094
+#: ../../enterprise/godmode/agentes/inventory_manager.php:184
+#: ../../enterprise/godmode/policies/policy_inventory_modules.php:198
+msgid "1 month"
+msgstr "1ヵ月"
+
+#: ../../godmode/reporting/create_container.php:305
+#: ../../godmode/reporting/graph_builder.main.php:168
+#: ../../godmode/setup/setup_visuals.php:523
+#: ../../godmode/setup/setup_visuals.php:532
+#: ../../include/functions_visual_map_editor.php:439
+#: ../../operation/agentes/graphs.php:181
+#: ../../operation/agentes/graphs.php:184
+#: ../../operation/agentes/graphs.php:333
+#: ../../operation/agentes/graphs.php:352
+#: ../../operation/reporting/graph_viewer.php:229
+#: ../../enterprise/dashboard/widgets/custom_graph.php:39
+#: ../../enterprise/godmode/reporting/graph_template_editor.php:208
+#: ../../enterprise/meta/advanced/metasetup.visual.php:151
+msgid "Area"
+msgstr "塗り潰し"
+
+#: ../../godmode/reporting/create_container.php:306
+#: ../../godmode/reporting/graph_builder.main.php:170
+#: ../../godmode/reporting/visual_console_builder.elements.php:203
+#: ../../godmode/setup/setup_visuals.php:526
+#: ../../godmode/setup/setup_visuals.php:535
+#: ../../include/functions_visual_map_editor.php:65
+#: ../../include/functions_visual_map_editor.php:438
+#: ../../include/functions_visual_map_editor.php:876
+#: ../../operation/agentes/graphs.php:181
+#: ../../operation/agentes/graphs.php:184
+#: ../../operation/agentes/graphs.php:341
+#: ../../operation/agentes/graphs.php:356
+#: ../../operation/reporting/graph_viewer.php:231
+#: ../../enterprise/dashboard/widgets/custom_graph.php:41
+#: ../../enterprise/godmode/reporting/graph_template_editor.php:210
+#: ../../enterprise/meta/advanced/metasetup.visual.php:154
+msgid "Line"
+msgstr "線"
+
+#: ../../godmode/reporting/create_container.php:311
+#: ../../godmode/reporting/create_container.php:416
+#: ../../godmode/reporting/create_container.php:471
+#: ../../godmode/reporting/reporting_builder.item_editor.php:744
+#: ../../godmode/reporting/reporting_builder.list_items.php:305
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1314
+#: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:251
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:107
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:106
+msgid "Time lapse"
+msgstr "時間経過"
+
+#: ../../godmode/reporting/create_container.php:312
+#: ../../godmode/reporting/create_container.php:417
+#: ../../godmode/reporting/create_container.php:472
+msgid ""
+"This is the interval or period of time with which the graph data will be "
+"obtained. For example, a week means data from a week ago from now. "
+msgstr "グラフデータを取得する時間間隔です。たとえば、一週間は、今から一週間前を意味します。 "
+
+#: ../../godmode/reporting/create_container.php:353
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1053
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1850
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1885
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2046
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2074
+#: ../../enterprise/dashboard/widgets/top_n.php:179
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2263
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2452
+msgid "Select an Agent first"
+msgstr "最初にエージェントを選択してください。"
+
+#: ../../godmode/reporting/create_container.php:362
+#: ../../godmode/reporting/create_container.php:518
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1370
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1702
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:364
+msgid "Only average"
+msgstr "平均のみ"
+
+#: ../../godmode/reporting/create_container.php:371
+#: ../../godmode/reporting/create_container.php:512
+#: ../../godmode/reporting/graph_builder.main.php:162
+#: ../../include/functions_visual_map_editor.php:436
+msgid "Type of graph"
+msgstr "グラフのタイプ"
+
+#: ../../godmode/reporting/create_container.php:380
+#: ../../godmode/reporting/create_container.php:437
+#: ../../godmode/reporting/create_container.php:524
+#: ../../godmode/reporting/graph_builder.main.php:198
+#: ../../operation/agentes/interface_traffic_graph_win.php:274
+#: ../../operation/agentes/stat_win.php:428
+msgid "Show full scale graph (TIP)"
+msgstr "詳細グラフ表示 (TIP)"
+
+#: ../../godmode/reporting/create_container.php:391
+#: ../../godmode/reporting/create_container.php:445
+#: ../../godmode/reporting/create_container.php:532
+msgid "Add item"
+msgstr "アイテムの追加"
+
+#: ../../godmode/reporting/create_container.php:423
+#: ../../godmode/reporting/create_container.php:558
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1190
+#: ../../godmode/reporting/visual_console_builder.elements.php:78
+#: ../../godmode/reporting/visual_console_builder.elements.php:385
+#: ../../include/functions_reporting.php:6408
+#: ../../include/functions_visual_map_editor.php:312
+#: ../../include/functions_visual_map_editor.php:322
+#: ../../include/functions_reports.php:429
+#: ../../include/functions_reports.php:505
+#: ../../include/functions_reports.php:507
+#: ../../enterprise/dashboard/widgets/custom_graph.php:25
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1577
+msgid "Custom graph"
+msgstr "カスタムグラフ"
+
+#: ../../godmode/reporting/create_container.php:504
+#: ../../godmode/reporting/create_container.php:563
+#: ../../mobile/operation/modules.php:151
+#: ../../mobile/operation/modules.php:152
+#: ../../mobile/operation/modules.php:244
+#: ../../mobile/operation/modules.php:245
+#: ../../operation/agentes/group_view.php:255
+#: ../../enterprise/godmode/alerts/alert_events_rules.php:410
+#: ../../enterprise/godmode/alerts/configure_alert_rule.php:161
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:309
+msgid "Tag"
+msgstr "タグ"
+
+#: ../../godmode/reporting/create_container.php:548
+msgid "There are no defined item container"
+msgstr "定義済のアイテムコンテナがありません。"
+
+#: ../../godmode/reporting/create_container.php:557
+msgid "Agent/Module"
+msgstr "エージェント/モジュール"
+
+#: ../../godmode/reporting/create_container.php:560
+msgid "M.Group"
+msgstr "モジュールグループ"
+
+#: ../../godmode/reporting/graph_builder.graph_editor.php:206
+#: ../../godmode/reporting/reporting_builder.item_editor.php:709
 #: ../../godmode/reporting/visual_console_builder.elements.php:77
-#: ../../godmode/reporting/visual_console_builder.elements.php:178
+#: ../../godmode/reporting/visual_console_builder.elements.php:183
 #: ../../godmode/reporting/visual_console_builder.wizard.php:300
-#: ../../include/functions_visual_map.php:2757
-#: ../../include/functions_visual_map_editor.php:59
-#: ../../include/functions_visual_map_editor.php:167
-#: ../../include/functions_visual_map_editor.php:654
-#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:40
+#: ../../include/functions_visual_map.php:3939
+#: ../../include/functions_visual_map_editor.php:60
+#: ../../include/functions_visual_map_editor.php:169
+#: ../../include/functions_visual_map_editor.php:571
+#: ../../include/functions_visual_map_editor.php:871
+#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:38
 #: ../../enterprise/dashboard/widgets/module_icon.php:49
-#: ../../enterprise/dashboard/widgets/module_status.php:49
+#: ../../enterprise/dashboard/widgets/module_status.php:38
 #: ../../enterprise/dashboard/widgets/module_value.php:49
 #: ../../enterprise/dashboard/widgets/sla_percent.php:37
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1232
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:234
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1302
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:342
 msgid "Label"
 msgstr "ラベル"
 
-#: ../../godmode/reporting/graph_builder.graph_editor.php:87
-#: ../../godmode/reporting/graph_builder.graph_editor.php:156
+#: ../../godmode/reporting/graph_builder.graph_editor.php:207
+#: ../../godmode/reporting/graph_builder.graph_editor.php:322
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:147
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:205
 msgid "Weight"
 msgstr "ウエイト"
 
-#: ../../godmode/reporting/graph_builder.graph_editor.php:140
-#: ../../operation/events/events_list.php:230
-#: ../../enterprise/godmode/policies/policy_agents.php:233
-#: ../../enterprise/godmode/policies/policy_agents.php:250
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:152
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:93
+#: ../../godmode/reporting/graph_builder.graph_editor.php:209
+#: ../../godmode/reporting/graph_builder.graph_editor.php:290
+#: ../../godmode/reporting/reporting_builder.list_items.php:314
+#: ../../godmode/reporting/reporting_builder.list_items.php:520
+#: ../../enterprise/extensions/ipam/ipam_network.php:269
+#: ../../enterprise/godmode/alerts/alert_events_list.php:420
+#: ../../enterprise/godmode/alerts/alert_events_rules.php:406
+#: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:217
+#: ../../enterprise/meta/include/functions_autoprovision.php:381
+#: ../../enterprise/meta/include/functions_autoprovision.php:538
+msgid "Sort"
+msgstr "並べ替え"
+
+#: ../../godmode/reporting/graph_builder.graph_editor.php:276
+#: ../../godmode/reporting/graph_builder.graph_editor.php:281
+#: ../../godmode/reporting/reporting_builder.list_items.php:506
+#: ../../godmode/reporting/reporting_builder.list_items.php:511
+msgid "Sort items"
+msgstr "アイテムの並び替え"
+
+#: ../../godmode/reporting/graph_builder.graph_editor.php:283
+msgid "Sort selected items"
+msgstr "選択アイテムの並べ替え"
+
+#: ../../godmode/reporting/graph_builder.graph_editor.php:285
+msgid "before to"
+msgstr ""
+
+#: ../../godmode/reporting/graph_builder.graph_editor.php:285
+msgid "after to"
+msgstr ""
+
+#: ../../godmode/reporting/graph_builder.graph_editor.php:306
+#: ../../operation/events/events_list.php:296
+#: ../../enterprise/godmode/policies/policy_agents.php:368
+#: ../../enterprise/godmode/policies/policy_agents.php:385
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:155
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:94
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:436
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:313
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:341
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:92
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:314
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:342
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:111
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:102
 #: ../../enterprise/meta/event/custom_events.php:149
 msgid "Filter group"
 msgstr "フィルターグループ"
 
-#: ../../godmode/reporting/graph_builder.graph_editor.php:185
+#: ../../godmode/reporting/graph_builder.graph_editor.php:351
 #: ../../enterprise/meta/monitoring/wizard/wizard.create_module.php:357
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:102
 msgid "Please, select a module"
 msgstr "モジュールを選択してください"
 
-#: ../../godmode/reporting/graph_builder.main.php:151
-#: ../../include/functions_visual_map_editor.php:322
-msgid "Type of graph"
-msgstr "グラフのタイプ"
+#: ../../godmode/reporting/graph_builder.graph_editor.php:402
+#: ../../godmode/reporting/reporting_builder.list_items.php:605
+msgid "Please select any item to order"
+msgstr "並び替えるアイテムを選択してください"
 
-#: ../../godmode/reporting/graph_builder.main.php:157
-#: ../../godmode/setup/setup_visuals.php:507
-#: ../../godmode/setup/setup_visuals.php:516
-#: ../../include/functions_visual_map_editor.php:325
-#: ../../operation/reporting/graph_viewer.php:227
-#: ../../enterprise/dashboard/widgets/custom_graph.php:39
-#: ../../enterprise/godmode/reporting/graph_template_editor.php:208
-#: ../../enterprise/meta/advanced/metasetup.visual.php:129
-msgid "Area"
-msgstr "塗り潰し"
-
-#: ../../godmode/reporting/graph_builder.main.php:158
-#: ../../operation/reporting/graph_viewer.php:228
+#: ../../godmode/reporting/graph_builder.main.php:169
+#: ../../operation/reporting/graph_viewer.php:230
 #: ../../enterprise/dashboard/widgets/custom_graph.php:40
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:209
 msgid "Stacked area"
 msgstr "塗り潰しの積み上げ"
 
-#: ../../godmode/reporting/graph_builder.main.php:159
-#: ../../godmode/reporting/visual_console_builder.elements.php:198
-#: ../../godmode/setup/setup_visuals.php:510
-#: ../../godmode/setup/setup_visuals.php:519
-#: ../../include/functions_visual_map_editor.php:63
-#: ../../include/functions_visual_map_editor.php:324
-#: ../../include/functions_visual_map_editor.php:658
-#: ../../operation/reporting/graph_viewer.php:229
-#: ../../enterprise/dashboard/widgets/custom_graph.php:41
-#: ../../enterprise/godmode/reporting/graph_template_editor.php:210
-#: ../../enterprise/meta/advanced/metasetup.visual.php:132
-msgid "Line"
-msgstr "線"
-
-#: ../../godmode/reporting/graph_builder.main.php:160
-#: ../../operation/reporting/graph_viewer.php:230
+#: ../../godmode/reporting/graph_builder.main.php:171
+#: ../../operation/reporting/graph_viewer.php:232
 #: ../../enterprise/dashboard/widgets/custom_graph.php:42
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:211
 msgid "Stacked line"
 msgstr "線の積み上げ"
 
-#: ../../godmode/reporting/graph_builder.main.php:161
-#: ../../operation/reporting/graph_viewer.php:231
+#: ../../godmode/reporting/graph_builder.main.php:172
+#: ../../operation/reporting/graph_viewer.php:233
 #: ../../enterprise/dashboard/widgets/custom_graph.php:43
 msgid "Bullet chart"
 msgstr "ブレットグラフ"
 
-#: ../../godmode/reporting/graph_builder.main.php:162
-#: ../../operation/reporting/graph_viewer.php:232
+#: ../../godmode/reporting/graph_builder.main.php:173
+#: ../../operation/reporting/graph_viewer.php:234
 #: ../../enterprise/dashboard/widgets/custom_graph.php:44
 msgid "Gauge"
 msgstr "ゲージ"
 
-#: ../../godmode/reporting/graph_builder.main.php:163
+#: ../../godmode/reporting/graph_builder.main.php:174
 msgid "Horizontal bars"
 msgstr "水平バー"
 
-#: ../../godmode/reporting/graph_builder.main.php:164
+#: ../../godmode/reporting/graph_builder.main.php:175
 msgid "Vertical bars"
 msgstr "垂直バー"
 
-#: ../../godmode/reporting/graph_builder.main.php:165
-#: ../../operation/reporting/graph_viewer.php:235
+#: ../../godmode/reporting/graph_builder.main.php:176
+#: ../../operation/reporting/graph_viewer.php:237
 #: ../../enterprise/dashboard/widgets/custom_graph.php:47
 msgid "Pie"
 msgstr "円"
 
-#: ../../godmode/reporting/graph_builder.main.php:169
-#: ../../operation/reporting/graph_viewer.php:240
+#: ../../godmode/reporting/graph_builder.main.php:182
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1379
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1711
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:384
+msgid "Percentil"
+msgstr "パーセント値"
+
+#: ../../godmode/reporting/graph_builder.main.php:184
+#: ../../operation/reporting/graph_viewer.php:242
 msgid "Equalize maximum thresholds"
 msgstr "最大閾値を合わせる"
 
-#: ../../godmode/reporting/graph_builder.main.php:170
-#: ../../operation/reporting/graph_viewer.php:241
+#: ../../godmode/reporting/graph_builder.main.php:185
+#: ../../operation/reporting/graph_viewer.php:243
 msgid ""
 "If an option is selected, all graphs will have the highest value from all "
 "modules included in the graph as a maximum threshold"
 msgstr "オプションを選択すると、最大閾値として、すべてのグラフに全モジュールの最大の値が含まれます。"
 
-#: ../../godmode/reporting/graph_builder.main.php:177
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1313
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1605
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:266
-msgid "Percentil"
-msgstr "パーセント値"
+#: ../../godmode/reporting/graph_builder.main.php:188
+msgid "Add summatory series"
+msgstr "合計の表示"
 
-#: ../../godmode/reporting/graph_builder.php:214
+#: ../../godmode/reporting/graph_builder.main.php:189
+msgid ""
+"Adds synthetic series to the graph, using all module \n"
+"\tvalues to calculate the summation and/or average in each time interval. \n"
+"\tThis feature could be used instead of synthetic modules if you only want "
+"to see a graph."
+msgstr ""
+"時間間隔ごとに合計や平均を計算した結果をグラフ表示します。この機能は、\n"
+"\t計算した結果のモジュールを用意する代わりに、グラフにのみ計算結果を\n"
+"\t表示したい場合に利用します。"
+
+#: ../../godmode/reporting/graph_builder.main.php:193
+msgid "Add average series"
+msgstr "平均の表示"
+
+#: ../../godmode/reporting/graph_builder.main.php:195
+msgid "Modules and series"
+msgstr "モジュール値と統計値"
+
+#: ../../godmode/reporting/graph_builder.main.php:198
+#: ../../godmode/setup/setup_visuals.php:554
+#: ../../operation/agentes/interface_traffic_graph_win.php:276
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1707
+#: ../../enterprise/meta/advanced/metasetup.visual.php:137
+msgid "This option may cause performance issues"
+msgstr "このオプションはパフォーマンスに影響します"
+
+#: ../../godmode/reporting/graph_builder.php:233
+#: ../../godmode/reporting/graph_container.php:56
 #: ../../godmode/reporting/graphs.php:43 ../../godmode/reporting/graphs.php:53
-#: ../../operation/reporting/graph_viewer.php:147
+#: ../../operation/reporting/graph_viewer.php:148
 #: ../../enterprise/godmode/reporting/graph_template_list.php:32
 #: ../../enterprise/godmode/reporting/graph_template_list.php:43
 #: ../../enterprise/godmode/reporting/graph_template_list.php:53
@@ -13727,73 +14273,78 @@ msgstr "パーセント値"
 msgid "Graph list"
 msgstr "グラフ一覧"
 
-#: ../../godmode/reporting/graph_builder.php:217
+#: ../../godmode/reporting/graph_builder.php:236
 #: ../../godmode/reporting/reporting_builder.main.php:51
-#: ../../godmode/reporting/reporting_builder.php:1957
-#: ../../godmode/reporting/reporting_builder.php:1985
-#: ../../godmode/reporting/visual_console_builder.php:668
-#: ../../operation/reporting/graph_viewer.php:150
+#: ../../godmode/reporting/reporting_builder.php:2053
+#: ../../godmode/reporting/reporting_builder.php:2081
+#: ../../godmode/reporting/visual_console_builder.php:670
+#: ../../operation/reporting/graph_viewer.php:151
 #: ../../operation/reporting/reporting_viewer.php:82
 #: ../../operation/visual_console/pure_ajax.php:110
 #: ../../operation/visual_console/render_view.php:113
-#: ../../enterprise/meta/screens/screens.visualmap.php:181
-#: ../../enterprise/meta/screens/screens.visualmap.php:206
+#: ../../enterprise/meta/screens/screens.visualmap.php:121
+#: ../../enterprise/meta/screens/screens.visualmap.php:146
 msgid "Main data"
 msgstr "メインデータ"
 
-#: ../../godmode/reporting/graph_builder.php:220
-#: ../../operation/reporting/graph_viewer.php:153
+#: ../../godmode/reporting/graph_builder.php:239
+#: ../../operation/reporting/graph_viewer.php:154
 msgid "Graph editor"
 msgstr "グラフ編集"
 
-#: ../../godmode/reporting/graph_builder.php:223
-#: ../../operation/reporting/graph_viewer.php:159
+#: ../../godmode/reporting/graph_builder.php:242
+#: ../../operation/reporting/graph_viewer.php:160
 msgid "View graph"
 msgstr "グラフ表示"
 
-#: ../../godmode/reporting/graph_builder.php:235
+#: ../../godmode/reporting/graph_builder.php:254
 msgid "Graph builder"
 msgstr "グラフビルダー"
 
-#: ../../godmode/reporting/graph_builder.php:255
+#: ../../godmode/reporting/graph_builder.php:274
 msgid "Graph stored successfully"
 msgstr "グラフを作成しました。"
 
-#: ../../godmode/reporting/graph_builder.php:255
+#: ../../godmode/reporting/graph_builder.php:274
 msgid "There was a problem storing Graph"
 msgstr "グラフの作成に失敗しました。"
 
-#: ../../godmode/reporting/graph_builder.php:258
+#: ../../godmode/reporting/graph_builder.php:277
 msgid "There was a problem adding Module"
 msgstr "モジュール追加で問題が発生しました。"
 
-#: ../../godmode/reporting/graph_builder.php:261
+#: ../../godmode/reporting/graph_builder.php:280
 msgid "Update the graph"
 msgstr "グラフを更新しました。"
 
-#: ../../godmode/reporting/graph_builder.php:261
+#: ../../godmode/reporting/graph_builder.php:280
 msgid "Bad update the graph"
 msgstr "グラフ更新に失敗しました。"
 
-#: ../../godmode/reporting/graph_builder.php:264
+#: ../../godmode/reporting/graph_builder.php:283
 msgid "Graph deleted successfully"
 msgstr "グラフを削除しました。"
 
-#: ../../godmode/reporting/graph_builder.php:264
+#: ../../godmode/reporting/graph_builder.php:283
 msgid "There was a problem deleting Graph"
 msgstr "グラフの削除で問題が発生しました。"
 
-#: ../../godmode/reporting/graphs.php:75
-#: ../../godmode/reporting/map_builder.php:39
-#: ../../godmode/reporting/reporting_builder.php:359
-#: ../../godmode/reporting/reporting_builder.php:364
-#: ../../godmode/reporting/reporting_builder.php:1924
-#: ../../godmode/reporting/reporting_builder.php:1929
-#: ../../godmode/reporting/reporting_builder.php:1995
-#: ../../godmode/reporting/reporting_builder.php:2000
-#: ../../operation/menu.php:235
+#: ../../godmode/reporting/graphs.php:70
+msgid "Graphs containers"
+msgstr "グラフコンテナ"
+
+#: ../../godmode/reporting/graphs.php:78
+#: ../../godmode/reporting/map_builder.php:43
+#: ../../godmode/reporting/reporting_builder.php:393
+#: ../../godmode/reporting/reporting_builder.php:398
+#: ../../godmode/reporting/reporting_builder.php:2020
+#: ../../godmode/reporting/reporting_builder.php:2025
+#: ../../godmode/reporting/reporting_builder.php:2091
+#: ../../godmode/reporting/reporting_builder.php:2096
+#: ../../godmode/reporting/visual_console_favorite.php:37
+#: ../../operation/menu.php:272
 #: ../../operation/reporting/custom_reporting.php:27
-#: ../../operation/reporting/graph_viewer.php:327
+#: ../../operation/reporting/graph_viewer.php:329
 #: ../../operation/reporting/reporting_viewer.php:119
 #: ../../operation/reporting/reporting_viewer.php:124
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:180
@@ -13808,106 +14359,120 @@ msgstr "グラフの削除で問題が発生しました。"
 msgid "Reporting"
 msgstr "レポート"
 
-#: ../../godmode/reporting/graphs.php:75 ../../operation/menu.php:249
+#: ../../godmode/reporting/graphs.php:78 ../../operation/menu.php:286
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:295
 msgid "Custom graphs"
 msgstr "カスタムグラフ"
 
-#: ../../godmode/reporting/graphs.php:152
-#: ../../operation/reporting/graph_viewer.php:338
+#: ../../godmode/reporting/graphs.php:155
+#: ../../include/functions_container.php:129
+#: ../../operation/reporting/graph_viewer.php:340
 #: ../../operation/search_graphs.php:33
 msgid "Graph name"
 msgstr "グラフ名"
 
-#: ../../godmode/reporting/graphs.php:154
+#: ../../godmode/reporting/graphs.php:157
+#: ../../include/functions_container.php:131
 msgid "Number of Graphs"
 msgstr "グラフ数"
 
-#: ../../godmode/reporting/graphs.php:213
+#: ../../godmode/reporting/graphs.php:220
 msgid "Create graph"
 msgstr "グラフ作成"
 
-#: ../../godmode/reporting/map_builder.php:187
-#: ../../godmode/reporting/map_builder.php:197
+#: ../../godmode/reporting/map_builder.php:39
+#: ../../godmode/reporting/visual_console_favorite.php:37
+msgid "Visual Favourite Console"
+msgstr "お気に入りビジュアルコンソール"
+
+#: ../../godmode/reporting/map_builder.php:194
+#: ../../godmode/reporting/map_builder.php:204
 msgid "Not copied. Error copying data"
 msgstr "コピーできませんでした。データのコピーでエラーが発生しました。"
 
-#: ../../godmode/reporting/map_builder.php:207
+#: ../../godmode/reporting/map_builder.php:244
+#: ../../godmode/reporting/visual_console_favorite.php:69
+msgid "Group Recursion"
+msgstr "子グループを含む"
+
+#: ../../godmode/reporting/map_builder.php:258
 msgid "Map name"
 msgstr "マップ名"
 
-#: ../../godmode/reporting/map_builder.php:209
+#: ../../godmode/reporting/map_builder.php:260
 #: ../../enterprise/dashboard/widgets/top_n.php:82
 msgid "Items"
 msgstr "アイテム"
 
 #: ../../godmode/reporting/reporting_builder.item_editor.php:35
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:49
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:164
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:50
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:166
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:42
 msgid "Only table"
 msgstr "表のみ"
 
 #: ../../godmode/reporting/reporting_builder.item_editor.php:36
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:50
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:165
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:51
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:167
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:43
 msgid "Table & Graph"
 msgstr "表とグラフ"
 
 #: ../../godmode/reporting/reporting_builder.item_editor.php:37
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:51
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:166
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:52
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:168
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:44
 msgid "Only graph"
 msgstr "グラフのみ"
 
 #: ../../godmode/reporting/reporting_builder.item_editor.php:41
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1262
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1323
 #: ../../enterprise/dashboard/widgets/top_n.php:72
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:231
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:170
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1568
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:188
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:245
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:172
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1669
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:250
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:48
 msgid "Ascending"
 msgstr "昇順"
 
 #: ../../godmode/reporting/reporting_builder.item_editor.php:42
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1265
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1326
 #: ../../enterprise/dashboard/widgets/top_n.php:71
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:233
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:171
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1571
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:190
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:247
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:173
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1672
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:252
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:49
 msgid "Descending"
 msgstr "降順"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:611
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1185
+#: ../../godmode/reporting/reporting_builder.item_editor.php:628
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1255
 msgid "Item Editor"
 msgstr "アイテムエディタ"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:639
+#: ../../godmode/reporting/reporting_builder.item_editor.php:656
 msgid "Not valid"
 msgstr "不正です"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:644
+#: ../../godmode/reporting/reporting_builder.item_editor.php:661
 msgid ""
 "This type of report brings a lot of data loading, it is recommended to use "
 "it for scheduled reports and not for real-time view."
 msgstr "このタイプのレポートは多くのデータを読み込みます。リアルタイム表示ではなくスケジューリングでのレポートをお勧めします。"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:705
-#: ../../godmode/reporting/reporting_builder.list_items.php:305
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1244
-#: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:251
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:88
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:106
-msgid "Time lapse"
-msgstr "時間経過"
+#: ../../godmode/reporting/reporting_builder.item_editor.php:731
+msgid "Log number"
+msgstr "ログ番号"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:706
+#: ../../godmode/reporting/reporting_builder.item_editor.php:732
+msgid ""
+"Warning: this parameter limits the contents of the logs and affects the "
+"performance."
+msgstr "警告: このパラメータはログの内容を制限しパフォーマンスに影響します。"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:745
 msgid ""
 "This is the range, or period of time over which the report renders the "
 "information for this report type. For example, a week means data from a week "
@@ -13915,25 +14480,25 @@ msgid ""
 msgstr ""
 "これは、レポートがこのレポートタイプの情報をレンダリングする範囲または期間です。 たとえば、1週間は、今から1週間前のデータを意味します。 "
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:720
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:149
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1258
+#: ../../godmode/reporting/reporting_builder.item_editor.php:759
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:150
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1328
 msgid "Last value"
 msgstr "最新の値"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:721
-#: ../../godmode/reporting/reporting_builder.item_editor.php:3203
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:151
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:606
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1259
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:3108
+#: ../../godmode/reporting/reporting_builder.item_editor.php:760
+#: ../../godmode/reporting/reporting_builder.item_editor.php:3484
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:152
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:622
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1329
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:3326
 msgid ""
 "Warning: period 0 reports cannot be used to show information back in time. "
 "Information contained in this kind of reports will be always reporting the "
 "most recent information"
 msgstr "警告: 間隔 0 のレポートは過去の情報表示には利用できません。このレポートに含まれるのは、最新の情報のみとなります。"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:735
+#: ../../godmode/reporting/reporting_builder.item_editor.php:774
 #: ../../include/functions_netflow.php:1134
 #: ../../include/functions_netflow.php:1144
 #: ../../include/functions_netflow.php:1161
@@ -13943,418 +14508,472 @@ msgstr "警告: 間隔 0 のレポートは過去の情報表示には利用で
 msgid "Resolution"
 msgstr "解像度"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:766
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1292
+#: ../../godmode/reporting/reporting_builder.item_editor.php:805
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1362
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:486
 msgid "Projection period"
 msgstr "予想期間"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:776
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1306
+#: ../../godmode/reporting/reporting_builder.item_editor.php:815
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1376
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:473
 msgid "Data range"
 msgstr "データ範囲"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:787
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1320
+#: ../../godmode/reporting/reporting_builder.item_editor.php:826
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1390
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:226
 msgid "Only display wrong SLAs"
 msgstr "不正な SLA のみ表示"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:796
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1329
+#: ../../godmode/reporting/reporting_builder.item_editor.php:835
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1399
 msgid "Working time"
 msgstr "対象時間"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1011
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1684
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1719
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1880
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1908
-#: ../../enterprise/dashboard/widgets/top_n.php:179
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2078
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2267
-msgid "Select an Agent first"
-msgstr "最初にエージェントを選択してください。"
-
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1042
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1093
 msgid "Show modules"
 msgstr "モジュール表示"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1132
-#: ../../include/functions_graph.php:754
-#: ../../include/functions_graph.php:3949
-#: ../../include/functions_graph.php:3954
-#: ../../include/functions_graph.php:4672
-#: ../../include/functions_graph.php:4675
-#: ../../include/functions_graph.php:4678
-#: ../../enterprise/operation/inventory/inventory.php:227
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1183
+#: ../../include/functions_graph.php:856 ../../include/functions_graph.php:866
+#: ../../include/functions_graph.php:4631
+#: ../../include/functions_graph.php:5515
+#: ../../include/functions_graph.php:5518
+#: ../../include/functions_graph.php:5521
+#: ../../enterprise/operation/inventory/inventory.php:228
 msgid "Last"
 msgstr "最新"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1139
-#: ../../godmode/reporting/visual_console_builder.elements.php:78
-#: ../../godmode/reporting/visual_console_builder.elements.php:380
-#: ../../include/functions_reports.php:429
-#: ../../include/functions_reports.php:505
-#: ../../include/functions_reports.php:507
-#: ../../include/functions_visual_map_editor.php:254
-#: ../../include/functions_visual_map_editor.php:264
-#: ../../include/functions_reporting.php:5780
-#: ../../enterprise/dashboard/widgets/custom_graph.php:25
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1498
-msgid "Custom graph"
-msgstr "カスタムグラフ"
-
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1180
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1231
 msgid "Target server"
 msgstr "対象サーバ"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1201
-#: ../../godmode/setup/news.php:181 ../../godmode/setup/setup_visuals.php:705
-#: ../../include/functions_reports.php:603
-#: ../../include/functions_reporting.php:3878
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1252
+#: ../../godmode/setup/news.php:181 ../../godmode/setup/setup_visuals.php:771
+#: ../../include/functions_reporting.php:4400
+#: ../../include/functions_reports.php:604
 #: ../../enterprise/dashboard/widgets/post.php:25
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1524
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1603
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:321
 #: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:76
 #: ../../enterprise/include/functions_netflow_pdf.php:208
 msgid "Text"
 msgstr "文字列"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1208
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1539
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1259
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1627
 msgid "Custom SQL template"
 msgstr "カスタム SQL テンプレート"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1213
-#: ../../include/functions_reports.php:592
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1264
+#: ../../include/functions_reports.php:593
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:318
 msgid "SQL query"
 msgstr "SQL クエリ"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1229
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1405
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1407
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1274
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1613
+msgid "Max items"
+msgstr "最大アイテム"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1290
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1475
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1477
 msgid "Select server"
 msgstr "サーバ選択"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1238
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1534
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1299
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1622
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:497
 msgid "Serialized header"
 msgstr "ヘッダの並び"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1238
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1534
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1299
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1622
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:497
 msgid "The separator character is |"
 msgstr "デリミタは'|'です。"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1247
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1553
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1308
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1641
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:501
 msgid "Field separator"
 msgstr "フィールドセパレータ"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1247
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1553
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1308
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1641
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:501
 msgid "Separator for different fields in the serialized text chain"
 msgstr "連なったテキスト文字列でフィールドを分離するためのセパレータ"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1251
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1557
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1312
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1645
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:505
 msgid "Line separator"
 msgstr "行セパレータ"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1251
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1557
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1312
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1645
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:505
 msgid ""
 "Separator in different lines (composed by fields) of the serialized text "
 "chain"
 msgstr "(複数フィールドからなる)複数行のテキスト文字列をまたぐセパレータ"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1255
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:220
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1561
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1316
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:221
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1649
 msgid "Group by agent"
 msgstr "エージェント毎のグループ"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1268
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1329
 #: ../../enterprise/dashboard/widgets/top_n.php:73
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:235
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1574
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:192
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:249
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1675
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:254
 msgid "By agent name"
 msgstr "エージェント名で"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1276
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1337
 #: ../../enterprise/dashboard/widgets/top_n.php:67
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:241
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1582
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:255
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1683
 msgid "Quantity (n)"
 msgstr "数量(n)"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1286
-#: ../../operation/agentes/ver_agente.php:1101
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1347
+#: ../../operation/agentes/ver_agente.php:1195
 #: ../../enterprise/dashboard/widgets/top_n.php:75
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:249
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1587
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:263
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1688
 msgid "Display"
 msgstr "表示"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1293
-#: ../../include/functions_graph.php:755 ../../include/functions_graph.php:758
-#: ../../include/functions_graph.php:759 ../../include/functions_graph.php:760
-#: ../../include/functions_graph.php:763
-#: ../../include/functions_graph.php:1437
-#: ../../include/functions_graph.php:3949
-#: ../../include/functions_graph.php:3954
-#: ../../include/functions_graph.php:4672
-#: ../../include/functions_graph.php:4675
-#: ../../include/functions_graph.php:4678
-#: ../../include/functions_reporting.php:961
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1354
+#: ../../include/functions_reporting.php:1044
+#: ../../include/functions_graph.php:857 ../../include/functions_graph.php:860
+#: ../../include/functions_graph.php:861 ../../include/functions_graph.php:862
+#: ../../include/functions_graph.php:867 ../../include/functions_graph.php:870
+#: ../../include/functions_graph.php:871 ../../include/functions_graph.php:872
+#: ../../include/functions_graph.php:878 ../../include/functions_graph.php:897
+#: ../../include/functions_graph.php:1603
+#: ../../include/functions_graph.php:4631
+#: ../../include/functions_graph.php:5515
+#: ../../include/functions_graph.php:5518
+#: ../../include/functions_graph.php:5521
+#: ../../include/functions_reporting_html.php:2705
 #: ../../enterprise/dashboard/widgets/top_n.php:482
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1594
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1695
+#: ../../enterprise/include/functions_reporting_csv.php:531
+#: ../../enterprise/include/functions_reporting_pdf.php:910
 msgid "Avg"
 msgstr "平均"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1300
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1361
 #: ../../mobile/operation/module_graph.php:418
-#: ../../operation/agentes/stat_win.php:383
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:246
+#: ../../operation/agentes/stat_win.php:408
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:354
 msgid "Time compare (Overlapped)"
 msgstr "時間比較 (重ね合わせ)"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1309
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1601
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:256
-msgid "Only average"
-msgstr "平均のみ"
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1374
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1706
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:374
+msgid "Full resolution graph (TIP)"
+msgstr "詳細グラフ (TIP)"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1326
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:279
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1615
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1375
+msgid "This option may cause performance issues."
+msgstr "このオプションはパフォーマンス問題が発生する可能性があります。"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1392
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:293
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1721
 msgid "Condition"
 msgstr "状態"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1331
-#: ../../include/functions_reporting.php:1746
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:282
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1618
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1397
+#: ../../include/functions_reporting.php:1835
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:296
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1724
 msgid "Everything"
 msgstr "すべて"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1332
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1398
 msgid "Greater or equal (>=)"
 msgstr "以上 (>=)"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1333
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1399
 msgid "Less or equal (<=)"
 msgstr "以下 (<=)"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1334
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1400
 msgid "Less (<)"
 msgstr "未満 (<)"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1335
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1401
 msgid "Greater (>)"
 msgstr "超えて (>)"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1336
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1402
 msgid "Equal (=)"
 msgstr "同じ (=)"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1337
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1403
 msgid "Not equal (!=)"
 msgstr "異なる (!=)"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1338
-#: ../../include/functions_db.php:1529
-#: ../../include/functions_reporting_html.php:496
-#: ../../include/functions_reporting_html.php:575
-#: ../../include/functions_reporting_html.php:675
-#: ../../include/functions_reporting_html.php:2049
-#: ../../include/functions_reporting_html.php:2531
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1404
+#: ../../include/functions_db.php:1594
+#: ../../include/functions_reporting_html.php:499
+#: ../../include/functions_reporting_html.php:578
+#: ../../include/functions_reporting_html.php:678
+#: ../../include/functions_reporting_html.php:2052
+#: ../../include/functions_reporting_html.php:2597
 #: ../../enterprise/dashboard/widgets/maps_status.php:74
 #: ../../enterprise/extensions/backup/main.php:163
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:288
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1624
-#: ../../enterprise/include/functions_reporting.php:1282
-#: ../../enterprise/include/functions_reporting.php:2074
-#: ../../enterprise/include/functions_reporting.php:2259
-#: ../../enterprise/include/functions_reporting.php:2851
-#: ../../enterprise/include/functions_reporting.php:3028
-#: ../../enterprise/include/functions_reporting.php:3744
-#: ../../enterprise/include/functions_reporting.php:4440
-#: ../../enterprise/include/functions_reporting.php:4782
-#: ../../enterprise/include/functions_reporting_csv.php:964
-#: ../../enterprise/include/functions_reporting_csv.php:1011
-#: ../../enterprise/include/functions_reporting_pdf.php:1322
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:302
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1730
+#: ../../enterprise/include/functions_reporting.php:1668
+#: ../../enterprise/include/functions_reporting.php:2476
+#: ../../enterprise/include/functions_reporting.php:2661
+#: ../../enterprise/include/functions_reporting.php:3253
+#: ../../enterprise/include/functions_reporting.php:3430
+#: ../../enterprise/include/functions_reporting.php:4162
+#: ../../enterprise/include/functions_reporting.php:4858
+#: ../../enterprise/include/functions_reporting.php:5200
+#: ../../enterprise/include/functions_reporting_csv.php:1076
+#: ../../enterprise/include/functions_reporting_csv.php:1123
 #: ../../enterprise/include/functions_reporting_pdf.php:1403
-#: ../../enterprise/include/functions_reporting_pdf.php:1502
-#: ../../enterprise/include/functions_reporting_pdf.php:1635
-#: ../../enterprise/include/functions_reporting_pdf.php:2056
-#: ../../enterprise/include/functions_reporting_pdf.php:2106
-#: ../../enterprise/include/functions_services.php:1700
-#: ../../enterprise/operation/agentes/ux_console_view.php:101
-#: ../../enterprise/operation/agentes/ux_console_view.php:263
+#: ../../enterprise/include/functions_reporting_pdf.php:1484
+#: ../../enterprise/include/functions_reporting_pdf.php:1583
+#: ../../enterprise/include/functions_reporting_pdf.php:1716
+#: ../../enterprise/include/functions_reporting_pdf.php:2137
+#: ../../enterprise/include/functions_reporting_pdf.php:2187
+#: ../../enterprise/include/functions_services.php:1789
+#: ../../enterprise/include/functions_ux_console.php:448
+#: ../../enterprise/operation/agentes/ux_console_view.php:201
+#: ../../enterprise/operation/agentes/ux_console_view.php:364
+#: ../../enterprise/operation/agentes/wux_console_view.php:331
 msgid "OK"
 msgstr "OK"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1339
-#: ../../include/functions_reporting_html.php:2055
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:290
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1626
-#: ../../enterprise/include/functions_reporting_pdf.php:2109
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1405
+#: ../../include/functions_reporting_html.php:2058
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:304
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1732
+#: ../../enterprise/include/functions_reporting_pdf.php:2190
 msgid "Not OK"
 msgstr "NG"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1361
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:296
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1633
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1427
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:310
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1739
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:232
 msgid "Show graph"
 msgstr "グラフ表示"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1369
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1640
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1435
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1746
 msgid "Show address instead module name."
 msgstr "モジュール名の代わりにアドレスを表示"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1370
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1641
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:219
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1436
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1747
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:281
 msgid "Show the main address of agent."
 msgstr "エージェントのメインアドレスを表示"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1382
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:304
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1653
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:202
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1448
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:318
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1759
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:264
 msgid "Show resume"
 msgstr "復旧を表示"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1382
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1448
 msgid ""
 "Show a summary chart with max, min and average number of total modules at "
 "the end of the report and Checks."
 msgstr "最新のレポートおよび監視時点のトータルモジュール数の最大、最小、平均の概要グラフを表示します。"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1392
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1662
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:277
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1458
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1768
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:395
 msgid "Show Summary group"
 msgstr "グループ概要を表示"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1425
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1696
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:307
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1491
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1802
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:425
 msgid "Event Status"
 msgstr "イベントの状態"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1437
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1708
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:318
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1503
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1814
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:436
 msgid "Event graphs"
 msgstr "イベントグラフ"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1441
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1712
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:322
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1507
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1818
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:440
 msgid "By agent"
 msgstr "エージェントで分類"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1447
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1718
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:328
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1513
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1824
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:446
 msgid "By user validator"
 msgstr "ユーザで分類"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1453
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1724
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:334
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1519
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1830
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:452
 msgid "By criticity"
 msgstr "重要度で分類"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1459
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1730
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:340
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1525
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1836
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:458
 msgid "Validated vs unvalidated"
 msgstr "承諾済み・未承諾で分類"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1467
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1738
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1534
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1872
+msgid "Query History Database"
+msgstr "ヒストリデータベース問い合わせ"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1543
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1844
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:509
 msgid "Show in two columns"
 msgstr "2カラムで表示"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1473
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1744
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1548
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1850
+msgid "Height (dynamic graphs)"
+msgstr "高さ(動的グラフ)"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1555
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:230
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1655
+msgid "Show in the same row"
+msgstr "同一行に表示"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1556
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:231
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1656
+msgid "Show one module per row with all its operations"
+msgstr "すべての操作で行ごとに1つのモジュールを表示"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1567
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1855
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:221
 msgid "SLA items sorted by fulfillment value"
 msgstr "実データによりソートしたSLAアイテム"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1478
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1749
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1572
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1860
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:514
 msgid "Show in landscape"
 msgstr "横向きで表示"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1489
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1760
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1583
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1881
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:215
 msgid "Hide not init agents"
 msgstr "未初期化エージェントを隠す"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1548
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1949
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1613
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2017
+msgid "Calculate for custom intervals"
+msgstr "時間間隔の計算"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1624
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2028
+msgid "Time lapse intervals"
+msgstr "時間経過間隔"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1625
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2029
+msgid ""
+"Lapses of time in which the period is divided to make more precise "
+"calculations\n"
+msgstr "より正確な計算を行うための経過時間の期間分割\n"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1657
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2068
+msgid "Table only"
+msgstr "表のみ"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1660
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2071
+msgid "Graph only"
+msgstr "グラフのみ"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1663
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2074
+msgid "Graph and table"
+msgstr "グラフと表"
+
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1714
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2134
 msgid "SLA Min. (value)"
 msgstr "SLA 最小値"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1549
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1950
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1715
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2135
 msgid "SLA Max. (value)"
 msgstr "SLA 最大値"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1550
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1951
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1716
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2136
 msgid "SLA Limit (%)"
 msgstr "SLA 制限 (%)"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1559
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1725
 msgid "Please save the SLA for start to add items in this list."
 msgstr "このリストにアイテムを追加するには、最初に SLA を保存してください。"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1731
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1897
 msgid "rate"
 msgstr "律"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1732
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1898
 #: ../../enterprise/dashboard/widgets/top_n.php:115
 #: ../../enterprise/dashboard/widgets/top_n.php:298
 #: ../../enterprise/include/ajax/top_n_widget.ajax.php:74
 msgid "max"
 msgstr "最大"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1733
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1899
 #: ../../enterprise/dashboard/widgets/top_n.php:116
 #: ../../enterprise/dashboard/widgets/top_n.php:299
 #: ../../enterprise/include/ajax/top_n_widget.ajax.php:75
 msgid "min"
 msgstr "最小"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1734
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1900
 #: ../../enterprise/dashboard/widgets/top_n.php:117
 #: ../../enterprise/dashboard/widgets/top_n.php:300
 #: ../../enterprise/include/ajax/top_n_widget.ajax.php:76
 msgid "sum"
 msgstr "合計"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1754
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1920
 msgid ""
 "Please be careful, when the module have diferent intervals in their life, "
 "the summatory maybe get bad result."
 msgstr "モジュールの間隔が異なる場合、合計は正しい値にならない場合があることに注意してください。"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:1768
+#: ../../godmode/reporting/reporting_builder.item_editor.php:1934
 msgid "Please save the report to start adding items into the list."
 msgstr "リストに項目を追加する前にレポートを保存してください。"
 
-#: ../../godmode/reporting/reporting_builder.item_editor.php:2077
-#: ../../godmode/reporting/reporting_builder.item_editor.php:2097
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2274
+#: ../../godmode/reporting/reporting_builder.item_editor.php:2294
 msgid "Please select Agent"
 msgstr "エージェントを選択してください"
 
@@ -14362,7 +14981,7 @@ msgstr "エージェントを選択してください"
 #: ../../godmode/reporting/visual_console_builder.elements.php:80
 #: ../../godmode/snmpconsole/snmp_alert.php:966
 #: ../../godmode/snmpconsole/snmp_alert.php:1148
-#: ../../include/functions_visual_map_editor.php:500
+#: ../../include/functions_visual_map_editor.php:659
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:280
 msgid "Position"
 msgstr "位置"
@@ -14385,69 +15004,51 @@ msgstr "上へ"
 msgid "Descent"
 msgstr "下へ"
 
-#: ../../godmode/reporting/reporting_builder.list_items.php:314
-#: ../../godmode/reporting/reporting_builder.list_items.php:514
-#: ../../enterprise/extensions/ipam/ipam_network.php:269
-#: ../../enterprise/godmode/alerts/alert_events_list.php:420
-#: ../../enterprise/godmode/alerts/alert_events_rules.php:406
-#: ../../enterprise/godmode/reporting/reporting_builder.template_list_item.php:217
-msgid "Sort"
-msgstr "並べ替え"
-
 #: ../../godmode/reporting/reporting_builder.list_items.php:320
-#: ../../include/functions_custom_graphs.php:226
+#: ../../include/functions_custom_graphs.php:233
 msgid "No items."
 msgstr "アイテムがありません。"
 
-#: ../../godmode/reporting/reporting_builder.list_items.php:500
-#: ../../godmode/reporting/reporting_builder.list_items.php:505
-msgid "Sort items"
-msgstr "アイテムの並び替え"
-
-#: ../../godmode/reporting/reporting_builder.list_items.php:507
+#: ../../godmode/reporting/reporting_builder.list_items.php:513
 msgid "Sort selected items from position: "
 msgstr "選択したアイテムを次の位置から並び替え: "
 
-#: ../../godmode/reporting/reporting_builder.list_items.php:509
+#: ../../godmode/reporting/reporting_builder.list_items.php:515
 msgid "Move before to"
 msgstr "この前に移動:"
 
-#: ../../godmode/reporting/reporting_builder.list_items.php:509
+#: ../../godmode/reporting/reporting_builder.list_items.php:515
 msgid "Move after to"
 msgstr "この後ろに移動:"
 
-#: ../../godmode/reporting/reporting_builder.list_items.php:531
-#: ../../godmode/reporting/reporting_builder.list_items.php:536
+#: ../../godmode/reporting/reporting_builder.list_items.php:537
+#: ../../godmode/reporting/reporting_builder.list_items.php:542
 msgid "Delete items"
 msgstr "アイテムの削除"
 
-#: ../../godmode/reporting/reporting_builder.list_items.php:538
+#: ../../godmode/reporting/reporting_builder.list_items.php:544
 msgid "Delete selected items from position: "
 msgstr "次の場所から選択したアイテムを削除する: "
 
-#: ../../godmode/reporting/reporting_builder.list_items.php:540
+#: ../../godmode/reporting/reporting_builder.list_items.php:546
 msgid "Delete above to"
 msgstr "次の上を削除"
 
-#: ../../godmode/reporting/reporting_builder.list_items.php:540
+#: ../../godmode/reporting/reporting_builder.list_items.php:546
 msgid "Delete below to"
 msgstr "次の下を削除"
 
-#: ../../godmode/reporting/reporting_builder.list_items.php:578
+#: ../../godmode/reporting/reporting_builder.list_items.php:584
 msgid ""
 "Are you sure to sort the items into the report?\\nThis action change the "
 "sorting of items into data base."
 msgstr "レポートのアイテムを並び替えますか。\\nこの操作はデータベース内のアイテムの並びを変更します。"
 
-#: ../../godmode/reporting/reporting_builder.list_items.php:599
-msgid "Please select any item to order"
-msgstr "並び替えるアイテムを選択してください"
-
-#: ../../godmode/reporting/reporting_builder.list_items.php:629
+#: ../../godmode/reporting/reporting_builder.list_items.php:635
 msgid "Are you sure to delete the items into the report?\\n"
 msgstr "レポートのアイテムを削除しますがよろしいですか?\\n"
 
-#: ../../godmode/reporting/reporting_builder.list_items.php:651
+#: ../../godmode/reporting/reporting_builder.list_items.php:657
 msgid "Please select any item to delete"
 msgstr "削除するアイテムを選択してください"
 
@@ -14478,128 +15079,129 @@ msgstr ""
 msgid "Non interactive report"
 msgstr "非対話型レポート"
 
-#: ../../godmode/reporting/reporting_builder.php:80
+#: ../../godmode/reporting/reporting_builder.php:114
 msgid ""
 "Your report has been planned, and the system will email you a PDF with the "
 "report as soon as its finished"
 msgstr "レポートが予定されました。準備完了次第 PDF のレポートをメール送信します。"
 
-#: ../../godmode/reporting/reporting_builder.php:81
+#: ../../godmode/reporting/reporting_builder.php:115
 msgid "An error has ocurred"
 msgstr "エラーが発生しました"
 
-#: ../../godmode/reporting/reporting_builder.php:335
-#: ../../godmode/reporting/reporting_builder.php:1902
-#: ../../godmode/reporting/reporting_builder.php:1954
+#: ../../godmode/reporting/reporting_builder.php:369
+#: ../../godmode/reporting/reporting_builder.php:1998
+#: ../../godmode/reporting/reporting_builder.php:2050
 msgid "Reports list"
 msgstr "レポート一覧"
 
-#: ../../godmode/reporting/reporting_builder.php:346
-#: ../../godmode/reporting/reporting_builder.php:368
-#: ../../godmode/reporting/reporting_builder.php:1911
-#: ../../operation/menu.php:242
+#: ../../godmode/reporting/reporting_builder.php:380
+#: ../../godmode/reporting/reporting_builder.php:402
+#: ../../godmode/reporting/reporting_builder.php:2007
+#: ../../operation/menu.php:279
 #: ../../operation/reporting/custom_reporting.php:27
 msgid "Custom reporting"
 msgstr "カスタムレポート"
 
-#: ../../godmode/reporting/reporting_builder.php:435
+#: ../../godmode/reporting/reporting_builder.php:469
 msgid "Free text for search: "
 msgstr "文字列検索: "
 
-#: ../../godmode/reporting/reporting_builder.php:436
+#: ../../godmode/reporting/reporting_builder.php:470
 msgid "Search by report name or description, list matches."
 msgstr "レポート名または説明で検索したリスト。"
 
-#: ../../godmode/reporting/reporting_builder.php:446
+#: ../../godmode/reporting/reporting_builder.php:480
 msgid "Show Option"
 msgstr "オプション表示"
 
-#: ../../godmode/reporting/reporting_builder.php:532
+#: ../../godmode/reporting/reporting_builder.php:566
 #: ../../operation/reporting/custom_reporting.php:38
 #: ../../operation/search_reports.php:38
 #: ../../enterprise/extensions/cron/functions.php:47
-#: ../../enterprise/extensions/cron/main.php:250
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:271
-#: ../../enterprise/include/functions_reporting_csv.php:1503
-#: ../../enterprise/include/functions_reporting_csv.php:1507
+#: ../../enterprise/extensions/cron/main.php:319
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:272
+#: ../../enterprise/include/functions_reporting_csv.php:1615
+#: ../../enterprise/include/functions_reporting_csv.php:1619
 msgid "Report name"
 msgstr "レポート名"
 
-#: ../../godmode/reporting/reporting_builder.php:534
+#: ../../godmode/reporting/reporting_builder.php:568
 #: ../../operation/reporting/custom_reporting.php:40
 #: ../../operation/search_reports.php:40
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:289
 msgid "HTML"
 msgstr "HTML"
 
-#: ../../godmode/reporting/reporting_builder.php:535
+#: ../../godmode/reporting/reporting_builder.php:569
 #: ../../operation/reporting/custom_reporting.php:41
 #: ../../operation/search_reports.php:41
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:290
 msgid "XML"
 msgstr "XML"
 
-#: ../../godmode/reporting/reporting_builder.php:554
-#: ../../enterprise/dashboard/main_dashboard.php:298
+#: ../../godmode/reporting/reporting_builder.php:588
+#: ../../enterprise/dashboard/main_dashboard.php:314
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:287
 msgid "Private"
 msgstr "非公開"
 
-#: ../../godmode/reporting/reporting_builder.php:610
+#: ../../godmode/reporting/reporting_builder.php:648
 msgid "This report exceeds the item limit for realtime operations"
 msgstr "このレポートはリアルタイム処理のアイテム数制限を超過しています"
 
-#: ../../godmode/reporting/reporting_builder.php:615
+#: ../../godmode/reporting/reporting_builder.php:653
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:342
 msgid "HTML view"
 msgstr "HTML 表示"
 
-#: ../../godmode/reporting/reporting_builder.php:616
+#: ../../godmode/reporting/reporting_builder.php:654
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:344
 msgid "Export to XML"
 msgstr "XML へエクスポート"
 
-#: ../../godmode/reporting/reporting_builder.php:727
-#: ../../include/functions_reporting.php:1631
+#: ../../godmode/reporting/reporting_builder.php:771
+#: ../../include/functions_reporting.php:1720
 #: ../../enterprise/operation/agentes/agent_inventory.php:242
-#: ../../enterprise/operation/inventory/inventory.php:253
-#: ../../enterprise/operation/log/log_viewer.php:428
+#: ../../enterprise/operation/inventory/inventory.php:259
+#: ../../enterprise/operation/log/log_viewer.php:436
+#: ../../enterprise/operation/log/log_viewer.php:444
 msgid "No data found."
 msgstr "データがありません。"
 
-#: ../../godmode/reporting/reporting_builder.php:735
+#: ../../godmode/reporting/reporting_builder.php:779
 msgid "Create report"
 msgstr "レポートの作成"
 
-#: ../../godmode/reporting/reporting_builder.php:1960
+#: ../../godmode/reporting/reporting_builder.php:2056
 #: ../../operation/reporting/reporting_viewer.php:86
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:115
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:138
 msgid "List items"
 msgstr "アイテム一覧"
 
-#: ../../godmode/reporting/reporting_builder.php:1963
+#: ../../godmode/reporting/reporting_builder.php:2059
 #: ../../operation/reporting/reporting_viewer.php:90
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:108
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:143
-#: ../../enterprise/include/functions_reporting.php:6192
-#: ../../enterprise/include/functions_reporting.php:6242
+#: ../../enterprise/include/functions_reporting.php:6753
+#: ../../enterprise/include/functions_reporting.php:6803
 msgid "Item editor"
 msgstr "アイテム編集"
 
-#: ../../godmode/reporting/reporting_builder.php:1972
+#: ../../godmode/reporting/reporting_builder.php:2068
 #: ../../operation/reporting/reporting_viewer.php:98
 msgid "View report"
 msgstr "レポート参照"
 
-#: ../../godmode/reporting/reporting_builder.php:2020
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1164
+#: ../../godmode/reporting/reporting_builder.php:2116
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1234
 msgid "Successfull action"
 msgstr "処理に成功しました。"
 
-#: ../../godmode/reporting/reporting_builder.php:2020
-msgid "Unsuccessfull action<br><br>"
-msgstr "実行に失敗<br><br>"
+#: ../../godmode/reporting/reporting_builder.php:2116
+msgid "Unsuccessful action<br><br>"
+msgstr "アクション失敗<br><br>"
 
 #: ../../godmode/reporting/visual_console_builder.data.php:91
 msgid "Create visual console"
@@ -14608,6 +15210,7 @@ msgstr "ビジュアルコンソールの作成"
 #: ../../godmode/reporting/visual_console_builder.data.php:102
 #: ../../godmode/setup/os.builder.php:34
 #: ../../enterprise/godmode/agentes/collections.data.php:318
+#: ../../enterprise/meta/include/functions_autoprovision.php:470
 msgid "Name:"
 msgstr "名前:"
 
@@ -14617,40 +15220,44 @@ msgid ""
 "map name in main menu"
 msgstr "最初の文字には [ または ( を使ってください。例えば、マップ名をメインメニューに表示するには、'[*] Map name'  です。"
 
-#: ../../godmode/reporting/visual_console_builder.data.php:122
+#: ../../godmode/reporting/visual_console_builder.data.php:128
 #: ../../enterprise/godmode/agentes/collections.data.php:358
 msgid "Group:"
 msgstr "グループ:"
 
-#: ../../godmode/reporting/visual_console_builder.data.php:139
+#: ../../godmode/reporting/visual_console_builder.data.php:145
 #: ../../godmode/reporting/visual_console_builder.elements.php:111
 #: ../../include/functions_visual_map_editor.php:53
-#: ../../include/functions_visual_map_editor.php:359
+#: ../../include/functions_visual_map_editor.php:473
 #: ../../enterprise/dashboard/widget.php:65
 msgid "Background"
 msgstr "背景"
 
-#: ../../godmode/reporting/visual_console_builder.data.php:142
+#: ../../godmode/reporting/visual_console_builder.data.php:148
 msgid "Background image"
 msgstr "背景画像"
 
-#: ../../godmode/reporting/visual_console_builder.data.php:144
-#: ../../include/functions_visual_map_editor.php:237
+#: ../../godmode/reporting/visual_console_builder.data.php:150
+#: ../../include/functions_visual_map_editor.php:283
 msgid "Background color"
 msgstr "背景色"
 
-#: ../../godmode/reporting/visual_console_builder.data.php:164
+#: ../../godmode/reporting/visual_console_builder.data.php:170
 msgid "Layout size"
 msgstr "レイアウトサイズ"
 
-#: ../../godmode/reporting/visual_console_builder.data.php:168
+#: ../../godmode/reporting/visual_console_builder.data.php:174
 msgid "Set custom size"
 msgstr "カスタムサイズを設定"
 
-#: ../../godmode/reporting/visual_console_builder.data.php:177
+#: ../../godmode/reporting/visual_console_builder.data.php:183
 msgid "Get default image size"
 msgstr "デフォルトのイメージサイズ取得"
 
+#: ../../godmode/reporting/visual_console_builder.data.php:186
+msgid "Favourite visual console"
+msgstr "お気に入りのビジュアルコンソール"
+
 #: ../../godmode/reporting/visual_console_builder.editor.php:134
 msgid "Min allowed size is 1024x768"
 msgstr "最小サイズは 1024x768 です"
@@ -14658,12 +15265,12 @@ msgstr "最小サイズは 1024x768 です"
 #: ../../godmode/reporting/visual_console_builder.editor.php:138
 #: ../../godmode/reporting/visual_console_builder.editor.php:143
 #: ../../godmode/reporting/visual_console_builder.editor.php:148
-#: ../../enterprise/dashboard/main_dashboard.php:348
+#: ../../enterprise/dashboard/main_dashboard.php:373
 msgid "Action in progress"
 msgstr "アクション実行中"
 
 #: ../../godmode/reporting/visual_console_builder.editor.php:139
-#: ../../enterprise/dashboard/main_dashboard.php:349
+#: ../../enterprise/dashboard/main_dashboard.php:374
 msgid "Loading in progress"
 msgstr "読み込み中"
 
@@ -14677,7 +15284,7 @@ msgstr "削除中"
 
 #: ../../godmode/reporting/visual_console_builder.elements.php:78
 #: ../../godmode/reporting/visual_console_builder.wizard.php:118
-#: ../../include/functions_visual_map_editor.php:198
+#: ../../include/functions_visual_map_editor.php:204
 #: ../../include/functions_filemanager.php:682
 msgid "Image"
 msgstr "画像"
@@ -14687,21 +15294,22 @@ msgid "Width x Height<br>Max value"
 msgstr "幅 x 高さ<br>最大値"
 
 #: ../../godmode/reporting/visual_console_builder.elements.php:81
-#: ../../include/functions_visual_map_editor.php:540
+#: ../../include/functions_visual_map_editor.php:701
 msgid "Map linked"
 msgstr "リンク先マップ"
 
 #: ../../godmode/reporting/visual_console_builder.elements.php:86
-#: ../../mobile/operation/agents.php:324
+#: ../../mobile/operation/agents.php:347
 #: ../../enterprise/godmode/admin_access_logs.php:25
-#: ../../enterprise/godmode/policies/policy_agents.php:381
+#: ../../enterprise/godmode/policies/policy_agents.php:576
+#: ../../enterprise/godmode/policies/policy_agents.php:820
 msgid "A."
 msgstr "A."
 
 #: ../../godmode/reporting/visual_console_builder.elements.php:138
 #: ../../godmode/reporting/visual_console_builder.wizard.php:104
 #: ../../include/functions_visual_map_editor.php:54
-#: ../../include/functions_visual_map_editor.php:650
+#: ../../include/functions_visual_map_editor.php:864
 msgid "Static Graph"
 msgstr "静的グラフ"
 
@@ -14714,167 +15322,172 @@ msgid "Percentile Bubble"
 msgstr "パーセント円表示"
 
 #: ../../godmode/reporting/visual_console_builder.elements.php:153
-#: ../../include/functions_visual_map_editor.php:652
+#: ../../include/functions_visual_map_editor.php:866
 #: ../../mobile/operation/events.php:506
 msgid "Module Graph"
 msgstr "モジュールグラフ"
 
 #: ../../godmode/reporting/visual_console_builder.elements.php:158
-#: ../../include/functions_visual_map.php:2753
-#: ../../include/functions_visual_map_editor.php:653
+#: ../../include/functions_visual_map.php:3914
+#: ../../include/functions_visual_map_editor.php:57
+#: ../../include/functions_visual_map_editor.php:869
+msgid "Auto SLA Graph"
+msgstr "自動 SLA グラフ"
+
+#: ../../godmode/reporting/visual_console_builder.elements.php:163
+#: ../../include/functions_visual_map.php:3935
+#: ../../include/functions_visual_map_editor.php:870
 msgid "Simple Value"
 msgstr "数値"
 
-#: ../../godmode/reporting/visual_console_builder.elements.php:163
+#: ../../godmode/reporting/visual_console_builder.elements.php:168
 msgid "Simple Value (Process Max)"
 msgstr "値 (最大値)"
 
-#: ../../godmode/reporting/visual_console_builder.elements.php:168
+#: ../../godmode/reporting/visual_console_builder.elements.php:173
 msgid "Simple Value (Process Min)"
 msgstr "値 (最小値)"
 
-#: ../../godmode/reporting/visual_console_builder.elements.php:173
+#: ../../godmode/reporting/visual_console_builder.elements.php:178
 msgid "Simple Value (Process Avg)"
 msgstr "値 (平均値)"
 
-#: ../../godmode/reporting/visual_console_builder.elements.php:188
-#: ../../include/functions_visual_map.php:2736
-#: ../../include/functions_visual_map_editor.php:62
-#: ../../include/functions_visual_map_editor.php:657
+#: ../../godmode/reporting/visual_console_builder.elements.php:193
+#: ../../include/functions_visual_map.php:3898
+#: ../../include/functions_visual_map_editor.php:64
+#: ../../include/functions_visual_map_editor.php:875
 msgid "Box"
 msgstr "ボックス"
 
-#: ../../godmode/reporting/visual_console_builder.elements.php:226
-#: ../../godmode/reporting/visual_console_builder.elements.php:619
+#: ../../godmode/reporting/visual_console_builder.elements.php:231
+#: ../../godmode/reporting/visual_console_builder.elements.php:632
 msgid "Edit label"
 msgstr "ラベル編集"
 
-#: ../../godmode/reporting/visual_console_builder.php:159
+#: ../../godmode/reporting/visual_console_builder.php:162
 msgid "This file isn't image"
 msgstr "このファイルは画像ではありません"
 
-#: ../../godmode/reporting/visual_console_builder.php:160
+#: ../../godmode/reporting/visual_console_builder.php:163
 msgid "This file isn't image."
 msgstr "このファイルは画像ではありません。"
 
-#: ../../godmode/reporting/visual_console_builder.php:164
-#: ../../godmode/reporting/visual_console_builder.php:165
+#: ../../godmode/reporting/visual_console_builder.php:167
+#: ../../godmode/reporting/visual_console_builder.php:168
 msgid "File already are exists."
 msgstr "ファイルが既に存在します。"
 
-#: ../../godmode/reporting/visual_console_builder.php:171
-#: ../../godmode/reporting/visual_console_builder.php:172
+#: ../../godmode/reporting/visual_console_builder.php:174
+#: ../../godmode/reporting/visual_console_builder.php:175
 msgid "The file have not image extension."
 msgstr "画像ファイルの拡張子ではありません。"
 
-#: ../../godmode/reporting/visual_console_builder.php:183
-#: ../../godmode/reporting/visual_console_builder.php:184
-#: ../../godmode/reporting/visual_console_builder.php:191
+#: ../../godmode/reporting/visual_console_builder.php:186
+#: ../../godmode/reporting/visual_console_builder.php:187
 #: ../../godmode/reporting/visual_console_builder.php:194
+#: ../../godmode/reporting/visual_console_builder.php:197
 msgid "Problems with move file to target."
 msgstr "対象へのファイルの移動で問題が発生しました。"
 
-#: ../../godmode/reporting/visual_console_builder.php:223
+#: ../../godmode/reporting/visual_console_builder.php:222
 msgid "Successfully update."
 msgstr "更新しました。"
 
-#: ../../godmode/reporting/visual_console_builder.php:235
+#: ../../godmode/reporting/visual_console_builder.php:234
 msgid "Could not be update."
 msgstr "更新に失敗しました。"
 
-#: ../../godmode/reporting/visual_console_builder.php:250
-#: ../../enterprise/meta/screens/screens.visualmap.php:120
+#: ../../godmode/reporting/visual_console_builder.php:248
 msgid "Successfully created."
 msgstr "作成しました。"
 
-#: ../../godmode/reporting/visual_console_builder.php:263
-#: ../../enterprise/meta/screens/screens.visualmap.php:123
+#: ../../godmode/reporting/visual_console_builder.php:261
 msgid "Could not be created."
 msgstr "作成に失敗しました。"
 
-#: ../../godmode/reporting/visual_console_builder.php:304
+#: ../../godmode/reporting/visual_console_builder.php:302
 msgid "Successfully multiple delete."
 msgstr "複数削除をしました。"
 
-#: ../../godmode/reporting/visual_console_builder.php:305
-msgid "Unsuccessfull multiple delete."
-msgstr "複数削除に失敗しました。"
+#: ../../godmode/reporting/visual_console_builder.php:303
+msgid "Unsuccessful multiple delete."
+msgstr "複数削除失敗。"
 
-#: ../../godmode/reporting/visual_console_builder.php:387
+#: ../../godmode/reporting/visual_console_builder.php:386
 msgid "Successfully delete."
 msgstr "削除しました。"
 
-#: ../../godmode/reporting/visual_console_builder.php:662
+#: ../../godmode/reporting/visual_console_builder.php:664
 #: ../../operation/visual_console/pure_ajax.php:96
 #: ../../operation/visual_console/render_view.php:96
-#: ../../enterprise/meta/screens/screens.visualmap.php:196
+#: ../../enterprise/meta/screens/screens.visualmap.php:136
 msgid "Visual consoles list"
 msgstr "ビジュアルコンソール一覧"
 
-#: ../../godmode/reporting/visual_console_builder.php:665
+#: ../../godmode/reporting/visual_console_builder.php:667
 #: ../../operation/gis_maps/render_view.php:128
 #: ../../operation/visual_console/pure_ajax.php:105
 #: ../../operation/visual_console/render_view.php:108
-#: ../../enterprise/meta/screens/screens.visualmap.php:188
+#: ../../enterprise/meta/screens/screens.visualmap.php:128
 msgid "Show link to public Visual Console"
 msgstr "パブリックビジュアルコンソール表示"
 
-#: ../../godmode/reporting/visual_console_builder.php:671
+#: ../../godmode/reporting/visual_console_builder.php:673
 #: ../../operation/visual_console/pure_ajax.php:113
 #: ../../operation/visual_console/render_view.php:116
-#: ../../enterprise/meta/screens/screens.visualmap.php:177
+#: ../../enterprise/meta/screens/screens.visualmap.php:117
 msgid "List elements"
 msgstr "エレメント一覧"
 
-#: ../../godmode/reporting/visual_console_builder.php:676
+#: ../../godmode/reporting/visual_console_builder.php:678
 #: ../../operation/visual_console/pure_ajax.php:118
 #: ../../operation/visual_console/render_view.php:121
 msgid "Services wizard"
 msgstr "サービスウィザード"
 
-#: ../../godmode/reporting/visual_console_builder.php:681
+#: ../../godmode/reporting/visual_console_builder.php:683
 #: ../../godmode/reporting/visual_console_builder.wizard.php:354
 #: ../../operation/visual_console/pure_ajax.php:123
 #: ../../operation/visual_console/render_view.php:126
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:71
-#: ../../enterprise/include/functions_reporting.php:32
-#: ../../enterprise/include/functions_reporting.php:6162
-#: ../../enterprise/include/functions_reporting.php:6184
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:90
+#: ../../enterprise/include/functions_reporting.php:33
+#: ../../enterprise/include/functions_reporting.php:6723
+#: ../../enterprise/include/functions_reporting.php:6745
 #: ../../enterprise/meta/general/logon_ok.php:38
 #: ../../enterprise/meta/general/main_header.php:114
 #: ../../enterprise/meta/monitoring/wizard/wizard.main.php:42
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:82
-#: ../../enterprise/meta/screens/screens.visualmap.php:173
+#: ../../enterprise/meta/screens/screens.visualmap.php:113
 msgid "Wizard"
 msgstr "設定追加"
 
-#: ../../godmode/reporting/visual_console_builder.php:684
+#: ../../godmode/reporting/visual_console_builder.php:686
 #: ../../operation/visual_console/pure_ajax.php:126
 #: ../../operation/visual_console/render_view.php:129
-#: ../../enterprise/meta/screens/screens.visualmap.php:169
+#: ../../enterprise/meta/screens/screens.visualmap.php:109
 msgid "Builder"
 msgstr "ビルダ"
 
-#: ../../godmode/reporting/visual_console_builder.php:693
-#: ../../enterprise/meta/screens/screens.visualmap.php:208
+#: ../../godmode/reporting/visual_console_builder.php:695
+#: ../../enterprise/meta/screens/screens.visualmap.php:148
 msgid "New visual console"
 msgstr "新規ビジュアルコンソール"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:105
 #: ../../include/functions_visual_map_editor.php:55
-#: ../../include/functions_visual_map_editor.php:651
+#: ../../include/functions_visual_map_editor.php:865
 msgid "Percentile Item"
 msgstr "パーセント表示"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:106
-#: ../../include/functions_visual_map.php:2740
-#: ../../include/functions_visual_map_editor.php:251
-#: ../../mobile/operation/home.php:78
+#: ../../include/functions_visual_map.php:3902
+#: ../../include/functions_visual_map_editor.php:309
+#: ../../mobile/operation/home.php:98
 msgid "Module graph"
 msgstr "モジュールデータのグラフ"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:107
-#: ../../include/functions_visual_map_editor.php:57
+#: ../../include/functions_visual_map_editor.php:58
 msgid "Simple value"
 msgstr "値"
 
@@ -14887,30 +15500,30 @@ msgid "Size (px)"
 msgstr "サイズ (px)"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:170
-#: ../../enterprise/extensions/vmware/vmware_view.php:1333
+#: ../../enterprise/extensions/vmware/vmware_view.php:1420
 msgid "Font"
 msgstr "フォント"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:178
-#: ../../godmode/setup/setup_visuals.php:344
-#: ../../include/functions_config.php:467
+#: ../../godmode/setup/setup_visuals.php:365
+#: ../../include/functions_config.php:499
 msgid "Font size"
 msgstr "フォントサイズ"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:196
-#: ../../include/functions_visual_map_editor.php:350
+#: ../../include/functions_visual_map_editor.php:464
 msgid "Min value"
 msgstr "最小値"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:197
 #: ../../godmode/reporting/visual_console_builder.wizard.php:210
-#: ../../include/functions_visual_map_editor.php:351
-#: ../../include/functions_visual_map_editor.php:393
+#: ../../include/functions_visual_map_editor.php:465
+#: ../../include/functions_visual_map_editor.php:512
 msgid "Max value"
 msgstr "最大値"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:198
-#: ../../include/functions_visual_map_editor.php:352
+#: ../../include/functions_visual_map_editor.php:466
 msgid "Avg value"
 msgstr "平均値"
 
@@ -14919,21 +15532,26 @@ msgid "Width (px)"
 msgstr "幅 (px)"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:218
-#: ../../godmode/setup/setup_visuals.php:532
+#: ../../godmode/setup/setup_visuals.php:548
+#: ../../include/functions_visual_map_editor.php:515
+#: ../../enterprise/meta/advanced/metasetup.visual.php:114
+#: ../../enterprise/meta/include/functions_meta.php:1122
 msgid "Percentile"
 msgstr "パーセント"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:223
+#: ../../include/functions_visual_map_editor.php:515
 msgid "Bubble"
 msgstr "バブル"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:230
-#: ../../include/functions_visual_map_editor.php:409
-#: ../../include/functions_visual_map_editor.php:428
+#: ../../include/functions_visual_map_editor.php:528
+#: ../../include/functions_visual_map_editor.php:544
 msgid "Value to show"
 msgstr "表示する値"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:232
+#: ../../include/functions_visual_map_editor.php:516
 msgid "Percent"
 msgstr "パーセント"
 
@@ -14978,13 +15596,13 @@ msgstr ""
 "よろしいですか。"
 
 #: ../../godmode/reporting/visual_console_builder.wizard.php:377
-#: ../../mobile/operation/agent.php:305 ../../mobile/operation/agents.php:381
+#: ../../mobile/operation/agent.php:338 ../../mobile/operation/agents.php:404
 #: ../../mobile/operation/events.php:797
 #: ../../mobile/operation/module_graph.php:467
 #: ../../mobile/operation/modules.php:706
 #: ../../mobile/operation/tactical.php:215
 #: ../../mobile/operation/visualmap.php:118
-#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:74
+#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:81
 #: ../../enterprise/mobile/operation/dashboard.php:118
 #: ../../enterprise/operation/agentes/agent_inventory.diff_view.php:149
 #: ../../enterprise/operation/agentes/agent_inventory.diff_view.php:152
@@ -14995,9 +15613,15 @@ msgstr "読み込み中..."
 msgid "Please select any module or modules."
 msgstr "モジュールを選択してください。"
 
+#: ../../godmode/reporting/visual_console_favorite.php:102
+#: ../../include/ajax/visual_console_builder.ajax.php:280
+#: ../../enterprise/operation/agentes/wux_console_view.php:447
+msgid "No data to show"
+msgstr "表示するデータがありません"
+
 #: ../../godmode/servers/manage_recontask.php:43
 #: ../../godmode/servers/manage_recontask_form.php:186
-#: ../../include/functions_menu.php:473
+#: ../../include/functions_menu.php:484
 msgid "Manage recontask"
 msgstr "自動検出管理"
 
@@ -15043,7 +15667,8 @@ msgstr "自動検出処理の作成に失敗しました。"
 
 #: ../../godmode/servers/manage_recontask.php:296
 #: ../../godmode/servers/manage_recontask_form.php:248
-#: ../../operation/servers/recon_view.php:95
+#: ../../include/functions_ui.php:678
+#: ../../operation/servers/recon_view.php:98
 #: ../../enterprise/extensions/ipam/ipam_calculator.php:136
 #: ../../enterprise/extensions/ipam/ipam_editor.php:69
 #: ../../enterprise/extensions/ipam/ipam_list.php:148
@@ -15056,7 +15681,7 @@ msgid "Ports"
 msgstr "ポート番号"
 
 #: ../../godmode/servers/manage_recontask.php:319
-#: ../../operation/servers/recon_view.php:145
+#: ../../operation/servers/recon_view.php:148
 msgid "Network recon task"
 msgstr "ネットワーク自動検出タスク"
 
@@ -15064,7 +15689,7 @@ msgstr "ネットワーク自動検出タスク"
 #: ../../godmode/servers/manage_recontask_form.php:262
 #: ../../enterprise/extensions/ipam/ipam_list.php:217
 #: ../../enterprise/extensions/ipam/ipam_network.php:127
-#: ../../enterprise/godmode/services/services.service.php:255
+#: ../../enterprise/godmode/services/services.service.php:295
 #: ../../enterprise/operation/services/services.list.php:189
 #: ../../enterprise/operation/services/services.table_services.php:158
 msgid "Manual"
@@ -15082,7 +15707,7 @@ msgstr ""
 "デフォルトでは、Windows においては Pandora FMS は標準のネットワーク探索のみの対応で、カスタムスクリプトは使えません。"
 
 #: ../../godmode/servers/manage_recontask_form.php:224
-#: ../../operation/servers/recon_view.php:89
+#: ../../operation/servers/recon_view.php:92
 msgid "Task name"
 msgstr "タスク名"
 
@@ -15097,8 +15722,8 @@ msgid "Network sweep"
 msgstr "ネットワーク探査"
 
 #: ../../godmode/servers/manage_recontask_form.php:240
-#: ../../enterprise/extensions/cron/functions.php:69
-#: ../../enterprise/extensions/cron/main.php:255
+#: ../../enterprise/extensions/cron/functions.php:73
+#: ../../enterprise/extensions/cron/main.php:336
 msgid "Custom script"
 msgstr "カスタムスクリプト"
 
@@ -15113,8 +15738,8 @@ msgid "Manual interval means that it will be executed only On-demand"
 msgstr "手動は、オンデマンドでのみの実行を意味します。"
 
 #: ../../godmode/servers/manage_recontask_form.php:262
-#: ../../include/functions_reporting_html.php:1602
-#: ../../enterprise/include/functions_reporting_pdf.php:733
+#: ../../include/functions_reporting_html.php:1605
+#: ../../enterprise/include/functions_reporting_pdf.php:779
 msgid "Defined"
 msgstr "定義済み"
 
@@ -15180,48 +15805,67 @@ msgstr "親検出が有効の場合に、作成される親ホストの最大数
 
 #: ../../godmode/servers/manage_recontask_form.php:391
 msgid "Vlan enabled"
-msgstr "VLAN 有効化"
+msgstr "Vlan 有効化"
 
 #: ../../godmode/servers/modificar_server.php:35
 msgid "Update Server"
 msgstr "サーバ情報の更新"
 
-#: ../../godmode/servers/modificar_server.php:61
+#: ../../godmode/servers/modificar_server.php:41
+#: ../../godmode/servers/plugin.php:300 ../../godmode/servers/plugin.php:759
+msgid "Standard"
+msgstr "標準"
+
+#: ../../godmode/servers/modificar_server.php:43
+#: ../../godmode/setup/license.php:88 ../../include/functions_ui.php:673
+#: ../../enterprise/meta/advanced/license_meta.php:103
+msgid "Satellite"
+msgstr "サテライト"
+
+#: ../../godmode/servers/modificar_server.php:62
+msgid "Exec Server"
+msgstr "実行サーバ"
+
+#: ../../godmode/servers/modificar_server.php:64
+msgid "Check Exec Server"
+msgstr "実行サーバ確認"
+
+#: ../../godmode/servers/modificar_server.php:80
 msgid "Remote Configuration"
 msgstr "リモート設定"
 
-#: ../../godmode/servers/modificar_server.php:66
+#: ../../godmode/servers/modificar_server.php:85
 msgid "Pandora servers"
 msgstr "Pandora サーバ"
 
-#: ../../godmode/servers/modificar_server.php:73
-#: ../../godmode/servers/modificar_server.php:85
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1164
+#: ../../godmode/servers/modificar_server.php:92
+#: ../../godmode/servers/modificar_server.php:104
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1234
 msgid "Unsuccessfull action"
 msgstr "処理に失敗しました。"
 
-#: ../../godmode/servers/modificar_server.php:76
-#: ../../godmode/servers/modificar_server.php:88
+#: ../../godmode/servers/modificar_server.php:95
+#: ../../godmode/servers/modificar_server.php:107
 #: ../../enterprise/godmode/alerts/alert_events_list.php:328
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:357
 msgid "Successfully action"
 msgstr "アクションに成功しました。"
 
-#: ../../godmode/servers/modificar_server.php:98
+#: ../../godmode/servers/modificar_server.php:117
 #: ../../enterprise/meta/advanced/servers.php:39
 msgid "Server deleted successfully"
 msgstr "サーバを削除しました。"
 
-#: ../../godmode/servers/modificar_server.php:101
+#: ../../godmode/servers/modificar_server.php:120
 #: ../../enterprise/meta/advanced/servers.php:42
 msgid "There was a problem deleting the server"
 msgstr "サーバの削除に失敗しました。"
 
-#: ../../godmode/servers/modificar_server.php:112
+#: ../../godmode/servers/modificar_server.php:132
 msgid "Server updated successfully"
 msgstr "サーバを更新しました。"
 
-#: ../../godmode/servers/modificar_server.php:115
+#: ../../godmode/servers/modificar_server.php:135
 msgid "There was a problem updating the server"
 msgstr "サーバの更新に失敗しました。"
 
@@ -15230,14 +15874,14 @@ msgid "Network Components"
 msgstr "ネットワークコンポーネント"
 
 #: ../../godmode/servers/plugin.php:151
-#: ../../include/functions_filemanager.php:759
-#: ../../enterprise/godmode/agentes/collections.editor.php:111
-#: ../../enterprise/godmode/agentes/collections.editor.php:172
+#: ../../include/functions_filemanager.php:770
+#: ../../enterprise/godmode/agentes/collections.editor.php:105
+#: ../../enterprise/godmode/agentes/collections.editor.php:166
 msgid "Edit file"
 msgstr "ファイル編集"
 
 #: ../../godmode/servers/plugin.php:170
-#: ../../enterprise/godmode/agentes/collections.editor.php:193
+#: ../../enterprise/godmode/agentes/collections.editor.php:187
 msgid "Compatibility mode"
 msgstr "互換モード"
 
@@ -15260,10 +15904,6 @@ msgstr "プラグインの更新"
 msgid "Plugin type"
 msgstr "プラグインタイプ"
 
-#: ../../godmode/servers/plugin.php:300 ../../godmode/servers/plugin.php:759
-msgid "Standard"
-msgstr "標準"
-
 #: ../../godmode/servers/plugin.php:301 ../../godmode/servers/plugin.php:761
 msgid "Nagios"
 msgstr "Nagios"
@@ -15309,9 +15949,11 @@ msgstr "このフィールドは、パスワードのようにドットで表示
 
 #: ../../godmode/servers/plugin.php:473
 #: ../../godmode/servers/recon_script.php:183
-#: ../../include/functions_ui.php:1080
+#: ../../include/functions_ui.php:1112
 #: ../../enterprise/godmode/modules/configure_local_component.php:452
-#: ../../enterprise/meta/general/login_page.php:50
+#: ../../enterprise/meta/general/login_page.php:78
+#: ../../enterprise/meta/include/process_reset_pass.php:48
+#: ../../enterprise/meta/include/reset_pass.php:48
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -15479,21 +16121,25 @@ msgstr "マスタサーバです。"
 msgid "of"
 msgstr "/"
 
-#: ../../godmode/servers/servers.build_table.php:147
+#: ../../godmode/servers/servers.build_table.php:148
+msgid "Manage recon tasks"
+msgstr "自動検出タスク管理"
+
+#: ../../godmode/servers/servers.build_table.php:155
 msgid "Reset module status and fired alert counts"
 msgstr "モジュールの状態とアラート発報回数のリセット"
 
-#: ../../godmode/servers/servers.build_table.php:153
+#: ../../godmode/servers/servers.build_table.php:161
 msgid "Claim back SNMP modules"
 msgstr "SNMP モジュールに戻す"
 
-#: ../../godmode/servers/servers.build_table.php:173
+#: ../../godmode/servers/servers.build_table.php:181
 #: ../../enterprise/meta/advanced/servers.build_table.php:133
 msgid ""
 "Modules run by this server will stop working. Do you want to continue?"
 msgstr "このサーバで動作しているモジュールを停止します。実行しますか?"
 
-#: ../../godmode/servers/servers.build_table.php:194
+#: ../../godmode/servers/servers.build_table.php:202
 #: ../../enterprise/meta/advanced/servers.build_table.php:154
 msgid "Tactical server information"
 msgstr "モニタリングサーバの情報"
@@ -15647,17 +16293,17 @@ msgid "This selects what to change by clicking on the map"
 msgstr "マップ上でクリックした位置情報をどちらに反映させるかを選択します。"
 
 #: ../../godmode/setup/gis_step_2.php:296
-#: ../../operation/agentes/gis_view.php:179
+#: ../../operation/agentes/gis_view.php:199
 msgid "Latitude"
 msgstr "緯度"
 
 #: ../../godmode/setup/gis_step_2.php:300
-#: ../../operation/agentes/gis_view.php:178
+#: ../../operation/agentes/gis_view.php:198
 msgid "Longitude"
 msgstr "経度"
 
 #: ../../godmode/setup/gis_step_2.php:304
-#: ../../operation/agentes/gis_view.php:180
+#: ../../operation/agentes/gis_view.php:200
 msgid "Altitude"
 msgstr "高度"
 
@@ -15749,30 +16395,23 @@ msgstr "有効"
 msgid "disabled"
 msgstr "無効化"
 
-#: ../../godmode/setup/license.php:88
-#: ../../enterprise/meta/advanced/license_meta.php:103
-msgid "Satellite"
-msgstr "サテライト"
-
 #: ../../godmode/setup/license.php:91
 #: ../../enterprise/meta/advanced/license_meta.php:106
 msgid "Licensed to"
 msgstr "ライセンス先"
 
 #: ../../godmode/setup/license.php:98 ../../mobile/operation/events.php:528
-#: ../../operation/agentes/alerts_status.php:436
-#: ../../operation/agentes/alerts_status.php:477
-#: ../../operation/agentes/alerts_status.php:511
-#: ../../operation/agentes/alerts_status.php:545
-#: ../../operation/agentes/alerts_status.php:590
-#: ../../operation/snmpconsole/snmp_view.php:745
-#: ../../operation/snmpconsole/snmp_view.php:902
-#: ../../operation/snmpconsole/snmp_view.php:930
-#: ../../enterprise/extensions/vmware/main.php:196
-#: ../../enterprise/extensions/vmware/main.php:203
+#: ../../operation/agentes/alerts_status.php:469
+#: ../../operation/agentes/alerts_status.php:510
+#: ../../operation/agentes/alerts_status.php:544
+#: ../../operation/agentes/alerts_status.php:578
+#: ../../operation/agentes/alerts_status.php:623
+#: ../../operation/snmpconsole/snmp_view.php:853
+#: ../../operation/snmpconsole/snmp_view.php:1014
+#: ../../operation/snmpconsole/snmp_view.php:1042
 #: ../../enterprise/godmode/alerts/alert_events_list.php:426
 #: ../../enterprise/godmode/alerts/alert_events_list.php:676
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:494
 msgid "Validate"
 msgstr "承諾する"
 
@@ -15880,7 +16519,7 @@ msgid "There are no defined news"
 msgstr "定義済のニュースがありません"
 
 #: ../../godmode/setup/news.php:222
-#: ../../operation/agentes/estado_generalagente.php:392
+#: ../../operation/agentes/estado_generalagente.php:421
 #: ../../operation/incidents/incident_detail.php:419
 msgid "Author"
 msgstr "作者"
@@ -15942,9 +16581,9 @@ msgid "Builder OS"
 msgstr "OS 設定"
 
 #: ../../godmode/setup/performance.php:49
-#: ../../include/functions_config.php:371
+#: ../../include/functions_config.php:401
 #: ../../enterprise/meta/advanced/metasetup.performance.php:78
-#: ../../enterprise/meta/include/functions_meta.php:1281
+#: ../../enterprise/meta/include/functions_meta.php:1426
 msgid "Max. days before delete events"
 msgstr "イベントデータ保持日数"
 
@@ -15955,29 +16594,29 @@ msgid ""
 msgstr "イベントの削除よりもデータの削除が短い場合、モジュールグラフの表示がおかしくなる可能性があります"
 
 #: ../../godmode/setup/performance.php:52
-#: ../../include/functions_config.php:373
+#: ../../include/functions_config.php:403
 msgid "Max. days before delete traps"
 msgstr "トラップデータ保持日数"
 
 #: ../../godmode/setup/performance.php:55
-#: ../../include/functions_config.php:377
-#: ../../enterprise/meta/advanced/metasetup.performance.php:87
-#: ../../enterprise/meta/include/functions_meta.php:1301
+#: ../../include/functions_config.php:407
+#: ../../enterprise/meta/advanced/metasetup.performance.php:85
+#: ../../enterprise/meta/include/functions_meta.php:1446
 msgid "Max. days before delete audit events"
 msgstr "監査イベントデータ保持日数"
 
 #: ../../godmode/setup/performance.php:58
-#: ../../include/functions_config.php:375
+#: ../../include/functions_config.php:405
 msgid "Max. days before delete string data"
 msgstr "文字列データ保持日数"
 
 #: ../../godmode/setup/performance.php:61
-#: ../../include/functions_config.php:379
+#: ../../include/functions_config.php:409
 msgid "Max. days before delete GIS data"
 msgstr "GIS データ保持日数"
 
 #: ../../godmode/setup/performance.php:64
-#: ../../include/functions_config.php:381
+#: ../../include/functions_config.php:411
 msgid "Max. days before purge"
 msgstr "データ保持日数"
 
@@ -15988,12 +16627,12 @@ msgid ""
 msgstr "データの圧縮よりも削除を短くすることには意味がありません"
 
 #: ../../godmode/setup/performance.php:67
-#: ../../include/functions_config.php:385
+#: ../../include/functions_config.php:415
 msgid "Max. days before compact data"
 msgstr "データ保持日数(丸め込みなし)"
 
 #: ../../godmode/setup/performance.php:70
-#: ../../include/functions_config.php:383
+#: ../../include/functions_config.php:413
 msgid "Max. days before delete unknown modules"
 msgstr "不明モジュール保持日数"
 
@@ -16002,7 +16641,7 @@ msgid "Max. days before delete autodisabled agents"
 msgstr "自動無効化エージェントを削除せず保持する日数"
 
 #: ../../godmode/setup/performance.php:76
-#: ../../include/functions_config.php:409
+#: ../../include/functions_config.php:439
 msgid "Retention period of past special days"
 msgstr "過去の特別日の保存期間"
 
@@ -16011,7 +16650,7 @@ msgid "This number is days to keep past special days. 0 means never remove."
 msgstr "過ぎた特別日を保持する日数です。0 を設定すると永久保存になります。"
 
 #: ../../godmode/setup/performance.php:79
-#: ../../include/functions_config.php:411
+#: ../../include/functions_config.php:441
 msgid "Max. macro data fields"
 msgstr "最大マクロデータフィールド"
 
@@ -16020,7 +16659,7 @@ msgid "Number of macro fields in alerts and templates between 1 and 15"
 msgstr "アラートとテンプレートのマクロフィールド数は、1 から 15 までです"
 
 #: ../../godmode/setup/performance.php:83
-#: ../../include/functions_config.php:414
+#: ../../include/functions_config.php:444
 msgid "Max. days before delete inventory data"
 msgstr "インベントリデータの保持日数"
 
@@ -16035,7 +16674,7 @@ msgid ""
 msgstr "大きすぎる値にすると、コンソールが遅くなったりシステムのパフォーマンス低下が発生します。"
 
 #: ../../godmode/setup/performance.php:100
-#: ../../include/functions_config.php:391
+#: ../../include/functions_config.php:421
 msgid "Compact interpolation in hours (1 Fine-20 bad)"
 msgstr "データ縮小時の丸め込み単位時間 (1〜20)"
 
@@ -16043,21 +16682,7 @@ msgstr "データ縮小時の丸め込み単位時間 (1〜20)"
 msgid "Data will be compacted in intervals of the specified length."
 msgstr "指定した間隔でデータは丸め込まれます。"
 
-#: ../../godmode/setup/performance.php:105 ../../include/ajax/module.php:134
-#: ../../include/functions.php:2022 ../../include/functions.php:2592
-#: ../../include/functions_netflow.php:1052
-#: ../../include/functions_netflow.php:1085
-#: ../../operation/gis_maps/render_view.php:142
-#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:65
-#: ../../enterprise/dashboard/widgets/sla_percent.php:62
-#: ../../enterprise/dashboard/widgets/top_n.php:61
-#: ../../enterprise/godmode/agentes/inventory_manager.php:176
-#: ../../enterprise/godmode/policies/policy_inventory_modules.php:190
-#: ../../enterprise/godmode/reporting/graph_template_editor.php:181
-msgid "1 hour"
-msgstr "1時間"
-
-#: ../../godmode/setup/performance.php:106 ../../include/ajax/module.php:136
+#: ../../godmode/setup/performance.php:106 ../../include/ajax/module.php:141
 #: ../../include/functions_netflow.php:1055
 #: ../../include/functions_netflow.php:1088
 #: ../../enterprise/dashboard/widgets/top_n.php:64
@@ -16101,19 +16726,19 @@ msgid "Last month"
 msgstr "先月"
 
 #: ../../godmode/setup/performance.php:114
-#: ../../include/functions_config.php:393
-#: ../../enterprise/meta/advanced/metasetup.performance.php:92
-#: ../../enterprise/meta/include/functions_meta.php:1311
+#: ../../include/functions_config.php:423
+#: ../../enterprise/meta/advanced/metasetup.performance.php:88
+#: ../../enterprise/meta/include/functions_meta.php:1456
 msgid "Default hours for event view"
 msgstr "イベント表示期間(時間)"
 
 #: ../../godmode/setup/performance.php:117
-#: ../../include/functions_config.php:395
+#: ../../include/functions_config.php:425
 msgid "Use realtime statistics"
 msgstr "リアルタイム更新の利用"
 
 #: ../../godmode/setup/performance.php:121
-#: ../../include/functions_config.php:397
+#: ../../include/functions_config.php:427
 msgid "Batch statistics period (secs)"
 msgstr "バッチ更新間隔(秒)"
 
@@ -16124,13 +16749,13 @@ msgid ""
 msgstr "リアルタイム統計が無効の場合、ここで統計処理間隔を設定します。"
 
 #: ../../godmode/setup/performance.php:124
-#: ../../include/functions_config.php:399
-#: ../../enterprise/meta/include/functions_meta.php:1321
+#: ../../include/functions_config.php:429
+#: ../../enterprise/meta/include/functions_meta.php:1466
 msgid "Use agent access graph"
 msgstr "エージェントアクセスグラフの利用"
 
 #: ../../godmode/setup/performance.php:128
-#: ../../include/functions_config.php:401
+#: ../../include/functions_config.php:431
 msgid "Max. recommended number of files in attachment directory"
 msgstr "添付ディレクトリファイルの推奨上限数"
 
@@ -16142,7 +16767,7 @@ msgid ""
 msgstr "添付ディレクトリにおくファイルの上限数です。ファイル数がこの値に達した場合、コンソールのヘッダ部分に警告メッセージが現れます。"
 
 #: ../../godmode/setup/performance.php:131
-#: ../../include/functions_config.php:403
+#: ../../include/functions_config.php:433
 msgid "Delete not init modules"
 msgstr "未初期化モジュールの削除"
 
@@ -16160,7 +16785,7 @@ msgstr ""
 "100です。"
 
 #: ../../godmode/setup/performance.php:138
-#: ../../include/functions_config.php:407
+#: ../../include/functions_config.php:437
 msgid "Small Operation Step to purge old data"
 msgstr "古いデータ削除のための小さな操作ステップ"
 
@@ -16173,12 +16798,24 @@ msgstr ""
 "単一の削除クエリで処理される行数です。デフォルトは 1000です。処理が速いシステムで、3000-"
 "5000に増加してください。500や250に減らすと、システムがロックします。"
 
-#: ../../godmode/setup/performance.php:143
+#: ../../godmode/setup/performance.php:141
+#: ../../include/functions_config.php:447
+msgid "Graph container - Max. Items"
+msgstr "グラフコンテナ - 最大アイテム"
+
+#: ../../godmode/setup/performance.php:141
+msgid ""
+"The number of graphs that are viewed in a container. Default is 10 "
+".Increasing this number could lead to performance problems"
+msgstr "コンテナで表示する最大グラフ数。デフォルトは 10です。この数値を増やすとパフォーマンスの問題を引き起こす可能性があります。"
+
+#: ../../godmode/setup/performance.php:146
 msgid "Database maintenance options"
 msgstr "データベースメンテナンスオプション"
 
-#: ../../godmode/setup/performance.php:149
-#: ../../include/functions_graph.php:3236
+#: ../../godmode/setup/performance.php:152
+#: ../../include/functions_visual_map.php:2818
+#: ../../include/functions_graph.php:3717
 msgid "Others"
 msgstr "その他"
 
@@ -16187,7 +16824,7 @@ msgid "Correct update the setup options"
 msgstr "設定オプションを更新しました"
 
 #: ../../godmode/setup/setup_auth.php:49
-#: ../../include/functions_config.php:323
+#: ../../include/functions_config.php:351
 #: ../../enterprise/meta/include/functions_meta.php:612
 msgid "Fallback to local authentication"
 msgstr "ローカル認証へのフォールバック"
@@ -16198,91 +16835,103 @@ msgid ""
 "remote (ldap etc...) authentication failed."
 msgstr "リモート(ldapなど)認証が失敗した場合にローカル認証にフォールバックしたい場合は、このオプションを有効にします。"
 
-#: ../../godmode/setup/setup_auth.php:57
-#: ../../include/functions_config.php:287
+#: ../../godmode/setup/setup_auth.php:58
+#: ../../include/functions_config.php:308
 #: ../../enterprise/meta/include/functions_meta.php:622
 msgid "Autocreate remote users"
 msgstr "リモートユーザの自動作成"
 
 #: ../../godmode/setup/setup_auth.php:74
-#: ../../include/functions_config.php:311
-#: ../../enterprise/meta/include/functions_meta.php:766
+#: ../../include/functions_config.php:335
+#: ../../enterprise/meta/include/functions_meta.php:796
 msgid "LDAP server"
 msgstr "LDAP サーバ"
 
 #: ../../godmode/setup/setup_auth.php:80
-#: ../../include/functions_config.php:313
-#: ../../enterprise/meta/include/functions_meta.php:776
+#: ../../include/functions_config.php:337
+#: ../../enterprise/meta/include/functions_meta.php:806
 msgid "LDAP port"
 msgstr "LDAP ポート"
 
 #: ../../godmode/setup/setup_auth.php:87
-#: ../../include/functions_config.php:315
-#: ../../enterprise/meta/include/functions_meta.php:786
+#: ../../include/functions_config.php:339
+#: ../../enterprise/meta/include/functions_meta.php:816
 msgid "LDAP version"
 msgstr "LDAP バージョン"
 
 #: ../../godmode/setup/setup_auth.php:93
-#: ../../include/functions_config.php:302
-#: ../../include/functions_config.php:317
-#: ../../enterprise/godmode/setup/setup_auth.php:511
+#: ../../include/functions_config.php:323
+#: ../../include/functions_config.php:341
+#: ../../enterprise/godmode/setup/setup_auth.php:821
 #: ../../enterprise/meta/include/functions_meta.php:714
-#: ../../enterprise/meta/include/functions_meta.php:796
+#: ../../enterprise/meta/include/functions_meta.php:826
 msgid "Start TLS"
 msgstr "TLS の開始"
 
 #: ../../godmode/setup/setup_auth.php:100
-#: ../../include/functions_config.php:319
-#: ../../enterprise/meta/include/functions_meta.php:806
+#: ../../include/functions_config.php:343
+#: ../../enterprise/meta/include/functions_meta.php:836
 msgid "Base DN"
 msgstr "ベース DN"
 
 #: ../../godmode/setup/setup_auth.php:106
-#: ../../include/functions_config.php:321
-#: ../../enterprise/meta/include/functions_meta.php:816
+#: ../../include/functions_config.php:345
+#: ../../enterprise/meta/include/functions_meta.php:846
 msgid "Login attribute"
 msgstr "ログイン属性"
 
-#: ../../godmode/setup/setup_auth.php:128
-#: ../../include/functions_config.php:359
-#: ../../operation/users/user_edit.php:334
+#: ../../godmode/setup/setup_auth.php:112
+#: ../../include/functions_config.php:347
+#: ../../enterprise/meta/include/functions_meta.php:856
+msgid "Admin LDAP login"
+msgstr "LDAP 管理者ログイン"
+
+#: ../../godmode/setup/setup_auth.php:118
+#: ../../include/functions_config.php:349
+#: ../../enterprise/meta/include/functions_meta.php:866
+msgid "Admin LDAP password"
+msgstr "LDAP 管理者パスワード"
+
+#: ../../godmode/setup/setup_auth.php:139
+#: ../../include/functions_config.php:389
+#: ../../operation/users/user_edit.php:337
 #: ../../enterprise/meta/include/functions_meta.php:672
 msgid "Double authentication"
 msgstr "二段階認証"
 
-#: ../../godmode/setup/setup_auth.php:129
+#: ../../godmode/setup/setup_auth.php:140
 msgid ""
 "If this option is enabled, the users can use double authentication with "
 "their accounts"
 msgstr "このオプションを有効にすると、ユーザはアカウントの二段階認証を使うことができます。"
 
-#: ../../godmode/setup/setup_auth.php:141
+#: ../../godmode/setup/setup_auth.php:152
 msgid "Session timeout (mins)"
 msgstr "セッションタイムアウト(分)"
 
-#: ../../godmode/setup/setup_auth.php:142
-#: ../../godmode/users/configure_user.php:548
+#: ../../godmode/setup/setup_auth.php:153
+#: ../../godmode/users/configure_user.php:652
 msgid ""
 "This is defined in minutes, If you wish a permanent session should putting -"
 "1 in this field."
 msgstr "分単位で定義します。無制限の場合は -1 を設定してください。"
 
-#: ../../godmode/setup/setup_auth.php:177
+#: ../../godmode/setup/setup_auth.php:188
 msgid "Local Pandora FMS"
 msgstr "Pandora FMS ローカル"
 
-#: ../../godmode/setup/setup_auth.php:177
+#: ../../godmode/setup/setup_auth.php:188
 msgid "ldap"
 msgstr "LDAP"
 
-#: ../../godmode/setup/setup_auth.php:183
-#: ../../include/functions_config.php:285
+#: ../../godmode/setup/setup_auth.php:194
+#: ../../include/functions_config.php:306
 #: ../../enterprise/meta/include/functions_meta.php:602
 msgid "Authentication method"
 msgstr "認証方法"
 
 #: ../../godmode/setup/setup_ehorus.php:54
-#: ../../include/functions_config.php:713
+#: ../../include/functions_config.php:773
 msgid "Enable eHorus"
 msgstr "eHorus の有効化"
 
@@ -16328,9 +16977,8 @@ msgid "Test"
 msgstr "テスト"
 
 #: ../../godmode/setup/setup_ehorus.php:107
-#: ../../enterprise/dashboard/full_dashboard.php:286
-#: ../../enterprise/dashboard/main_dashboard.php:466
-#: ../../enterprise/dashboard/public_dashboard.php:312
+#: ../../enterprise/dashboard/main_dashboard.php:501
+#: ../../enterprise/include/functions_dashboard.php:931
 #: ../../enterprise/operation/agentes/transactional_map.php:301
 msgid "Start"
 msgstr "開始"
@@ -16396,27 +17044,27 @@ msgstr "エージェントのリモート設定保存ディレクトリ"
 #: ../../godmode/setup/setup_general.php:62
 #: ../../include/functions_config.php:133
 #: ../../enterprise/meta/advanced/metasetup.setup.php:125
-#: ../../enterprise/meta/include/functions_meta.php:368
+#: ../../enterprise/meta/include/functions_meta.php:347
 msgid "Auto login (hash) password"
 msgstr "自動ログインパスワード(ハッシュ)"
 
 #: ../../godmode/setup/setup_general.php:65
 #: ../../include/functions_config.php:136
 #: ../../enterprise/meta/advanced/metasetup.setup.php:129
-#: ../../enterprise/meta/include/functions_meta.php:378
+#: ../../enterprise/meta/include/functions_meta.php:357
 msgid "Time source"
 msgstr "日時データソース"
 
 #: ../../godmode/setup/setup_general.php:66 ../../include/functions.php:1042
+#: ../../include/functions_reporting.php:7057
 #: ../../include/functions_events.php:988
-#: ../../include/functions_events.php:1419
-#: ../../include/functions_graph.php:2258
-#: ../../include/functions_graph.php:2924
-#: ../../include/functions_graph.php:3352
-#: ../../include/functions_graph.php:3355
-#: ../../include/functions_reporting.php:6397
-#: ../../include/functions_reporting_html.php:878
-#: ../../include/functions_reporting_html.php:1701
+#: ../../include/functions_events.php:1423
+#: ../../include/functions_graph.php:2736
+#: ../../include/functions_graph.php:3405
+#: ../../include/functions_graph.php:3833
+#: ../../include/functions_graph.php:3836
+#: ../../include/functions_reporting_html.php:881
+#: ../../include/functions_reporting_html.php:1704
 #: ../../mobile/operation/events.php:111 ../../operation/events/events.php:77
 #: ../../operation/events/events_rss.php:178
 #: ../../enterprise/dashboard/widgets/top_n_events_by_group.php:130
@@ -16438,7 +17086,7 @@ msgstr "更新の自動チェック"
 #: ../../godmode/setup/setup_general.php:74
 #: ../../include/functions_config.php:142
 #: ../../enterprise/meta/advanced/metasetup.setup.php:136
-#: ../../enterprise/meta/include/functions_meta.php:388
+#: ../../enterprise/meta/include/functions_meta.php:367
 msgid "Enforce https"
 msgstr "httpsの利用"
 
@@ -16466,7 +17114,7 @@ msgstr "証明書を置いたパスとその名前です。証明書の拡張子
 #: ../../godmode/setup/setup_general.php:86
 #: ../../include/functions_config.php:146
 #: ../../enterprise/meta/advanced/metasetup.setup.php:142
-#: ../../enterprise/meta/include/functions_meta.php:398
+#: ../../enterprise/meta/include/functions_meta.php:377
 msgid "Attachment store"
 msgstr "添付ファイル保存場所"
 
@@ -16477,23 +17125,24 @@ msgstr "テンポラリデータの保存ディレクトリ"
 
 #: ../../godmode/setup/setup_general.php:89
 #: ../../include/functions_config.php:148
-#: ../../enterprise/meta/advanced/metasetup.setup.php:241
-#: ../../enterprise/meta/include/functions_meta.php:459
+#: ../../enterprise/meta/advanced/metasetup.setup.php:246
+#: ../../enterprise/meta/include/functions_meta.php:448
 msgid "IP list with API access"
 msgstr "APIアクセスを許可するIPアドレスリスト"
 
 #: ../../godmode/setup/setup_general.php:98
 #: ../../include/functions_config.php:150
+#: ../../enterprise/extensions/vmware/functions.php:473
 #: ../../enterprise/godmode/setup/setup_metaconsole.php:183
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:318
-#: ../../enterprise/meta/advanced/metasetup.setup.php:237
-#: ../../enterprise/meta/include/functions_meta.php:438
-#: ../../enterprise/meta/include/functions_meta.php:448
+#: ../../enterprise/meta/advanced/metasetup.setup.php:242
+#: ../../enterprise/meta/include/functions_meta.php:427
+#: ../../enterprise/meta/include/functions_meta.php:437
 msgid "API password"
 msgstr "API パスワード"
 
 #: ../../godmode/setup/setup_general.php:99
-#: ../../enterprise/meta/advanced/metasetup.setup.php:238
+#: ../../enterprise/meta/advanced/metasetup.setup.php:243
 msgid "Please be careful if you put a password put https access."
 msgstr "パスワードの設定には注意してください。httpsアクセスを使ってください。"
 
@@ -16536,7 +17185,7 @@ msgstr "警告状態時のサウンド"
 #: ../../godmode/setup/setup_general.php:161
 #: ../../include/functions_config.php:188
 #: ../../enterprise/meta/advanced/metasetup.setup.php:183
-#: ../../enterprise/meta/include/functions_meta.php:418
+#: ../../enterprise/meta/include/functions_meta.php:397
 msgid "Public URL"
 msgstr "公開 URL"
 
@@ -16548,64 +17197,80 @@ msgid ""
 msgstr ""
 "Pandora FMS がリバースプロキシ配下にある場合や Apache の mod_proxy などを利用している場合などに、この値を設定してください。"
 
-#: ../../godmode/setup/setup_general.php:165
+#: ../../godmode/setup/setup_general.php:163
+msgid "Without the index.php such as http://domain/pandora_url/"
+msgstr "http://domain/pandora_url/ のように、index.php を含めません"
+
+#: ../../godmode/setup/setup_general.php:166
 #: ../../include/functions_config.php:190
 msgid "Referer security"
 msgstr "リファラーセキュリティ"
 
-#: ../../godmode/setup/setup_general.php:166
+#: ../../godmode/setup/setup_general.php:167
 msgid ""
 "When it is set as \"yes\" in some important sections check if the user have "
 "gone from url Pandora."
 msgstr "\"はい\" に設定すると、いくつかの重要なセクションで Pandora の URL から遷移してきたかどうかをチェックします。"
 
-#: ../../godmode/setup/setup_general.php:173
+#: ../../godmode/setup/setup_general.php:174
 #: ../../include/functions_config.php:192
 msgid "Event storm protection"
 msgstr "イベントストーム保護"
 
-#: ../../godmode/setup/setup_general.php:174
+#: ../../godmode/setup/setup_general.php:175
 msgid ""
 "If set to yes no events or alerts will be generated, but agents will "
 "continue receiving data."
 msgstr "「はい」に設定すると、イベントやアラートは生成されませんがエージェントはデータの受信を継続します。"
 
-#: ../../godmode/setup/setup_general.php:182
+#: ../../godmode/setup/setup_general.php:183
 #: ../../include/functions_config.php:194
+#: ../../enterprise/meta/advanced/metasetup.setup.php:191
+#: ../../enterprise/meta/include/functions_meta.php:417
 msgid "Command Snapshot"
 msgstr "コマンドスナップショット"
 
-#: ../../godmode/setup/setup_general.php:183
+#: ../../godmode/setup/setup_general.php:184
+#: ../../enterprise/meta/advanced/metasetup.setup.php:192
 msgid "The string modules with several lines show as command output"
 msgstr "複数行の文字列モジュールはコマンドの出力として表示されます。"
 
-#: ../../godmode/setup/setup_general.php:187
+#: ../../godmode/setup/setup_general.php:188
 #: ../../include/functions_config.php:196
 msgid "Server logs directory"
 msgstr "サーバログディレクトリ"
 
-#: ../../godmode/setup/setup_general.php:187
+#: ../../godmode/setup/setup_general.php:188
 msgid "Directory where the server logs are stored."
 msgstr "サーバのログを保存するディレクトリ。"
 
 #: ../../godmode/setup/setup_general.php:192
+#: ../../include/functions_config.php:198
+msgid "Log size limit in system logs viewer extension"
+msgstr "システムログビューワ拡張でのログサイズ制限"
+
+#: ../../godmode/setup/setup_general.php:192
+msgid "Max size (in bytes) for the logs to be shown."
+msgstr "表示するログの最大サイズ(バイト)"
+
+#: ../../godmode/setup/setup_general.php:197
 msgid "Full mode"
 msgstr "フルモード"
 
-#: ../../godmode/setup/setup_general.php:193
+#: ../../godmode/setup/setup_general.php:198
 msgid "On demand"
 msgstr "オンデマンド"
 
-#: ../../godmode/setup/setup_general.php:194
+#: ../../godmode/setup/setup_general.php:199
 msgid "Expert"
 msgstr "上級者"
 
-#: ../../godmode/setup/setup_general.php:196
-#: ../../include/functions_config.php:198
+#: ../../godmode/setup/setup_general.php:201
+#: ../../include/functions_config.php:200
 msgid "Tutorial mode"
 msgstr "チュートリアルモード"
 
-#: ../../godmode/setup/setup_general.php:197
+#: ../../godmode/setup/setup_general.php:202
 msgid ""
 "Configuration of our clippy, 'full mode' show the icon in the header and the "
 "contextual helps and it is noise, 'on demand' it is equal to full but it is "
@@ -16614,44 +17279,46 @@ msgstr ""
 "アシスタントの設定です。'フルモード' はヘッダーにアイコンとヘルプが表示されうるさい感じになます。'オンデマンド' "
 "はフルモードと同じですがうるさくはありません。'上級者' はヘッダーにアイコンとヘルプが表示されません。"
 
-#: ../../godmode/setup/setup_general.php:203
-#: ../../include/functions_config.php:200
+#: ../../godmode/setup/setup_general.php:208
+#: ../../include/functions_config.php:202
 msgid "Allow create planned downtimes in the past"
 msgstr "終了した計画停止の作成を許可する"
 
-#: ../../godmode/setup/setup_general.php:204
+#: ../../godmode/setup/setup_general.php:209
 msgid "The planned downtimes created in the past will affect the SLA reports"
 msgstr "終了した計画停止の作成は SLA レポートに影響します"
 
-#: ../../godmode/setup/setup_general.php:208
-#: ../../include/functions_config.php:202
-msgid "Limit parameters massive"
+#: ../../godmode/setup/setup_general.php:213
+msgid "Limit for bulk operations"
 msgstr "一括操作制限"
 
-#: ../../godmode/setup/setup_general.php:209
-#, php-format
+#: ../../godmode/setup/setup_general.php:214
 msgid ""
-"Your PHP environment is setted with %d max_input_vars. Maybe you must not "
-"set this value with upper values."
-msgstr "PHP の max_input_vars が %d に設定されています。この値は大きく設定してはいけません。"
+"Your PHP environment is set to 1000 max_input_vars. This parameter should "
+"have the same value or lower."
+msgstr "PHP で max_input_vars が 1000 に設定されています。このパラメータは同じか低い値にする必要があります。"
 
-#: ../../godmode/setup/setup_general.php:213
+#: ../../godmode/setup/setup_general.php:218
 msgid "Include agents manually disabled"
 msgstr "手動で無効化したエージェントを含める"
 
-#: ../../godmode/setup/setup_general.php:217
+#: ../../godmode/setup/setup_general.php:222
 msgid "audit log directory"
 msgstr "監査ログディレクトリ"
 
-#: ../../godmode/setup/setup_general.php:218
+#: ../../godmode/setup/setup_general.php:223
 msgid "Directory where audit log is stored."
 msgstr "監査ログを保存するディレクトリ"
 
-#: ../../godmode/setup/setup_general.php:224
+#: ../../godmode/setup/setup_general.php:226
+msgid "Set alias as name by default in agent creation"
+msgstr "エージェント作成でデフォルトでエイリアスを名前にする"
+
+#: ../../godmode/setup/setup_general.php:233
 msgid "General options"
 msgstr "全般オプション"
 
-#: ../../godmode/setup/setup_general.php:283
+#: ../../godmode/setup/setup_general.php:292
 msgid ""
 "If Enterprise ACL System is enabled without rules you will lose access to "
 "Pandora FMS Console (even admin). Do you want to continue?"
@@ -16660,7 +17327,7 @@ msgstr ""
 "コンソールへアクセスできなくなります。続けますか。"
 
 #: ../../godmode/setup/setup_netflow.php:41
-#: ../../include/functions_config.php:663
+#: ../../include/functions_config.php:719
 msgid "Data storage path"
 msgstr "データストアのパス"
 
@@ -16669,7 +17336,7 @@ msgid "Directory where netflow data will be stored."
 msgstr "Netflow データを保存するディレクトリ。"
 
 #: ../../godmode/setup/setup_netflow.php:45
-#: ../../include/functions_config.php:665
+#: ../../include/functions_config.php:721
 msgid "Daemon interval"
 msgstr "デーモン間隔"
 
@@ -16678,22 +17345,22 @@ msgid "Specifies the time interval in seconds to rotate netflow data files."
 msgstr "Netflow データファイルをローテートする時間間隔を秒で指定します。"
 
 #: ../../godmode/setup/setup_netflow.php:49
-#: ../../include/functions_config.php:667
+#: ../../include/functions_config.php:723
 msgid "Daemon binary path"
 msgstr "デーモンのバイナリパス"
 
 #: ../../godmode/setup/setup_netflow.php:52
-#: ../../include/functions_config.php:669
+#: ../../include/functions_config.php:725
 msgid "Nfdump binary path"
 msgstr "nfdump バイナリのパス"
 
 #: ../../godmode/setup/setup_netflow.php:55
-#: ../../include/functions_config.php:671
+#: ../../include/functions_config.php:727
 msgid "Nfexpire binary path"
 msgstr "nfexpire バイナリのパス"
 
 #: ../../godmode/setup/setup_netflow.php:58
-#: ../../include/functions_config.php:673
+#: ../../include/functions_config.php:729
 msgid "Maximum chart resolution"
 msgstr "最大グラフ解像度"
 
@@ -16704,7 +17371,7 @@ msgid ""
 msgstr "Netflow グラフが表示される最大ポイント数です。大きくすると解像度がよくなります。50 から 100 の間の値を推奨します。"
 
 #: ../../godmode/setup/setup_netflow.php:61
-#: ../../include/functions_config.php:675
+#: ../../include/functions_config.php:731
 #: ../../enterprise/meta/advanced/metasetup.setup.php:187
 msgid "Disable custom live view filters"
 msgstr "カスタムライブビューフィルタの無効化"
@@ -16717,8 +17384,7 @@ msgid ""
 msgstr "ライブビューでカスタムフィルタの定義を無効化します。フィルタが存在する場合のみ利用可能です。"
 
 #: ../../godmode/setup/setup_netflow.php:65
-#: ../../include/functions_config.php:677
-#: ../../include/functions_config.php:683
+#: ../../include/functions_config.php:733
 msgid "Netflow max lifetime"
 msgstr "Netflow 最大保持期間"
 
@@ -16727,7 +17393,7 @@ msgid "Sets the maximum lifetime for netflow data in days."
 msgstr "Netflow データを保持する最大期間を日数で設定します。"
 
 #: ../../godmode/setup/setup_netflow.php:68
-#: ../../include/functions_config.php:679
+#: ../../include/functions_config.php:735
 msgid "Name resolution for IP address"
 msgstr "IP アドレスの名前解決"
 
@@ -16742,7 +17408,7 @@ msgid "IP address resolution can take a lot of time"
 msgstr "IP アドレスの解決には多くの時間がかかります"
 
 #: ../../godmode/setup/setup_visuals.php:75
-#: ../../include/functions_config.php:498
+#: ../../include/functions_config.php:540
 msgid "Default interval for refresh on Visual Console"
 msgstr "ビジュアルコンソールのデフォルト更新間隔"
 
@@ -16755,23 +17421,23 @@ msgid "Paginated module view"
 msgstr "ページ区切りモジュール表示"
 
 #: ../../godmode/setup/setup_visuals.php:85
-#: ../../include/functions_config.php:546
-#: ../../enterprise/meta/advanced/metasetup.visual.php:174
-#: ../../enterprise/meta/include/functions_meta.php:1257
+#: ../../include/functions_config.php:595
+#: ../../enterprise/meta/advanced/metasetup.visual.php:196
+#: ../../enterprise/meta/include/functions_meta.php:1402
 msgid "Display data of proc modules in other format"
 msgstr "別フォーマットでのprocモジュールのデータ表示"
 
 #: ../../godmode/setup/setup_visuals.php:95
-#: ../../include/functions_config.php:548
-#: ../../enterprise/meta/advanced/metasetup.visual.php:183
-#: ../../enterprise/meta/include/functions_meta.php:1262
+#: ../../include/functions_config.php:597
+#: ../../enterprise/meta/advanced/metasetup.visual.php:205
+#: ../../enterprise/meta/include/functions_meta.php:1407
 msgid "Display text proc modules have state is ok"
 msgstr "正常状態時のprocモジュール表示テキスト"
 
 #: ../../godmode/setup/setup_visuals.php:99
-#: ../../include/functions_config.php:550
-#: ../../enterprise/meta/advanced/metasetup.visual.php:186
-#: ../../enterprise/meta/include/functions_meta.php:1267
+#: ../../include/functions_config.php:599
+#: ../../enterprise/meta/advanced/metasetup.visual.php:208
+#: ../../enterprise/meta/include/functions_meta.php:1412
 msgid "Display text when proc modules have state critical"
 msgstr "障害状態時のprocモジュール表示テキスト"
 
@@ -16786,7 +17452,7 @@ msgid ""
 msgstr "有効化すると、マウスオーバーではなく左クリックしたときに横のメニューが表示されます。"
 
 #: ../../godmode/setup/setup_visuals.php:117
-#: ../../include/functions_config.php:557
+#: ../../include/functions_config.php:606
 msgid "Service label font size"
 msgstr "サービスラベルフォントサイズ"
 
@@ -16794,106 +17460,128 @@ msgstr "サービスラベルフォントサイズ"
 msgid "Space between items in Service maps"
 msgstr "サービスマップにおける要素間のスペース"
 
-#: ../../godmode/setup/setup_visuals.php:126
-#: ../../include/functions_config.php:564
+#: ../../godmode/setup/setup_visuals.php:122
+msgid "It must be bigger than 80"
+msgstr "80より大きくなければいけません"
+
+#: ../../godmode/setup/setup_visuals.php:127
+#: ../../include/functions_config.php:617
 msgid "Classic menu mode"
 msgstr "クラシックメニューモード"
 
-#: ../../godmode/setup/setup_visuals.php:127
+#: ../../godmode/setup/setup_visuals.php:128
 msgid "Text menu options always visible, don't hide"
 msgstr "テキストメニューを隠さずに表示します。"
 
-#: ../../godmode/setup/setup_visuals.php:138
+#: ../../godmode/setup/setup_visuals.php:139
 msgid "Behaviour configuration"
 msgstr "動作設定"
 
-#: ../../godmode/setup/setup_visuals.php:153
-#: ../../include/functions_config.php:455
+#: ../../godmode/setup/setup_visuals.php:154
+#: ../../include/functions_config.php:487
 msgid "Style template"
 msgstr "スタイルテンプレート"
 
-#: ../../godmode/setup/setup_visuals.php:158
-#: ../../include/functions_config.php:463
+#: ../../godmode/setup/setup_visuals.php:159
+#: ../../include/functions_config.php:495
 msgid "Status icon set"
 msgstr "ステータスアイコンの種類"
 
-#: ../../godmode/setup/setup_visuals.php:159
+#: ../../godmode/setup/setup_visuals.php:160
 msgid "Colors"
 msgstr "色"
 
-#: ../../godmode/setup/setup_visuals.php:160
+#: ../../godmode/setup/setup_visuals.php:161
 msgid "Faces"
 msgstr "顔"
 
-#: ../../godmode/setup/setup_visuals.php:161
+#: ../../godmode/setup/setup_visuals.php:162
 msgid "Colors and text"
 msgstr "色と文字"
 
-#: ../../godmode/setup/setup_visuals.php:168
-#: ../../include/functions_config.php:482
-#: ../../enterprise/meta/advanced/metasetup.visual.php:207
+#: ../../godmode/setup/setup_visuals.php:169
+#: ../../include/functions_config.php:514
+#: ../../enterprise/meta/advanced/metasetup.visual.php:229
 msgid "Login background"
 msgstr "ログイン背景"
 
-#: ../../godmode/setup/setup_visuals.php:169
-#: ../../enterprise/meta/advanced/metasetup.visual.php:208
+#: ../../godmode/setup/setup_visuals.php:170
+#: ../../enterprise/meta/advanced/metasetup.visual.php:230
 msgid "You can place your custom images into the folder images/backgrounds/"
 msgstr "カスタム画像を images/backgrounds/ フォルダに置くことができます。"
 
-#: ../../godmode/setup/setup_visuals.php:188
-#: ../../enterprise/meta/advanced/metasetup.visual.php:218
+#: ../../godmode/setup/setup_visuals.php:189
+#: ../../enterprise/meta/advanced/metasetup.visual.php:240
 msgid "Custom logo (header)"
 msgstr "カスタムロゴ (ヘッダー)"
 
-#: ../../godmode/setup/setup_visuals.php:207
-#: ../../enterprise/meta/advanced/metasetup.visual.php:225
+#: ../../godmode/setup/setup_visuals.php:208
+#: ../../enterprise/meta/advanced/metasetup.visual.php:247
 msgid "Custom logo (login)"
 msgstr "カスタムロゴ (ログイン)"
 
-#: ../../godmode/setup/setup_visuals.php:225
-#: ../../enterprise/meta/advanced/metasetup.visual.php:232
+#: ../../godmode/setup/setup_visuals.php:226
+#: ../../enterprise/meta/advanced/metasetup.visual.php:254
 msgid "Custom Splash (login)"
 msgstr "カスタムスプラッシュ(ログイン)"
 
-#: ../../godmode/setup/setup_visuals.php:238
-#: ../../enterprise/meta/advanced/metasetup.visual.php:239
+#: ../../godmode/setup/setup_visuals.php:239
+#: ../../enterprise/meta/advanced/metasetup.visual.php:261
 msgid "Title 1 (login)"
-msgstr "タイトル1 (ログイン)"
+msgstr "タイトル 1 (ログイン)"
 
-#: ../../godmode/setup/setup_visuals.php:245
-#: ../../enterprise/meta/advanced/metasetup.visual.php:243
+#: ../../godmode/setup/setup_visuals.php:246
+#: ../../enterprise/meta/advanced/metasetup.visual.php:265
 msgid "Title 2 (login)"
-msgstr "タイトル2 (ログイン)"
+msgstr "タイトル 2 (ログイン)"
 
-#: ../../godmode/setup/setup_visuals.php:250
+#: ../../godmode/setup/setup_visuals.php:252
+#: ../../enterprise/meta/advanced/metasetup.visual.php:268
+#: ../../enterprise/meta/include/functions_meta.php:1295
+msgid "Docs URL (login)"
+msgstr "ドキュメントURL(ログイン)"
+
+#: ../../godmode/setup/setup_visuals.php:258
+#: ../../enterprise/meta/advanced/metasetup.visual.php:271
+#: ../../enterprise/meta/include/functions_meta.php:1305
+msgid "Support URL (login)"
+msgstr "サポートURL(ログイン)"
+
+#: ../../godmode/setup/setup_visuals.php:263
 msgid "Disable logo in graphs"
 msgstr "グラフ内ロゴの無効化"
 
-#: ../../godmode/setup/setup_visuals.php:264
-#: ../../include/functions_config.php:524
+#: ../../godmode/setup/setup_visuals.php:277
+#: ../../include/functions_config.php:573
 msgid "Fixed header"
 msgstr "ヘッダーの固定"
 
-#: ../../godmode/setup/setup_visuals.php:272
-#: ../../include/functions_config.php:526
+#: ../../godmode/setup/setup_visuals.php:285
+#: ../../include/functions_config.php:575
 msgid "Fixed menu"
 msgstr "メニューの固定"
 
-#: ../../godmode/setup/setup_visuals.php:280
-#: ../../include/functions_config.php:520
+#: ../../godmode/setup/setup_visuals.php:294
+#: ../../include/functions_config.php:567
 msgid "Autohidden menu"
 msgstr "メニューを自動的に隠す"
 
-#: ../../godmode/setup/setup_visuals.php:285
+#: ../../godmode/setup/setup_visuals.php:298
+#: ../../enterprise/meta/advanced/metasetup.visual.php:317
+#: ../../enterprise/meta/include/functions_meta.php:1205
+msgid "Visual effects and animation"
+msgstr "表示効果およびアニメーション"
+
+#: ../../godmode/setup/setup_visuals.php:306
 msgid "Style configuration"
 msgstr "スタイル設定"
 
-#: ../../godmode/setup/setup_visuals.php:300
-#: ../../include/functions_config.php:514
+#: ../../godmode/setup/setup_visuals.php:321
+#: ../../include/functions_config.php:561
 msgid "GIS Labels"
 msgstr "GIS ラベル"
 
-#: ../../godmode/setup/setup_visuals.php:301
+#: ../../godmode/setup/setup_visuals.php:322
 msgid ""
 "This enabling this, you get a label with agent name in GIS maps. If you have "
 "lots of agents in the map, will be unreadable. Disabled by default."
@@ -16901,494 +17589,539 @@ msgstr ""
 "これを有効にすると、GISマップ内でエージェント名をラベルに付与します。マップ内に大量のエージェントがある場合は読みにくくなります。デフォルトでは無効です"
 "。"
 
-#: ../../godmode/setup/setup_visuals.php:312
-#: ../../include/functions_config.php:518
+#: ../../godmode/setup/setup_visuals.php:333
+#: ../../include/functions_config.php:565
 msgid "Default icon in GIS"
 msgstr "GIS でのデフォルトアイコン"
 
-#: ../../godmode/setup/setup_visuals.php:313
+#: ../../godmode/setup/setup_visuals.php:334
 msgid "Agent icon for GIS Maps. If set to \"none\", group icon will be used"
 msgstr "GISマップでのエージェントアイコンです。\"なし\" に設定するとグループのアイコンが利用されます。"
 
-#: ../../godmode/setup/setup_visuals.php:322
+#: ../../godmode/setup/setup_visuals.php:336
+msgid "Agent icon group"
+msgstr "エージェントアイコングループ"
+
+#: ../../godmode/setup/setup_visuals.php:343
 msgid "GIS configuration"
 msgstr "GIS設定"
 
-#: ../../godmode/setup/setup_visuals.php:337
-#: ../../include/functions_config.php:465
+#: ../../godmode/setup/setup_visuals.php:358
+#: ../../include/functions_config.php:497
+#: ../../enterprise/meta/advanced/metasetup.visual.php:274
+#: ../../enterprise/meta/include/functions_meta.php:1360
 msgid "Font path"
 msgstr "フォントパス"
 
-#: ../../godmode/setup/setup_visuals.php:367
-#: ../../include/functions_config.php:502
-#: ../../include/functions_config.php:504
+#: ../../godmode/setup/setup_visuals.php:388
+#: ../../include/functions_config.php:549
+#: ../../include/functions_config.php:551
 msgid "Agent size text"
 msgstr "エージェント名の表示長さ"
 
-#: ../../godmode/setup/setup_visuals.php:368
+#: ../../godmode/setup/setup_visuals.php:389
 msgid ""
 "When the agent name have a lot of characters, in some places in Pandora "
 "Console it is necesary truncate to N characters."
 msgstr "エージェント名が長い場合、Pandora コンソールのいくつかの表示は N 文字までで切る必要があります。"
 
-#: ../../godmode/setup/setup_visuals.php:369
-#: ../../godmode/setup/setup_visuals.php:377
+#: ../../godmode/setup/setup_visuals.php:390
+#: ../../godmode/setup/setup_visuals.php:398
 msgid "Small:"
 msgstr "小:"
 
-#: ../../godmode/setup/setup_visuals.php:371
-#: ../../godmode/setup/setup_visuals.php:379
+#: ../../godmode/setup/setup_visuals.php:392
+#: ../../godmode/setup/setup_visuals.php:400
 msgid "Normal:"
 msgstr "通常:"
 
-#: ../../godmode/setup/setup_visuals.php:375
-#: ../../include/functions_config.php:506
+#: ../../godmode/setup/setup_visuals.php:396
+#: ../../include/functions_config.php:553
 msgid "Module size text"
 msgstr "モジュール名の表示長さ"
 
-#: ../../godmode/setup/setup_visuals.php:376
+#: ../../godmode/setup/setup_visuals.php:397
 msgid ""
 "When the module name have a lot of characters, in some places in Pandora "
 "Console it is necesary truncate to N characters."
 msgstr "モジュール名が長い場合、Pandora コンソールのいくつかの表示は N 文字までで切る必要があります。"
 
-#: ../../godmode/setup/setup_visuals.php:383
-#: ../../include/functions_config.php:508
-#: ../../include/functions_config.php:510
+#: ../../godmode/setup/setup_visuals.php:404
+#: ../../include/functions_config.php:555
+#: ../../include/functions_config.php:557
 msgid "Description size text"
 msgstr "説明の表示長さ"
 
-#: ../../godmode/setup/setup_visuals.php:383
+#: ../../godmode/setup/setup_visuals.php:404
 msgid ""
 "When the description name have a lot of characters, in some places in "
 "Pandora Console it is necesary truncate to N characters."
 msgstr "説明が長い場合、Pandora コンソールのいくつかの表示は N 文字までで切る必要があります。"
 
-#: ../../godmode/setup/setup_visuals.php:387
-#: ../../include/functions_config.php:512
+#: ../../godmode/setup/setup_visuals.php:408
+#: ../../include/functions_config.php:559
 msgid "Item title size text"
 msgstr "アイテムタイトルの表示長さ"
 
-#: ../../godmode/setup/setup_visuals.php:388
+#: ../../godmode/setup/setup_visuals.php:409
 msgid ""
 "When the item title name have a lot of characters, in some places in Pandora "
 "Console it is necesary truncate to N characters."
 msgstr "アイテムのタイトル名が長い場合、Pandora コンソールのいくつかの表示は N 文字までで切る必要があります。"
 
-#: ../../godmode/setup/setup_visuals.php:393
+#: ../../godmode/setup/setup_visuals.php:414
 msgid "Show unit along with value in reports"
 msgstr "レポート内に値に加えて単位を表示する"
 
-#: ../../godmode/setup/setup_visuals.php:394
+#: ../../godmode/setup/setup_visuals.php:415
 msgid "This enabling this, max, min and avg values will be shown with units."
 msgstr "これを有効化すると、単位をつけて最大、最小、平均を表示します。"
 
-#: ../../godmode/setup/setup_visuals.php:402
+#: ../../godmode/setup/setup_visuals.php:423
 msgid "Font and Text configuration"
 msgstr "フォントおよびテキスト設定"
 
-#: ../../godmode/setup/setup_visuals.php:417
-#: ../../include/functions_config.php:426
+#: ../../godmode/setup/setup_visuals.php:438
+#: ../../include/functions_config.php:458
 #: ../../enterprise/meta/advanced/metasetup.visual.php:99
-#: ../../enterprise/meta/include/functions_meta.php:1008
+#: ../../enterprise/meta/include/functions_meta.php:1092
 msgid "Graph color (min)"
 msgstr "グラフの色 (最小値)"
 
-#: ../../godmode/setup/setup_visuals.php:421
-#: ../../include/functions_config.php:428
+#: ../../godmode/setup/setup_visuals.php:442
+#: ../../include/functions_config.php:460
 #: ../../enterprise/meta/advanced/metasetup.visual.php:102
-#: ../../enterprise/meta/include/functions_meta.php:1018
+#: ../../enterprise/meta/include/functions_meta.php:1102
 msgid "Graph color (avg)"
 msgstr "グラフの色 (平均値)"
 
-#: ../../godmode/setup/setup_visuals.php:425
-#: ../../include/functions_config.php:430
+#: ../../godmode/setup/setup_visuals.php:446
+#: ../../include/functions_config.php:462
 #: ../../enterprise/meta/advanced/metasetup.visual.php:105
-#: ../../enterprise/meta/include/functions_meta.php:1028
+#: ../../enterprise/meta/include/functions_meta.php:1112
 msgid "Graph color (max)"
 msgstr "グラフの色 (最大値)"
 
-#: ../../godmode/setup/setup_visuals.php:429
-#: ../../include/functions_config.php:432
+#: ../../godmode/setup/setup_visuals.php:450
+#: ../../include/functions_config.php:464
 msgid "Graph color #4"
 msgstr "グラフの色 #4"
 
-#: ../../godmode/setup/setup_visuals.php:433
-#: ../../include/functions_config.php:434
+#: ../../godmode/setup/setup_visuals.php:454
+#: ../../include/functions_config.php:466
 msgid "Graph color #5"
 msgstr "グラフの色 #5"
 
-#: ../../godmode/setup/setup_visuals.php:437
-#: ../../include/functions_config.php:436
+#: ../../godmode/setup/setup_visuals.php:458
+#: ../../include/functions_config.php:468
 msgid "Graph color #6"
 msgstr "グラフの色 #6"
 
-#: ../../godmode/setup/setup_visuals.php:441
-#: ../../include/functions_config.php:438
+#: ../../godmode/setup/setup_visuals.php:462
+#: ../../include/functions_config.php:470
 msgid "Graph color #7"
 msgstr "グラフの色 #7"
 
-#: ../../godmode/setup/setup_visuals.php:445
-#: ../../include/functions_config.php:440
+#: ../../godmode/setup/setup_visuals.php:466
+#: ../../include/functions_config.php:472
 msgid "Graph color #8"
 msgstr "グラフの色 #8"
 
-#: ../../godmode/setup/setup_visuals.php:449
-#: ../../include/functions_config.php:442
+#: ../../godmode/setup/setup_visuals.php:470
+#: ../../include/functions_config.php:474
 msgid "Graph color #9"
 msgstr "グラフの色 #9"
 
-#: ../../godmode/setup/setup_visuals.php:453
-#: ../../include/functions_config.php:444
+#: ../../godmode/setup/setup_visuals.php:474
+#: ../../include/functions_config.php:476
 msgid "Graph color #10"
 msgstr "グラフの色 #10"
 
-#: ../../godmode/setup/setup_visuals.php:457
+#: ../../godmode/setup/setup_visuals.php:478
 msgid "Graph resolution (1-low, 5-high)"
 msgstr "グラフ解像度 (1-低, 5-高)"
 
-#: ../../godmode/setup/setup_visuals.php:461
-#: ../../include/functions_config.php:448
-#: ../../enterprise/meta/advanced/metasetup.visual.php:114
-#: ../../enterprise/meta/include/functions_meta.php:1058
+#: ../../godmode/setup/setup_visuals.php:482
+#: ../../include/functions_config.php:480
+#: ../../enterprise/meta/advanced/metasetup.visual.php:118
+#: ../../enterprise/meta/include/functions_meta.php:1152
 msgid "Value to interface graphics"
 msgstr "インタフェースグラフの値"
 
-#: ../../godmode/setup/setup_visuals.php:470
-#: ../../include/functions_config.php:450
-#: ../../enterprise/meta/advanced/metasetup.visual.php:108
-#: ../../enterprise/meta/include/functions_meta.php:1038
-msgid "Data precision for reports"
-msgstr "レポートのデータ精度"
+#: ../../godmode/setup/setup_visuals.php:491
+msgid "Data precision in PandoraFMS"
+msgstr "Pandora FMS のデータ精度"
 
-#: ../../godmode/setup/setup_visuals.php:471
+#: ../../godmode/setup/setup_visuals.php:492
 msgid ""
-"Number of decimals shown in reports. It must be a number between 0 and 5"
-msgstr "レポートに表示する小数点以下の数です。0 から 5 の間の数字でなければいけません。"
+"Number of decimals shown. It must be a number between 0 and 5, except in "
+"graphs."
+msgstr "小数点以下の桁数。グラフを除いて、値は 0 と 5 の間でなければいけません。"
 
-#: ../../godmode/setup/setup_visuals.php:475
-#: ../../include/functions_config.php:538
+#: ../../godmode/setup/setup_visuals.php:498
+msgid "Data precision in graphs"
+msgstr "グラフにおけるデータの精度"
+
+#: ../../godmode/setup/setup_visuals.php:499
+msgid ""
+"Number of decimals shown. If the field is empty, it will show all the "
+"decimals"
+msgstr "小数点以下の桁数。空の場合、小数点以下すべてを表示します。"
+
+#: ../../godmode/setup/setup_visuals.php:503
+#: ../../include/functions_config.php:587
 msgid "Default line thickness for the Custom Graph."
 msgstr "カスタムグラフのデフォルトの線の太さ"
 
-#: ../../godmode/setup/setup_visuals.php:480
-#: ../../include/functions_config.php:459
-#: ../../enterprise/meta/advanced/metasetup.visual.php:120
-#: ../../enterprise/meta/include/functions_meta.php:1081
+#: ../../godmode/setup/setup_visuals.php:508
+#: ../../include/functions_config.php:491
+#: ../../enterprise/meta/advanced/metasetup.visual.php:124
+#: ../../enterprise/meta/include/functions_meta.php:1175
 msgid "Use round corners"
 msgstr "角を丸くする"
 
-#: ../../godmode/setup/setup_visuals.php:485
-#: ../../godmode/users/configure_user.php:515
-#: ../../include/functions_config.php:469
-#: ../../operation/users/user_edit.php:251
-#: ../../enterprise/meta/advanced/metasetup.visual.php:124
-#: ../../enterprise/meta/include/functions_meta.php:1091
+#: ../../godmode/setup/setup_visuals.php:513
+#: ../../godmode/users/configure_user.php:578
+#: ../../include/functions_config.php:501
+#: ../../operation/users/user_edit.php:253
+#: ../../enterprise/meta/advanced/metasetup.visual.php:128
+#: ../../enterprise/meta/include/functions_meta.php:1185
+#: ../../enterprise/meta/include/functions_meta.php:1195
 msgid "Interactive charts"
 msgstr "動的グラフ"
 
-#: ../../godmode/setup/setup_visuals.php:486
-#: ../../godmode/users/configure_user.php:515
-#: ../../operation/users/user_edit.php:251
-#: ../../enterprise/meta/advanced/metasetup.visual.php:124
+#: ../../godmode/setup/setup_visuals.php:514
+#: ../../godmode/users/configure_user.php:578
+#: ../../operation/users/user_edit.php:253
+#: ../../enterprise/meta/advanced/metasetup.visual.php:128
 msgid "Whether to use Javascript or static PNG graphs"
 msgstr "Javascript のグラフか静的な PNG のグラフ利用の選択"
 
-#: ../../godmode/setup/setup_visuals.php:495
-#: ../../include/functions_config.php:534
-msgid "Shortened module graph data"
-msgstr "短縮モジュールグラフデータ"
-
-#: ../../godmode/setup/setup_visuals.php:496
-msgid "The data number of the module graphs will be rounded and shortened"
-msgstr "モジュールグラフのデータ数が四捨五入して短くなります"
-
-#: ../../godmode/setup/setup_visuals.php:506
-#: ../../enterprise/meta/advanced/metasetup.visual.php:128
+#: ../../godmode/setup/setup_visuals.php:522
+#: ../../enterprise/meta/advanced/metasetup.visual.php:150
 msgid "Type of module charts"
 msgstr "モジュールグラフのタイプ"
 
-#: ../../godmode/setup/setup_visuals.php:515
+#: ../../godmode/setup/setup_visuals.php:531
 msgid "Type of interface charts"
 msgstr "インタフェースグラフのタイプ"
 
-#: ../../godmode/setup/setup_visuals.php:524
+#: ../../godmode/setup/setup_visuals.php:540
 msgid "Show only average"
 msgstr "平均のみ表示"
 
-#: ../../godmode/setup/setup_visuals.php:525
+#: ../../godmode/setup/setup_visuals.php:541
 msgid "Hide Max and Min values in graphs"
 msgstr "グラフ内の最大・最小値を隠す"
 
-#: ../../godmode/setup/setup_visuals.php:533
+#: ../../godmode/setup/setup_visuals.php:549
+#: ../../enterprise/meta/advanced/metasetup.visual.php:115
 msgid "Show percentile 95 in graphs"
 msgstr "グラフで 95%表示"
 
-#: ../../godmode/setup/setup_visuals.php:538
+#: ../../godmode/setup/setup_visuals.php:553
+msgid "Graph TIP view:"
+msgstr "グラフ詳細表示:"
+
+#: ../../godmode/setup/setup_visuals.php:559
+#: ../../enterprise/meta/advanced/metasetup.visual.php:135
+msgid "On Boolean graphs"
+msgstr ""
+
+#: ../../godmode/setup/setup_visuals.php:574
 msgid "Charts configuration"
 msgstr "グラフ設定"
 
-#: ../../godmode/setup/setup_visuals.php:554
-#: ../../include/functions_config.php:500
+#: ../../godmode/setup/setup_visuals.php:591
+msgid "Type of view of visual consoles"
+msgstr "ビジュアルコンソールの表示タイプ"
+
+#: ../../godmode/setup/setup_visuals.php:592
+msgid "Allows you to directly display the list of favorite visual consoles"
+msgstr "お気に入りビジュアルコンソール一覧を直接表示可能"
+
+#: ../../godmode/setup/setup_visuals.php:596
+msgid "Number of favorite visual consoles to show in the menu"
+msgstr "メニューに表示するお気に入りビジュアルコンソールの数"
+
+#: ../../godmode/setup/setup_visuals.php:597
+msgid ""
+"If the number is 0 it will not show the pull-down menu and maximum 25 "
+"favorite consoles"
+msgstr "値が 0 の場合プルダウンメニューに表示されません。また、お気に入りコンソールの最大は 25 です。"
+
+#: ../../godmode/setup/setup_visuals.php:603
+#: ../../include/functions_config.php:546
 msgid "Default line thickness for the Visual Console"
 msgstr "ビジュアルコンソールのデフォルトの線の太さ"
 
-#: ../../godmode/setup/setup_visuals.php:554
+#: ../../godmode/setup/setup_visuals.php:604
 msgid ""
 "This interval will affect to the lines between elements on the Visual Console"
 msgstr "これは、ビジュアルコンソール上の要素間の線に影響します。"
 
-#: ../../godmode/setup/setup_visuals.php:559
+#: ../../godmode/setup/setup_visuals.php:609
+msgid "Visual consoles configuration"
+msgstr "ビジュアルコンソール設定"
+
+#: ../../godmode/setup/setup_visuals.php:625
+#: ../../enterprise/meta/advanced/metasetup.visual.php:280
 msgid "Show report info with description"
 msgstr "説明とともにレポート情報を表示"
 
-#: ../../godmode/setup/setup_visuals.php:561
+#: ../../godmode/setup/setup_visuals.php:627
+#: ../../enterprise/meta/advanced/metasetup.visual.php:280
 msgid ""
 "Custom report description info. It will be applied to all reports and "
 "templates by default."
 msgstr "カスタムレポートの説明情報。デフォルトですべてのレポートおよびテンプレートに適用されます。"
 
-#: ../../godmode/setup/setup_visuals.php:569
-#: ../../enterprise/meta/advanced/metasetup.visual.php:247
+#: ../../godmode/setup/setup_visuals.php:635
+#: ../../enterprise/meta/advanced/metasetup.visual.php:286
 msgid "Custom report front page"
 msgstr "カスタムレポート表紙"
 
-#: ../../godmode/setup/setup_visuals.php:571
-#: ../../enterprise/meta/advanced/metasetup.visual.php:247
+#: ../../godmode/setup/setup_visuals.php:637
+#: ../../enterprise/meta/advanced/metasetup.visual.php:286
 msgid ""
 "Custom report front page. It will be applied to all reports and templates by "
 "default."
 msgstr "カスタムレポートの表紙。すべてのレポートおよびテンプレートにデフォルトで適用されます。"
 
-#: ../../godmode/setup/setup_visuals.php:593
-#: ../../godmode/setup/setup_visuals.php:599
-#: ../../godmode/setup/setup_visuals.php:612
-#: ../../godmode/setup/setup_visuals.php:620
-#: ../../godmode/setup/setup_visuals.php:625
-#: ../../godmode/setup/setup_visuals.php:633
-#: ../../include/functions_config.php:643
-#: ../../include/functions_config.php:646
-#: ../../include/functions_config.php:649
-#: ../../include/functions_config.php:652
-#: ../../include/functions_config.php:655
-#: ../../include/functions_config.php:658
-#: ../../enterprise/meta/advanced/metasetup.visual.php:250
-#: ../../enterprise/meta/advanced/metasetup.visual.php:253
-#: ../../enterprise/meta/advanced/metasetup.visual.php:257
-#: ../../enterprise/meta/advanced/metasetup.visual.php:263
-#: ../../enterprise/meta/advanced/metasetup.visual.php:267
-#: ../../enterprise/meta/advanced/metasetup.visual.php:274
-#: ../../enterprise/meta/include/functions_meta.php:1227
-#: ../../enterprise/meta/include/functions_meta.php:1232
-#: ../../enterprise/meta/include/functions_meta.php:1237
-#: ../../enterprise/meta/include/functions_meta.php:1242
-#: ../../enterprise/meta/include/functions_meta.php:1247
-#: ../../enterprise/meta/include/functions_meta.php:1252
+#: ../../godmode/setup/setup_visuals.php:659
+#: ../../godmode/setup/setup_visuals.php:665
+#: ../../godmode/setup/setup_visuals.php:678
+#: ../../godmode/setup/setup_visuals.php:686
+#: ../../godmode/setup/setup_visuals.php:691
+#: ../../godmode/setup/setup_visuals.php:699
+#: ../../include/functions_config.php:696
+#: ../../include/functions_config.php:699
+#: ../../include/functions_config.php:702
+#: ../../include/functions_config.php:705
+#: ../../include/functions_config.php:708
+#: ../../include/functions_config.php:711
+#: ../../enterprise/meta/advanced/metasetup.visual.php:289
+#: ../../enterprise/meta/advanced/metasetup.visual.php:292
+#: ../../enterprise/meta/advanced/metasetup.visual.php:296
+#: ../../enterprise/meta/advanced/metasetup.visual.php:302
+#: ../../enterprise/meta/advanced/metasetup.visual.php:306
+#: ../../enterprise/meta/advanced/metasetup.visual.php:313
+#: ../../enterprise/meta/include/functions_meta.php:1366
+#: ../../enterprise/meta/include/functions_meta.php:1377
+#: ../../enterprise/meta/include/functions_meta.php:1382
+#: ../../enterprise/meta/include/functions_meta.php:1387
+#: ../../enterprise/meta/include/functions_meta.php:1392
+#: ../../enterprise/meta/include/functions_meta.php:1397
 msgid "Custom report front"
 msgstr "カスタムレポートスタイル"
 
-#: ../../godmode/setup/setup_visuals.php:593
-#: ../../include/functions_config.php:646
+#: ../../godmode/setup/setup_visuals.php:659
+#: ../../include/functions_config.php:699
 #: ../../enterprise/godmode/reporting/reporting_builder.advanced.php:82
 #: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:116
-#: ../../enterprise/meta/advanced/metasetup.visual.php:250
-#: ../../enterprise/meta/include/functions_meta.php:1232
+#: ../../enterprise/meta/advanced/metasetup.visual.php:289
+#: ../../enterprise/meta/include/functions_meta.php:1377
 msgid "Font family"
 msgstr "フォントファミリ"
 
-#: ../../godmode/setup/setup_visuals.php:600
-#: ../../include/functions_config.php:472
-#: ../../include/functions_config.php:649
+#: ../../godmode/setup/setup_visuals.php:666
+#: ../../include/functions_config.php:504
+#: ../../include/functions_config.php:702
 #: ../../enterprise/godmode/reporting/reporting_builder.advanced.php:85
 #: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:119
-#: ../../enterprise/meta/advanced/metasetup.visual.php:253
-#: ../../enterprise/meta/include/functions_meta.php:1131
-#: ../../enterprise/meta/include/functions_meta.php:1237
+#: ../../enterprise/meta/advanced/metasetup.visual.php:292
+#: ../../enterprise/meta/include/functions_meta.php:1245
+#: ../../enterprise/meta/include/functions_meta.php:1382
 msgid "Custom logo"
 msgstr "カスタムロゴ"
 
-#: ../../godmode/setup/setup_visuals.php:602
+#: ../../godmode/setup/setup_visuals.php:668
 #: ../../enterprise/godmode/reporting/reporting_builder.advanced.php:87
-#: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:121
-#: ../../enterprise/meta/advanced/metasetup.visual.php:255
 msgid ""
 "The dir of custom logos is in your www Pandora Console in "
-"\"images/custom_logo\". You can upload more files (ONLY JPEG) in upload tool "
-"in console."
+"\"images/custom_logo\". You can upload more files (ONLY JPEG AND PNG) in "
+"upload tool in console."
 msgstr ""
-"カスタムロゴのディレクトリは、Pandora コンソールの \"images/custom_logo\" "
-"です。コンソールのアップロードツールを使って、ファイル(JPEG)をアップロードできます。"
+"カスタムロゴのディレクトリは Pandora コンソールの \"images/custom_logo\" "
+"です。コンソールのアップロードツールを使って、ファイル(JPEG および PNG のみ)をアップロードできます。"
 
-#: ../../godmode/setup/setup_visuals.php:620
-#: ../../include/functions_config.php:652
+#: ../../godmode/setup/setup_visuals.php:686
+#: ../../include/functions_config.php:705
 #: ../../enterprise/godmode/reporting/reporting_builder.advanced.php:96
 #: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:129
-#: ../../enterprise/meta/advanced/metasetup.visual.php:263
-#: ../../enterprise/meta/include/functions_meta.php:1242
+#: ../../enterprise/meta/advanced/metasetup.visual.php:302
+#: ../../enterprise/meta/include/functions_meta.php:1387
 msgid "Header"
 msgstr "ヘッダー"
 
-#: ../../godmode/setup/setup_visuals.php:625
-#: ../../include/functions_config.php:655
+#: ../../godmode/setup/setup_visuals.php:691
+#: ../../include/functions_config.php:708
 #: ../../enterprise/godmode/reporting/reporting_builder.advanced.php:99
 #: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:133
-#: ../../enterprise/meta/advanced/metasetup.visual.php:267
-#: ../../enterprise/meta/include/functions_meta.php:1247
+#: ../../enterprise/meta/advanced/metasetup.visual.php:306
+#: ../../enterprise/meta/include/functions_meta.php:1392
 msgid "First page"
 msgstr "最初のページ"
 
-#: ../../godmode/setup/setup_visuals.php:633
-#: ../../include/functions_config.php:658
+#: ../../godmode/setup/setup_visuals.php:699
+#: ../../include/functions_config.php:711
 #: ../../enterprise/godmode/reporting/reporting_builder.advanced.php:102
 #: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:137
-#: ../../enterprise/meta/advanced/metasetup.visual.php:274
-#: ../../enterprise/meta/include/functions_meta.php:1252
+#: ../../enterprise/meta/advanced/metasetup.visual.php:313
+#: ../../enterprise/meta/include/functions_meta.php:1397
 msgid "Footer"
 msgstr "フッター"
 
-#: ../../godmode/setup/setup_visuals.php:640
+#: ../../godmode/setup/setup_visuals.php:706
 msgid "Show QR Code icon in the header"
 msgstr "ヘッダーに QR コードを表示する"
 
-#: ../../godmode/setup/setup_visuals.php:651
-#: ../../include/functions_config.php:530
+#: ../../godmode/setup/setup_visuals.php:717
+#: ../../include/functions_config.php:579
 msgid "Custom graphviz directory"
 msgstr "カスタム graphviz ディレクトリ"
 
-#: ../../godmode/setup/setup_visuals.php:652
+#: ../../godmode/setup/setup_visuals.php:718
 msgid "Custom directory where the graphviz binaries are stored."
 msgstr "graphviz バイナリが置かれているカスタムディレクトリ。"
 
-#: ../../godmode/setup/setup_visuals.php:658
-#: ../../include/functions_config.php:532
+#: ../../godmode/setup/setup_visuals.php:724
+#: ../../include/functions_config.php:581
 msgid "Networkmap max width"
 msgstr "ネットワークマップ最大幅"
 
-#: ../../godmode/setup/setup_visuals.php:665
-#: ../../enterprise/meta/advanced/metasetup.visual.php:163
-#: ../../enterprise/meta/include/functions_meta.php:1121
+#: ../../godmode/setup/setup_visuals.php:731
+#: ../../enterprise/meta/advanced/metasetup.visual.php:185
+#: ../../enterprise/meta/include/functions_meta.php:1235
 msgid "Show only the group name"
 msgstr "グループ名のみ表示"
 
-#: ../../godmode/setup/setup_visuals.php:667
-#: ../../include/functions_config.php:536
-#: ../../enterprise/meta/advanced/metasetup.visual.php:165
+#: ../../godmode/setup/setup_visuals.php:733
+#: ../../include/functions_config.php:585
+#: ../../enterprise/meta/advanced/metasetup.visual.php:187
 msgid "Show the group name instead the group icon."
 msgstr "グループアイコンの代わりにグループ名を表示します。"
 
-#: ../../godmode/setup/setup_visuals.php:677
-#: ../../include/functions_config.php:422
+#: ../../godmode/setup/setup_visuals.php:743
+#: ../../include/functions_config.php:454
 #: ../../enterprise/meta/advanced/metasetup.visual.php:81
-#: ../../enterprise/meta/include/functions_meta.php:988
+#: ../../enterprise/meta/include/functions_meta.php:1072
 msgid "Date format string"
 msgstr "日時フォーマット"
 
-#: ../../godmode/setup/setup_visuals.php:678
+#: ../../godmode/setup/setup_visuals.php:744
 #: ../../enterprise/meta/advanced/metasetup.visual.php:82
 msgid "Example"
 msgstr "例"
 
-#: ../../godmode/setup/setup_visuals.php:690
-#: ../../include/functions_config.php:424
+#: ../../godmode/setup/setup_visuals.php:756
+#: ../../include/functions_config.php:456
 #: ../../enterprise/meta/advanced/metasetup.visual.php:93
-#: ../../enterprise/meta/include/functions_meta.php:998
+#: ../../enterprise/meta/include/functions_meta.php:1082
 msgid "Timestamp or time comparation"
 msgstr "タイムスタンプ表示"
 
-#: ../../godmode/setup/setup_visuals.php:691
+#: ../../godmode/setup/setup_visuals.php:757
 #: ../../enterprise/meta/advanced/metasetup.visual.php:94
 msgid "Comparation in rollover"
 msgstr "経過時間表示"
 
-#: ../../godmode/setup/setup_visuals.php:693
+#: ../../godmode/setup/setup_visuals.php:759
 #: ../../enterprise/meta/advanced/metasetup.visual.php:96
 msgid "Timestamp in rollover"
 msgstr "日時表示"
 
-#: ../../godmode/setup/setup_visuals.php:701
+#: ../../godmode/setup/setup_visuals.php:767
 msgid "Custom values post process"
 msgstr "保存倍率のカスタム値"
 
-#: ../../godmode/setup/setup_visuals.php:715
+#: ../../godmode/setup/setup_visuals.php:781
 msgid "Delete custom values"
 msgstr "カスタム値の削除"
 
-#: ../../godmode/setup/setup_visuals.php:735
+#: ../../godmode/setup/setup_visuals.php:801
 msgid "Interval values"
 msgstr "間隔値"
 
-#: ../../godmode/setup/setup_visuals.php:738 ../../include/functions.php:434
-#: ../../include/functions.php:568 ../../include/functions_html.php:729
+#: ../../godmode/setup/setup_visuals.php:804 ../../include/functions.php:434
+#: ../../include/functions.php:568 ../../include/functions_html.php:832
 #: ../../enterprise/extensions/vmware/functions.php:21
 #: ../../enterprise/extensions/vmware/functions.php:22
 #: ../../enterprise/extensions/vmware/functions.php:23
 #: ../../enterprise/extensions/vmware/functions.php:24
-#: ../../enterprise/meta/advanced/metasetup.visual.php:141
+#: ../../enterprise/meta/advanced/metasetup.visual.php:163
 msgid "minutes"
 msgstr "分"
 
-#: ../../godmode/setup/setup_visuals.php:739 ../../include/functions.php:435
-#: ../../include/functions.php:569 ../../include/functions_html.php:730
-#: ../../enterprise/meta/advanced/metasetup.visual.php:142
+#: ../../godmode/setup/setup_visuals.php:805 ../../include/functions.php:435
+#: ../../include/functions.php:569 ../../include/functions_html.php:833
+#: ../../enterprise/meta/advanced/metasetup.visual.php:164
 msgid "hours"
 msgstr "時間"
 
-#: ../../godmode/setup/setup_visuals.php:741 ../../include/functions.php:432
-#: ../../include/functions.php:566 ../../include/functions_html.php:733
-#: ../../enterprise/meta/advanced/metasetup.visual.php:144
+#: ../../godmode/setup/setup_visuals.php:807 ../../include/functions.php:432
+#: ../../include/functions.php:566 ../../include/functions_html.php:836
+#: ../../enterprise/meta/advanced/metasetup.visual.php:166
 msgid "months"
 msgstr "月"
 
-#: ../../godmode/setup/setup_visuals.php:742 ../../include/functions.php:433
-#: ../../include/functions.php:567 ../../include/functions_html.php:734
-#: ../../enterprise/meta/advanced/metasetup.visual.php:145
+#: ../../godmode/setup/setup_visuals.php:808 ../../include/functions.php:433
+#: ../../include/functions.php:567 ../../include/functions_html.php:837
+#: ../../enterprise/meta/advanced/metasetup.visual.php:167
 msgid "years"
 msgstr "年"
 
-#: ../../godmode/setup/setup_visuals.php:743
-#: ../../enterprise/meta/advanced/metasetup.visual.php:146
+#: ../../godmode/setup/setup_visuals.php:809
+#: ../../enterprise/meta/advanced/metasetup.visual.php:168
 msgid "Add new custom value to intervals"
 msgstr "新たな間隔カスタム値の追加"
 
-#: ../../godmode/setup/setup_visuals.php:749
-#: ../../include/functions_config.php:634
-#: ../../enterprise/meta/advanced/metasetup.visual.php:152
-#: ../../enterprise/meta/include/functions_meta.php:1221
+#: ../../godmode/setup/setup_visuals.php:815
+#: ../../include/functions_config.php:687
+#: ../../enterprise/meta/advanced/metasetup.visual.php:174
+#: ../../enterprise/meta/include/functions_meta.php:1355
 msgid "Delete interval"
 msgstr "間隔値を削除"
 
-#: ../../godmode/setup/setup_visuals.php:760
+#: ../../godmode/setup/setup_visuals.php:829
+#: ../../include/functions_config.php:714
+msgid "CSV divider"
+msgstr "CSV 区切り文字"
+
+#: ../../godmode/setup/setup_visuals.php:846
 msgid "Other configuration"
 msgstr "その他設定"
 
-#: ../../godmode/setup/setup_visuals.php:948
-#: ../../godmode/setup/setup_visuals.php:988
-#: ../../enterprise/meta/advanced/metasetup.visual.php:399
-#: ../../enterprise/meta/advanced/metasetup.visual.php:439
+#: ../../godmode/setup/setup_visuals.php:1079
+#: ../../godmode/setup/setup_visuals.php:1119
+#: ../../enterprise/meta/advanced/metasetup.visual.php:462
+#: ../../enterprise/meta/advanced/metasetup.visual.php:502
 msgid "Logo preview"
 msgstr "ロゴのプレビュー"
 
-#: ../../godmode/setup/setup_visuals.php:1028
-#: ../../enterprise/meta/advanced/metasetup.visual.php:479
+#: ../../godmode/setup/setup_visuals.php:1159
+#: ../../enterprise/meta/advanced/metasetup.visual.php:542
 msgid "Splash Preview"
-msgstr "スプラッシュ表示"
+msgstr "スプラッシュプレビュー"
 
-#: ../../godmode/setup/setup_visuals.php:1069
-#: ../../enterprise/meta/advanced/metasetup.visual.php:519
+#: ../../godmode/setup/setup_visuals.php:1200
+#: ../../enterprise/meta/advanced/metasetup.visual.php:582
 msgid "Background preview"
 msgstr "背景のプレビュー"
 
-#: ../../godmode/setup/setup_visuals.php:1113
+#: ../../godmode/setup/setup_visuals.php:1244
 msgid "Gis icons preview"
 msgstr "GISアイコンのプレビュー"
 
-#: ../../godmode/setup/setup_visuals.php:1168
+#: ../../godmode/setup/setup_visuals.php:1299
 msgid "Status set preview"
 msgstr "状態表示プレビュー"
 
 #: ../../godmode/setup/snmp_wizard.php:43
-#: ../../enterprise/godmode/setup/setup_auth.php:427
-#: ../../enterprise/godmode/setup/setup_auth.php:468
+#: ../../enterprise/godmode/setup/setup_auth.php:138
+#: ../../enterprise/godmode/setup/setup_auth.php:182
+#: ../../enterprise/godmode/setup/setup_auth.php:737
+#: ../../enterprise/godmode/setup/setup_auth.php:778
 msgid "OP"
 msgstr "OP"
 
@@ -17417,45 +18150,45 @@ msgid "Unsucessful save the snmp translation."
 msgstr "SNMP翻訳の保存に失敗しました。"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:28
-#: ../../operation/snmpconsole/snmp_view.php:424
-#: ../../operation/snmpconsole/snmp_view.php:810
-#: ../../operation/snmpconsole/snmp_view.php:817
+#: ../../operation/snmpconsole/snmp_view.php:491
+#: ../../operation/snmpconsole/snmp_view.php:922
+#: ../../operation/snmpconsole/snmp_view.php:929
 #: ../../enterprise/godmode/massive/massive_delete_alerts_snmp.php:28
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:29
 msgid "Cold start (0)"
 msgstr "Cold start (0)"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:29
-#: ../../operation/snmpconsole/snmp_view.php:425
-#: ../../operation/snmpconsole/snmp_view.php:810
-#: ../../operation/snmpconsole/snmp_view.php:820
+#: ../../operation/snmpconsole/snmp_view.php:492
+#: ../../operation/snmpconsole/snmp_view.php:922
+#: ../../operation/snmpconsole/snmp_view.php:932
 #: ../../enterprise/godmode/massive/massive_delete_alerts_snmp.php:29
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:30
 msgid "Warm start (1)"
 msgstr "Warm start (1)"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:30
-#: ../../operation/snmpconsole/snmp_view.php:426
-#: ../../operation/snmpconsole/snmp_view.php:810
-#: ../../operation/snmpconsole/snmp_view.php:823
+#: ../../operation/snmpconsole/snmp_view.php:493
+#: ../../operation/snmpconsole/snmp_view.php:922
+#: ../../operation/snmpconsole/snmp_view.php:935
 #: ../../enterprise/godmode/massive/massive_delete_alerts_snmp.php:30
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:31
 msgid "Link down (2)"
 msgstr "Link down (2)"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:31
-#: ../../operation/snmpconsole/snmp_view.php:427
-#: ../../operation/snmpconsole/snmp_view.php:810
-#: ../../operation/snmpconsole/snmp_view.php:826
+#: ../../operation/snmpconsole/snmp_view.php:494
+#: ../../operation/snmpconsole/snmp_view.php:922
+#: ../../operation/snmpconsole/snmp_view.php:938
 #: ../../enterprise/godmode/massive/massive_delete_alerts_snmp.php:31
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:32
 msgid "Link up (3)"
 msgstr "Link up (3)"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:32
-#: ../../operation/snmpconsole/snmp_view.php:428
-#: ../../operation/snmpconsole/snmp_view.php:810
-#: ../../operation/snmpconsole/snmp_view.php:829
+#: ../../operation/snmpconsole/snmp_view.php:495
+#: ../../operation/snmpconsole/snmp_view.php:922
+#: ../../operation/snmpconsole/snmp_view.php:941
 #: ../../enterprise/godmode/massive/massive_delete_alerts_snmp.php:32
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:33
 msgid "Authentication failure (4)"
@@ -17468,8 +18201,8 @@ msgstr "Authentication failure (4)"
 #: ../../godmode/snmpconsole/snmp_filters.php:38
 #: ../../godmode/snmpconsole/snmp_filters.php:42
 #: ../../operation/snmpconsole/snmp_statistics.php:64
-#: ../../operation/snmpconsole/snmp_view.php:466
-#: ../../operation/snmpconsole/snmp_view.php:553
+#: ../../operation/snmpconsole/snmp_view.php:540
+#: ../../operation/snmpconsole/snmp_view.php:655
 msgid "SNMP Console"
 msgstr "SNMP コンソール"
 
@@ -17477,12 +18210,6 @@ msgstr "SNMP コンソール"
 msgid "Update alert"
 msgstr "アラート設定"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:82
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:455
-#: ../../enterprise/meta/monitoring/wizard/wizard.main.php:533
-msgid "Create alert"
-msgstr "アラート作成"
-
 #: ../../godmode/snmpconsole/snmp_alert.php:86
 msgid "Alert overview"
 msgstr "アラート一覧"
@@ -17522,7 +18249,7 @@ msgstr "アラート (%s /%s) を削除できませんでした"
 #: ../../godmode/snmpconsole/snmp_alert.php:637
 #: ../../godmode/snmpconsole/snmp_alert.php:1157
 #: ../../godmode/snmpconsole/snmp_trap_generator.php:72
-#: ../../operation/snmpconsole/snmp_view.php:605
+#: ../../operation/snmpconsole/snmp_view.php:713
 msgid "Enterprise String"
 msgstr "Enterprise文字列"
 
@@ -17534,14 +18261,15 @@ msgstr "カスタム値/OID"
 #: ../../godmode/snmpconsole/snmp_alert.php:652
 #: ../../godmode/snmpconsole/snmp_alert.php:1153
 #: ../../godmode/snmpconsole/snmp_trap_generator.php:78
-#: ../../operation/snmpconsole/snmp_view.php:601
+#: ../../operation/snmpconsole/snmp_view.php:709
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:247
 msgid "SNMP Agent"
 msgstr "SNMPエージェント"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:664
 #: ../../godmode/snmpconsole/snmp_alert.php:1003
-#: ../../operation/snmpconsole/snmp_view.php:420
+#: ../../include/functions_snmp.php:377
+#: ../../operation/snmpconsole/snmp_view.php:487
 #: ../../enterprise/godmode/massive/massive_delete_alerts_snmp.php:169
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:220
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:249
@@ -17605,9 +18333,9 @@ msgid "Custom Value/Enterprise String"
 msgstr "カスタム値/Enterprise文字列"
 
 #: ../../godmode/snmpconsole/snmp_alert.php:1165
-#: ../../include/functions_reporting_html.php:2882
-#: ../../include/functions_reporting_html.php:3110
-#: ../../include/functions_treeview.php:423
+#: ../../include/functions_treeview.php:429
+#: ../../include/functions_reporting_html.php:2995
+#: ../../include/functions_reporting_html.php:3223
 msgid "Times fired"
 msgstr "通知回数"
 
@@ -17619,7 +18347,7 @@ msgstr "回数"
 msgid "ID Alert SNMP"
 msgstr "SNMPアラートID"
 
-#: ../../godmode/snmpconsole/snmp_alert.php:1487
+#: ../../godmode/snmpconsole/snmp_alert.php:1484
 msgid "Add action "
 msgstr "アクション追加 "
 
@@ -17627,24 +18355,33 @@ msgstr "アクション追加 "
 msgid "Filter overview"
 msgstr "フィルタの概要"
 
-#: ../../godmode/snmpconsole/snmp_filters.php:51
+#: ../../godmode/snmpconsole/snmp_filters.php:77
 msgid "There was a problem updating the filter"
 msgstr "フィルタの更新に問題が発生しました。"
 
-#: ../../godmode/snmpconsole/snmp_filters.php:63
+#: ../../godmode/snmpconsole/snmp_filters.php:107
 msgid "There was a problem creating the filter"
 msgstr "フィルタの作成に問題が発生しました。"
 
-#: ../../godmode/snmpconsole/snmp_filters.php:73
+#: ../../godmode/snmpconsole/snmp_filters.php:125
 msgid "There was a problem deleting the filter"
 msgstr "フィルタの削除で問題が発生しました。"
 
-#: ../../godmode/snmpconsole/snmp_filters.php:98
+#: ../../godmode/snmpconsole/snmp_filters.php:169
+#: ../../godmode/snmpconsole/snmp_filters.php:180
 msgid ""
 "This field contains a substring, could be part of a IP address, a numeric "
 "OID, or a plain substring"
 msgstr "このフィールドには、IPアドレス、OID、文字列の一部を入力します。"
 
+#: ../../godmode/snmpconsole/snmp_filters.php:172
+msgid "Click to remove the filter"
+msgstr "フィルタ削除"
+
+#: ../../godmode/snmpconsole/snmp_filters.php:195
+msgid "Click to add new filter"
+msgstr "新規フィルタ追加"
+
 #: ../../godmode/snmpconsole/snmp_trap_generator.php:37
 msgid "SNMP Trap generator"
 msgstr "SNMPトラップジェネレータ"
@@ -17662,6 +18399,10 @@ msgstr "生成しました"
 msgid "Could not be generated: %s"
 msgstr "生成できません: %s"
 
+#: ../../godmode/snmpconsole/snmp_trap_generator.php:66
+msgid "Host address"
+msgstr "ホストアドレス"
+
 #: ../../godmode/snmpconsole/snmp_trap_generator.php:81
 msgid "SNMP Type"
 msgstr "SNMPタイプ"
@@ -17704,7 +18445,7 @@ msgid "Create Tag"
 msgstr "タグの作成"
 
 #: ../../godmode/tag/edit_tag.php:185
-#: ../../include/functions_reporting.php:3843
+#: ../../include/functions_reporting.php:4365
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1666
 #: ../../enterprise/meta/include/functions_wizard_meta.php:521
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:108
@@ -17720,7 +18461,7 @@ msgid "Associated Email direction to use later in alerts associated to Tags."
 msgstr "タグに関連付けられるアラートで利用するためのメール送信先"
 
 #: ../../godmode/tag/edit_tag.php:205 ../../godmode/tag/tag.php:204
-#: ../../godmode/users/user_list.php:406
+#: ../../godmode/users/user_list.php:403
 msgid "Phone"
 msgstr "電話番号"
 
@@ -17825,21 +18566,20 @@ msgid "Package updated successfully."
 msgstr "パッケージを更新しました。"
 
 #: ../../godmode/update_manager/update_manager.offline.php:44
-msgid ""
-"If there are any database change, it will be applied on the next login."
-msgstr "データベース変更がある場合は、次回のログイン時に適用されます。"
+msgid "If there are any database change, it will be applied."
+msgstr "データベースの変更がある場合、それが適用されます。"
 
 #: ../../godmode/update_manager/update_manager.offline.php:45
 #: ../../include/functions_update_manager.php:345
 #: ../../enterprise/include/functions_update_manager.php:177
 msgid "Minor release available"
-msgstr "マイナーリリースがあります"
+msgstr "マイナーリリースがあります。"
 
 #: ../../godmode/update_manager/update_manager.offline.php:46
 #: ../../include/functions_update_manager.php:346
 #: ../../enterprise/include/functions_update_manager.php:178
 msgid "New package available"
-msgstr "新しいパッケージがあります"
+msgstr "新たなパッケージがあります。"
 
 #: ../../godmode/update_manager/update_manager.offline.php:47
 #: ../../godmode/update_manager/update_manager.offline.php:49
@@ -17848,7 +18588,7 @@ msgstr "新しいパッケージがあります"
 #: ../../enterprise/include/functions_update_manager.php:179
 #: ../../enterprise/include/functions_update_manager.php:181
 msgid "Minor release rejected. Changes will not apply."
-msgstr "マイナーリリースが不正です。変更は適用されません。"
+msgstr "マイナーリリースを受け付けません。変更は適用されません。"
 
 #: ../../godmode/update_manager/update_manager.offline.php:48
 #: ../../include/functions_update_manager.php:348
@@ -17856,25 +18596,25 @@ msgstr "マイナーリリースが不正です。変更は適用されません
 msgid ""
 "Minor release rejected. The database will not be updated and the package "
 "will apply."
-msgstr "マイナーリリースの適用ができませんでした。データベースはアップデートされませんが、パッケージは適用されます。"
+msgstr "マイナーリリースを受け付けません。データベースがアップデートされませんがパッケージは適用されます。"
 
 #: ../../godmode/update_manager/update_manager.offline.php:50
 #: ../../include/functions_update_manager.php:350
 #: ../../enterprise/include/functions_update_manager.php:182
 msgid "These package changes will not apply."
-msgstr "これらのパッケージの変更は適用されません。"
+msgstr "これらのパッケージ変更は適用されません。"
 
 #: ../../godmode/update_manager/update_manager.offline.php:51
 #: ../../include/functions_update_manager.php:351
 #: ../../enterprise/include/functions_update_manager.php:183
 msgid "Package rejected. These package changes will not apply."
-msgstr "パッケージが不正です。これらのパッケージの変更は適用されません。"
+msgstr "パッケージを受け付けられません。これらのパッケージは適用されません。"
 
 #: ../../godmode/update_manager/update_manager.offline.php:52
 #: ../../include/functions_update_manager.php:352
 #: ../../enterprise/include/functions_update_manager.php:184
 msgid "Database successfully updated"
-msgstr "データベースを更新しました"
+msgstr "データベースを更新しました。"
 
 #: ../../godmode/update_manager/update_manager.offline.php:53
 #: ../../include/functions_update_manager.php:353
@@ -17886,83 +18626,89 @@ msgstr "MR ファイルエラー"
 #: ../../include/functions_update_manager.php:354
 #: ../../enterprise/include/functions_update_manager.php:186
 msgid "Package updated successfully"
-msgstr "パッケージを更新しました"
+msgstr "パッケージを更新しました。"
 
 #: ../../godmode/update_manager/update_manager.offline.php:55
 #: ../../include/functions_update_manager.php:355
 #: ../../enterprise/include/functions_update_manager.php:187
 msgid "Error in package updated"
-msgstr "パッケージの更新エラー"
+msgstr "パッケージ更新エラー"
 
 #: ../../godmode/update_manager/update_manager.offline.php:56
 #: ../../include/functions_update_manager.php:356
 #: ../../enterprise/include/functions_update_manager.php:188
 msgid ""
 "Database MR version is inconsistent, do you want to apply the package?"
-msgstr "データベースのMRバージョンが矛盾しています。パッケージを適用しますか？"
+msgstr "データベースの MR バージョンの不整合があります。パッケージを適用しますか?"
 
 #: ../../godmode/update_manager/update_manager.offline.php:57
 #: ../../include/functions_update_manager.php:357
 #: ../../enterprise/include/functions_update_manager.php:189
 msgid "There are db changes"
-msgstr "DB の変更があります"
+msgstr "DB の変更があります。"
 
 #: ../../godmode/update_manager/update_manager.offline.php:58
 #: ../../include/functions_update_manager.php:358
+#: ../../enterprise/include/functions_update_manager.php:190
 msgid ""
-"There are a new database changes available to apply. Do you want to start "
-"the DB update process?"
-msgstr "適用すべきデータベースの更新があります。DB のアップデート処理を開始しますか?"
+"There are new database changes available to apply. Do you want to start the "
+"DB update process?"
+msgstr "新たなデータベースの変更があります。DB 更新プロセスを開始しますか?"
 
 #: ../../godmode/update_manager/update_manager.offline.php:59
 #: ../../include/functions_update_manager.php:359
-msgid "We recommend launch a "
-msgstr "このプロセスに対して、 "
+#: ../../enterprise/include/functions_update_manager.php:191
+msgid "We recommend launching "
+msgstr "つぎの実行をお勧めします "
 
 #: ../../godmode/update_manager/update_manager.offline.php:60
 #: ../../include/functions_update_manager.php:360
 #: ../../enterprise/include/functions_update_manager.php:192
 msgid "planned downtime"
-msgstr "計画停止を実行することを"
-
-#: ../../godmode/update_manager/update_manager.offline.php:61
-#: ../../include/functions_update_manager.php:361
-#: ../../enterprise/include/functions_update_manager.php:193
-msgid " to this process"
-msgstr " お勧めします:"
-
-#: ../../godmode/update_manager/update_manager.offline.php:62
-#: ../../include/functions_update_manager.php:362
-#: ../../enterprise/include/functions_update_manager.php:194
-msgid "There is a new update available"
-msgstr "新たな更新があります"
+msgstr "計画停止"
 
 #: ../../godmode/update_manager/update_manager.offline.php:63
+#: ../../godmode/update_manager/update_manager.offline.php:66
 #: ../../include/functions_update_manager.php:363
+#: ../../include/functions_update_manager.php:366
 #: ../../enterprise/include/functions_update_manager.php:195
+#: ../../enterprise/include/functions_update_manager.php:198
+msgid " to this process"
+msgstr ""
+
+#: ../../godmode/update_manager/update_manager.offline.php:69
+#: ../../include/functions_update_manager.php:369
+#: ../../enterprise/include/functions_update_manager.php:201
+msgid "There is a new update available"
+msgstr "新たな更新があります。"
+
+#: ../../godmode/update_manager/update_manager.offline.php:70
+#: ../../include/functions_update_manager.php:370
+#: ../../enterprise/include/functions_update_manager.php:202
 msgid ""
 "There is a new update available to apply. Do you want to start the update "
 "process?"
-msgstr "適用すべき新たなアップデートがあります。アップデート処理を開始しますか?"
+msgstr "新たな更新があります。更新処理を開始しますか?"
 
-#: ../../godmode/update_manager/update_manager.offline.php:64
-#: ../../include/functions_update_manager.php:364
-#: ../../enterprise/include/functions_update_manager.php:196
+#: ../../godmode/update_manager/update_manager.offline.php:71
+#: ../../include/functions_update_manager.php:371
+#: ../../enterprise/include/functions_update_manager.php:203
 msgid "Applying DB MR"
-msgstr "DB へ MR を適用中"
+msgstr "DB へ MR適用中"
 
-#: ../../godmode/update_manager/update_manager.offline.php:67
-#: ../../include/functions_update_manager.php:367
-#: ../../enterprise/include/functions_update_manager.php:199
+#: ../../godmode/update_manager/update_manager.offline.php:74
+#: ../../include/functions_update_manager.php:374
+#: ../../enterprise/include/functions_update_manager.php:206
 msgid "Apply MR"
-msgstr "MR を適用"
+msgstr "MR 適用"
 
-#: ../../godmode/update_manager/update_manager.offline.php:68
-#: ../../include/functions_update_manager.php:368
-#: ../../include/functions_visual_map_editor.php:367
-#: ../../enterprise/godmode/policies/policy_agents.php:381
-#: ../../enterprise/godmode/policies/policy_queue.php:415
-#: ../../enterprise/include/functions_update_manager.php:200
+#: ../../godmode/update_manager/update_manager.offline.php:75
+#: ../../include/functions_update_manager.php:375
+#: ../../include/functions_visual_map_editor.php:481
+#: ../../enterprise/godmode/policies/policy_agents.php:576
+#: ../../enterprise/godmode/policies/policy_agents.php:820
+#: ../../enterprise/godmode/policies/policy_queue.php:435
+#: ../../enterprise/include/functions_update_manager.php:207
 #: ../../enterprise/meta/advanced/policymanager.apply.php:215
 #: ../../enterprise/meta/advanced/policymanager.queue.php:306
 msgid "Apply"
@@ -17991,8 +18737,8 @@ msgstr ""
 "PHP の設定で、最大アップロードファイルサイズが %s に制限されています。大きな更新時に問題にならないよう、100M に設定してください。"
 
 #: ../../godmode/update_manager/update_manager.online.php:85
-msgid "The last version of package installed is:"
-msgstr "インストールされている最新バージョンのパッケージ:"
+msgid "The latest version of package installed is:"
+msgstr "インストール済の最新パッケージ:"
 
 #: ../../godmode/update_manager/update_manager.online.php:89
 msgid "Checking for the newest package."
@@ -18032,12 +18778,14 @@ msgstr "アップデートマネージャ > メッセージ"
 
 #: ../../godmode/update_manager/update_manager.setup.php:58
 #: ../../godmode/update_manager/update_manager.setup.php:87
+#: ../../enterprise/meta/advanced/metasetup.mail.php:63
 #: ../../enterprise/meta/advanced/metasetup.update_manager_setup.php:58
 msgid "Succesful Update the url config vars."
 msgstr "URL 設定を更新しました。"
 
 #: ../../godmode/update_manager/update_manager.setup.php:59
 #: ../../godmode/update_manager/update_manager.setup.php:88
+#: ../../enterprise/meta/advanced/metasetup.mail.php:64
 #: ../../enterprise/meta/advanced/metasetup.update_manager_setup.php:59
 msgid "Unsuccesful Update the url config vars."
 msgstr "URL 設定を更新できませんでした。"
@@ -18106,7 +18854,7 @@ msgstr "8日ごとに、この Pandora インスタンスを登録するリマ
 
 #: ../../godmode/users/configure_profile.php:41
 #: ../../godmode/users/configure_profile.php:49
-#: ../../godmode/users/configure_user.php:82
+#: ../../godmode/users/configure_user.php:84
 #: ../../godmode/users/profile_list.php:45
 #: ../../godmode/users/profile_list.php:53
 #: ../../godmode/users/user_list.php:113 ../../godmode/users/user_list.php:121
@@ -18158,7 +18906,7 @@ msgstr "エージェント編集"
 msgid "Edit alerts"
 msgstr "アラート編集"
 
-#: ../../godmode/users/configure_profile.php:275 ../../operation/menu.php:274
+#: ../../godmode/users/configure_profile.php:275 ../../operation/menu.php:311
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:217
 #: ../../enterprise/meta/event/custom_events.php:38
 msgid "View events"
@@ -18193,7 +18941,7 @@ msgid "Manage network maps"
 msgstr "ネットワークマップ管理"
 
 #: ../../godmode/users/configure_profile.php:320
-#: ../../include/functions_menu.php:486
+#: ../../include/functions_menu.php:497
 msgid "View visual console"
 msgstr "ビジュアルコンソール表示"
 
@@ -18202,7 +18950,7 @@ msgid "Edit visual console"
 msgstr "ビジュアルコンソール編集"
 
 #: ../../godmode/users/configure_profile.php:328
-#: ../../include/functions_menu.php:521
+#: ../../include/functions_menu.php:542
 msgid "Manage visual console"
 msgstr "ビジュアルコンソール管理"
 
@@ -18230,115 +18978,115 @@ msgstr "データベース管理"
 msgid "Pandora management"
 msgstr "Pandora システム管理"
 
-#: ../../godmode/users/configure_user.php:90
+#: ../../godmode/users/configure_user.php:92
 #: ../../operation/users/user_edit.php:62
 msgid "User detail editor"
 msgstr "ユーザ情報の編集"
 
-#: ../../godmode/users/configure_user.php:145
-#: ../../godmode/users/user_list.php:492
+#: ../../godmode/users/configure_user.php:150
+#: ../../godmode/users/user_list.php:489
 msgid ""
 "The current authentication scheme doesn't support creating users from "
 "Pandora FMS"
 msgstr "現在の認証設定では、Pandora FMS 上でユーザを作成することはできません。"
 
-#: ../../godmode/users/configure_user.php:182
+#: ../../godmode/users/configure_user.php:202
 msgid "User ID cannot be empty"
 msgstr "ユーザ ID は空に設定できません。"
 
-#: ../../godmode/users/configure_user.php:189
+#: ../../godmode/users/configure_user.php:209
 msgid "Passwords cannot be empty"
 msgstr "パスワードは空に設定できません。"
 
-#: ../../godmode/users/configure_user.php:196
+#: ../../godmode/users/configure_user.php:216
 msgid "Passwords didn't match"
 msgstr "パスワードが一致しません。"
 
-#: ../../godmode/users/configure_user.php:245
+#: ../../godmode/users/configure_user.php:264
 msgid ""
 "Strict ACL is not recommended for admin users because performance could be "
 "affected."
 msgstr "パフォーマンスに影響するため、管理者ユーザへの厳重な ACL 設定はお勧めしません。"
 
-#: ../../godmode/users/configure_user.php:303
-#: ../../godmode/users/configure_user.php:313
-#: ../../godmode/users/configure_user.php:341
-#: ../../godmode/users/configure_user.php:347
-#: ../../godmode/users/configure_user.php:375
-#: ../../operation/users/user_edit.php:154
-#: ../../operation/users/user_edit.php:164
+#: ../../godmode/users/configure_user.php:342
+#: ../../godmode/users/configure_user.php:354
+#: ../../godmode/users/configure_user.php:404
+#: ../../godmode/users/configure_user.php:410
+#: ../../godmode/users/configure_user.php:438
+#: ../../operation/users/user_edit.php:156
+#: ../../operation/users/user_edit.php:166
 msgid "User info successfully updated"
 msgstr "ユーザ情報を更新しました。"
 
-#: ../../godmode/users/configure_user.php:304
-#: ../../godmode/users/configure_user.php:314
-#: ../../godmode/users/configure_user.php:342
-#: ../../godmode/users/configure_user.php:348
-#: ../../godmode/users/configure_user.php:376
+#: ../../godmode/users/configure_user.php:343
+#: ../../godmode/users/configure_user.php:355
+#: ../../godmode/users/configure_user.php:405
+#: ../../godmode/users/configure_user.php:411
+#: ../../godmode/users/configure_user.php:439
 msgid "Error updating user info (no change?)"
 msgstr "ユーザ情報の更新に失敗しました。(変更なし?)"
 
-#: ../../godmode/users/configure_user.php:318
+#: ../../godmode/users/configure_user.php:361
 msgid "Passwords does not match"
 msgstr "パスワードが一致しません。"
 
-#: ../../godmode/users/configure_user.php:366
+#: ../../godmode/users/configure_user.php:429
 msgid ""
 "Strict ACL is not recommended for this user. Performance could be affected."
 msgstr "このユーザには厳重な ACL はお勧めしません。パフォーマンスに影響します。"
 
-#: ../../godmode/users/configure_user.php:398
+#: ../../godmode/users/configure_user.php:461
 msgid "Profile added successfully"
 msgstr "プロファイルを追加しました。"
 
-#: ../../godmode/users/configure_user.php:399
+#: ../../godmode/users/configure_user.php:462
 msgid "Profile cannot be added"
 msgstr "プロファイルの追加に失敗しました。"
 
-#: ../../godmode/users/configure_user.php:425
+#: ../../godmode/users/configure_user.php:488
 msgid "Update User"
 msgstr "ユーザ更新"
 
-#: ../../godmode/users/configure_user.php:428
+#: ../../godmode/users/configure_user.php:491
 msgid "Create User"
 msgstr "ユーザ作成"
 
-#: ../../godmode/users/configure_user.php:441
-#: ../../godmode/users/user_list.php:266
-#: ../../include/functions_reporting_html.php:2826
+#: ../../godmode/users/configure_user.php:504
+#: ../../godmode/users/user_list.php:263
+#: ../../include/functions_reporting_html.php:2939
 #: ../../operation/search_users.php:38
-#: ../../operation/snmpconsole/snmp_view.php:619
-#: ../../operation/users/user_edit.php:184
+#: ../../operation/snmpconsole/snmp_view.php:727
+#: ../../operation/users/user_edit.php:186
 msgid "User ID"
 msgstr "ユーザ ID"
 
-#: ../../godmode/users/configure_user.php:445
-#: ../../operation/users/user_edit.php:186
+#: ../../godmode/users/configure_user.php:508
+#: ../../operation/users/user_edit.php:188
 msgid "Full (display) name"
 msgstr "表示名"
 
-#: ../../godmode/users/configure_user.php:449
-#: ../../operation/users/user_edit.php:255
+#: ../../godmode/users/configure_user.php:512
+#: ../../operation/users/user_edit.php:257
 #: ../../enterprise/extensions/translate_string.php:250
 #: ../../enterprise/meta/advanced/metasetup.translate_string.php:132
 msgid "Language"
 msgstr "言語"
 
-#: ../../godmode/users/configure_user.php:457
-#: ../../operation/users/user_edit.php:221
+#: ../../godmode/users/configure_user.php:520
+#: ../../operation/users/user_edit.php:223
 msgid "Password confirmation"
 msgstr "パスワード確認"
 
-#: ../../godmode/users/configure_user.php:464
+#: ../../godmode/users/configure_user.php:527
 msgid "Global Profile"
 msgstr "全体プロファイル"
 
-#: ../../godmode/users/configure_user.php:468
-#: ../../godmode/users/user_list.php:414 ../../operation/search_users.php:64
+#: ../../godmode/users/configure_user.php:531
+#: ../../godmode/users/user_list.php:411 ../../operation/search_users.php:64
 msgid "Administrator"
 msgstr "管理者"
 
-#: ../../godmode/users/configure_user.php:469
+#: ../../godmode/users/configure_user.php:532
 msgid ""
 "This user has permissions to manage all. An admin user should not requiere "
 "additional group permissions, except for using Enterprise ACL."
@@ -18346,84 +19094,130 @@ msgstr ""
 "このユーザはすべてを管理する権限があります。Enterprise ACL "
 "の利用を除いて、管理者ユーザは追加のグループパーミッション設定をすべきではありません。"
 
-#: ../../godmode/users/configure_user.php:473
+#: ../../godmode/users/configure_user.php:536
 #: ../../operation/search_users.php:69
 msgid "Standard User"
 msgstr "標準ユーザ"
 
-#: ../../godmode/users/configure_user.php:474
+#: ../../godmode/users/configure_user.php:537
 msgid ""
 "This user has separated permissions to view data in his group agents, create "
 "incidents belong to his groups, add notes in another incidents, create "
 "personal assignments or reviews and other tasks, on different profiles"
 msgstr "このユーザは、以下のプロファイル名およびグループ名の組み合わせで定義した、限られた権限を所有します。"
 
-#: ../../godmode/users/configure_user.php:477
-#: ../../godmode/users/user_list.php:407
-#: ../../operation/users/user_edit.php:208
+#: ../../godmode/users/configure_user.php:540
+#: ../../godmode/users/user_list.php:404
+#: ../../operation/users/user_edit.php:210
 msgid "E-mail"
 msgstr "メールアドレス"
 
-#: ../../godmode/users/configure_user.php:481
-#: ../../operation/users/user_edit.php:210
+#: ../../godmode/users/configure_user.php:544
+#: ../../operation/users/user_edit.php:212
 msgid "Phone number"
 msgstr "電話番号"
 
-#: ../../godmode/users/configure_user.php:516
+#: ../../godmode/users/configure_user.php:579
 msgid "Use global conf"
 msgstr "グローバル設定を利用します。"
 
-#: ../../godmode/users/configure_user.php:531
+#: ../../godmode/users/configure_user.php:583
+#: ../../operation/users/user_edit.php:276
+msgid "Home screen"
+msgstr "ホーム画面"
+
+#: ../../godmode/users/configure_user.php:584
+#: ../../operation/users/user_edit.php:276
+msgid ""
+"User can customize the home page. By default, will display 'Agent Detail'. "
+"Example: Select 'Other' and type "
+"sec=estado&sec2=operation/agentes/estado_agente to show agent detail view"
+msgstr ""
+"ユーザはホームページをカスタマイズできます。デフォルトでは、'エージェント詳細' が表示されます。例: 'その他' "
+"を選択し、sec=estado&sec2=operation/agentes/estado_agente を入力すると、エージェント詳細が表示されます。"
+
+#: ../../godmode/users/configure_user.php:589
+#: ../../operation/agentes/group_view.php:70 ../../operation/menu.php:49
+#: ../../operation/users/user_edit.php:281
+#: ../../enterprise/meta/monitoring/group_view.php:46
+msgid "Group view"
+msgstr "グループ"
+
+#: ../../godmode/users/configure_user.php:590
+#: ../../mobile/operation/home.php:38 ../../mobile/operation/tactical.php:84
+#: ../../operation/agentes/tactical.php:55 ../../operation/menu.php:46
+#: ../../operation/users/user_edit.php:282
+#: ../../enterprise/dashboard/widgets/tactical.php:27
+#: ../../enterprise/dashboard/widgets/tactical.php:29
+#: ../../enterprise/meta/general/main_header.php:93
+#: ../../enterprise/meta/monitoring/tactical.php:60
+msgid "Tactical view"
+msgstr "モニタリング概要"
+
+#: ../../godmode/users/configure_user.php:591
+#: ../../operation/agentes/alerts_status.php:165 ../../operation/menu.php:65
+#: ../../operation/users/user_edit.php:283
+msgid "Alert detail"
+msgstr "アラート詳細"
+
+#: ../../godmode/users/configure_user.php:592
+msgid "External link"
+msgstr "外部リンク"
+
+#: ../../godmode/users/configure_user.php:595
+#: ../../mobile/include/functions_web.php:21
+#: ../../operation/users/user_edit.php:286
+#: ../../enterprise/extensions/vmware/vmware_view.php:1212
+#: ../../enterprise/extensions/vmware/vmware_view.php:1236
+#: ../../enterprise/mobile/operation/dashboard.php:221
+#: ../../enterprise/operation/menu.php:100
+msgid "Dashboard"
+msgstr "ダッシュボード"
+
+#: ../../godmode/users/configure_user.php:639
 msgid "Metaconsole access"
 msgstr "メタコンソールアクセス"
 
-#: ../../godmode/users/configure_user.php:539
+#: ../../godmode/users/configure_user.php:647
 msgid "Not Login"
 msgstr "ログイン無し"
 
-#: ../../godmode/users/configure_user.php:540
+#: ../../godmode/users/configure_user.php:648
 msgid "The user with not login set only can access to API."
 msgstr "ログイン無しを設定したユーザは、API にのみアクセスできます。"
 
-#: ../../godmode/users/configure_user.php:543
-msgid "Strict ACL"
-msgstr "厳重な ACL"
-
-#: ../../godmode/users/configure_user.php:544
-msgid ""
-"With this option enabled, the user will can access to accurate information. "
-"It is not recommended for admin users because performance could be affected"
-msgstr ""
-"このオプションを有効にすると、ユーザは指定の範囲の情報にのみアクセスすることができます。パフォーマンスに影響するため、管理者ユーザではお勧めしません。"
-
-#: ../../godmode/users/configure_user.php:547
+#: ../../godmode/users/configure_user.php:651
 msgid "Session Time"
 msgstr "セッション時間"
 
-#: ../../godmode/users/configure_user.php:554
+#: ../../godmode/users/configure_user.php:661
+msgid "Default event filter"
+msgstr "デフォルトイベントフィルタ"
+
+#: ../../godmode/users/configure_user.php:668
 msgid "Enable agents managment"
 msgstr "エージェント管理を有効にする"
 
-#: ../../godmode/users/configure_user.php:561
+#: ../../godmode/users/configure_user.php:675
 msgid "Assigned node"
 msgstr "割り当てノード"
 
-#: ../../godmode/users/configure_user.php:561
+#: ../../godmode/users/configure_user.php:675
 msgid "Server where the agents created of this user will be placed"
 msgstr "このユーザでエージェントが作成されたサーバです。"
 
-#: ../../godmode/users/configure_user.php:573
+#: ../../godmode/users/configure_user.php:687
 msgid "Enable node access"
 msgstr "ノードアクセスを有効にする"
 
-#: ../../godmode/users/configure_user.php:573
+#: ../../godmode/users/configure_user.php:687
 msgid "With this option enabled, the user will can access to nodes console"
 msgstr "このオプションが有能の場合、ユーザはノードのコンソールへアクセスできます。"
 
-#: ../../godmode/users/configure_user.php:604
-#: ../../godmode/users/configure_user.php:613
-#: ../../operation/users/user_edit.php:479
-#: ../../operation/users/user_edit.php:487
+#: ../../godmode/users/configure_user.php:718
+#: ../../godmode/users/configure_user.php:727
+#: ../../operation/users/user_edit.php:490
+#: ../../operation/users/user_edit.php:498
 msgid "Profiles/Groups assigned to this user"
 msgstr "このユーザに割り当てるプロファイル/グループの組み合わせ"
 
@@ -18475,7 +19269,7 @@ msgid "Agents reading"
 msgstr "エージェントからの情報取得"
 
 #: ../../godmode/users/profile_list.php:308
-#: ../../include/functions_menu.php:479
+#: ../../include/functions_menu.php:490
 #: ../../enterprise/extensions/disabled/check_acls.php:48
 #: ../../enterprise/extensions/disabled/check_acls.php:128
 msgid "Agents management"
@@ -18616,15 +19410,15 @@ msgstr "ユーザの無効化で問題が発生しました"
 msgid "There was a problem enabling user"
 msgstr "ユーザの有効化で問題が発生しました"
 
-#: ../../godmode/users/user_list.php:231 ../../godmode/users/user_list.php:233
+#: ../../godmode/users/user_list.php:229 ../../godmode/users/user_list.php:231
 msgid "Search by username, fullname or email"
 msgstr "ユーザ名、フルネーム、メールアドレスでの検索"
 
-#: ../../godmode/users/user_list.php:249
+#: ../../godmode/users/user_list.php:247
 msgid "Users control filter"
 msgstr "ユーザ制御フィルタ"
 
-#: ../../godmode/users/user_list.php:275 ../../godmode/users/user_list.php:413
+#: ../../godmode/users/user_list.php:272 ../../godmode/users/user_list.php:410
 #: ../../operation/search_users.php:63
 #: ../../enterprise/extensions/disabled/check_acls.php:61
 #: ../../enterprise/extensions/disabled/check_acls.php:141
@@ -18633,28 +19427,28 @@ msgstr "ユーザ制御フィルタ"
 msgid "Admin"
 msgstr "管理者"
 
-#: ../../godmode/users/user_list.php:276
+#: ../../godmode/users/user_list.php:273
 msgid "Profile / Group"
 msgstr "プロファイル / グループ"
 
-#: ../../godmode/users/user_list.php:457 ../../operation/search_users.php:82
+#: ../../godmode/users/user_list.php:454 ../../operation/search_users.php:82
 msgid "The user doesn't have any assigned profile/group"
 msgstr "このユーザには、プロファイル/グループの組み合わせが何も割り当てられていません。"
 
-#: ../../godmode/users/user_list.php:470
+#: ../../godmode/users/user_list.php:467
 msgid "Deleting User"
 msgstr "ユーザの削除"
 
-#: ../../godmode/users/user_list.php:472
+#: ../../godmode/users/user_list.php:469
 msgid "Delete from all consoles"
 msgstr "全コンソールからの削除"
 
-#: ../../godmode/users/user_list.php:472
+#: ../../godmode/users/user_list.php:469
 #, php-format
 msgid "Deleting User %s from all consoles"
 msgstr "ユーザ %s を全コンソールから削除しました"
 
-#: ../../godmode/users/user_list.php:488
+#: ../../godmode/users/user_list.php:485
 msgid "Create user"
 msgstr "ユーザの作成"
 
@@ -18715,8 +19509,8 @@ msgstr "アプリケーションをインストールしましたか。"
 #: ../../include/ajax/double_auth.ajax.php:351
 #: ../../include/ajax/double_auth.ajax.php:396
 #: ../../include/ajax/double_auth.ajax.php:511
-#: ../../operation/users/user_edit.php:700
-#: ../../operation/users/user_edit.php:765
+#: ../../operation/users/user_edit.php:711
+#: ../../operation/users/user_edit.php:776
 msgid "There was an error loading the data"
 msgstr "データのロードでエラーが発生しました"
 
@@ -18754,8 +19548,8 @@ msgid "The code is valid, you can exit now"
 msgstr "正しいコードです。終了します。"
 
 #: ../../include/ajax/double_auth.ajax.php:491
-#: ../../mobile/include/user.class.php:171 ../../enterprise/meta/index.php:239
-#: ../../index.php:256
+#: ../../mobile/include/user.class.php:171 ../../enterprise/meta/index.php:217
+#: ../../index.php:273
 msgid "Invalid code"
 msgstr "不正なコード"
 
@@ -18763,228 +19557,220 @@ msgstr "不正なコード"
 msgid "The code is valid, but it was an error saving the data"
 msgstr "正しいコードですが、データの保存でエラーが発生しました。"
 
-#: ../../include/ajax/events.php:158
+#: ../../include/ajax/events.php:203
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:269
 #, php-format
 msgid "Executing command: %s"
 msgstr "コマンド実行中: %s"
 
-#: ../../include/ajax/events.php:165
+#: ../../include/ajax/events.php:210
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:276
 msgid "Execute again"
 msgstr "再実行"
 
-#: ../../include/ajax/events.php:300
+#: ../../include/ajax/events.php:345
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:210
 msgid "Details"
 msgstr "詳細"
 
-#: ../../include/ajax/events.php:301
+#: ../../include/ajax/events.php:346
 msgid "Agent fields"
 msgstr "エージェントフィールド"
 
-#: ../../include/ajax/events.php:309
+#: ../../include/ajax/events.php:354
 msgid "Custom data"
 msgstr "カスタムデータ"
 
-#: ../../include/ajax/events.php:377
+#: ../../include/ajax/events.php:422
 msgid "Error adding comment"
 msgstr "コメント追加エラー"
 
-#: ../../include/ajax/events.php:378
+#: ../../include/ajax/events.php:423
 msgid "Comment added successfully"
 msgstr "コメントを追加しました"
 
-#: ../../include/ajax/events.php:379
+#: ../../include/ajax/events.php:424
 msgid "Error changing event status"
 msgstr "イベント状態変更エラー"
 
-#: ../../include/ajax/events.php:380
+#: ../../include/ajax/events.php:425
 msgid "Event status changed successfully"
 msgstr "イベントの状態を変更しました"
 
-#: ../../include/ajax/events.php:381
+#: ../../include/ajax/events.php:426
 msgid "Error changing event owner"
 msgstr "イベント所有者変更エラー"
 
-#: ../../include/ajax/events.php:382
+#: ../../include/ajax/events.php:427
 msgid "Event owner changed successfully"
 msgstr "イベントの所有者を変更しました"
 
-#: ../../include/ajax/events.php:447 ../../include/functions_events.php:928
-#: ../../include/functions_events.php:2402
-#: ../../include/functions_events.php:3657
-#: ../../include/functions_reporting.php:6371
-#: ../../include/functions_reporting_html.php:845
-#: ../../include/functions_reporting_html.php:1061
-#: ../../include/functions_reporting_html.php:1673
+#: ../../include/ajax/events.php:495
+#: ../../include/functions_reporting.php:7031
+#: ../../include/functions_events.php:928
+#: ../../include/functions_events.php:2368
+#: ../../include/functions_events.php:3756
+#: ../../include/functions_reporting_html.php:848
+#: ../../include/functions_reporting_html.php:1064
+#: ../../include/functions_reporting_html.php:1676
 #: ../../mobile/operation/events.php:247
 #: ../../operation/events/events.build_table.php:304
 msgid "New event"
 msgstr "新規イベント"
 
-#: ../../include/ajax/events.php:451 ../../include/functions_events.php:932
-#: ../../include/functions_events.php:2406
-#: ../../include/functions_events.php:3661
-#: ../../include/functions_reporting.php:6375
-#: ../../include/functions_reporting_html.php:849
-#: ../../include/functions_reporting_html.php:1065
-#: ../../include/functions_reporting_html.php:1677
+#: ../../include/ajax/events.php:499
+#: ../../include/functions_reporting.php:7035
+#: ../../include/functions_events.php:932
+#: ../../include/functions_events.php:2373
+#: ../../include/functions_events.php:3760
+#: ../../include/functions_reporting_html.php:852
+#: ../../include/functions_reporting_html.php:1068
+#: ../../include/functions_reporting_html.php:1680
 #: ../../mobile/operation/events.php:251
 #: ../../operation/events/events.build_table.php:308
-#: ../../operation/events/events.php:689 ../../operation/events/events.php:718
-#: ../../operation/events/events.php:719 ../../operation/events/events.php:939
-#: ../../operation/events/events.php:944 ../../operation/events/events.php:945
+#: ../../operation/events/events.php:715 ../../operation/events/events.php:744
+#: ../../operation/events/events.php:745 ../../operation/events/events.php:965
+#: ../../operation/events/events.php:970 ../../operation/events/events.php:971
 msgid "Event validated"
 msgstr "承諾済"
 
-#: ../../include/ajax/events.php:455 ../../include/functions_events.php:936
-#: ../../include/functions_events.php:2410
-#: ../../include/functions_events.php:3665
-#: ../../include/functions_reporting.php:6379
-#: ../../include/functions_reporting_html.php:853
-#: ../../include/functions_reporting_html.php:1069
-#: ../../include/functions_reporting_html.php:1681
+#: ../../include/ajax/events.php:503
+#: ../../include/functions_reporting.php:7039
+#: ../../include/functions_events.php:936
+#: ../../include/functions_events.php:2378
+#: ../../include/functions_events.php:3764
+#: ../../include/functions_reporting_html.php:856
+#: ../../include/functions_reporting_html.php:1072
+#: ../../include/functions_reporting_html.php:1684
 #: ../../mobile/operation/events.php:255
 #: ../../operation/events/events.build_table.php:312
-#: ../../operation/events/events.php:751 ../../operation/events/events.php:789
-#: ../../operation/events/events.php:790 ../../operation/events/events.php:949
-#: ../../operation/events/events.php:963 ../../operation/events/events.php:964
+#: ../../operation/events/events.php:777 ../../operation/events/events.php:815
+#: ../../operation/events/events.php:816 ../../operation/events/events.php:975
+#: ../../operation/events/events.php:989 ../../operation/events/events.php:990
 msgid "Event in process"
 msgstr "処理中イベント"
 
-#: ../../include/ajax/module.php:133 ../../include/functions.php:2591
+#: ../../include/ajax/events.php:562
+msgid "Show all Events 24h"
+msgstr "24h以内の全イベント表示"
+
+#: ../../include/ajax/graph.ajax.php:145
+msgid "Time container lapse"
+msgstr "時間コンテナの経過"
+
+#: ../../include/ajax/module.php:138 ../../include/functions.php:2615
 msgid "30 minutes"
 msgstr "30 分"
 
-#: ../../include/ajax/module.php:135
+#: ../../include/ajax/module.php:140
 #: ../../enterprise/godmode/agentes/inventory_manager.php:178
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:192
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:184
 msgid "6 hours"
 msgstr "6 時間"
 
-#: ../../include/ajax/module.php:137 ../../include/functions.php:2025
-#: ../../include/functions_netflow.php:1056
-#: ../../include/functions_netflow.php:1089
-#: ../../enterprise/dashboard/widgets/top_n.php:65
-#: ../../enterprise/godmode/agentes/inventory_manager.php:180
-#: ../../enterprise/godmode/policies/policy_inventory_modules.php:194
-#: ../../enterprise/godmode/reporting/graph_template_editor.php:186
-msgid "1 day"
-msgstr "1日"
-
-#: ../../include/ajax/module.php:138 ../../include/functions.php:2026
-#: ../../include/functions_netflow.php:1093
-msgid "1 week"
-msgstr "1週間"
-
-#: ../../include/ajax/module.php:139 ../../include/functions.php:2027
-#: ../../include/functions_netflow.php:1059
-#: ../../include/functions_netflow.php:1092
-#: ../../enterprise/godmode/agentes/inventory_manager.php:183
-#: ../../enterprise/godmode/policies/policy_inventory_modules.php:197
-#: ../../enterprise/godmode/reporting/graph_template_editor.php:190
-msgid "15 days"
-msgstr "15日"
-
-#: ../../include/ajax/module.php:140 ../../include/functions.php:2028
-#: ../../include/functions_netflow.php:1094
-#: ../../enterprise/godmode/agentes/inventory_manager.php:184
-#: ../../enterprise/godmode/policies/policy_inventory_modules.php:198
-msgid "1 month"
-msgstr "1ヵ月"
-
-#: ../../include/ajax/module.php:141 ../../include/functions_netflow.php:1063
+#: ../../include/ajax/module.php:146 ../../include/functions_netflow.php:1063
 msgid "3 months"
 msgstr "3ヵ月"
 
-#: ../../include/ajax/module.php:142 ../../include/functions_netflow.php:1064
+#: ../../include/ajax/module.php:147 ../../include/functions_netflow.php:1064
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:193
 msgid "6 months"
 msgstr "6ヵ月"
 
-#: ../../include/ajax/module.php:143 ../../include/functions.php:2031
+#: ../../include/ajax/module.php:148 ../../include/functions.php:2066
 #: ../../enterprise/godmode/reporting/graph_template_editor.php:194
 msgid "1 year"
 msgstr "1年"
 
-#: ../../include/ajax/module.php:144 ../../include/functions_netflow.php:1066
+#: ../../include/ajax/module.php:149 ../../include/functions_netflow.php:1066
 msgid "2 years"
 msgstr "2年"
 
-#: ../../include/ajax/module.php:145
+#: ../../include/ajax/module.php:150
 msgid "3 years"
 msgstr "3 年"
 
-#: ../../include/ajax/module.php:149
+#: ../../include/ajax/module.php:154
 #: ../../operation/agentes/datos_agente.php:185
 msgid "Choose a time from now"
 msgstr "現在からさかのぼって表示する期間を選択"
 
-#: ../../include/ajax/module.php:161
+#: ../../include/ajax/module.php:166
 #: ../../operation/agentes/datos_agente.php:188
 msgid "Specify time range"
 msgstr "時間範囲指定"
 
-#: ../../include/ajax/module.php:162
+#: ../../include/ajax/module.php:167
 #: ../../operation/agentes/datos_agente.php:189
-#: ../../operation/events/events_list.php:492
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:449
+#: ../../operation/events/events_list.php:558
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:450
 msgid "Timestamp from:"
 msgstr "開始日時:"
 
-#: ../../include/ajax/module.php:170
+#: ../../include/ajax/module.php:175
 #: ../../operation/agentes/datos_agente.php:195
-#: ../../operation/events/events_list.php:495
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:455
+#: ../../operation/events/events_list.php:561
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:456
 msgid "Timestamp to:"
 msgstr "終了日時:"
 
-#: ../../include/ajax/module.php:732
-#: ../../operation/agentes/alerts_status.php:422
-#: ../../operation/agentes/alerts_status.php:466
-#: ../../operation/agentes/alerts_status.php:500
-#: ../../operation/agentes/alerts_status.php:535
+#: ../../include/ajax/module.php:188
+msgid "Exact phrase"
+msgstr "完全なフレーズ"
+
+#: ../../include/ajax/module.php:768
+#: ../../operation/agentes/alerts_status.php:455
+#: ../../operation/agentes/alerts_status.php:499
+#: ../../operation/agentes/alerts_status.php:533
+#: ../../operation/agentes/alerts_status.php:568
 msgid "Force execution"
 msgstr "確認の強制(再)実行"
 
-#: ../../include/ajax/module.php:732
-#: ../../operation/agentes/alerts_status.php:423
-#: ../../operation/agentes/alerts_status.php:466
-#: ../../operation/agentes/alerts_status.php:500
-#: ../../operation/agentes/alerts_status.php:535
+#: ../../include/ajax/module.php:768
+#: ../../operation/agentes/alerts_status.php:456
+#: ../../operation/agentes/alerts_status.php:499
+#: ../../operation/agentes/alerts_status.php:533
+#: ../../operation/agentes/alerts_status.php:568
 msgid "F."
 msgstr "F."
 
-#: ../../include/ajax/module.php:804 ../../include/functions_groups.php:771
-#: ../../include/functions_groups.php:964 ../../include/functions_ui.php:834
+#: ../../include/ajax/module.php:784
+#: ../../enterprise/meta/include/functions_wizard_meta.php:858
+#: ../../enterprise/meta/include/functions_wizard_meta.php:944
+#: ../../enterprise/meta/include/functions_wizard_meta.php:1161
+msgid "Thresholds"
+msgstr "しきい値"
+
+#: ../../include/ajax/module.php:841 ../../include/functions_ui.php:861
+#: ../../include/functions_groups.php:765
+#: ../../include/functions_groups.php:958
 #: ../../operation/agentes/group_view.php:163
-#: ../../operation/agentes/group_view.php:216
-#: ../../operation/servers/recon_view.php:86
-#: ../../operation/servers/recon_view.php:118
+#: ../../operation/agentes/group_view.php:222
+#: ../../operation/servers/recon_view.php:89
+#: ../../operation/servers/recon_view.php:121
 #: ../../enterprise/extensions/ipam/ipam_network.php:154
 #: ../../enterprise/godmode/agentes/inventory_manager.php:272
 #: ../../enterprise/operation/services/services.list.php:469
 msgid "Force"
 msgstr "強制する"
 
-#: ../../include/ajax/module.php:1093
+#: ../../include/ajax/module.php:1155
 msgid "Any monitors aren't with this filter."
 msgstr "このフィルタに合うモニタ項目がありません。"
 
-#: ../../include/ajax/module.php:1096
+#: ../../include/ajax/module.php:1158
 msgid "This agent doesn't have any active monitors."
 msgstr "エージェントに有効な監視がありません。"
 
 #: ../../include/ajax/rolling_release.ajax.php:56
 msgid "The sql file contains a dangerous query"
-msgstr "SQL ファイルに、危険なクエリが含まれています"
+msgstr "SQL ファイルに危険なクエリが含まれています。"
 
 #: ../../include/ajax/rolling_release.ajax.php:103
 msgid ""
 "An error occurred while updating the database schema to the minor release "
-msgstr "マイナーリリースのデータベーススキーマ更新でエラーが発生しました。 "
+msgstr "マイナーリリースへのデータベーススキーマ更新でエラーが発生しました "
 
 #: ../../include/ajax/rolling_release.ajax.php:117
 #: ../../include/ajax/rolling_release.ajax.php:130
@@ -18993,19 +19779,19 @@ msgstr "ディレクトリ "
 
 #: ../../include/ajax/rolling_release.ajax.php:117
 msgid " should have read permissions in order to update the database schema"
-msgstr " は、データベーススキーマのアップデートのために読み出し権限が必要です。"
+msgstr " は、データベーススキーマ更新のために読み込み権限が必要です"
 
 #: ../../include/ajax/rolling_release.ajax.php:130
 msgid " does not exist"
-msgstr " は存在しません。"
+msgstr " が存在しません"
 
 #: ../../include/ajax/update_manager.ajax.php:75
-#: ../../enterprise/include/functions_update_manager.php:362
+#: ../../enterprise/include/functions_update_manager.php:369
 msgid "There was an error extracting the file '"
 msgstr "次のファイル展開中にエラーが発生しました '"
 
 #: ../../include/ajax/update_manager.ajax.php:91
-#: ../../enterprise/include/functions_update_manager.php:379
+#: ../../enterprise/include/functions_update_manager.php:386
 msgid "The package was not extracted."
 msgstr "パッケージが展開されませんでした。"
 
@@ -19017,91 +19803,86 @@ msgstr "不正な拡張子です。パッケージの拡張子は、.oum でな
 msgid "The file was not uploaded succesfully."
 msgstr "ファイルのアップロードに失敗しました。"
 
-#: ../../include/ajax/update_manager.ajax.php:173
-#: ../../include/ajax/update_manager.ajax.php:177
-#: ../../include/ajax/update_manager.ajax.php:204
+#: ../../include/ajax/update_manager.ajax.php:181
+#: ../../include/ajax/update_manager.ajax.php:185
+#: ../../include/ajax/update_manager.ajax.php:212
 #: ../../include/functions_update_manager.php:128
 #: ../../include/functions_update_manager.php:132
 #: ../../include/functions_update_manager.php:158
-#: ../../enterprise/include/functions_update_manager.php:501
-#: ../../enterprise/include/functions_update_manager.php:505
-#: ../../enterprise/include/functions_update_manager.php:532
+#: ../../enterprise/include/functions_update_manager.php:508
+#: ../../enterprise/include/functions_update_manager.php:512
+#: ../../enterprise/include/functions_update_manager.php:539
 msgid "Some of your files might not be recovered."
 msgstr "いくつかのファイルをリカバーできていない可能性があります。"
 
-#: ../../include/ajax/update_manager.ajax.php:181
-#: ../../include/ajax/update_manager.ajax.php:198
+#: ../../include/ajax/update_manager.ajax.php:189
+#: ../../include/ajax/update_manager.ajax.php:206
 #: ../../include/functions_update_manager.php:136
 #: ../../include/functions_update_manager.php:152
-#: ../../enterprise/include/functions_update_manager.php:510
-#: ../../enterprise/include/functions_update_manager.php:526
+#: ../../enterprise/include/functions_update_manager.php:517
+#: ../../enterprise/include/functions_update_manager.php:533
 msgid "Some of your old files might not be recovered."
 msgstr "いくつかの古いファイルをリカバーできていない可能性があります。"
 
-#: ../../include/ajax/update_manager.ajax.php:219
+#: ../../include/ajax/update_manager.ajax.php:227
 #: ../../include/functions_update_manager.php:173
-#: ../../enterprise/include/functions_update_manager.php:547
+#: ../../enterprise/include/functions_update_manager.php:554
 msgid "An error ocurred while reading a file."
 msgstr "ファイル読み込み中にエラーが発生しました。"
 
-#: ../../include/ajax/update_manager.ajax.php:226
+#: ../../include/ajax/update_manager.ajax.php:234
 #: ../../include/functions_update_manager.php:180
-#: ../../enterprise/include/functions_update_manager.php:554
+#: ../../enterprise/include/functions_update_manager.php:561
 msgid "The package does not exist"
 msgstr "パッケージが存在しません。"
 
-#: ../../include/ajax/update_manager.ajax.php:240
+#: ../../include/ajax/update_manager.ajax.php:248
 msgid "Package rejected."
-msgstr "パッケージが不正です。"
+msgstr "パッケージを受け入れられませんでした。"
 
-#: ../../include/ajax/update_manager.ajax.php:414
-#: ../../enterprise/include/functions_update_manager.php:315
+#: ../../include/ajax/update_manager.ajax.php:422
+#: ../../enterprise/include/functions_update_manager.php:322
 msgid "Fail to update to the last package."
 msgstr "最新パッケージへの更新に失敗しました。"
 
-#: ../../include/ajax/update_manager.ajax.php:422
-#: ../../enterprise/include/functions_update_manager.php:330
+#: ../../include/ajax/update_manager.ajax.php:430
+#: ../../enterprise/include/functions_update_manager.php:337
 msgid "Starting to update to the last package."
 msgstr "最新パッケージへの更新を開始します。"
 
-#: ../../include/ajax/update_manager.ajax.php:493
-#: ../../enterprise/include/functions_update_manager.php:423
+#: ../../include/ajax/update_manager.ajax.php:501
+#: ../../enterprise/include/functions_update_manager.php:430
 msgid "progress"
 msgstr "処理状況"
 
-#: ../../include/ajax/update_manager.ajax.php:514
+#: ../../include/ajax/update_manager.ajax.php:522
 msgid "The package is extracted."
-msgstr "パッケージを展開しました"
+msgstr "パッケージを展開しました。"
 
-#: ../../include/ajax/update_manager.ajax.php:518
+#: ../../include/ajax/update_manager.ajax.php:526
 msgid "Error in package extraction."
-msgstr "パッケージの展開エラー"
+msgstr "パッケージ展開エラーです。"
 
-#: ../../include/ajax/update_manager.ajax.php:536
+#: ../../include/ajax/update_manager.ajax.php:544
 #: ../../include/functions_update_manager.php:189
-#: ../../enterprise/include/functions_update_manager.php:563
+#: ../../enterprise/include/functions_update_manager.php:570
 msgid "The package is installed."
 msgstr "パッケージがインストールされました。"
 
-#: ../../include/ajax/update_manager.ajax.php:540
+#: ../../include/ajax/update_manager.ajax.php:548
 msgid "An error ocurred in the installation process."
-msgstr "インストール処理でエラーが発生しました"
+msgstr "インストール処理でエラーが発生しました。"
 
-#: ../../include/ajax/visual_console_builder.ajax.php:180
-#: ../../include/functions_graph.php:5209
-msgid "No data to show"
-msgstr "表示するデータがありません"
-
-#: ../../include/auth/mysql.php:246
+#: ../../include/auth/mysql.php:240
 msgid ""
 "Problems with configuration permissions. Please contact with Administrator"
 msgstr "パーミッション設定に問題があります。管理者に連絡してください。"
 
-#: ../../include/auth/mysql.php:252
+#: ../../include/auth/mysql.php:246 ../../include/auth/mysql.php:257
 msgid "Your permissions have changed. Please, login again."
 msgstr "権限が変更されました。ログインし直してください。"
 
-#: ../../include/auth/mysql.php:265
+#: ../../include/auth/mysql.php:271
 msgid ""
 "Ooops User not found in \n"
 "\t\t\t\tdatabase or incorrect password"
@@ -19109,15 +19890,17 @@ msgstr ""
 "データベースにユーザがいないか\n"
 "\t\t\t\tパスワードが不正です。"
 
-#: ../../include/auth/mysql.php:283 ../../include/auth/mysql.php:331
+#: ../../include/auth/mysql.php:289 ../../include/auth/mysql.php:322
+#: ../../include/auth/mysql.php:396
 msgid "Fail the group synchronizing"
 msgstr "グループの同期に失敗しました"
 
-#: ../../include/auth/mysql.php:289 ../../include/auth/mysql.php:337
+#: ../../include/auth/mysql.php:295 ../../include/auth/mysql.php:328
+#: ../../include/auth/mysql.php:402
 msgid "Fail the tag synchronizing"
 msgstr "タグの同期に失敗しました"
 
-#: ../../include/auth/mysql.php:302
+#: ../../include/auth/mysql.php:308
 msgid ""
 "User not found in database \n"
 "\t\t\t\t\tor incorrect password"
@@ -19125,133 +19908,152 @@ msgstr ""
 "データベースにユーザがいないか\n"
 "\t\t\t\t\tパスワードが不正です。"
 
-#: ../../include/auth/mysql.php:317
+#: ../../include/auth/mysql.php:361 ../../include/auth/mysql.php:382
 msgid "User not found in database or incorrect password"
 msgstr "データベース上にユーザが存在しないかパスワードが不正です"
 
-#: ../../include/auth/mysql.php:593
+#: ../../include/auth/mysql.php:665
 msgid "Could not changes password on remote pandora"
 msgstr "リモートの pandora のパスワードを変更できません"
 
-#: ../../include/auth/mysql.php:630
+#: ../../include/auth/mysql.php:702
 msgid "Your installation of PHP does not support LDAP"
 msgstr "インストールされている PHP が LDAP に対応していません"
 
-#: ../../include/class/Tree.class.php:1474
-#: ../../include/functions_modules.php:1875
-#: ../../include/functions_modules.php:1895
+#: ../../include/class/Tree.class.php:1506
+#: ../../include/functions_modules.php:1956
+#: ../../include/functions_modules.php:1976
 #: ../../mobile/operation/modules.php:459
 #: ../../mobile/operation/modules.php:477
 #: ../../mobile/operation/modules.php:512
 #: ../../mobile/operation/modules.php:530
-#: ../../operation/agentes/pandora_networkmap.view.php:285
-#: ../../operation/agentes/pandora_networkmap.view.php:307
-#: ../../operation/agentes/status_monitor.php:1158
-#: ../../operation/agentes/status_monitor.php:1162
-#: ../../operation/agentes/status_monitor.php:1195
-#: ../../operation/agentes/status_monitor.php:1200
+#: ../../operation/agentes/pandora_networkmap.view.php:301
+#: ../../operation/agentes/pandora_networkmap.view.php:323
+#: ../../operation/agentes/status_monitor.php:1166
+#: ../../operation/agentes/status_monitor.php:1170
+#: ../../operation/agentes/status_monitor.php:1203
+#: ../../operation/agentes/status_monitor.php:1208
 #: ../../operation/search_modules.php:112
 #: ../../operation/search_modules.php:132
-#: ../../enterprise/extensions/vmware/vmware_view.php:935
-#: ../../enterprise/include/functions_services.php:1595
-#: ../../enterprise/include/functions_services.php:1619
+#: ../../enterprise/extensions/vmware/vmware_view.php:949
+#: ../../enterprise/include/functions_services.php:1684
+#: ../../enterprise/include/functions_services.php:1708
 #: ../../enterprise/operation/agentes/policy_view.php:363
 #: ../../enterprise/operation/agentes/policy_view.php:382
+#: ../../enterprise/operation/agentes/tag_view.php:810
+#: ../../enterprise/operation/agentes/tag_view.php:814
+#: ../../enterprise/operation/agentes/tag_view.php:847
+#: ../../enterprise/operation/agentes/tag_view.php:852
 msgid "CRITICAL"
 msgstr "障害"
 
-#: ../../include/class/Tree.class.php:1481
-#: ../../include/functions_modules.php:1879
-#: ../../include/functions_modules.php:1899
+#: ../../include/class/Tree.class.php:1513
+#: ../../include/functions_pandora_networkmap.php:1013
+#: ../../include/functions_modules.php:1960
+#: ../../include/functions_modules.php:1980
 #: ../../mobile/operation/modules.php:463
 #: ../../mobile/operation/modules.php:482
 #: ../../mobile/operation/modules.php:516
 #: ../../mobile/operation/modules.php:535
-#: ../../operation/agentes/pandora_networkmap.view.php:289
-#: ../../operation/agentes/pandora_networkmap.view.php:312
-#: ../../operation/agentes/status_monitor.php:1168
-#: ../../operation/agentes/status_monitor.php:1172
-#: ../../operation/agentes/status_monitor.php:1207
-#: ../../operation/agentes/status_monitor.php:1212
+#: ../../operation/agentes/pandora_networkmap.view.php:305
+#: ../../operation/agentes/pandora_networkmap.view.php:328
+#: ../../operation/agentes/status_monitor.php:1176
+#: ../../operation/agentes/status_monitor.php:1180
+#: ../../operation/agentes/status_monitor.php:1215
+#: ../../operation/agentes/status_monitor.php:1220
 #: ../../operation/search_modules.php:116
 #: ../../operation/search_modules.php:139
-#: ../../enterprise/extensions/vmware/vmware_view.php:939
-#: ../../enterprise/include/functions_login.php:33
-#: ../../enterprise/include/functions_services.php:1599
-#: ../../enterprise/include/functions_services.php:1623
+#: ../../enterprise/extensions/vmware/vmware_view.php:953
+#: ../../enterprise/include/functions_login.php:32
+#: ../../enterprise/include/functions_services.php:1688
+#: ../../enterprise/include/functions_services.php:1712
 #: ../../enterprise/operation/agentes/policy_view.php:367
 #: ../../enterprise/operation/agentes/policy_view.php:386
+#: ../../enterprise/operation/agentes/tag_view.php:820
+#: ../../enterprise/operation/agentes/tag_view.php:824
+#: ../../enterprise/operation/agentes/tag_view.php:859
+#: ../../enterprise/operation/agentes/tag_view.php:864
 msgid "WARNING"
 msgstr "警告"
 
-#: ../../include/class/Tree.class.php:1486
-#: ../../include/functions_modules.php:1890
-#: ../../include/functions_modules.php:1894
-#: ../../include/functions_modules.php:1898
+#: ../../include/class/Tree.class.php:1518
+#: ../../include/functions_modules.php:1971
+#: ../../include/functions_modules.php:1975
+#: ../../include/functions_modules.php:1979
 #: ../../mobile/operation/modules.php:471
 #: ../../mobile/operation/modules.php:476
 #: ../../mobile/operation/modules.php:481
 #: ../../mobile/operation/modules.php:524
 #: ../../mobile/operation/modules.php:529
 #: ../../mobile/operation/modules.php:534
-#: ../../operation/agentes/pandora_networkmap.view.php:301
-#: ../../operation/agentes/pandora_networkmap.view.php:306
-#: ../../operation/agentes/pandora_networkmap.view.php:311
-#: ../../operation/agentes/status_monitor.php:1182
-#: ../../operation/agentes/status_monitor.php:1187
-#: ../../operation/agentes/status_monitor.php:1194
-#: ../../operation/agentes/status_monitor.php:1199
-#: ../../operation/agentes/status_monitor.php:1206
-#: ../../operation/agentes/status_monitor.php:1211
+#: ../../operation/agentes/pandora_networkmap.view.php:317
+#: ../../operation/agentes/pandora_networkmap.view.php:322
+#: ../../operation/agentes/pandora_networkmap.view.php:327
+#: ../../operation/agentes/status_monitor.php:1190
+#: ../../operation/agentes/status_monitor.php:1195
+#: ../../operation/agentes/status_monitor.php:1202
+#: ../../operation/agentes/status_monitor.php:1207
+#: ../../operation/agentes/status_monitor.php:1214
+#: ../../operation/agentes/status_monitor.php:1219
 #: ../../operation/search_modules.php:124
 #: ../../operation/search_modules.php:131
 #: ../../operation/search_modules.php:138
-#: ../../enterprise/extensions/vmware/vmware_view.php:943
-#: ../../enterprise/include/functions_services.php:1606
-#: ../../enterprise/include/functions_services.php:1614
-#: ../../enterprise/include/functions_services.php:1619
-#: ../../enterprise/include/functions_services.php:1623
-#: ../../enterprise/include/functions_services.php:1627
+#: ../../enterprise/extensions/vmware/vmware_view.php:957
+#: ../../enterprise/include/functions_services.php:1695
+#: ../../enterprise/include/functions_services.php:1703
+#: ../../enterprise/include/functions_services.php:1708
+#: ../../enterprise/include/functions_services.php:1712
+#: ../../enterprise/include/functions_services.php:1716
 #: ../../enterprise/operation/agentes/policy_view.php:378
 #: ../../enterprise/operation/agentes/policy_view.php:382
 #: ../../enterprise/operation/agentes/policy_view.php:386
+#: ../../enterprise/operation/agentes/tag_view.php:834
+#: ../../enterprise/operation/agentes/tag_view.php:839
+#: ../../enterprise/operation/agentes/tag_view.php:846
+#: ../../enterprise/operation/agentes/tag_view.php:851
+#: ../../enterprise/operation/agentes/tag_view.php:858
+#: ../../enterprise/operation/agentes/tag_view.php:863
 msgid "UNKNOWN"
 msgstr "不明"
 
-#: ../../include/class/Tree.class.php:1492
+#: ../../include/class/Tree.class.php:1524
 msgid "NO DATA"
 msgstr "データがありません"
 
-#: ../../include/class/Tree.class.php:1500
-#: ../../include/functions_modules.php:1883
-#: ../../include/functions_modules.php:1891
+#: ../../include/class/Tree.class.php:1532
+#: ../../include/functions_modules.php:1964
+#: ../../include/functions_modules.php:1972
 #: ../../mobile/operation/modules.php:455
 #: ../../mobile/operation/modules.php:472
 #: ../../mobile/operation/modules.php:508
 #: ../../mobile/operation/modules.php:525
-#: ../../operation/agentes/pandora_networkmap.view.php:293
-#: ../../operation/agentes/pandora_networkmap.view.php:302
-#: ../../operation/agentes/status_monitor.php:1148
-#: ../../operation/agentes/status_monitor.php:1152
-#: ../../operation/agentes/status_monitor.php:1183
-#: ../../operation/agentes/status_monitor.php:1188
+#: ../../operation/agentes/pandora_networkmap.view.php:309
+#: ../../operation/agentes/pandora_networkmap.view.php:318
+#: ../../operation/agentes/status_monitor.php:1156
+#: ../../operation/agentes/status_monitor.php:1160
+#: ../../operation/agentes/status_monitor.php:1191
+#: ../../operation/agentes/status_monitor.php:1196
 #: ../../operation/search_modules.php:108
 #: ../../operation/search_modules.php:125
-#: ../../enterprise/extensions/vmware/vmware_view.php:931
-#: ../../enterprise/include/functions_services.php:1591
-#: ../../enterprise/include/functions_services.php:1614
+#: ../../enterprise/extensions/vmware/vmware_view.php:945
+#: ../../enterprise/include/functions_services.php:1680
+#: ../../enterprise/include/functions_services.php:1703
 #: ../../enterprise/operation/agentes/policy_view.php:371
 #: ../../enterprise/operation/agentes/policy_view.php:378
+#: ../../enterprise/operation/agentes/tag_view.php:800
+#: ../../enterprise/operation/agentes/tag_view.php:804
+#: ../../enterprise/operation/agentes/tag_view.php:835
+#: ../../enterprise/operation/agentes/tag_view.php:840
 msgid "NORMAL"
 msgstr "正常"
 
-#: ../../include/class/Tree.class.php:1578
+#: ../../include/class/Tree.class.php:1619
 #: ../../enterprise/godmode/alerts/configure_alert_rule.php:152
 msgid "Module alerts"
 msgstr "モジュールアラート"
 
 #: ../../include/functions.php:215
-#: ../../enterprise/include/functions_reporting_csv.php:1534
+#: ../../enterprise/include/functions_reporting_csv.php:1646
 msgid "."
 msgstr "."
 
@@ -19288,47 +20090,47 @@ msgid "N"
 msgstr "N"
 
 #: ../../include/functions.php:867 ../../include/functions.php:1075
-#: ../../include/functions.php:1108 ../../include/functions_events.php:1459
-#: ../../include/functions_graph.php:2778
-#: ../../include/functions_graph.php:3278
-#: ../../include/functions_graph.php:3279
-#: ../../include/functions_graph.php:5227
+#: ../../include/functions.php:1108 ../../include/functions_events.php:1463
+#: ../../include/functions_graph.php:3259
+#: ../../include/functions_graph.php:3759
+#: ../../include/functions_graph.php:3760
+#: ../../include/functions_graph.php:6073
 #: ../../include/functions_incidents.php:34
 #: ../../include/functions_incidents.php:69
 msgid "Maintenance"
 msgstr "メンテナンス"
 
 #: ../../include/functions.php:870 ../../include/functions.php:1076
-#: ../../include/functions.php:1111 ../../include/functions_events.php:1462
-#: ../../include/functions_graph.php:3282
-#: ../../include/functions_graph.php:3283
-#: ../../include/functions_graph.php:5230
+#: ../../include/functions.php:1111 ../../include/functions_events.php:1466
+#: ../../include/functions_graph.php:3763
+#: ../../include/functions_graph.php:3764
+#: ../../include/functions_graph.php:6076
 msgid "Informational"
 msgstr "情報"
 
 #: ../../include/functions.php:882 ../../include/functions.php:1078
-#: ../../include/functions.php:1123 ../../include/functions_graph.php:3290
-#: ../../include/functions_graph.php:3291
-#: ../../include/functions_graph.php:5242
+#: ../../include/functions.php:1123 ../../include/functions_graph.php:3771
+#: ../../include/functions_graph.php:3772
+#: ../../include/functions_graph.php:6088
 msgid "Minor"
 msgstr "マイナー"
 
 #: ../../include/functions.php:885 ../../include/functions.php:1080
-#: ../../include/functions.php:1126 ../../include/functions_graph.php:3298
-#: ../../include/functions_graph.php:3299
-#: ../../include/functions_graph.php:5245
+#: ../../include/functions.php:1126 ../../include/functions_graph.php:3779
+#: ../../include/functions_graph.php:3780
+#: ../../include/functions_graph.php:6091
 msgid "Major"
 msgstr "メジャー"
 
-#: ../../include/functions.php:1029 ../../include/functions_events.php:1395
+#: ../../include/functions.php:1029 ../../include/functions_events.php:1399
 msgid "Monitor Critical"
 msgstr "障害"
 
-#: ../../include/functions.php:1030 ../../include/functions_events.php:1398
+#: ../../include/functions.php:1030 ../../include/functions_events.php:1402
 msgid "Monitor Warning"
 msgstr "警告"
 
-#: ../../include/functions.php:1031 ../../include/functions_events.php:1401
+#: ../../include/functions.php:1031 ../../include/functions_events.php:1405
 msgid "Monitor Normal"
 msgstr "正常"
 
@@ -19337,16 +20139,16 @@ msgid "Monitor Unknown"
 msgstr "不明状態"
 
 #: ../../include/functions.php:1036 ../../include/functions_events.php:1138
-#: ../../include/functions_events.php:1407
+#: ../../include/functions_events.php:1411
 msgid "Alert recovered"
 msgstr "復旧したアラート"
 
 #: ../../include/functions.php:1037 ../../include/functions_events.php:1173
-#: ../../include/functions_events.php:1410
+#: ../../include/functions_events.php:1414
 msgid "Alert ceased"
 msgstr "停止されたアラート"
 
-#: ../../include/functions.php:1038 ../../include/functions_events.php:1413
+#: ../../include/functions.php:1038 ../../include/functions_events.php:1417
 msgid "Alert manual validation"
 msgstr "承諾されたアラート"
 
@@ -19354,98 +20156,4275 @@ msgstr "承諾されたアラート"
 msgid "Agent created"
 msgstr "エージェント作成"
 
-#: ../../include/functions.php:1041 ../../include/functions_events.php:1416
+#: ../../include/functions.php:1041 ../../include/functions_events.php:1420
 msgid "Recon host detected"
 msgstr "自動検出"
 
 #: ../../include/functions.php:1044 ../../include/functions_events.php:1170
-#: ../../include/functions_events.php:1425
+#: ../../include/functions_events.php:1429
 msgid "Configuration change"
 msgstr "設定変更"
 
-#: ../../include/functions.php:2015
-msgid "custom"
-msgstr "カスタム"
-
-#: ../../include/functions.php:2020 ../../include/functions.php:2021
+#: ../../include/functions.php:2055 ../../include/functions.php:2056
 #, php-format
 msgid "%s minutes"
 msgstr "%s 分"
 
-#: ../../include/functions.php:2023 ../../include/functions.php:2024
-#, php-format
-msgid "%s hours"
-msgstr "%s 時間"
-
-#: ../../include/functions.php:2029 ../../include/functions.php:2030
+#: ../../include/functions.php:2064 ../../include/functions.php:2065
 #, php-format
 msgid "%s months"
 msgstr "%s ヶ月"
 
-#: ../../include/functions.php:2032 ../../include/functions.php:2033
+#: ../../include/functions.php:2067 ../../include/functions.php:2068
 #, php-format
 msgid "%s years"
 msgstr "%s 年"
 
-#: ../../include/functions.php:2036
+#: ../../include/functions.php:2071
 msgid "Default values will be used"
 msgstr "デフォルト値を利用します"
 
-#: ../../include/functions.php:2196
+#: ../../include/functions.php:2220
 msgid "The uploaded file was only partially uploaded"
 msgstr "ファイルは部分的にのみアップロードされました"
 
-#: ../../include/functions.php:2199
+#: ../../include/functions.php:2223
 msgid "No file was uploaded"
 msgstr "ファイルがアップロードされませんでした"
 
-#: ../../include/functions.php:2202
+#: ../../include/functions.php:2226
 msgid "Missing a temporary folder"
 msgstr "テンポラリフォルダがありません"
 
-#: ../../include/functions.php:2205
+#: ../../include/functions.php:2229
 msgid "Failed to write file to disk"
 msgstr "ファイルのディスクへの書き込みに失敗しました"
 
-#: ../../include/functions.php:2208
+#: ../../include/functions.php:2232
 msgid "File upload stopped by extension"
 msgstr "拡張によりファイルのアップロードが停止されました"
 
-#: ../../include/functions.php:2212
+#: ../../include/functions.php:2236
 msgid "Unknown upload error"
 msgstr "不明なアップロードエラー"
 
-#: ../../include/functions.php:2297
+#: ../../include/functions.php:2321
 msgid "No data found to export"
 msgstr "エクスポートするデータがありません"
 
-#: ../../include/functions.php:2315
+#: ../../include/functions.php:2339
 msgid "Source ID"
 msgstr "ソース ID"
 
-#: ../../include/functions.php:2583
+#: ../../include/functions.php:2607
 #: ../../operation/gis_maps/render_view.php:135
 msgid "5 seconds"
 msgstr "5 秒"
 
-#: ../../include/functions.php:2584
+#: ../../include/functions.php:2608
 #: ../../operation/gis_maps/render_view.php:136
 msgid "10 seconds"
 msgstr "10 秒"
 
-#: ../../include/functions.php:2585
+#: ../../include/functions.php:2609
 msgid "15 seconds"
 msgstr "15秒"
 
-#: ../../include/functions.php:2586
+#: ../../include/functions.php:2610
 #: ../../operation/gis_maps/render_view.php:137
 msgid "30 seconds"
 msgstr "30 秒"
 
-#: ../../include/functions.php:2590
+#: ../../include/functions.php:2614
 msgid "15 minutes"
 msgstr "15 分"
 
+#: ../../include/functions_reporting.php:207
+#: ../../include/functions_reporting.php:10943
+msgid " agents"
+msgstr " エージェント"
+
+#: ../../include/functions_reporting.php:211
+#: ../../include/functions_reporting.php:10984
+msgid " modules"
+msgstr " モジュール"
+
+#: ../../include/functions_reporting.php:618
+#: ../../include/functions_reports.php:540
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:112
+#: ../../enterprise/godmode/services/services.service.php:341
+#: ../../enterprise/include/functions_reporting_csv.php:1020
+msgid "S.L.A."
+msgstr "SLA"
+
+#: ../../include/functions_reporting.php:651
+#: ../../include/functions_reporting.php:5659
+#: ../../enterprise/include/functions_reporting.php:2092
+#: ../../enterprise/include/functions_reporting.php:2818
+#: ../../enterprise/include/functions_reporting.php:3599
+#: ../../enterprise/include/functions_reporting.php:4934
+#: ../../enterprise/include/functions_reporting.php:4940
+msgid "There are no SLAs defined"
+msgstr "SLA が定義されていません。"
+
+#: ../../include/functions_reporting.php:707
+#: ../../include/functions_reporting.php:5699
+#: ../../include/functions_maps.php:43
+#: ../../include/functions_networkmap.php:1759
+#: ../../enterprise/include/functions_reporting.php:2136
+#: ../../enterprise/include/functions_reporting.php:2862
+#: ../../enterprise/include/functions_reporting.php:3643
+msgid "Dynamic"
+msgstr "動的"
+
+#: ../../include/functions_reporting.php:718
+#: ../../include/functions_reporting.php:5710
+#: ../../enterprise/include/functions_reporting.php:2147
+#: ../../enterprise/include/functions_reporting.php:2873
+#: ../../enterprise/include/functions_reporting.php:3654
+msgid "Inverse"
+msgstr "反転"
+
+#: ../../include/functions_reporting.php:1028
+#: ../../enterprise/dashboard/widgets/top_n.php:31
+msgid "Top N"
+msgstr "トップ N"
+
+#: ../../include/functions_reporting.php:1047
+#: ../../operation/snmpconsole/snmp_statistics.php:127
+#: ../../operation/snmpconsole/snmp_statistics.php:185
+#: ../../enterprise/include/functions_reporting_csv.php:430
+#, php-format
+msgid "Top %d"
+msgstr "トップ %d"
+
+#: ../../include/functions_reporting.php:1085
+#: ../../include/functions_reporting.php:1910
+#: ../../include/functions_reporting_html.php:2498
+#: ../../include/functions_reporting_html.php:2768
+#: ../../enterprise/dashboard/widgets/top_n.php:468
+#: ../../enterprise/include/functions_reporting_pdf.php:871
+#: ../../enterprise/include/functions_reporting_pdf.php:1339
+#: ../../enterprise/include/functions_reporting_pdf.php:2094
+msgid "There are no Agent/Modules defined"
+msgstr "定義済のエージェント/モジュールがありません"
+
+#: ../../include/functions_reporting.php:1138
+#: ../../enterprise/dashboard/widgets/top_n.php:534
+msgid "Insuficient data"
+msgstr "不十分なデータ"
+
+#: ../../include/functions_reporting.php:1295
+#: ../../include/functions_reporting.php:1450
+#: ../../include/functions_reporting.php:1469
+#: ../../include/functions_reporting.php:1490
+#: ../../include/functions_reporting.php:1511
+#: ../../include/functions_reporting.php:2181
+#: ../../include/functions_reporting.php:2363
+#: ../../include/functions_reporting.php:2384
+#: ../../include/functions_reporting.php:2405
+#: ../../include/functions_reporting.php:6871
+#: ../../include/functions_reporting.php:6891
+#: ../../include/functions_reporting.php:6911
+#: ../../include/functions_graph.php:2598
+#: ../../include/functions_graph.php:2678
+#: ../../include/functions_graph.php:2751
+#: ../../include/functions_graph.php:3520
+#: ../../include/functions_graph.php:4019
+#: ../../include/functions_reporting_html.php:3047
+#: ../../include/functions_reporting_html.php:3125
+#: ../../enterprise/dashboard/widgets/top_n_events_by_group.php:180
+#: ../../enterprise/dashboard/widgets/top_n_events_by_module.php:197
+msgid "other"
+msgstr "その他"
+
+#: ../../include/functions_reporting.php:1373
+msgid "Event Report Group"
+msgstr "イベントレポートグループ"
+
+#: ../../include/functions_reporting.php:1417
+#: ../../include/functions_reporting.php:1589
+#: ../../include/functions_events.php:865
+#: ../../include/functions_events.php:869
+#: ../../include/functions_reporting_html.php:3893
+#: ../../include/functions_reporting_html.php:4065
+#: ../../mobile/operation/events.php:790
+#: ../../operation/events/events.build_table.php:118
+#: ../../operation/events/events.build_table.php:787
+msgid "No events"
+msgstr "イベントがありません。"
+
+#: ../../include/functions_reporting.php:1550
+msgid "Event Report Module"
+msgstr "イベントレポートモジュール"
+
+#: ../../include/functions_reporting.php:1616
+#: ../../enterprise/include/functions_reporting_csv.php:302
+msgid "Inventory Changes"
+msgstr "インベントリ変更"
+
+#: ../../include/functions_reporting.php:1658
+#: ../../enterprise/extensions/ipam/ipam_action.php:198
+msgid "No changes found."
+msgstr "変更が見つかりません。"
+
+#: ../../include/functions_reporting.php:1745
+msgid "Agent/Modules"
+msgstr "エージェント/モジュール"
+
+#: ../../include/functions_reporting.php:1816
+#: ../../include/functions_reports.php:586
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:46
+#: ../../enterprise/include/functions_reporting_csv.php:403
+msgid "Exception"
+msgstr "例外"
+
+#: ../../include/functions_reporting.php:1834
+msgid "Exception - Everything"
+msgstr "例外 - 全て"
+
+#: ../../include/functions_reporting.php:1839
+#, php-format
+msgid "Exception - Modules over or equal to %s"
+msgstr "例外 - モジュールが %s 以上"
+
+#: ../../include/functions_reporting.php:1841
+#, php-format
+msgid "Modules over or equal to %s"
+msgstr "%s 以上のモジュール"
+
+#: ../../include/functions_reporting.php:1845
+#, php-format
+msgid "Exception - Modules under or equal to %s"
+msgstr "例外 - モジュールが %s 以下"
+
+#: ../../include/functions_reporting.php:1847
+#, php-format
+msgid "Modules under or equal to %s"
+msgstr "%s 以下のモジュール"
+
+#: ../../include/functions_reporting.php:1851
+#, php-format
+msgid "Exception - Modules under %s"
+msgstr "例外 - モジュールが %s 未満"
+
+#: ../../include/functions_reporting.php:1853
+#, php-format
+msgid "Modules under %s"
+msgstr "%s 未満のモジュール"
+
+#: ../../include/functions_reporting.php:1857
+#, php-format
+msgid "Exception - Modules over %s"
+msgstr "例外 - モジュールが %s より大きい"
+
+#: ../../include/functions_reporting.php:1859
+#, php-format
+msgid "Modules over %s"
+msgstr "%s を超えるモジュール"
+
+#: ../../include/functions_reporting.php:1863
+#, php-format
+msgid "Exception - Equal to %s"
+msgstr "例外 - %s と同じ"
+
+#: ../../include/functions_reporting.php:1865
+#, php-format
+msgid "Equal to %s"
+msgstr "%s と同じ"
+
+#: ../../include/functions_reporting.php:1869
+#, php-format
+msgid "Exception - Not equal to %s"
+msgstr "例外 - %s と異なる"
+
+#: ../../include/functions_reporting.php:1871
+#, php-format
+msgid "Not equal to %s"
+msgstr "%s と異なる"
+
+#: ../../include/functions_reporting.php:1875
+msgid "Exception - Modules at normal status"
+msgstr "例外 - モジュールが正常状態"
+
+#: ../../include/functions_reporting.php:1876
+msgid "Modules at normal status"
+msgstr "正常状態のモジュール"
+
+#: ../../include/functions_reporting.php:1880
+msgid "Exception - Modules at critical or warning status"
+msgstr "例外 - モジュールが障害または警告状態"
+
+#: ../../include/functions_reporting.php:1881
+msgid "Modules at critical or warning status"
+msgstr "障害または警告状態のモジュール"
+
+#: ../../include/functions_reporting.php:2070
+msgid "There are no Modules under those conditions."
+msgstr "これらの条件のモジュールはありません。"
+
+#: ../../include/functions_reporting.php:2073
+#, php-format
+msgid "There are no Modules over or equal to %s."
+msgstr "%s 以上のモジュールがありません。"
+
+#: ../../include/functions_reporting.php:2076
+#, php-format
+msgid "There are no Modules less or equal to %s."
+msgstr "%s 以下のモジュールがありません。"
+
+#: ../../include/functions_reporting.php:2079
+#, php-format
+msgid "There are no Modules less %s."
+msgstr "%s 未満のモジュールがありません。"
+
+#: ../../include/functions_reporting.php:2082
+#, php-format
+msgid "There are no Modules over %s."
+msgstr "%s を超えるモジュールがありません。"
+
+#: ../../include/functions_reporting.php:2085
+#, php-format
+msgid "There are no Modules equal to %s"
+msgstr "%s と同じモジュールがありません。"
+
+#: ../../include/functions_reporting.php:2088
+#, php-format
+msgid "There are no Modules not equal to %s"
+msgstr "%s と異なるモジュールがありません。"
+
+#: ../../include/functions_reporting.php:2091
+msgid "There are no Modules normal status"
+msgstr "正常状態のモジュールがありません"
+
+#: ../../include/functions_reporting.php:2094
+msgid "There are no Modules at critial or warning status"
+msgstr "障害または警告状態のモジュールはありません"
+
+#: ../../include/functions_reporting.php:2242
+#: ../../enterprise/include/functions_reporting_csv.php:456
+msgid "Group Report"
+msgstr "グループレポート"
+
+#: ../../include/functions_reporting.php:2296
+msgid "Event Report Agent"
+msgstr "イベントレポートエージェント"
+
+#: ../../include/functions_reporting.php:2498
+msgid "Database Serialized"
+msgstr "データベースの並び"
+
+#: ../../include/functions_reporting.php:2629
+#: ../../include/functions_reports.php:641
+msgid "Group configuration"
+msgstr "グループ設定"
+
+#: ../../include/functions_reporting.php:2705
+msgid "Network interfaces report"
+msgstr "ネットワークインタフェースレポート"
+
+#: ../../include/functions_reporting.php:2728
+msgid ""
+"The group has no agents or none of the agents has any network interface"
+msgstr "グループにエージェントが無いか、ネットワークインタフェースのあるエージェントがありません"
+
+#: ../../include/functions_reporting.php:2777
+#: ../../include/functions_reporting.php:2806
+msgid "bytes/s"
+msgstr "バイト/秒"
+
+#: ../../include/functions_reporting.php:2864
+msgid "Alert Report Group"
+msgstr "アラートレポートグループ"
+
+#: ../../include/functions_reporting.php:3010
+msgid "Alert Report Agent"
+msgstr "アラートレポートエージェント"
+
+#: ../../include/functions_reporting.php:3127
+msgid "Alert Report Module"
+msgstr "アラートレポートモジュール"
+
+#: ../../include/functions_reporting.php:3260
+msgid "SQL Graph Vertical Bars"
+msgstr "SQL縦棒グラフ"
+
+#: ../../include/functions_reporting.php:3263
+msgid "SQL Graph Horizontal Bars"
+msgstr "SQL横棒グラフ"
+
+#: ../../include/functions_reporting.php:3266
+msgid "SQL Graph Pie"
+msgstr "SQL円グラフ"
+
+#: ../../include/functions_reporting.php:3314
+#: ../../enterprise/include/functions_reporting_csv.php:941
+#: ../../enterprise/include/functions_reporting_csv.php:957
+#: ../../enterprise/include/functions_reporting_csv.php:965
+msgid "Monitor Report"
+msgstr "モニタレポート"
+
+#: ../../include/functions_reporting.php:3391
+msgid "Netflow Area"
+msgstr "Netflow塗りつぶしグラフ"
+
+#: ../../include/functions_reporting.php:3394
+msgid "Netflow Pie"
+msgstr "NetFlow円グラフ"
+
+#: ../../include/functions_reporting.php:3397
+msgid "Netflow Data"
+msgstr "Netflowデータ"
+
+#: ../../include/functions_reporting.php:3400
+msgid "Netflow Statistics"
+msgstr "Netflow 統計"
+
+#: ../../include/functions_reporting.php:3403
+msgid "Netflow Summary"
+msgstr "Netflow 概要"
+
+#: ../../include/functions_reporting.php:3466
+#: ../../include/functions_reports.php:501
+msgid "Simple baseline graph"
+msgstr "シンプルベースライングラフ"
+
+#: ../../include/functions_reporting.php:3533
+msgid "Prediction Date"
+msgstr "予測日時"
+
+#: ../../include/functions_reporting.php:3584
+#: ../../enterprise/include/functions_reporting_csv.php:345
+msgid "Projection Graph"
+msgstr "予想グラフ"
+
+#: ../../include/functions_reporting.php:3671
+#: ../../include/functions_reports.php:639
+msgid "Agent configuration"
+msgstr "エージェント設定"
+
+#: ../../include/functions_reporting.php:3825
+#: ../../enterprise/include/functions_reporting_csv.php:904
+#: ../../enterprise/include/functions_reporting_csv.php:920
+#: ../../enterprise/include/functions_reporting_csv.php:927
+msgid "AVG. Value"
+msgstr "平均値"
+
+#: ../../include/functions_reporting.php:3828
+#: ../../include/functions_reporting.php:6342
+#: ../../include/functions_reports.php:574
+#: ../../enterprise/include/functions_reporting_csv.php:735
+#: ../../enterprise/include/functions_reporting_csv.php:751
+#: ../../enterprise/include/functions_reporting_csv.php:758
+msgid "Summatory"
+msgstr "合計"
+
+#: ../../include/functions_reporting.php:3831
+#: ../../include/functions_reports.php:535
+#: ../../enterprise/include/functions_reporting_csv.php:555
+#: ../../enterprise/include/functions_reporting_csv.php:570
+#: ../../enterprise/include/functions_reporting_csv.php:577
+msgid "MTTR"
+msgstr "MTTR"
+
+#: ../../include/functions_reporting.php:3834
+#: ../../include/functions_reports.php:533
+#: ../../enterprise/include/functions_reporting_csv.php:591
+#: ../../enterprise/include/functions_reporting_csv.php:607
+#: ../../enterprise/include/functions_reporting_csv.php:614
+msgid "MTBF"
+msgstr "MTBF"
+
+#: ../../include/functions_reporting.php:3837
+#: ../../include/functions_reports.php:531
+#: ../../enterprise/include/functions_reporting_csv.php:628
+#: ../../enterprise/include/functions_reporting_csv.php:644
+#: ../../enterprise/include/functions_reporting_csv.php:651
+msgid "TTO"
+msgstr "TTO"
+
+#: ../../include/functions_reporting.php:3840
+#: ../../include/functions_reports.php:529
+#: ../../enterprise/include/functions_reporting_csv.php:665
+#: ../../enterprise/include/functions_reporting_csv.php:682
+#: ../../enterprise/include/functions_reporting_csv.php:689
+msgid "TTRT"
+msgstr "TTRT"
+
+#: ../../include/functions_reporting.php:3906
+#: ../../include/functions_reporting.php:3984
+#: ../../include/functions_reporting.php:6348
+msgid "Maximum"
+msgstr "最大"
+
+#: ../../include/functions_reporting.php:3981
+#: ../../include/functions_reporting.php:4126
+#: ../../include/functions_reporting.php:4267
+msgid "Lapse"
+msgstr "経過"
+
+#: ../../include/functions_reporting.php:4050
+#: ../../include/functions_reporting.php:4129
+#: ../../include/functions_reporting.php:6345
+msgid "Minimum"
+msgstr "最小"
+
+#: ../../include/functions_reporting.php:4192
+#: ../../include/functions_reporting.php:4270
+msgid "Average"
+msgstr "平均"
+
+#: ../../include/functions_reporting.php:4420
+#: ../../enterprise/godmode/reporting/mysql_builder.php:142
+#: ../../enterprise/include/functions_reporting_csv.php:700
+msgid "SQL"
+msgstr "SQL"
+
+#: ../../include/functions_reporting.php:4496
+msgid ""
+"Illegal query: Due security restrictions, there are some tokens or words you "
+"cannot use: *, delete, drop, alter, modify, password, pass, insert or update."
+msgstr ""
+"不正なクエリ: セキュリティ制限により、*, delete, drop, alter, modify, password, pass, insert, "
+"update といったいくつかのトークンや単語は利用できません。"
+
+#: ../../include/functions_reporting.php:5390
+#: ../../include/functions_reporting.php:5633
+#: ../../include/functions_reports.php:600
+#: ../../enterprise/include/functions_reporting.php:1018
+#: ../../enterprise/include/functions_reporting_csv.php:258
+msgid "Availability"
+msgstr "可用性"
+
+#: ../../include/functions_reporting.php:5501
+msgid "No Address"
+msgstr "アドレスがありません"
+
+#: ../../include/functions_reporting.php:6020
+#: ../../include/functions_reporting_html.php:2238
+#: ../../include/functions_reports.php:578
+#: ../../enterprise/include/functions_reporting_csv.php:845
+#: ../../enterprise/include/functions_reporting_csv.php:857
+#: ../../enterprise/include/functions_reporting_csv.php:861
+#: ../../enterprise/include/functions_reporting_csv.php:879
+#: ../../enterprise/include/functions_reporting_pdf.php:363
+msgid "Increment"
+msgstr "増分"
+
+#: ../../include/functions_reporting.php:6074
+msgid ""
+"The monitor have no data in this range of dates or monitor type is not "
+"numeric"
+msgstr "この日付範囲にデータが無いか、数値ではないタイプの監視項目です。"
+
+#: ../../include/functions_reporting.php:6096
+msgid "The monitor type is not numeric"
+msgstr "監視タイプは数値ではありません。"
+
+#: ../../include/functions_reporting.php:6352
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:195
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:278
+msgid "Rate"
+msgstr "率"
+
+#: ../../include/functions_reporting.php:6411
+#: ../../include/functions_reporting.php:6560
+#: ../../include/functions_reports.php:499
+msgid "Simple graph"
+msgstr "単一グラフ"
+
+#: ../../include/functions_reporting.php:7016
+msgid "Maximum of events shown"
+msgstr "最大表示イベント"
+
+#: ../../include/functions_reporting.php:7656
+#: ../../include/functions_reporting.php:7693
+msgid "Server health"
+msgstr "サーバの正常性"
+
+#: ../../include/functions_reporting.php:7656
+#, php-format
+msgid "%d Downed servers"
+msgstr "停止サーバ数 %d"
+
+#: ../../include/functions_reporting.php:7664
+#: ../../include/functions_reporting.php:7696
+msgid "Monitor health"
+msgstr "モニタ項目の正常性"
+
+#: ../../include/functions_reporting.php:7664
+#, php-format
+msgid "%d Not Normal monitors"
+msgstr "非正常数 %d"
+
+#: ../../include/functions_reporting.php:7666
+#: ../../include/functions_reporting.php:7697
+msgid "of monitors up"
+msgstr "のモニタ項目が正常です。"
+
+#: ../../include/functions_reporting.php:7672
+#: ../../include/functions_reporting.php:7699
+msgid "Module sanity"
+msgstr "モジュール"
+
+#: ../../include/functions_reporting.php:7672
+#, php-format
+msgid "%d Not inited monitors"
+msgstr "未初期化数 %d"
+
+#: ../../include/functions_reporting.php:7674
+#: ../../include/functions_reporting.php:7700
+msgid "of total modules inited"
+msgstr "のモジュールが初期化済みです。"
+
+#: ../../include/functions_reporting.php:7680
+#: ../../include/functions_reporting.php:7702
+#: ../../include/functions_reporting_html.php:2866
+msgid "Alert level"
+msgstr "アラートレベル"
+
+#: ../../include/functions_reporting.php:7680
+#: ../../include/functions_reporting.php:8704
+#: ../../include/functions_reporting.php:8713
+#, php-format
+msgid "%d Fired alerts"
+msgstr "アラート発報数 %d"
+
+#: ../../include/functions_reporting.php:7682
+#: ../../include/functions_reporting.php:7703
+msgid "of defined alerts not fired"
+msgstr "の定義済みアラートが未発生です。"
+
+#: ../../include/functions_reporting.php:7740
+#: ../../enterprise/include/functions_reporting_csv.php:477
+msgid "Defined alerts"
+msgstr "定義済みアラート"
+
+#: ../../include/functions_reporting.php:7753
+#: ../../include/functions_reporting.php:7774
+#: ../../include/functions_graph.php:2589 ../../operation/tree.php:298
+#: ../../operation/tree.php:299 ../../operation/tree.php:300
+#: ../../enterprise/dashboard/widgets/tree_view.php:210
+#: ../../enterprise/dashboard/widgets/tree_view.php:211
+#: ../../enterprise/dashboard/widgets/tree_view.php:212
+#: ../../enterprise/include/functions_reporting_csv.php:478
+msgid "Fired alerts"
+msgstr "発生したアラート"
+
+#: ../../include/functions_reporting.php:7762
+msgid "Defined and fired alerts"
+msgstr "定義済・発報アラート"
+
+#: ../../include/functions_reporting.php:7821
+#: ../../operation/events/sound_events.php:84
+msgid "Monitor critical"
+msgstr "障害状態"
+
+#: ../../include/functions_reporting.php:7825
+#: ../../operation/events/sound_events.php:86
+msgid "Monitor warning"
+msgstr "警告状態"
+
+#: ../../include/functions_reporting.php:7832
+msgid "Monitor normal"
+msgstr "正常状態"
+
+#: ../../include/functions_reporting.php:7836
+#: ../../operation/events/sound_events.php:85
+msgid "Monitor unknown"
+msgstr "不明状態"
+
+#: ../../include/functions_reporting.php:7843
+msgid "Monitor not init"
+msgstr "未初期化状態"
+
+#: ../../include/functions_reporting.php:7867
+#: ../../include/functions_reporting.php:7878
+msgid "Monitors by status"
+msgstr "状態ごとの監視項目"
+
+#: ../../include/functions_reporting.php:7925
+#: ../../include/functions_reporting_html.php:3584
+#: ../../enterprise/dashboard/widgets/tactical.php:32
+msgid "Monitor checks"
+msgstr "モニタ項目"
+
+#: ../../include/functions_reporting.php:7943
+#: ../../include/functions_reporting_html.php:3589
+msgid "Total agents and monitors"
+msgstr "全エージェントと監視項目"
+
+#: ../../include/functions_reporting.php:7966
+msgid "Defined users"
+msgstr "定義済ユーザ"
+
+#: ../../include/functions_reporting.php:8604
+msgid "Agent without data"
+msgstr "データの無いエージェント"
+
+#: ../../include/functions_reporting.php:8643
+#: ../../include/functions_agents.php:2229
+#: ../../include/functions_agents.php:2254
+#: ../../include/functions_agents.php:2279
+msgid "At least one module in CRITICAL status"
+msgstr "一つ以上のモジュールが致命的な状態です。"
+
+#: ../../include/functions_reporting.php:8647
+#: ../../include/functions_agents.php:2233
+#: ../../include/functions_agents.php:2258
+#: ../../include/functions_agents.php:2283
+msgid "At least one module in WARNING status"
+msgstr "一つ以上のモジュールが警告状態です。"
+
+#: ../../include/functions_reporting.php:8651
+#: ../../include/functions_agents.php:2237
+#: ../../include/functions_agents.php:2262
+#: ../../include/functions_agents.php:2287
+msgid "At least one module is in UKNOWN status"
+msgstr "一つ以上のモジュールが不明な状態です。"
+
+#: ../../include/functions_reporting.php:8655
+#: ../../include/functions_agents.php:2241
+#: ../../include/functions_agents.php:2266
+#: ../../include/functions_agents.php:2291
+msgid "All Monitors OK"
+msgstr "全モニタ項目が正常"
+
+#: ../../include/functions_reporting.php:8691
+#: ../../include/functions_reporting.php:8699
+#: ../../enterprise/operation/agentes/tag_view.php:904
+#, php-format
+msgid "%d Total modules"
+msgstr "全モジュール数 %d"
+
+#: ../../include/functions_reporting.php:8692
+#: ../../enterprise/operation/agentes/tag_view.php:905
+#, php-format
+msgid "%d Modules in normal status"
+msgstr "%d モジュールが正常状態"
+
+#: ../../include/functions_reporting.php:8693
+#: ../../enterprise/operation/agentes/tag_view.php:906
+#, php-format
+msgid "%d Modules in critical status"
+msgstr "%d モジュールが障害状態"
+
+#: ../../include/functions_reporting.php:8694
+#: ../../enterprise/operation/agentes/tag_view.php:907
+#, php-format
+msgid "%d Modules in warning status"
+msgstr "%d モジュールが警告状態"
+
+#: ../../include/functions_reporting.php:8695
+#: ../../enterprise/operation/agentes/tag_view.php:908
+#, php-format
+msgid "%d Modules in unknown status"
+msgstr "%d モジュールが不明状態"
+
+#: ../../include/functions_reporting.php:8696
+#: ../../enterprise/operation/agentes/tag_view.php:909
+#, php-format
+msgid "%d Modules in not init status"
+msgstr "%d モジュールが未初期化状態"
+
+#: ../../include/functions_reporting.php:8700
+#, php-format
+msgid "%d Normal modules"
+msgstr "正常モジュール数 %d"
+
+#: ../../include/functions_reporting.php:8701
+#, php-format
+msgid "%d Critical modules"
+msgstr "障害モジュール数 %d"
+
+#: ../../include/functions_reporting.php:8702
+#, php-format
+msgid "%d Warning modules"
+msgstr "警告モジュール数 %d"
+
+#: ../../include/functions_reporting.php:8703
+#, php-format
+msgid "%d Unknown modules"
+msgstr "不明モジュール数 %d"
+
+#: ../../include/functions_reporting.php:8707
+#, php-format
+msgid "%d Total agents"
+msgstr "全エージェント数 %d"
+
+#: ../../include/functions_reporting.php:8708
+#, php-format
+msgid "%d Normal agents"
+msgstr "正常エージェント数 %d"
+
+#: ../../include/functions_reporting.php:8709
+#, php-format
+msgid "%d Critical agents"
+msgstr "障害エージェント数 %d"
+
+#: ../../include/functions_reporting.php:8710
+#, php-format
+msgid "%d Warning agents"
+msgstr "警告エージェント数 %d"
+
+#: ../../include/functions_reporting.php:8711
+#, php-format
+msgid "%d Unknown agents"
+msgstr "不明エージェント数 %d"
+
+#: ../../include/functions_reporting.php:8712
+#, php-format
+msgid "%d not init agents"
+msgstr "%d 未初期化エージェント"
+
+#: ../../include/functions_reporting.php:10414
+msgid "Total running modules"
+msgstr "全実行中モジュール数"
+
+#: ../../include/functions_reporting.php:10417
+#: ../../include/functions_reporting.php:10433
+#: ../../include/functions_reporting.php:10449
+#: ../../include/functions_reporting.php:10472
+#: ../../include/functions_reporting.php:10491
+#: ../../include/functions_reporting.php:10503
+#: ../../include/functions_reporting.php:10515
+#: ../../include/functions_reporting.php:10531
+msgid "Ratio"
+msgstr "比率"
+
+#: ../../include/functions_reporting.php:10417
+#: ../../include/functions_reporting.php:10433
+#: ../../include/functions_reporting.php:10449
+#: ../../include/functions_reporting.php:10472
+#: ../../include/functions_reporting.php:10491
+#: ../../include/functions_reporting.php:10503
+#: ../../include/functions_reporting.php:10515
+#: ../../include/functions_reporting.php:10531
+msgid "Modules by second"
+msgstr "秒ごとのモジュール"
+
+#: ../../include/functions_reporting.php:10429
+msgid "Local modules"
+msgstr "ローカルモジュール数"
+
+#: ../../include/functions_reporting.php:10440
+msgid "Remote modules"
+msgstr "リモートモジュール数"
+
+#: ../../include/functions_reporting.php:10464
+msgid "Network modules"
+msgstr "ネットワークモジュール"
+
+#: ../../include/functions_reporting.php:10487
+msgid "Plugin modules"
+msgstr "プラグインモジュール"
+
+#: ../../include/functions_reporting.php:10499
+msgid "Prediction modules"
+msgstr "予測モジュール"
+
+#: ../../include/functions_reporting.php:10511
+msgid "WMI modules"
+msgstr "WMIモジュール"
+
+#: ../../include/functions_reporting.php:10523
+msgid "Web modules"
+msgstr "Webモジュール"
+
+#: ../../include/functions_reporting.php:10585
+#: ../../enterprise/dashboard/widgets/tactical.php:39
+msgid "Server performance"
+msgstr "サーバパフォーマンス"
+
+#: ../../include/functions_reporting.php:10667
+#: ../../enterprise/include/functions_reporting.php:5011
+msgid "Weekly:"
+msgstr "週次:"
+
+#: ../../include/functions_reporting.php:10701
+#: ../../enterprise/include/functions_reporting.php:5045
+msgid "Monthly:"
+msgstr "月次:"
+
+#: ../../include/functions_reporting.php:10702
+#: ../../enterprise/include/functions_reporting.php:5046
+msgid "From day"
+msgstr "開始日"
+
+#: ../../include/functions_reporting.php:10703
+#: ../../enterprise/include/functions_reporting.php:5047
+msgid "To day"
+msgstr "終了日"
+
+#: ../../include/functions_agents.php:690
+msgid ""
+"There was an error copying the agent configuration, the copy has been "
+"cancelled"
+msgstr "エージェントの設定コピーに失敗しました。コピーを中止します。"
+
+#: ../../include/functions_agents.php:2225
+#: ../../include/functions_agents.php:2250
+#: ../../include/functions_agents.php:2275
+msgid "No Monitors"
+msgstr "モニタ項目なし"
+
+#: ../../include/functions_alerts.php:401
+#: ../../enterprise/include/functions_policies.php:456
+#: ../../enterprise/include/functions_policies.php:471
+msgid "copy"
+msgstr "コピー"
+
+#: ../../include/functions_alerts.php:567
+#: ../../enterprise/godmode/massive/massive_add_alerts_policy.php:113
+#: ../../enterprise/godmode/massive/massive_add_alerts_policy.php:114
+#: ../../enterprise/godmode/massive/massive_delete_alerts_policy.php:112
+#: ../../enterprise/godmode/massive/massive_delete_alerts_policy.php:113
+msgid "Regular expression"
+msgstr "正規表現"
+
+#: ../../include/functions_alerts.php:568
+msgid "Max and min"
+msgstr "最大および最小"
+
+#: ../../include/functions_alerts.php:571
+msgid "Equal to"
+msgstr "同じ値"
+
+#: ../../include/functions_alerts.php:572
+msgid "Not equal to"
+msgstr "異なる値"
+
+#: ../../include/functions_alerts.php:575
+#: ../../enterprise/operation/agentes/wux_console_view.php:272
+#: ../../enterprise/operation/agentes/wux_console_view.php:276
+msgid "Unknown status"
+msgstr "不明状態"
+
+#: ../../include/functions_alerts.php:576
+msgid "On Change"
+msgstr "変化発生"
+
+#: ../../include/functions_alerts.php:970
+#: ../../include/functions_network_components.php:507
+#: ../../enterprise/include/functions_local_components.php:284
+msgid "Copy of"
+msgstr "複製"
+
+#: ../../include/functions_alerts.php:1401
+msgid "No actions defined"
+msgstr "アクションが定義されていません"
+
+#: ../../include/functions_api.php:78
+msgid "No set or get or help operation."
+msgstr "設定、参照、ヘルプの操作がありません。"
+
+#: ../../include/functions_api.php:82
+msgid "This operation does not exist."
+msgstr "この操作は存在しません。"
+
+#: ../../include/functions_api.php:86
+msgid "Id does not exist in BD."
+msgstr "ID が存在しません。"
+
+#: ../../include/functions_api.php:977 ../../include/functions_api.php:1037
+msgid "Does not exist agent with this name."
+msgstr "この名前のエージェントが存在しません。"
+
+#: ../../include/functions_api.php:979 ../../include/functions_api.php:1039
+msgid "Does not exist module with this name."
+msgstr "この名前のモジュールがありません。"
+
+#: ../../include/functions_api.php:1516 ../../include/functions_api.php:6477
+msgid "Correct Delete"
+msgstr "削除しました。"
+
+#: ../../include/functions_api.php:2508
+msgid "Error in creation network module. Agent name doesn't exist."
+msgstr "ネットワークモジュール作成エラー。エージェント名が存在しません。"
+
+#: ../../include/functions_api.php:2514
+msgid ""
+"Error in creation network module. Id_module_type is not correct for network "
+"modules."
+msgstr "ネットワークモジュール作成エラー。ネットワークモジュールの id_module_type が不正です。"
+
+#: ../../include/functions_api.php:2569
+msgid "Error in creation network module."
+msgstr "ネットワークモジュールの作成に失敗しました。"
+
+#: ../../include/functions_api.php:2602
+msgid "Error updating network module. Module name cannot be left blank."
+msgstr "ネットワークモジュール更新エラー。モジュール名が指定されていません。"
+
+#: ../../include/functions_api.php:2610
+msgid "Error updating network module. Id_module doesn't exist."
+msgstr "ネットワークモジュール更新エラー。id_module が存在しません。"
+
+#: ../../include/functions_api.php:2625
+msgid "Error updating network module. Id_module exists in the new agent."
+msgstr "ネットワークモジュール更新エラー。id_module が新規エージェントにあります。"
+
+#: ../../include/functions_api.php:2632
+msgid "Error updating network module. Id_agent doesn't exist."
+msgstr "ネットワークモジュールの更新エラー。id_agent が存在しません。"
+
+#: ../../include/functions_api.php:2685
+msgid "Network module updated."
+msgstr "ネットワークモジュールを更新しました。"
+
+#: ../../include/functions_api.php:2714
+msgid "Error in creation plugin module. Id_plugin cannot be left blank."
+msgstr "ラグインモジュール作成エラー。id_plugin が指定されていません。"
+
+#: ../../include/functions_api.php:2721
+msgid "Error in creation plugin module. Agent name doesn't exist."
+msgstr "プラグインモジュール作成エラー。エージェント名が存在しません。"
+
+#: ../../include/functions_api.php:2781
+msgid "Error in creation plugin module."
+msgstr "プラグインモジュール作成エラー。"
+
+#: ../../include/functions_api.php:2812
+msgid "Error updating plugin module. Id_module cannot be left blank."
+msgstr "プラグインモジュール更新エラー。id_module が指定されていません。"
+
+#: ../../include/functions_api.php:2819
+msgid "Error updating plugin module. Id_module doesn't exist."
+msgstr "プラグインモジュール更新エラー。id_module が存在しません。"
+
+#: ../../include/functions_api.php:2831
+msgid "Error updating plugin module. Id_module exists in the new agent."
+msgstr "プラグインモジュール更新エラー。id_module が新規エージェントにあります。"
+
+#: ../../include/functions_api.php:2838
+msgid "Error updating plugin module. Id_agent doesn't exist."
+msgstr "プラグインモジュールの更新エラー。id_agent が存在しません。"
+
+#: ../../include/functions_api.php:2899
+msgid "Plugin module updated."
+msgstr "プラグインモジュールを更新しました。"
+
+#: ../../include/functions_api.php:2928
+msgid "Error in creation data module. Module_name cannot be left blank."
+msgstr "データモジュール作成エラー。module_name が指定されていません。"
+
+#: ../../include/functions_api.php:2935
+msgid "Error in creation data module. Agent name doesn't exist."
+msgstr "データモジュール作成エラー。エージェント名が存在しません。"
+
+#: ../../include/functions_api.php:2986 ../../include/functions_api.php:3052
+msgid "Error in creation data module."
+msgstr "データモジュール作成エラー。"
+
+#: ../../include/functions_api.php:3020
+msgid "Error in creation synthetic module. Module_name cannot be left blank."
+msgstr "統合モジュール作成エラー。モジュール名は空にできません。"
+
+#: ../../include/functions_api.php:3027
+msgid "Error in creation synthetic module. Agent name doesn't exist."
+msgstr "統合モジュール作成エラー。エージェント名が存在しません。"
+
+#: ../../include/functions_api.php:3164
+msgid "Synthetic module created ID: "
+msgstr "統合モジュールを作成しました。ID: "
+
+#: ../../include/functions_api.php:3195
+msgid "Error updating data module. Id_module cannot be left blank."
+msgstr "データモジュール更新エラー。id_module が指定されていません。"
+
+#: ../../include/functions_api.php:3202
+msgid "Error updating data module. Id_module doesn't exist."
+msgstr "データモジュール更新エラー。id_moduleが存在しません。"
+
+#: ../../include/functions_api.php:3214
+msgid "Error updating data module. Id_module exists in the new agent."
+msgstr "データモジュール更新エラー。id_module が新規エージェントにあります。"
+
+#: ../../include/functions_api.php:3221
+msgid "Error updating data module. Id_agent doesn't exist."
+msgstr "データモジュールの更新エラー。id_agent が存在しません。"
+
+#: ../../include/functions_api.php:3269
+msgid "Data module updated."
+msgstr "データモジュールを更新しました。"
+
+#: ../../include/functions_api.php:3306
+msgid "Error in creation SNMP module. Module_name cannot be left blank."
+msgstr "SNMPモジュール作成エラー。module_name が指定されていません。"
+
+#: ../../include/functions_api.php:3311
+msgid ""
+"Error in creation SNMP module. Invalid id_module_type for a SNMP module."
+msgstr "SNMPモジュール作成エラー。SNMPモジュールの id_module_type が不正です。"
+
+#: ../../include/functions_api.php:3318
+msgid "Error in creation SNMP module. Agent name doesn't exist."
+msgstr "SNMPモジュール作成エラー。エージェント名が存在しません。"
+
+#: ../../include/functions_api.php:3333 ../../include/functions_api.php:3496
+#: ../../include/functions_api.php:5956
+msgid ""
+"Error in creation SNMP module. snmp3_priv_method doesn't exist. Set it to "
+"'AES' or 'DES'. "
+msgstr "SNMPモジュール作成エラー。snmp3_priv_method がありません。'AES' または 'DES' を設定してください。 "
+
+#: ../../include/functions_api.php:3338 ../../include/functions_api.php:3505
+#: ../../include/functions_api.php:5961
+msgid ""
+"Error in creation SNMP module. snmp3_sec_level doesn't exist. Set it to "
+"'authNoPriv' or 'authPriv' or 'noAuthNoPriv'. "
+msgstr ""
+"SNMPモジュール作成エラー。snmp3_sec_level がありません。 'authNoPriv'、'authPriv'、noAuthNoPriv' "
+"のいずれかを設定してください。 "
+
+#: ../../include/functions_api.php:3343 ../../include/functions_api.php:3511
+#: ../../include/functions_api.php:5966
+msgid ""
+"Error in creation SNMP module. snmp3_auth_method doesn't exist. Set it to "
+"'MD5' or 'SHA'. "
+msgstr "SNMPモジュール作成エラー。snmp3_auth_method がありません。'MD5' または 'SHA' を設定してください。 "
+
+#: ../../include/functions_api.php:3427
+msgid "Error in creation SNMP module."
+msgstr "SNMPモジュール作成エラー。"
+
+#: ../../include/functions_api.php:3460
+msgid "Error updating SNMP module. Id_module cannot be left blank."
+msgstr "SNMPモジュール更新エラー。id_module が指定されていません。"
+
+#: ../../include/functions_api.php:3467
+msgid "Error updating SNMP module. Id_module doesn't exist."
+msgstr "SNMPモジュール更新エラー。id_module が存在しません。"
+
+#: ../../include/functions_api.php:3479
+msgid "Error updating SNMP module. Id_module exists in the new agent."
+msgstr "SNMPモジュール更新エラー。id_moduleが新規エージェントにあります。"
+
+#: ../../include/functions_api.php:3486
+msgid "Error updating snmp module. Id_agent doesn't exist."
+msgstr "snmp モジュールの更新エラー。id_agent が存在しません。"
+
+#: ../../include/functions_api.php:3599
+msgid "SNMP module updated."
+msgstr "SNMPモジュールを更新しました。"
+
+#: ../../include/functions_api.php:3627
+msgid ""
+"Error creating network component. Network component name cannot be left "
+"blank."
+msgstr "ネットワークコンポーネント作成エラー。ネットワークコンポーネント名が指定されていません。"
+
+#: ../../include/functions_api.php:3632
+msgid ""
+"Error creating network component. Incorrect value for Network component type "
+"field."
+msgstr "ネットワークコンポーネント作成エラー。ネットワークコンポーネントタイプが不正です。"
+
+#: ../../include/functions_api.php:3637
+msgid ""
+"Error creating network component. Network component group cannot be left "
+"blank."
+msgstr "ネットワークコンポーネント作成エラー。ネットワークコンポーネントグループが指定されていません。"
+
+#: ../../include/functions_api.php:3673
+msgid ""
+"Error creating network component. This network component already exists."
+msgstr "ネットワークコンポーネント作成エラー。ネットワークコンポーネントがすでに存在します。"
+
+#: ../../include/functions_api.php:3712
+msgid ""
+"Error creating plugin component. Plugin component name cannot be left blank."
+msgstr "プラグインコンポーネント作成エラー。プラグインコンポーネント名が指定されていません。"
+
+#: ../../include/functions_api.php:3717
+msgid "Error creating plugin component. Incorrect value for Id plugin."
+msgstr "プラグインコンポーネント作成エラー。プラグイン ID が不正です。"
+
+#: ../../include/functions_api.php:3722
+msgid ""
+"Error creating plugin component. Plugin component group cannot be left blank."
+msgstr "プラグインコンポーネント作成エラー。プラグインコンポーネントグループが指定されていません。"
+
+#: ../../include/functions_api.php:3762
+msgid ""
+"Error creating plugin component. This plugin component already exists."
+msgstr "プラグインコンポーネント作成エラー。プラグインコンポーネントがすでに存在します。"
+
+#: ../../include/functions_api.php:3800
+msgid ""
+"Error creating SNMP component. SNMP component name cannot be left blank."
+msgstr "SNMPコンポーネント作成エラー。SNMPコンポーネント名が指定されていません。"
+
+#: ../../include/functions_api.php:3805
+msgid ""
+"Error creating SNMP component. Incorrect value for Snmp component type field."
+msgstr "SNMPコンポーネント作成エラー。SNMPコンポーネントタイプが不正です。"
+
+#: ../../include/functions_api.php:3810
+msgid ""
+"Error creating SNMP component. Snmp component group cannot be left blank."
+msgstr "SNMPコンポーネント作成エラー。SNMPコンポーネントグループが指定されていません。"
+
+#: ../../include/functions_api.php:3822
+msgid ""
+"Error creating SNMP component. snmp3_priv_method doesn't exist. Set it to "
+"'AES' or 'DES'. "
+msgstr ""
+"SNMPコンポーネント作成エラー。snmp3_priv_methd が存在しません。'AES' または 'DES' を設定してください。 "
+
+#: ../../include/functions_api.php:3831
+msgid ""
+"Error creating SNMP component. snmp3_sec_level doesn't exist. Set it to "
+"'authNoPriv' or 'authPriv' or 'noAuthNoPriv'. "
+msgstr ""
+"SNMPコンポーネント作成エラー。snmp3_sec_level "
+"が存在しません。'authNoPriv'、'authPriv'、'noAuthNoPriv' のいずれかを設定してください。 "
+
+#: ../../include/functions_api.php:3837
+msgid ""
+"Error creating SNMP component. snmp3_auth_method doesn't exist. Set it to "
+"'MD5' or 'SHA'. "
+msgstr ""
+"SNMPコンポーネント作成エラー。snmp3_auth_method が存在しません。'MD5' または 'SHA' を設定してください。 "
+
+#: ../../include/functions_api.php:3912
+msgid "Error creating SNMP component. This SNMP component already exists."
+msgstr "SNMPコンポーネント作成エラー。このSNMPコンポーネントはすでに存在します。"
+
+#: ../../include/functions_api.php:3949
+msgid ""
+"Error creating local component. Local component name cannot be left blank."
+msgstr "ローカルコンポーネント作成エラー。ローカルコンポーネント名が指定されていません。"
+
+#: ../../include/functions_api.php:3955
+msgid ""
+"Error creating local component. Local component group cannot be left blank."
+msgstr "ローカルコンポーネント作成エラー。ローカルコンポーネントグループが指定されていません。"
+
+#: ../../include/functions_api.php:3979
+msgid "Error creating local component."
+msgstr "ローカルコンポーネント作成エラー。"
+
+#: ../../include/functions_api.php:3985
+msgid "Error creating local component. This local component already exists."
+msgstr "ローカルコンポーネント作成エラー。このローカルコンポーネントはすでに存在します。"
+
+#: ../../include/functions_api.php:4018
+msgid ""
+"Error getting module value from all agents. Module name cannot be left blank."
+msgstr "全エージェントからのモジュール値取得エラー。モジュール名が指定されていません。"
+
+#: ../../include/functions_api.php:4026
+msgid ""
+"Error getting module value from all agents. Module name doesn't exist."
+msgstr "全エージェントからのモジュール値取得エラー。モジュール名が存在しません。"
+
+#: ../../include/functions_api.php:4071
+msgid "Error creating alert template. Template name cannot be left blank."
+msgstr "アラートテンプレート作成エラー。テンプレート名が指定されていません。"
+
+#: ../../include/functions_api.php:4143
+msgid "Error creating alert template."
+msgstr "アラートテンプレート作成エラー。"
+
+#: ../../include/functions_api.php:4174
+msgid "Error updating alert template. Id_template cannot be left blank."
+msgstr "アラートテンプレート更新エラー。id_templateが指定されていません。"
+
+#: ../../include/functions_api.php:4182
+msgid "Error updating alert template. Id_template doesn't exist."
+msgstr "アラートテンプレート更新エラー。id_templateが存在しません。"
+
+#: ../../include/functions_api.php:4208
+msgid "Error updating alert template."
+msgstr "アラートテンプレート更新エラー。"
+
+#: ../../include/functions_api.php:4213
+msgid "Correct updating of alert template"
+msgstr "アラートテンプレートの更新内容を修正してください"
+
+#: ../../include/functions_api.php:4237
+msgid "Error deleting alert template. Id_template cannot be left blank."
+msgstr "アラートテンプレート削除エラー。id_templateが指定されていません。"
+
+#: ../../include/functions_api.php:4246
+msgid "Error deleting alert template."
+msgstr "アラートテンプレート削除エラー。"
+
+#: ../../include/functions_api.php:4250
+msgid "Correct deleting of alert template."
+msgstr "アラートテンプレートの削除内容を修正してください"
+
+#: ../../include/functions_api.php:4287
+msgid "Error getting all alert templates."
+msgstr "全アラートテンプレート取得エラー。"
+
+#: ../../include/functions_api.php:4319
+msgid "Error getting alert template. Id_template doesn't exist."
+msgstr "アラートテンプレート取得エラー。id_templateが存在しません。"
+
+#: ../../include/functions_api.php:4336
+msgid "Error getting alert template."
+msgstr "アラートテンプレート取得エラー。"
+
+#: ../../include/functions_api.php:4375
+msgid "Error getting module groups."
+msgstr "モジュールグループ取得エラー。"
+
+#: ../../include/functions_api.php:4420
+msgid "Error getting plugins."
+msgstr "プラグイン取得エラー。"
+
+#: ../../include/functions_api.php:4443
+msgid "Error creating module from network component. Agent doesn't exist."
+msgstr "ネットワークコンポーネントからのモジュール作成エラー。エージェントが存在しません。"
+
+#: ../../include/functions_api.php:4450
+msgid ""
+"Error creating module from network component. Network component doesn't "
+"exist."
+msgstr "ネットワークコンポーネントからのモジュール作成エラー。ネットワークコンポーネントが存在しません。"
+
+#: ../../include/functions_api.php:4468
+msgid "Error creating module from network component. Error creating module."
+msgstr "ネットワークコンポーネントからのモジュール作成エラー。モジュール作成エラー。"
+
+#: ../../include/functions_api.php:4495
+msgid "Error assigning module to template. Id_template cannot be left blank."
+msgstr "テンプレートへのモジュール割当エラー。id_templateが指定されていません。"
+
+#: ../../include/functions_api.php:4501
+msgid "Error assigning module to template. Id_module cannot be left blank."
+msgstr "テンプレートへのモジュール割当エラー。id_moduleが指定されていません。"
+
+#: ../../include/functions_api.php:4507
+msgid "Error assigning module to template. Id_agent cannot be left blank."
+msgstr "テンプレートへのモジュール割当エラー。id_agentが指定されていません。"
+
+#: ../../include/functions_api.php:4515
+msgid "Error assigning module to template. Id_template doensn't exists."
+msgstr "テンプレートへのモジュール割当エラー。id_templateが存在しません。"
+
+#: ../../include/functions_api.php:4525
+msgid "Error assigning module to template. Id_agent doesn't exist."
+msgstr "テンプレートへのモジュール割当エラー。id_agentが存在しません。"
+
+#: ../../include/functions_api.php:4532
+msgid "Error assigning module to template. Id_module doesn't exist."
+msgstr "テンプレートへのモジュール割当エラー。id_moduleが存在しません。"
+
+#: ../../include/functions_api.php:4540
+msgid "Error assigning module to template."
+msgstr "テンプレートへのモジュール割当エラー。"
+
+#: ../../include/functions_api.php:4566
+msgid ""
+"Error deleting module template. Id_module_template cannot be left blank."
+msgstr "モジュールテンプレート削除エラー。id_module_templateが指定されていません。"
+
+#: ../../include/functions_api.php:4573
+msgid "Error deleting module template. Id_module_template doesn't exist."
+msgstr "モジュールテンプレート削除エラー。id_module_templateが存在しません。"
+
+#: ../../include/functions_api.php:4581 ../../include/functions_api.php:4640
+msgid "Error deleting module template."
+msgstr "モジュールテンプレート削除エラー。"
+
+#: ../../include/functions_api.php:4584 ../../include/functions_api.php:4643
+msgid "Correct deleting of module template."
+msgstr "モジュールテンプレートの削除内容を修正してください。"
+
+#: ../../include/functions_api.php:4720
+msgid "Error validate all alerts. Failed "
+msgstr "全アラートの承諾エラー。失敗数: "
+
+#: ../../include/functions_api.php:4723
+msgid "Correct validating of all alerts."
+msgstr "全アラートの承諾内容を修正してください。"
+
+#: ../../include/functions_api.php:4750
+msgid "Error validating all alert policies."
+msgstr "全アラートポリシーの承諾エラー。"
+
+#: ../../include/functions_api.php:4808
+msgid "Error validate all policy alerts. Failed "
+msgstr "全ポリシーアラートの承諾エラー。失敗数: "
+
+#: ../../include/functions_api.php:4811
+msgid "Correct validating of all policy alerts."
+msgstr "全ポリシーアラートの承諾内容を修正してください。"
+
+#: ../../include/functions_api.php:4834
+msgid "Error stopping downtime. Id_downtime cannot be left blank."
+msgstr "計画停止の中断エラー。id_downtimeが指定されていません。"
+
+#: ../../include/functions_api.php:4850
+msgid "Downtime stopped."
+msgstr "計画停止を中断しました。"
+
+#: ../../include/functions_api.php:5165
+msgid "and this modules are doesn't exists or not applicable a this agents: "
+msgstr "これらのモジュールが存在しないかまたはエージェントに適用できません : "
+
+#: ../../include/functions_api.php:5167
+msgid "and this agents are generate problems: "
+msgstr "これらのエージェントでエラーです : "
+
+#: ../../include/functions_api.php:5169
+msgid "and this agents with ids are doesn't exists: "
+msgstr "これらのエージェントIDは存在しません : "
+
+#: ../../include/functions_api.php:5196
+msgid "Error adding agent to policy. Id_policy cannot be left blank."
+msgstr "ポリシーへのエージェント追加エラー。id_policyが指定されていません。"
+
+#: ../../include/functions_api.php:5201
+msgid "Error adding agent to policy. Id_agent cannot be left blank."
+msgstr "ポリシーへのエージェント追加エラー。id_agentが指定されていません。"
+
+#: ../../include/functions_api.php:5209
+msgid "Error adding agent to policy. Id_agent doesn't exist."
+msgstr "ポリシーへのエージェント追加エラー。id_agentが存在しません。"
+
+#: ../../include/functions_api.php:5217
+msgid "Error adding agent to policy."
+msgstr "ポリシーへのエージェント追加エラー。"
+
+#: ../../include/functions_api.php:5225
+msgid "Error adding agent to policy. The agent is already in the policy."
+msgstr "ポリシーへのエージェント追加エラー。指定のエージェントはすでにポリシー内にあります。"
+
+#: ../../include/functions_api.php:5260
+msgid "Error adding data module to policy. Id_policy cannot be left blank."
+msgstr "ポリシーへのデータモジュール追加エラー。id_policyが指定されていません。"
+
+#: ../../include/functions_api.php:5265
+msgid "Error adding data module to policy. Module_name cannot be left blank."
+msgstr "ポリシーへのデータモジュール追加エラー。module_nameが指定されていません。"
+
+#: ../../include/functions_api.php:5273
+msgid "Error adding data module to policy."
+msgstr "ポリシーへのデータモジュール追加エラー。"
+
+#: ../../include/functions_api.php:5309
+msgid ""
+"Error adding data module to policy. The module is already in the policy."
+msgstr "ポリシーへのデータモジュール追加エラー。指定のモジュールがすでにポリシー内にあります。"
+
+#: ../../include/functions_api.php:5349
+msgid "Error updating data module in policy. Id_policy cannot be left blank."
+msgstr "ポリシーのデータモジュール更新エラー。id_policyが指定されていません。"
+
+#: ../../include/functions_api.php:5354
+msgid ""
+"Error updating data module in policy. Id_policy_module cannot be left blank."
+msgstr "ポリシーのデータモジュール更新エラー。id_policy_moduleが指定されていません。"
+
+#: ../../include/functions_api.php:5362
+msgid "Error updating data module in policy. Module doesn't exist."
+msgstr "ポリシーのデータモジュール更新エラー。モジュールが存在しません。"
+
+#: ../../include/functions_api.php:5368
+msgid ""
+"Error updating data module in policy. Module type is not network type."
+msgstr "ポリシー内のデータモジュールの更新エラー。モジュールタイプがネットワークタイプではありません。"
+
+#: ../../include/functions_api.php:5397
+msgid "Data policy module updated."
+msgstr "データポリシーモジュールを更新しました。"
+
+#: ../../include/functions_api.php:5426
+msgid ""
+"Error adding network module to policy. Id_policy cannot be left blank."
+msgstr "ポリシーへのネットワークモジュール追加エラー。id_policyが指定されていません。"
+
+#: ../../include/functions_api.php:5432
+msgid ""
+"Error adding network module to policy. Module_name cannot be left blank."
+msgstr "ポリシーへのネットワークモジュール追加エラー。module_nameが指定されていません。"
+
+#: ../../include/functions_api.php:5438
+msgid ""
+"Error adding network module to policy. Id_module_type is not correct for "
+"network modules."
+msgstr "ポリシーへのネットワークモジュール追加エラー。id_module_typeがネットワークモジュールとして不正です。"
+
+#: ../../include/functions_api.php:5448
+msgid "Error adding network module to policy."
+msgstr "ポリシーへのネットワークモジュール追加エラー。"
+
+#: ../../include/functions_api.php:5486
+msgid ""
+"Error adding network module to policy. The module is already in the policy."
+msgstr "ポリシーへのネットワークモジュール追加エラー。指定したモジュールはすでにポリシー内にあります。"
+
+#: ../../include/functions_api.php:5524
+msgid ""
+"Error updating network module in policy. Id_policy cannot be left blank."
+msgstr "ポリシーのネットワークモジュール更新エラー。id_policyが指定されていません。"
+
+#: ../../include/functions_api.php:5530
+msgid ""
+"Error updating network module in policy. Id_policy_module cannot be left "
+"blank."
+msgstr "ポリシーのネットワークモジュール更新エラー。id_policy_moduleが指定されていません。"
+
+#: ../../include/functions_api.php:5539
+msgid "Error updating network module in policy. Module doesn't exist."
+msgstr "ポリシーのネットワークモジュール更新エラー。モジュールが存在しません。"
+
+#: ../../include/functions_api.php:5545
+msgid ""
+"Error updating network module in policy. Module type is not network type."
+msgstr "ポリシーのネットワークモジュール更新エラー。モジュールタイプがネットワークのタイプではありません。"
+
+#: ../../include/functions_api.php:5571
+msgid "Network policy module updated."
+msgstr "ネットワークポリシーモジュールを更新しました。"
+
+#: ../../include/functions_api.php:5598
+msgid "Error adding plugin module to policy. Id_policy cannot be left blank."
+msgstr "ポリシーへのプラグインモジュール追加エラー。id_policyが指定されていません。"
+
+#: ../../include/functions_api.php:5603
+msgid ""
+"Error adding plugin module to policy. Module_name cannot be left blank."
+msgstr "ポリシーへのプラグインモジュール追加エラー。module_nameが指定されていません。"
+
+#: ../../include/functions_api.php:5608
+msgid "Error adding plugin module to policy. Id_plugin cannot be left blank."
+msgstr "ポリシーへのプラグインモジュール追加エラー。id_pluginが指定されていません。"
+
+#: ../../include/functions_api.php:5616
+msgid "Error adding plugin module to policy."
+msgstr "ポリシーへのプラグインモジュール追加エラー。"
+
+#: ../../include/functions_api.php:5659
+msgid ""
+"Error adding plugin module to policy. The module is already in the policy."
+msgstr "ポリシーへのプラグインモジュール追加エラー。指定のモジュールはすでにポリシー内にあります。"
+
+#: ../../include/functions_api.php:5698
+msgid ""
+"Error updating plugin module in policy. Id_policy cannot be left blank."
+msgstr "ポリシーのプラグインモジュール更新エラー。id_policyが指定されていません。"
+
+#: ../../include/functions_api.php:5704
+msgid ""
+"Error updating plugin module in policy. Id_policy_module cannot be left "
+"blank."
+msgstr "ポリシーのプラグインモジュール更新エラー。id_policy_moduleが指定されていません。"
+
+#: ../../include/functions_api.php:5713
+msgid "Error updating plugin module in policy. Module doesn't exist."
+msgstr "ポリシーのプラグインモジュール更新エラー。モジュールが存在しません。"
+
+#: ../../include/functions_api.php:5719
+msgid ""
+"Error updating plugin module in policy. Module type is not network type."
+msgstr "ポリシーのプラグインモジュール更新エラー。モジュールタイプがネットワークのタイプではありません。"
+
+#: ../../include/functions_api.php:5751
+msgid "Plugin policy module updated."
+msgstr "プラグインポリシーモジュールを更新しました。"
+
+#: ../../include/functions_api.php:5926
+msgid "Error adding SNMP module to policy. Id_policy cannot be left blank."
+msgstr "SNMPモジュールのポリシーへの追加エラー。id_policyが指定されていません。"
+
+#: ../../include/functions_api.php:5931
+msgid "Error adding SNMP module to policy. Module_name cannot be left blank."
+msgstr "SNMPモジュールのポリシーへの追加エラー。module_nameが指定されていません。"
+
+#: ../../include/functions_api.php:5939
+msgid "Error adding SNMP module to policy."
+msgstr "SNMPモジュールのポリシーへの追加エラー。"
+
+#: ../../include/functions_api.php:5944
+msgid ""
+"Error adding SNMP module to policy. Id_module_type is not correct for SNMP "
+"modules."
+msgstr "SNMPモジュールのポリシーへの追加エラー。id_module_type が SNMP モジュール用になっていません。"
+
+#: ../../include/functions_api.php:6038
+msgid ""
+"Error adding SNMP module to policy. The module is already in the policy."
+msgstr "SNMPモジュールのポリシーへの追加エラー。モジュールはすでにポリシー内に存在します。"
+
+#: ../../include/functions_api.php:6077
+msgid "Error updating SNMP module in policy. Id_policy cannot be left blank."
+msgstr "ポリシー内のSNMPモジュール更新エラー。id_policyが指定されていません。"
+
+#: ../../include/functions_api.php:6082
+msgid ""
+"Error updating SNMP module in policy. Id_policy_module cannot be left blank."
+msgstr "ポリシー内のSNMPモジュール更新エラー。id_policy_moduleが指定されていません。"
+
+#: ../../include/functions_api.php:6090
+msgid "Error updating SNMP module in policy. Module doesn't exist."
+msgstr "ポリシー内のSNMPモジュール更新エラー。モジュールが存在しません。"
+
+#: ../../include/functions_api.php:6095
+msgid "Error updating SNMP module in policy. Module type is not SNMP type."
+msgstr "ポリシー内のSNMPモジュール更新エラー。モジュールタイプが SNMP ではありません。"
+
+#: ../../include/functions_api.php:6105
+msgid ""
+"Error updating SNMP module. snmp3_priv_method doesn't exist. Set it to 'AES' "
+"or 'DES'. "
+msgstr "SNMPモジュール更新エラー。snmp3_priv_methodがありません。'AES' または 'DES' を指定してください。 "
+
+#: ../../include/functions_api.php:6115
+msgid ""
+"Error updating SNMP module. snmp3_sec_level doesn't exist. Set it to "
+"'authNoPriv' or 'authPriv' or 'noAuthNoPriv'. "
+msgstr ""
+"SNMPモジュール更新エラー。snmp3_sec_level がありません。'authNoPriv'、'authPriv'、'noAuthNoPriv' "
+"のいずれかを指定してください。 "
+
+#: ../../include/functions_api.php:6122
+msgid ""
+"Error updating SNMP module. snmp3_auth_method doesn't exist. Set it to 'MD5' "
+"or 'SHA'. "
+msgstr "SNMPモジュール更新エラー。snmp3_auth_method がありません。'MD5' または 'SHA' を指定してください。 "
+
+#: ../../include/functions_api.php:6162
+msgid "SNMP policy module updated."
+msgstr "SNMPポリシーモジュールを更新しました。"
+
+#: ../../include/functions_api.php:6185
+msgid "Error applying policy. Id_policy cannot be left blank."
+msgstr "ポリシー適用エラー。id_policy が指定されていません。"
+
+#: ../../include/functions_api.php:6198 ../../include/functions_api.php:6223
+msgid "Error applying policy."
+msgstr "ポリシー適用エラー。"
+
+#: ../../include/functions_api.php:6210
+msgid "Error applying policy. This policy is already pending to apply."
+msgstr "ポリシー適用エラー。このポリシーは適用が保留されています。"
+
+#: ../../include/functions_api.php:6268
+msgid "Error applying all policies."
+msgstr "全ポリシーの適用エラー。"
+
+#: ../../include/functions_api.php:6320
+msgid "Error in group creation. Group_name cannot be left blank."
+msgstr "グループ作成エラー。group_name が指定されていません。"
+
+#: ../../include/functions_api.php:6326
+msgid "Error in group creation. Icon_name cannot be left blank."
+msgstr "グループ作成エラー。icon_name が指定されていません。"
+
+#: ../../include/functions_api.php:6339 ../../include/functions_api.php:6515
+msgid "Error in group creation. Id_parent_group doesn't exist."
+msgstr "グループ作成エラー。id_parent_group が存在しません。"
+
+#: ../../include/functions_api.php:6367
+msgid "Error in group creation."
+msgstr "グループ作成エラー。"
+
+#: ../../include/functions_api.php:6503
+msgid "Error in netflow filter creation. Filter name cannot be left blank."
+msgstr "Netflow フィルタ作成エラー。フィルタ名が空です。"
+
+#: ../../include/functions_api.php:6508
+msgid "Error in netflow filter creation. Group id cannot be left blank."
+msgstr "Netflow フィルタ作成エラー。グループ ID が空です。"
+
+#: ../../include/functions_api.php:6521
+msgid "Error in netflow filter creation. Filter cannot be left blank."
+msgstr "Netflow フィルタ作成エラー。フィルタが空です。"
+
+#: ../../include/functions_api.php:6526
+msgid "Error in netflow filter creation. Aggregate_by cannot be left blank."
+msgstr "Netflow フィルタ作成エラー。集約設定が空です。"
+
+#: ../../include/functions_api.php:6531
+msgid "Error in netflow filter creation. Output_format cannot be left blank."
+msgstr "Netflow フィルタ作成エラー。出力フォーマットが空です。"
+
+#: ../../include/functions_api.php:6549
+msgid "Error in netflow filter creation."
+msgstr "Netflow フィルタ作成エラー。"
+
+#: ../../include/functions_api.php:6733
+msgid "Create user."
+msgstr "ユーザ作成"
+
+#: ../../include/functions_api.php:6772
+msgid "Error updating user. Id_user cannot be left blank."
+msgstr "ユーザ更新エラー。id_user が指定されていません。"
+
+#: ../../include/functions_api.php:6780
+msgid "Error updating user. Id_user doesn't exist."
+msgstr "ユーザ更新エラー。id_user が存在しません。"
+
+#: ../../include/functions_api.php:6796
+msgid "Error updating user. Password info incorrect."
+msgstr "ユーザ更新エラー。パスワード情報が不正です。"
+
+#: ../../include/functions_api.php:6804
+msgid "Updated user."
+msgstr "ユーザを更新しました。"
+
+#: ../../include/functions_api.php:6835
+msgid "Error enable/disable user. Id_user cannot be left blank."
+msgstr "ユーザの有効化/無効化エラー。id_user は空にできません。"
+
+#: ../../include/functions_api.php:6842
+msgid "Error enable/disable user. Enable/disable value cannot be left blank."
+msgstr "ユーザの有効化/無効化エラー。有効化/無効化の値は空にできません。"
+
+#: ../../include/functions_api.php:6848
+msgid "Error enable/disable user. The user doesn't exist."
+msgstr "ユーザの有効化/無効化エラー。ユーザが存在しません。"
+
+#: ../../include/functions_api.php:6857
+msgid "Error in user enabling/disabling."
+msgstr "ユーザの有効化/無効化エラー。"
+
+#: ../../include/functions_api.php:6862
+msgid "Enabled user."
+msgstr "ユーザを有効化しました。"
+
+#: ../../include/functions_api.php:6866
+msgid "Disabled user."
+msgstr "ユーザを無効化しました。"
+
+#: ../../include/functions_api.php:8330
+msgid "Delete user."
+msgstr "ユーザ削除"
+
+#: ../../include/functions_api.php:8359
+msgid "Add user profile."
+msgstr "ユーザプロファイル追加"
+
+#: ../../include/functions_api.php:8392
+msgid "Delete user profile."
+msgstr "ユーザプロファイル削除"
+
+#: ../../include/functions_api.php:8490
+msgid "Correct module disable"
+msgstr "モジュールを無効にしました"
+
+#: ../../include/functions_api.php:8493
+msgid "Error disabling module"
+msgstr "モジュール無効化エラー"
+
+#: ../../include/functions_api.php:8519
+msgid "Correct module enable"
+msgstr "モジュールを有効にしました"
+
+#: ../../include/functions_api.php:8522
+msgid "Error enabling module"
+msgstr "モジュール有効化エラー"
+
+#: ../../include/functions_api.php:8554 ../../include/functions_api.php:8592
+msgid "Error alert disable"
+msgstr "アラート無効化エラー"
+
+#: ../../include/functions_api.php:8624 ../../include/functions_api.php:8661
+msgid "Error alert enable"
+msgstr "アラート有効化エラー"
+
+#: ../../include/functions_api.php:9217
+msgid "Error adding event comment."
+msgstr "イベントコメント追加エラー"
+
+#: ../../include/functions_api.php:9454
+msgid "Error enable/disable agent. Id_agent cannot be left blank."
+msgstr "エージェント有効化/無効化エラー。id_agent は空にできません。"
+
+#: ../../include/functions_api.php:9461
+msgid ""
+"Error enable/disable agent. Enable/disable value cannot be left blank."
+msgstr "エージェント有効化/無効化エラー。有効化/無効化は空にできません。"
+
+#: ../../include/functions_api.php:9467
+msgid "Error enable/disable agent. The agent doesn't exist."
+msgstr "エージェント有効化/無効化エラー。エージェントが存在しません。"
+
+#: ../../include/functions_api.php:9478
+msgid "Error in agent enabling/disabling."
+msgstr "エージェント有効化/無効化エラー"
+
+#: ../../include/functions_api.php:9484
+msgid "Enabled agent."
+msgstr "エージェントを有効化しました"
+
+#: ../../include/functions_api.php:9489
+msgid "Disabled agent."
+msgstr "エージェントを無効化しました"
+
+#: ../../include/functions_api.php:9585
+msgid "Error getting special_days."
+msgstr "特別日取得エラー。"
+
+#: ../../include/functions_api.php:9620
+msgid "Error creating special day. Specified day already exists."
+msgstr "特別日作成エラー。特別日はすでに存在します。"
+
+#: ../../include/functions_api.php:9625
+msgid "Error creating special day. Invalid date format."
+msgstr "特別日作成エラー。日付の書式が不正です。"
+
+#: ../../include/functions_api.php:9637
+msgid "Error in creation special day."
+msgstr "特別日作成エラー。"
+
+#: ../../include/functions_api.php:9677
+msgid "Error in creation service. No name"
+msgstr "サービス作成エラー。名前がありません。"
+
+#: ../../include/functions_api.php:9691
+msgid "Error in creation service. No agent id"
+msgstr "サービス作成エラー。エージェントIDがありません。"
+
+#: ../../include/functions_api.php:9719
+msgid "Error in creation service"
+msgstr "サービス作成エラー"
+
+#: ../../include/functions_api.php:9744
+msgid "Error in update service. No service id"
+msgstr "サービス更新エラー。サービスIDがありません。"
+
+#: ../../include/functions_api.php:9810
+msgid "Error in update service"
+msgstr "サービス更新エラー"
+
+#: ../../include/functions_api.php:9838
+msgid "Error adding elements to service. No service id"
+msgstr "サービスへの要素追加エラー。サービスIDがありません。"
+
+#: ../../include/functions_api.php:9891
+msgid "Error adding elements to service"
+msgstr "サービスへの要素追加エラー"
+
+#: ../../include/functions_api.php:9921
+msgid "Error updating special day. Id cannot be left blank."
+msgstr "特別日更新エラー。IDは空にできません。"
+
+#: ../../include/functions_api.php:9928
+msgid "Error updating special day. Id doesn't exist."
+msgstr "特別日更新エラー。IDが存在しません。"
+
+#: ../../include/functions_api.php:9933
+msgid "Error updating special day. Invalid date format."
+msgstr "特別日更新エラー。日付の書式が不正です。"
+
+#: ../../include/functions_api.php:9967
+msgid "Error deleting special day. Id cannot be left blank."
+msgstr "特別日削除エラー。IDは空にできません。"
+
+#: ../../include/functions_api.php:9974
+msgid "Error deleting special day. Id doesn't exist."
+msgstr "特別日削除エラー。IDが存在しません。"
+
+#: ../../include/functions_api.php:9981
+msgid "Error in deletion special day."
+msgstr "特別日削除エラー。"
+
+#: ../../include/functions_api.php:10133
+#: ../../enterprise/meta/advanced/license_meta.php:40
+msgid "Metaconsole and all nodes license updated"
+msgstr "メタコンソールと全ノードのライセンスを更新しました。"
+
+#: ../../include/functions_api.php:10136
+#: ../../enterprise/meta/advanced/license_meta.php:43
+#, php-format
+msgid "Metaconsole license updated but %d of %d node synchronization failed"
+msgstr "メタコンソールのライセンスを更新しましたが、%d ノード(%d中)の同期に失敗しました。"
+
+#: ../../include/functions_api.php:10140
+msgid "This function is only for metaconsole"
+msgstr "この機能はメタコンソール専用です。"
+
+#: ../../include/functions_tags.php:602
+msgid "Click here to open a popup window with URL tag"
+msgstr "URLタグのポップアップウインドウを開くにはここをクリックしてください"
+
+#: ../../include/functions_clippy.php:163
+#: ../../include/functions_clippy.php:168
+msgid "End wizard"
+msgstr "ウィザードの終了"
+
+#: ../../include/functions_clippy.php:195
+msgid "Next &rarr;"
+msgstr "次へ &rarr;"
+
+#: ../../include/functions_clippy.php:196
+msgid "&larr; Back"
+msgstr "&larr; 戻る"
+
+#: ../../include/functions_clippy.php:208
+msgid "Do you want to exit the help tour?"
+msgstr "ヘルプツアーを終了しますか。"
+
+#: ../../include/functions_pandora_networkmap.php:107
+#: ../../include/functions_pandora_networkmap.php:214
+#: ../../mobile/operation/networkmap.php:110
+#: ../../mobile/operation/networkmap.php:129
+#: ../../mobile/operation/networkmap.php:146
+#: ../../operation/agentes/networkmap.dinamic.php:190
+#: ../../enterprise/include/class/NetworkmapEnterprise.class.php:227
+#: ../../enterprise/operation/policies/networkmap.policies.php:64
+msgid "Pandora FMS"
+msgstr "Pandora FMS"
+
+#: ../../include/functions_pandora_networkmap.php:998
+#, php-format
+msgid "Edit node %s"
+msgstr "ノード編集 %s"
+
+#: ../../include/functions_pandora_networkmap.php:999
+msgid "Holding Area"
+msgstr "保持エリア"
+
+#: ../../include/functions_pandora_networkmap.php:1000
+msgid "Show details and options"
+msgstr "詳細とオプションの表示"
+
+#: ../../include/functions_pandora_networkmap.php:1001
+msgid "Add a interface link"
+msgstr "インタフェースリンクを追加"
+
+#: ../../include/functions_pandora_networkmap.php:1002
+msgid "Set parent interface"
+msgstr "親インタフェースを設定"
+
+#: ../../include/functions_pandora_networkmap.php:1003
+msgid "Set as children"
+msgstr "子に設定"
+
+#: ../../include/functions_pandora_networkmap.php:1004
+msgid "Set parent"
+msgstr "親を設定"
+
+#: ../../include/functions_pandora_networkmap.php:1005
+#: ../../include/functions_pandora_networkmap.php:1018
+msgid "Abort the action of set relationship"
+msgstr "関係設定動作の中止"
+
+#: ../../include/functions_pandora_networkmap.php:1007
+#: ../../include/functions_pandora_networkmap.php:1793
+msgid "Add node"
+msgstr "ノード追加"
+
+#: ../../include/functions_pandora_networkmap.php:1008
+msgid "Set center"
+msgstr "中心設定"
+
+#: ../../include/functions_pandora_networkmap.php:1010
+msgid "Refresh Holding area"
+msgstr "保持エリアの更新"
+
+#: ../../include/functions_pandora_networkmap.php:1011
+#: ../../include/functions_pandora_networkmap.php:1014
+msgid "Proceed"
+msgstr "実行"
+
+#: ../../include/functions_pandora_networkmap.php:1012
+msgid ""
+"Resetting the map will delete all customizations you have done, including "
+"manual relationships between elements, new items, etc."
+msgstr "マップリセットは、要素や新たなアイテム間の関連付けなど、行った全てのカスタマイズを削除します。"
+
+#: ../../include/functions_pandora_networkmap.php:1016
+msgid "Restart map"
+msgstr "マップリセット"
+
+#: ../../include/functions_pandora_networkmap.php:1017
+msgid "Abort the interface relationship"
+msgstr "インタフェース関連付けの中止"
+
+#: ../../include/functions_pandora_networkmap.php:1201
+#: ../../include/functions_maps.php:62
+msgid "Copy of "
+msgstr "コピー: "
+
+#: ../../include/functions_pandora_networkmap.php:1524
+msgid "Open Minimap"
+msgstr "ミニマップを開く"
+
+#: ../../include/functions_pandora_networkmap.php:1531
+msgid "Hide Labels"
+msgstr "ラベルを隠す"
+
+#: ../../include/functions_pandora_networkmap.php:1621
+msgid "Edit node"
+msgstr "ノード編集"
+
+#: ../../include/functions_pandora_networkmap.php:1632
+#: ../../enterprise/include/ajax/clustermap.php:40
+msgid "Adresses"
+msgstr "アドレス"
+
+#: ../../include/functions_pandora_networkmap.php:1634
+msgid "OS type"
+msgstr "OS 種別"
+
+#: ../../include/functions_pandora_networkmap.php:1639
+#: ../../include/functions_pandora_networkmap.php:1640
+#: ../../enterprise/include/ajax/clustermap.php:50
+#: ../../enterprise/include/ajax/clustermap.php:51
+msgid "Node Details"
+msgstr "ノード詳細"
+
+#: ../../include/functions_pandora_networkmap.php:1649
+msgid "Ip"
+msgstr "IP"
+
+#: ../../include/functions_pandora_networkmap.php:1650
+msgid "MAC"
+msgstr "MAC"
+
+#: ../../include/functions_pandora_networkmap.php:1659
+#: ../../include/functions_pandora_networkmap.php:1660
+msgid "Interface Information (SNMP)"
+msgstr "インタフェース情報 (SNMP)"
+
+#: ../../include/functions_pandora_networkmap.php:1667
+msgid "Shape"
+msgstr "形"
+
+#: ../../include/functions_pandora_networkmap.php:1669
+msgid "Circle"
+msgstr "円"
+
+#: ../../include/functions_pandora_networkmap.php:1670
+msgid "Square"
+msgstr "四角"
+
+#: ../../include/functions_pandora_networkmap.php:1671
+msgid "Rhombus"
+msgstr "ひしがた"
+
+#: ../../include/functions_pandora_networkmap.php:1681
+msgid "name node"
+msgstr "ノード名"
+
+#: ../../include/functions_pandora_networkmap.php:1683
+msgid "Update node"
+msgstr "ノード更新"
+
+#: ../../include/functions_pandora_networkmap.php:1688
+#: ../../include/functions_pandora_networkmap.php:1849
+msgid "name fictional node"
+msgstr "仮想ノード名"
+
+#: ../../include/functions_pandora_networkmap.php:1689
+#: ../../include/functions_pandora_networkmap.php:1850
+msgid "Networkmap to link"
+msgstr "リンクするネットワークマップ"
+
+#: ../../include/functions_pandora_networkmap.php:1695
+msgid "Update fictional node"
+msgstr "仮想ノード更新"
+
+#: ../../include/functions_pandora_networkmap.php:1698
+#: ../../include/functions_pandora_networkmap.php:1699
+msgid "Node options"
+msgstr "ノードオプション"
+
+#: ../../include/functions_pandora_networkmap.php:1706
+#: ../../include/functions_pandora_networkmap.php:1761
+msgid "Node source"
+msgstr "ノードソース"
+
+#: ../../include/functions_pandora_networkmap.php:1707
+#: ../../include/functions_pandora_networkmap.php:1762
+msgid "Interface source"
+msgstr "インタフェースソース"
+
+#: ../../include/functions_pandora_networkmap.php:1708
+#: ../../include/functions_pandora_networkmap.php:1763
+msgid "Interface Target"
+msgstr "インタフェースターゲット"
+
+#: ../../include/functions_pandora_networkmap.php:1710
+#: ../../include/functions_pandora_networkmap.php:1764
+msgid "Node target"
+msgstr "ノードターゲット"
+
+#: ../../include/functions_pandora_networkmap.php:1711
+msgid "E."
+msgstr "E."
+
+#: ../../include/functions_pandora_networkmap.php:1742
+msgid "There are not relations"
+msgstr "関連付がありません。"
+
+#: ../../include/functions_pandora_networkmap.php:1749
+#: ../../include/functions_pandora_networkmap.php:1750
+msgid "Relations"
+msgstr "関連付"
+
+#: ../../include/functions_pandora_networkmap.php:1785
+msgid "Add interface link"
+msgstr "インタフェースリンクを追加"
+
+#: ../../include/functions_pandora_networkmap.php:1812
+#: ../../include/functions_pandora_networkmap.php:1816
+#: ../../include/functions_pandora_networkmap.php:1817
+#: ../../include/functions_pandora_networkmap.php:1837
+#: ../../include/functions_pandora_networkmap.php:1842
+#: ../../include/functions_pandora_networkmap.php:1860
+msgid "Add agent node"
+msgstr "エージェントノード追加"
+
+#: ../../include/functions_pandora_networkmap.php:1841
+msgid "Add agent node (filter by group)"
+msgstr "エージェントノード追加 (グループによるフィルタ)"
+
+#: ../../include/functions_pandora_networkmap.php:1856
+msgid "Add fictional node"
+msgstr "仮想ノード追加"
+
+#: ../../include/functions_pandora_networkmap.php:1859
+msgid "Add fictional point"
+msgstr "仮想ポイント追加"
+
+#: ../../include/functions_treeview.php:54
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1347
+msgid "There was a problem loading module"
+msgstr "モジュールの読み込みで問題が発生しました。"
+
+#: ../../include/functions_treeview.php:285
+#: ../../include/functions_treeview.php:292
+#: ../../include/functions_ui.php:3830 ../../include/functions_ui.php:3837
+#: ../../mobile/operation/modules.php:610
+#: ../../mobile/operation/modules.php:617
+#: ../../operation/agentes/estado_agente.php:123
+#: ../../operation/agentes/status_monitor.php:1377
+#: ../../operation/agentes/status_monitor.php:1384
+#: ../../enterprise/include/functions_services.php:1658
+#: ../../enterprise/include/functions_ux_console.php:441
+#: ../../enterprise/operation/agentes/tag_view.php:723
+#: ../../enterprise/operation/agentes/tag_view.php:730
+#: ../../enterprise/operation/agentes/ux_console_view.php:116
+#: ../../enterprise/operation/agentes/ux_console_view.php:285
+#: ../../enterprise/operation/agentes/ux_console_view.php:358
+#: ../../enterprise/operation/agentes/wux_console_view.php:259
+msgid "Snapshot view"
+msgstr "スナップショット表示"
+
+#: ../../include/functions_treeview.php:300
+#: ../../include/functions_visual_map.php:2805
+#: ../../include/functions_visual_map.php:2815
+#: ../../include/graphs/functions_flot.php:631
+#: ../../enterprise/godmode/reporting/cluster_view.php:325
+#: ../../enterprise/godmode/reporting/cluster_view.php:402
+#: ../../enterprise/godmode/reporting/cluster_list.php:240
+msgid "No data"
+msgstr "データがありません"
+
+#: ../../include/functions_treeview.php:304
+#: ../../include/functions_reporting_html.php:70
+#: ../../include/functions_reporting_html.php:3496
+#: ../../enterprise/include/functions_reporting_pdf.php:2341
+#: ../../enterprise/include/functions_reporting_pdf.php:2379
+msgid "Last data"
+msgstr "最新データ"
+
+#: ../../include/functions_treeview.php:319
+msgid "Go to module edition"
+msgstr "モジュールの編集へ行く"
+
+#: ../../include/functions_treeview.php:368
+msgid "There was a problem loading alerts"
+msgstr "アラートの読み込みで問題が発生しました。"
+
+#: ../../include/functions_treeview.php:452
+msgid "Go to alerts edition"
+msgstr "アラートの編集へ行く"
+
+#: ../../include/functions_treeview.php:512
+#: ../../operation/agentes/agent_fields.php:28
+#: ../../operation/agentes/custom_fields.php:28
+#: ../../operation/agentes/estado_generalagente.php:46
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1057
+msgid "There was a problem loading agent"
+msgstr "エージェントのロードに失敗しました。"
+
+#: ../../include/functions_treeview.php:577
+#: ../../operation/agentes/estado_generalagente.php:297
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1102
+msgid "Other IP addresses"
+msgstr "他のIPアドレス"
+
+#: ../../include/functions_treeview.php:608
+#: ../../operation/agentes/estado_agente.php:546
+#: ../../operation/agentes/estado_generalagente.php:234
+#: ../../operation/gis_maps/ajax.php:332
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1149
+#: ../../enterprise/operation/agentes/tag_view.php:464
+msgid "Remote"
+msgstr "リモート"
+
+#: ../../include/functions_treeview.php:616
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1170
+msgid "Next agent contact"
+msgstr "次の接続予定"
+
+#: ../../include/functions_treeview.php:626
+msgid "Go to agent edition"
+msgstr "エージェントの編集へ行く"
+
+#: ../../include/functions_treeview.php:635
+msgid "Agent data"
+msgstr "エージェントデータ"
+
+#: ../../include/functions_treeview.php:648
+#: ../../operation/agentes/estado_generalagente.php:188
+#: ../../operation/gis_maps/ajax.php:315
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1117
+msgid "Agent Version"
+msgstr "エージェントバージョン"
+
+#: ../../include/functions_treeview.php:665
+#: ../../operation/agentes/estado_generalagente.php:339
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1124
+msgid "Position (Long, Lat)"
+msgstr "位置 (経度、緯度)"
+
+#: ../../include/functions_treeview.php:682
+#: ../../operation/agentes/estado_generalagente.php:367
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1164
+msgid "Timezone Offset"
+msgstr "タイムゾーンオフセット"
+
+#: ../../include/functions_treeview.php:697
+#: ../../operation/agentes/agent_fields.php:45
+#: ../../operation/agentes/estado_generalagente.php:383
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1180
+msgid "Custom field"
+msgstr "カスタムフィールド"
+
+#: ../../include/functions_treeview.php:708
+msgid "Advanced information"
+msgstr "拡張情報"
+
+#: ../../include/functions_treeview.php:720
+#: ../../operation/agentes/estado_generalagente.php:285
+msgid "Agent access rate (24h)"
+msgstr "エージェントアクセス頻度(過去24時間)"
+
+#: ../../include/functions_treeview.php:728
+#: ../../mobile/operation/agent.php:247
+#: ../../operation/agentes/estado_generalagente.php:631
+msgid "Events (24h)"
+msgstr "イベント (24時間)"
+
+#: ../../include/functions_treeview.php:780
+#: ../../operation/agentes/estado_generalagente.php:507
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:1023
+msgid "Interface traffic"
+msgstr "インタフェーストラフィック"
+
+#: ../../include/functions_treeview.php:802
+#: ../../operation/agentes/estado_generalagente.php:477
+msgid "Interface information"
+msgstr "インタフェース情報"
+
+#: ../../include/functions_config.php:94
+msgid "Failed updated: User did not login."
+msgstr "更新失敗: ユーザがログインしていません。"
+
+#: ../../include/functions_config.php:102
+msgid "Failed updated: User is not admin."
+msgstr "更新失敗: ユーザは管理者ではありません。"
+
+#: ../../include/functions_config.php:140
+msgid "SSL cert path"
+msgstr "SSL証明書パス"
+
+#: ../../include/functions_config.php:144
+msgid "Use cert."
+msgstr "証明書利用"
+
+#: ../../include/functions_config.php:154
+msgid "Enable Integria incidents in Pandora Console"
+msgstr "PandoraコンソールでIntegriaインシデントを有効にする"
+
+#: ../../include/functions_config.php:156
+msgid "Integria inventory"
+msgstr "Integria インベントリ"
+
+#: ../../include/functions_config.php:158
+msgid "Integria API password"
+msgstr "Integria API パスワード"
+
+#: ../../include/functions_config.php:160
+msgid "Integria URL"
+msgstr "Integria URL"
+
+#: ../../include/functions_config.php:184
+msgid "License information"
+msgstr "ライセンス情報"
+
+#: ../../include/functions_config.php:204
+msgid "Limit parameters bulk"
+msgstr "一括処理制限"
+
+#: ../../include/functions_config.php:206
+msgid "Identification_reminder"
+msgstr "識別リマインダ"
+
+#: ../../include/functions_config.php:208
+msgid "Include_agents"
+msgstr "エージェントのインクルード"
+
+#: ../../include/functions_config.php:210
+msgid "alias_as_name"
+msgstr "名前としてのエイリアス"
+
+#: ../../include/functions_config.php:212
+msgid "Audit log directory"
+msgstr "監査ログディレクトリ"
+
+#: ../../include/functions_config.php:217
+#: ../../enterprise/godmode/setup/setup.php:30
+msgid "Forward SNMP traps to agent (if exist)"
+msgstr "SNMP トラップのエージェント(存在する場合)への転送"
+
+#: ../../include/functions_config.php:219
+#: ../../enterprise/godmode/setup/setup.php:38
+msgid "Use Enterprise ACL System"
+msgstr "エンタープライズ ACL システムを利用する"
+
+#: ../../include/functions_config.php:221
+#: ../../enterprise/meta/include/functions_meta.php:327
+msgid "Activate Metaconsole"
+msgstr "メタコンソールの有効化"
+
+#: ../../include/functions_config.php:223
+#: ../../enterprise/godmode/setup/setup.php:47
+msgid "Size of collection"
+msgstr "コレクションのサイズ"
+
+#: ../../include/functions_config.php:225
+#: ../../enterprise/godmode/setup/setup.php:54
+#: ../../enterprise/meta/advanced/metasetup.consoles.php:384
+msgid "Events replication"
+msgstr "イベント複製"
+
+#: ../../include/functions_config.php:228
+#: ../../enterprise/godmode/setup/setup.php:63
+msgid "Replication interval"
+msgstr "複製間隔"
+
+#: ../../include/functions_config.php:230
+#: ../../enterprise/godmode/setup/setup.php:70
+msgid "Replication limit"
+msgstr "複製制限"
+
+#: ../../include/functions_config.php:232
+#: ../../enterprise/godmode/setup/setup.php:89
+msgid "Replication mode"
+msgstr "複製モード"
+
+#: ../../include/functions_config.php:234
+#: ../../enterprise/godmode/setup/setup.php:138
+msgid "Show events list in local console (read only)"
+msgstr "ローカルコンソールでのイベント一覧表示 (参照のみ)"
+
+#: ../../include/functions_config.php:237
+msgid "Replication DB engine"
+msgstr "複製 DB エンジン"
+
+#: ../../include/functions_config.php:239
+msgid "Replication DB host"
+msgstr "複製 DB ホスト"
+
+#: ../../include/functions_config.php:241
+msgid "Replication DB database"
+msgstr "複製データベース"
+
+#: ../../include/functions_config.php:243
+msgid "Replication DB user"
+msgstr "複製 DB ユーザ"
+
+#: ../../include/functions_config.php:245
+msgid "Replication DB password"
+msgstr "複製 DB パスワード"
+
+#: ../../include/functions_config.php:247
+msgid "Replication DB port"
+msgstr "複製 DB ポート"
+
+#: ../../include/functions_config.php:249
+msgid "Metaconsole agent cache"
+msgstr "メタコンソールエージェントキャッシュ"
+
+#: ../../include/functions_config.php:251
+#: ../../enterprise/godmode/setup/setup.php:203
+msgid "Activate Log Collector"
+msgstr "ログ収集の有効化"
+
+#: ../../include/functions_config.php:255
+#: ../../enterprise/godmode/setup/setup.php:147
+msgid "Inventory changes blacklist"
+msgstr "インベントリブラックリスト変更"
+
+#: ../../include/functions_config.php:258
+#: ../../enterprise/godmode/setup/setup.php:244
+#: ../../enterprise/meta/advanced/metasetup.mail.php:84
+msgid "From dir"
+msgstr "From アドレス"
+
+#: ../../include/functions_config.php:260
+#: ../../enterprise/godmode/setup/setup.php:247
+#: ../../enterprise/meta/advanced/metasetup.mail.php:87
+msgid "From name"
+msgstr "From 名"
+
+#: ../../include/functions_config.php:262
+#: ../../enterprise/godmode/setup/setup.php:250
+#: ../../enterprise/meta/advanced/metasetup.mail.php:90
+msgid "Server SMTP"
+msgstr "SMTP サーバ"
+
+#: ../../include/functions_config.php:264
+#: ../../enterprise/godmode/setup/setup.php:253
+#: ../../enterprise/meta/advanced/metasetup.mail.php:93
+msgid "Port SMTP"
+msgstr "SMTP ポート"
+
+#: ../../include/functions_config.php:266
+#: ../../enterprise/godmode/setup/setup.php:256
+msgid "Encryption"
+msgstr "暗号化"
+
+#: ../../include/functions_config.php:268
+#: ../../enterprise/godmode/setup/setup.php:259
+#: ../../enterprise/meta/advanced/metasetup.mail.php:96
+msgid "Email user"
+msgstr "メールユーザ"
+
+#: ../../include/functions_config.php:270
+#: ../../enterprise/godmode/setup/setup.php:262
+#: ../../enterprise/meta/advanced/metasetup.mail.php:99
+msgid "Email password"
+msgstr "メールユーザパスワード"
+
+#: ../../include/functions_config.php:277
+#: ../../enterprise/godmode/setup/setup.php:287
+#: ../../enterprise/meta/advanced/metasetup.password.php:78
+#: ../../enterprise/meta/include/functions_meta.php:499
+msgid "Enable password policy"
+msgstr "パスワードポリシーを利用する"
+
+#: ../../include/functions_config.php:280
+#: ../../enterprise/godmode/setup/setup.php:292
+#: ../../enterprise/meta/advanced/metasetup.password.php:84
+#: ../../enterprise/meta/include/functions_meta.php:509
+msgid "Min. size password"
+msgstr "最小パスワードサイズ"
+
+#: ../../include/functions_config.php:282
+#: ../../enterprise/godmode/setup/setup.php:306
+#: ../../enterprise/meta/advanced/metasetup.password.php:101
+#: ../../enterprise/meta/include/functions_meta.php:539
+msgid "Password expiration"
+msgstr "パスワードの期限切れ"
+
+#: ../../include/functions_config.php:284
+#: ../../enterprise/godmode/setup/setup.php:310
+#: ../../enterprise/meta/advanced/metasetup.password.php:106
+#: ../../enterprise/meta/include/functions_meta.php:549
+msgid "Force change password on first login"
+msgstr "初回ログイン時にパスワードを変更する"
+
+#: ../../include/functions_config.php:286
+#: ../../enterprise/godmode/setup/setup.php:315
+#: ../../enterprise/meta/advanced/metasetup.password.php:112
+#: ../../enterprise/meta/include/functions_meta.php:559
+msgid "User blocked if login fails"
+msgstr "ログインに失敗するとユーザをブロックします"
+
+#: ../../include/functions_config.php:288
+#: ../../enterprise/godmode/setup/setup.php:319
+#: ../../enterprise/meta/advanced/metasetup.password.php:117
+#: ../../enterprise/meta/include/functions_meta.php:569
+msgid "Number of failed login attempts"
+msgstr "ログイン失敗回数"
+
+#: ../../include/functions_config.php:290
+#: ../../enterprise/godmode/setup/setup.php:296
+#: ../../enterprise/meta/advanced/metasetup.password.php:89
+#: ../../enterprise/meta/include/functions_meta.php:519
+msgid "Password must have numbers"
+msgstr "パスワードには数字を含む必要があります"
+
+#: ../../include/functions_config.php:292
+#: ../../enterprise/godmode/setup/setup.php:301
+#: ../../enterprise/meta/advanced/metasetup.password.php:95
+#: ../../enterprise/meta/include/functions_meta.php:529
+msgid "Password must have symbols"
+msgstr "パスワードには記号を含む必要があります"
+
+#: ../../include/functions_config.php:294
+#: ../../enterprise/godmode/setup/setup.php:324
+#: ../../enterprise/meta/advanced/metasetup.password.php:122
+#: ../../enterprise/meta/include/functions_meta.php:486
+msgid "Apply password policy to admin users"
+msgstr "管理者ユーザへパスワードポリシーを適用"
+
+#: ../../include/functions_config.php:296
+#: ../../enterprise/godmode/setup/setup.php:329
+#: ../../enterprise/meta/advanced/metasetup.password.php:128
+#: ../../enterprise/meta/include/functions_meta.php:579
+msgid "Enable password history"
+msgstr "パスワード履歴の有効化"
+
+#: ../../include/functions_config.php:298
+#: ../../enterprise/godmode/setup/setup.php:334
+#: ../../enterprise/meta/advanced/metasetup.password.php:134
+#: ../../enterprise/meta/include/functions_meta.php:589
+msgid "Compare previous password"
+msgstr "以前のパスワードとの比較"
+
+#: ../../include/functions_config.php:300
+#: ../../enterprise/godmode/setup/setup.php:339
+#: ../../enterprise/meta/advanced/metasetup.setup.php:256
+#: ../../enterprise/meta/include/functions_meta.php:459
+msgid "Activate reset password"
+msgstr "パスワードリセットの有効化"
+
+#: ../../include/functions_config.php:310
+#: ../../enterprise/godmode/setup/setup_auth.php:51
+#: ../../enterprise/godmode/setup/setup_auth.php:210
+#: ../../enterprise/godmode/setup/setup_auth.php:679
+#: ../../enterprise/meta/include/functions_meta.php:632
+msgid "Autocreate profile"
+msgstr "プロファイルの自動作成"
+
+#: ../../include/functions_config.php:312
+#: ../../enterprise/godmode/setup/setup_auth.php:57
+#: ../../enterprise/godmode/setup/setup_auth.php:216
+#: ../../enterprise/godmode/setup/setup_auth.php:685
+#: ../../enterprise/meta/include/functions_meta.php:642
+msgid "Autocreate profile group"
+msgstr "プロファイルグループの自動作成"
+
+#: ../../include/functions_config.php:314
+#: ../../enterprise/godmode/setup/setup_auth.php:64
+#: ../../enterprise/godmode/setup/setup_auth.php:223
+#: ../../enterprise/godmode/setup/setup_auth.php:692
+#: ../../enterprise/meta/include/functions_meta.php:652
+msgid "Autocreate profile tags"
+msgstr "自動作成プロファイルタグ"
+
+#: ../../include/functions_config.php:316
+#: ../../enterprise/godmode/setup/setup_auth.php:801
+#: ../../enterprise/meta/include/functions_meta.php:662
+msgid "Autocreate blacklist"
+msgstr "ブラックリストの自動作成"
+
+#: ../../include/functions_config.php:319
+#: ../../enterprise/godmode/setup/setup_auth.php:809
+#: ../../enterprise/meta/include/functions_meta.php:694
+msgid "Active directory server"
+msgstr "アクティブディレクトリサーバ"
+
+#: ../../include/functions_config.php:321
+#: ../../enterprise/godmode/setup/setup_auth.php:815
+#: ../../enterprise/meta/include/functions_meta.php:704
+msgid "Active directory port"
+msgstr "アクティブディレクトリポート"
+
+#: ../../include/functions_config.php:325
+#: ../../enterprise/godmode/setup/setup_auth.php:664
+#: ../../enterprise/meta/include/functions_meta.php:724
+msgid "Advanced Config AD"
+msgstr "拡張 AD 設定"
+
+#: ../../include/functions_config.php:327
+#: ../../enterprise/godmode/setup/setup_auth.php:101
+#: ../../enterprise/meta/include/functions_meta.php:764
+msgid "Advanced Config LDAP"
+msgstr "LDAP 拡張設定"
+
+#: ../../include/functions_config.php:329
+#: ../../enterprise/godmode/setup/setup_auth.php:828
+#: ../../enterprise/meta/include/functions_meta.php:734
+msgid "Domain"
+msgstr "ドメイン"
+
+#: ../../include/functions_config.php:331
+#: ../../enterprise/godmode/setup/setup_auth.php:726
+#: ../../enterprise/meta/include/functions_meta.php:744
+msgid "Advanced Permisions AD"
+msgstr "AD 拡張パーミッション"
+
+#: ../../include/functions_config.php:333
+#: ../../enterprise/godmode/setup/setup_auth.php:127
+#: ../../enterprise/meta/include/functions_meta.php:754
+msgid "Advanced Permissions LDAP"
+msgstr "LDAP 拡張パーミッション"
+
+#: ../../include/functions_config.php:353
+#: ../../enterprise/godmode/setup/setup_auth.php:96
+#: ../../enterprise/meta/include/functions_meta.php:891
+msgid "Login user attribute"
+msgstr "ログインユーザアトリビュート"
+
+#: ../../include/functions_config.php:355
+#: ../../enterprise/godmode/setup/setup_auth.php:89
+#: ../../enterprise/meta/include/functions_meta.php:901
+msgid "LDAP function"
+msgstr "LDAP 機能"
+
+#: ../../include/functions_config.php:359
+#: ../../enterprise/godmode/setup/setup_auth.php:77
+#: ../../enterprise/meta/include/functions_meta.php:877
+msgid "Save Password"
+msgstr "パスワードを保存"
+
+#: ../../include/functions_config.php:366
+#: ../../enterprise/godmode/setup/setup_auth.php:595
+msgid "MySQL host"
+msgstr "MySQL ホスト"
+
+#: ../../include/functions_config.php:368
+#: ../../include/functions_config.php:379
+#: ../../enterprise/godmode/setup/setup_auth.php:601
+#: ../../enterprise/godmode/setup/setup_auth.php:632
+#: ../../enterprise/meta/include/functions_meta.php:923
+#: ../../enterprise/meta/include/functions_meta.php:976
+#: ../../enterprise/meta/include/functions_meta.php:1029
+msgid "MySQL port"
+msgstr "MySQL ポート"
+
+#: ../../include/functions_config.php:370
+#: ../../include/functions_config.php:381
+#: ../../include/functions_config.php:757
+#: ../../enterprise/godmode/setup/setup_auth.php:607
+#: ../../enterprise/godmode/setup/setup_auth.php:638
+#: ../../enterprise/godmode/setup/setup_history.php:59
+#: ../../enterprise/meta/include/functions_meta.php:933
+#: ../../enterprise/meta/include/functions_meta.php:986
+#: ../../enterprise/meta/include/functions_meta.php:1039
+msgid "Database name"
+msgstr "データベース名"
+
+#: ../../include/functions_config.php:377
+#: ../../enterprise/godmode/setup/setup_auth.php:626
+#: ../../enterprise/meta/include/functions_meta.php:1019
+msgid "Integria host"
+msgstr "Integria ホスト"
+
+#: ../../include/functions_config.php:387
+msgid "Saml path"
+msgstr "SAML パス"
+
+#: ../../include/functions_config.php:391
+#: ../../enterprise/meta/include/functions_meta.php:682
+msgid "Session timeout"
+msgstr "セッションタイムアウト"
+
+#: ../../include/functions_config.php:417
+msgid "Max. days before autodisable deletion"
+msgstr "自動無効化エージェントの保持日数"
+
+#: ../../include/functions_config.php:419
+msgid "Item limit for realtime reports)"
+msgstr "リアルタイムレポートのアイテム制限"
+
+#: ../../include/functions_config.php:435
+msgid "Big Operatiopn Step to purge old data"
+msgstr "古いデータ削除のための大きな操作ステップ"
+
+#: ../../include/functions_config.php:478
+#: ../../enterprise/meta/advanced/metasetup.visual.php:111
+#: ../../enterprise/meta/include/functions_meta.php:1142
+msgid "Graphic resolution (1-low, 5-high)"
+msgstr "グラフ解像度 (1-低い,5-高い)"
+
+#: ../../include/functions_config.php:479
+#: ../../include/functions_config.php:1732
+#: ../../include/functions_netflow.php:1640
+#: ../../operation/netflow/nf_live_view.php:406
+msgid "Bytes"
+msgstr "バイト"
+
+#: ../../include/functions_config.php:482
+#: ../../enterprise/meta/include/functions_meta.php:1132
+msgid "Data precision for reports"
+msgstr "レポートのデータ精度"
+
+#: ../../include/functions_config.php:493
+msgid "Show QR code header"
+msgstr "QR コードヘッダー表示"
+
+#: ../../include/functions_config.php:506
+#: ../../enterprise/meta/include/functions_meta.php:1255
+msgid "Custom logo login"
+msgstr "ログイン時のカスタムロゴ"
+
+#: ../../include/functions_config.php:508
+#: ../../enterprise/meta/include/functions_meta.php:1265
+msgid "Custom splash login"
+msgstr "カスタムスプラッシュログイン"
+
+#: ../../include/functions_config.php:510
+#: ../../enterprise/meta/include/functions_meta.php:1275
+msgid "Custom title1 login"
+msgstr ""
+
+#: ../../include/functions_config.php:512
+#: ../../enterprise/meta/include/functions_meta.php:1285
+msgid "Custom title2 login"
+msgstr ""
+
+#: ../../include/functions_config.php:517
+#: ../../include/functions_config.php:535
+msgid "Custom Docs url"
+msgstr "カスタムドキュメントURL"
+
+#: ../../include/functions_config.php:519
+#: ../../include/functions_config.php:537
+msgid "Custom support url"
+msgstr "カスタムサポートURL"
+
+#: ../../include/functions_config.php:522
+msgid "Custom logo metaconsole"
+msgstr "メタコンソールカスタムロゴ"
+
+#: ../../include/functions_config.php:524
+msgid "Custom logo login metaconsole"
+msgstr "メタコンソールログインカスタムロゴ"
+
+#: ../../include/functions_config.php:526
+msgid "Custom splash login metaconsole"
+msgstr "カスタムスプラッシュログイン メタコンソール"
+
+#: ../../include/functions_config.php:528
+msgid "Custom title1 login metaconsole"
+msgstr ""
+
+#: ../../include/functions_config.php:530
+msgid "Custom title2 login metaconsole"
+msgstr ""
+
+#: ../../include/functions_config.php:532
+msgid "Login background metaconsole"
+msgstr "メタコンソールログイン背景"
+
+#: ../../include/functions_config.php:542
+msgid "Default line favourite_view for the Visual Console"
+msgstr ""
+
+#: ../../include/functions_config.php:544
+msgid "Default line menu items for the Visual Console"
+msgstr ""
+
+#: ../../include/functions_config.php:563
+msgid "Show units in values report"
+msgstr "値のレポートに単位を表示"
+
+#: ../../include/functions_config.php:569
+msgid "visual_animation"
+msgstr "ビジュアルアニメーション"
+
+#: ../../include/functions_config.php:571
+msgid "Fixed graph"
+msgstr "グラフの固定"
+
+#: ../../include/functions_config.php:577
+msgid "Paginate module"
+msgstr "モジュール画面分割"
+
+#: ../../include/functions_config.php:583
+msgid "Shortened module graph data"
+msgstr "短縮モジュールグラフデータ"
+
+#: ../../include/functions_config.php:589
+msgid "Default type of module charts."
+msgstr "モジュールグラフのデフォルトタイプ"
+
+#: ../../include/functions_config.php:591
+msgid "Default type of interface charts."
+msgstr "インタフェースグラフのデフォルトタイプ"
+
+#: ../../include/functions_config.php:593
+msgid "Default show only average or min and max"
+msgstr "平均のみまたは最小と最大のみ表示のデフォルト"
+
+#: ../../include/functions_config.php:598
+#: ../../include/functions_config.php:1796
+#: ../../include/functions_reporting_html.php:505
+#: ../../include/functions_reporting_html.php:584
+#: ../../enterprise/include/functions_reporting.php:1662
+#: ../../enterprise/include/functions_reporting.php:1698
+#: ../../enterprise/include/functions_reporting.php:2470
+#: ../../enterprise/include/functions_reporting.php:2506
+#: ../../enterprise/include/functions_reporting.php:3247
+#: ../../enterprise/include/functions_reporting.php:3283
+#: ../../enterprise/include/functions_reporting.php:4870
+#: ../../enterprise/include/functions_reporting.php:5204
+#: ../../enterprise/include/functions_reporting_csv.php:1079
+#: ../../enterprise/include/functions_reporting_csv.php:1126
+#: ../../enterprise/include/functions_reporting_pdf.php:1409
+#: ../../enterprise/include/functions_reporting_pdf.php:1490
+#: ../../enterprise/include/functions_reporting_pdf.php:1710
+#: ../../enterprise/include/functions_reporting_pdf.php:1746
+#: ../../enterprise/include/functions_reporting_pdf.php:2149
+msgid "Fail"
+msgstr "失敗"
+
+#: ../../include/functions_config.php:602
+msgid "Display lateral menus with left click"
+msgstr "クリックでサイドメニューを表示"
+
+#: ../../include/functions_config.php:608
+msgid "Service item padding size"
+msgstr "サービス要素の間隔"
+
+#: ../../include/functions_config.php:611
+msgid "Default percentil"
+msgstr "デフォルトのパーセンテージ"
+
+#: ../../include/functions_config.php:614
+msgid "Default full scale (TIP)"
+msgstr ""
+
+#: ../../include/functions_config.php:635
+msgid "Add the custom post process"
+msgstr "カスタム保存倍率を追加"
+
+#: ../../include/functions_config.php:642
+msgid "Delete the custom post process"
+msgstr "カスタム保存倍率を削除"
+
+#: ../../include/functions_config.php:691
+#: ../../enterprise/meta/include/functions_meta.php:1372
+msgid "Custom report info"
+msgstr "カスタムレポート情報"
+
+#: ../../include/functions_config.php:739
+msgid "IP ElasticSearch server"
+msgstr "ElasticSearch サーバ IP"
+
+#: ../../include/functions_config.php:741
+msgid "Port ElasticSearch server"
+msgstr "ElasticSearch サーバポート番号"
+
+#: ../../include/functions_config.php:743
+#: ../../enterprise/godmode/setup/setup_log_collector.php:50
+msgid "Number of logs viewed"
+msgstr "ログ表示数"
+
+#: ../../include/functions_config.php:745
+#: ../../enterprise/godmode/setup/setup_log_collector.php:52
+msgid "Days to purge old information"
+msgstr "旧情報を削除する日数"
+
+#: ../../include/functions_config.php:749
+#: ../../enterprise/godmode/setup/setup_history.php:45
+msgid "Enable history database"
+msgstr "ヒストリデータベースの有効化"
+
+#: ../../include/functions_config.php:751
+msgid "Enable history event"
+msgstr "ヒストリイベントの有効化"
+
+#: ../../include/functions_config.php:753
+#: ../../enterprise/godmode/setup/setup_history.php:53
+msgid "Host"
+msgstr "ホスト"
+
+#: ../../include/functions_config.php:759
+#: ../../enterprise/godmode/setup/setup_history.php:62
+msgid "Database user"
+msgstr "データベースユーザ"
+
+#: ../../include/functions_config.php:761
+#: ../../enterprise/godmode/setup/setup_history.php:65
+msgid "Database password"
+msgstr "データベースパスワード"
+
+#: ../../include/functions_config.php:765
+msgid "Event Days"
+msgstr "イベント日数"
+
+#: ../../include/functions_config.php:769
+#: ../../enterprise/godmode/setup/setup_history.php:74
+msgid "Delay"
+msgstr "遅延"
+
+#: ../../include/functions_config.php:775
+msgid "eHorus user"
+msgstr "eHorus ユーザ"
+
+#: ../../include/functions_config.php:777
+msgid "eHorus password"
+msgstr "eHorus パスワード"
+
+#: ../../include/functions_config.php:779
+msgid "eHorus API hostname"
+msgstr "eHorus API ホスト名"
+
+#: ../../include/functions_config.php:781
+msgid "eHorus API port"
+msgstr "eHorus API ポート"
+
+#: ../../include/functions_config.php:783
+msgid "eHorus request timeout"
+msgstr "eHorus リクエストタイムアウト"
+
+#: ../../include/functions_config.php:785
+msgid "eHorus id custom field"
+msgstr "eHorus id カスタムフィールド"
+
+#: ../../include/functions_config.php:797
+#, php-format
+msgid "Failed updated: the next values cannot update: %s"
+msgstr "更新失敗: 次の値は更新できません: %s"
+
+#: ../../include/functions_config.php:1228
+#: ../../enterprise/meta/general/login_page.php:170
+#: ../../enterprise/meta/include/process_reset_pass.php:108
+#: ../../enterprise/meta/include/reset_pass.php:97
+msgid "PANDORA FMS NEXT GENERATION"
+msgstr "PANDORA FMS NEXT GENERATION"
+
+#: ../../include/functions_config.php:1232
+#: ../../enterprise/meta/general/login_page.php:178
+#: ../../enterprise/meta/include/process_reset_pass.php:116
+#: ../../enterprise/meta/include/reset_pass.php:105
+msgid "METACONSOLE"
+msgstr "メタコンソール"
+
+#: ../../include/functions_config.php:1954
+msgid ""
+"Click <a style=\"font-weight:bold; text-decoration:underline\" "
+"href=\"javascript: force_run_register();\"> here</a> to start the "
+"registration process"
+msgstr ""
+"登録処理を開始するには <a style=\"font-weight:bold; text-decoration:underline\" "
+"href=\"javascript: force_run_register();\"> こちら</a> をクリックしてください"
+
+#: ../../include/functions_config.php:1955
+msgid "This instance is not registered in the Update manager"
+msgstr "このインスタンスはアップデートマネージャに登録されていません"
+
+#: ../../include/functions_config.php:1962
+msgid ""
+"Click <a style=\"font-weight:bold; text-decoration:underline\" "
+"href=\"javascript: force_run_newsletter();\"> here</a> to start the "
+"newsletter subscription process"
+msgstr ""
+"ニュースレターの購読を開始するには <a style=\"font-weight:bold; text-decoration:underline\" "
+"href=\"javascript: force_run_newsletter();\"> こちら</a> をクリックしてください"
+
+#: ../../include/functions_config.php:1963
+msgid "Not subscribed to the newsletter"
+msgstr "ニュースレターを購読していません"
+
+#: ../../include/functions_config.php:1974
+msgid "Default password for \"Admin\" user has not been changed."
+msgstr "\"Admin\" ユーザのデフォルトパスワードが変更されていません。"
+
+#: ../../include/functions_config.php:1975
+msgid ""
+"Please change the default password because is a common vulnerability "
+"reported."
+msgstr "脆弱性となるため、デフォルトのパスワードは変更してください。"
+
+#: ../../include/functions_config.php:1981
+msgid "You can not get updates until you renew the license."
+msgstr "ライセンスを更新するまで更新は入手できません。"
+
+#: ../../include/functions_config.php:1982
+msgid "This license has expired."
+msgstr "このライセンスは期限切れです。"
+
+#: ../../include/functions_config.php:1987
+msgid ""
+"Please check that the web server has write rights on the "
+"{HOMEDIR}/attachment directory"
+msgstr "{HOMEDIR}/attachment ディレクトリに、ウェブサーバの書き込み権限があるか確認してください。"
+
+#: ../../include/functions_config.php:2000
+msgid "Remote configuration directory is not readble for the console"
+msgstr "リモート設定ディレクトリがコンソールから読めません"
+
+#: ../../include/functions_config.php:2006
+#: ../../include/functions_config.php:2013
+msgid "Remote configuration directory is not writtable for the console"
+msgstr "コンソールから、リモート設定ディレクトリに書き込めません。"
+
+#: ../../include/functions_config.php:2024
+msgid ""
+"There are too much files in attachment directory. This is not fatal, but you "
+"should consider cleaning up your attachment directory manually"
+msgstr "添付ディレクトリに大量のファイルがあります。障害ではありませんが、添付ディレクトリの手動での整理をお勧めします。"
+
+#: ../../include/functions_config.php:2024
+msgid "files"
+msgstr "ファイル"
+
+#: ../../include/functions_config.php:2025
+msgid "Too much files in your tempora/attachment directory"
+msgstr "attachmentディレクトリにあるファイルが多すぎます。"
+
+#: ../../include/functions_config.php:2042
+msgid ""
+"Your database is not well maintained. Seems that it have more than 48hr "
+"without a proper maintance. Please review Pandora FMS documentation about "
+"how to execute this maintance process (pandora_db.pl) and enable it as soon "
+"as possible"
+msgstr ""
+"データベースがあまりメンテナンスされていません。48時間以上適切なメンテナンスがされていないように見受けられます。メンテナンスプロセス(pandora_d"
+"b.pl)の実行に関しては Pandora FMS ドキュメントを参照し、メンテナンス処理を早急に有効にしてください。"
+
+#: ../../include/functions_config.php:2043
+msgid "Database maintance problem"
+msgstr "データベースメンテナンスにおける問題"
+
+#: ../../include/functions_config.php:2049
+msgid ""
+"Your defined font doesnt exist or is not defined. Please check font "
+"parameters in your config"
+msgstr "定義したフォントが存在しないかフォントが定義されていません。フォントパラメータの設定を確認してください。"
+
+#: ../../include/functions_config.php:2050
+msgid "Default font doesnt exist"
+msgstr "デフォルトのフォントがありません"
+
+#: ../../include/functions_config.php:2055
+msgid "You need to restart server after altering this configuration setting."
+msgstr "この設定を変更したあとは、サーバを再起動する必要があります。"
+
+#: ../../include/functions_config.php:2056
+msgid ""
+"Event storm protection is activated. No events will be generated during this "
+"mode."
+msgstr "イベントストーム保護が有効です。このモードではイベントが生成されません。"
+
+#: ../../include/functions_config.php:2063
+msgid ""
+"Your Pandora FMS has the \"develop_bypass\" mode enabled. This is a "
+"developer mode and should be disabled in a production system. This value is "
+"written in the main index.php file"
+msgstr ""
+"この Pandora FMS は、\"develop_bypass\" "
+"モードが有効になっています。これは、これは開発用のモードであるため本番システムでは無効にしてください。この設定は、メインの index.php "
+"ファイルに書かれています。"
+
+#: ../../include/functions_config.php:2064
+msgid "Developer mode is enabled"
+msgstr "開発モードが有効です"
+
+#: ../../include/functions_config.php:2073
+msgid "Error first setup Open update"
+msgstr "オープンアップデートの初期設定エラー"
+
+#: ../../include/functions_config.php:2079
+msgid ""
+"There is a new update available. Please<a style=\"font-weight:bold;\" "
+"href=\"index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=on"
+"line\"> go to Administration:Setup:Update Manager</a> for more details."
+msgstr ""
+"新たな更新があります。詳細は、<a style=\"font-weight:bold;\" "
+"href=\"index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=on"
+"line\">管理メニューのアップデートマネージャ</a>を参照してください。"
+
+#: ../../include/functions_config.php:2080
+msgid "New update of Pandora Console"
+msgstr "Pandora コンソールの新たな更新"
+
+#: ../../include/functions_config.php:2094
+msgid ""
+"To disable, change it on your PHP configuration file (php.ini) and put "
+"safe_mode = Off (Dont forget restart apache process after changes)"
+msgstr ""
+"無効化するには、PHP 設定ファイル (php.ini) を変更し、safe_mode = Off を設定します。 (変更後、apache "
+"プロセスの再起動を忘れずに行ってください)"
+
+#: ../../include/functions_config.php:2095
+msgid "PHP safe mode is enabled. Some features may not properly work."
+msgstr "PHP safe モードが有効です。いくつかの機能は正しく動作しません。"
+
+#: ../../include/functions_config.php:2100
+#, php-format
+msgid "Recommended value is %s"
+msgstr "推奨値は %s です"
+
+#: ../../include/functions_config.php:2100
+#: ../../include/functions_config.php:2106
+msgid "Unlimited"
+msgstr "無制限"
+
+#: ../../include/functions_config.php:2100
+#: ../../include/functions_config.php:2106
+#: ../../include/functions_config.php:2114
+#: ../../include/functions_config.php:2129
+msgid ""
+"Please, change it on your PHP configuration file (php.ini) or contact with "
+"administrator (Dont forget restart apache process after changes)"
+msgstr ""
+"PHP 設定ファイル (php.ini) を変更するか、管理者へ連絡してください。(変更後は apache プロセスの再起動を忘れないでください)"
+
+#: ../../include/functions_config.php:2101
+#: ../../include/functions_config.php:2107
+#: ../../include/functions_config.php:2115
+#: ../../include/functions_config.php:2123
+#, php-format
+msgid "Not recommended '%s' value in PHP configuration"
+msgstr "PHP 設定における値 '%s' はおすすめしません"
+
+#: ../../include/functions_config.php:2106
+#: ../../include/functions_config.php:2114
+#: ../../include/functions_config.php:2122
+#, php-format
+msgid "Recommended value is: %s"
+msgstr "推奨値: %s"
+
+#: ../../include/functions_config.php:2114
+#: ../../include/functions_config.php:2122
+#, php-format
+msgid "%s or greater"
+msgstr "%s または大きい"
+
+#: ../../include/functions_config.php:2122
+msgid ""
+"Please, change it on your PHP configuration file (php.ini) or contact with "
+"administrator"
+msgstr "PHP 設定ファイル (php.ini) を変更するか、管理者へ連絡してください。"
+
+#: ../../include/functions_config.php:2128
+msgid ""
+"Variable disable_functions containts functions system() or exec(), in PHP "
+"configuration file (php.ini)"
+msgstr ""
+"PHP 設定ファイル(php.ini)において、disable_functions 変数に system() または exec() 関数が含まれています。"
+
+#: ../../include/functions_config.php:2129
+msgid "Problems with disable functions in PHP.INI"
+msgstr "PHP.INI で無効化された機能の問題"
+
+#: ../../include/functions_ui.php:230
+msgid "Information"
+msgstr "情報"
+
+#: ../../include/functions_ui.php:236
+#: ../../enterprise/include/functions_visual_map.php:622
+msgid "Success"
+msgstr "成功"
+
+#: ../../include/functions_ui.php:372
+msgid "Request successfully processed"
+msgstr "要求された処理を実行しました。"
+
+#: ../../include/functions_ui.php:375
+msgid "Error processing request"
+msgstr "要求された処理の実行に失敗しました。"
+
+#: ../../include/functions_ui.php:513
+msgid ""
+"Is possible that this view uses part of information which your user has not "
+"access"
+msgstr "あなたのユーザでアクセスできない情報の一部を利用している可能性があります"
+
+#: ../../include/functions_ui.php:683
+msgid "Software"
+msgstr "ソフトウェア"
+
+#: ../../include/functions_ui.php:1055
+msgid "The alert would fire when the value is over <span id=\"max\"></span>"
+msgstr "取得した値が <span id=\"max\"></span> 以上になったら、アラートを発生させます。"
+
+#: ../../include/functions_ui.php:1060
+msgid "The alert would fire when the value is under <span id=\"min\"></span>"
+msgstr "取得した値が <span id=\"min\"></span> 未満になったら、アラートを発生させます。"
+
+#: ../../include/functions_ui.php:1343
+#: ../../enterprise/meta/include/functions_ui_meta.php:54
+msgid "the Flexible Monitoring System"
+msgstr "the Flexible Monitoring System"
+
+#: ../../include/functions_ui.php:1681 ../../include/functions_ui.php:1707
+#, php-format
+msgid "Total items: %s"
+msgstr "全アイテム数: %s"
+
+#: ../../include/functions_ui.php:2024
+msgid "Unknown type"
+msgstr "不明なタイプ"
+
+#: ../../include/functions_ui.php:2837
+msgid "Type at least two characters to search."
+msgstr "2文字以上入力するとマッチするエージェント名が検索されます"
+
+#: ../../include/functions_ui.php:3721
+msgid ""
+"Cannot connect to the database, please check your database setup in the "
+"<b>include/config.php</b> file.<i><br/><br/>\n"
+"\t\t\tProbably your database, hostname, user or password values are "
+"incorrect or\n"
+"\t\t\tthe database server is not running."
+msgstr ""
+"データベースに接続できません。 <b>include/config.php</b> "
+"ファイル内のデータベースの設定を確認してください。<i><br/><br/>\n"
+"\t\t\tおそらく、データベース名、ホスト名、ユーザ名またはパスワードの値が不正か、\n"
+"\t\t\tデータベースが動作していません。"
+
+#: ../../include/functions_ui.php:3736
+msgid ""
+"Cannot load configuration variables from database. Please check your "
+"database setup in the\n"
+"\t\t\t<b>include/config.php</b> file.<i><br><br>\n"
+"\t\t\tMost likely your database schema has been created but there are is no "
+"data in it, you have a problem with the database access credentials or your "
+"schema is out of date.\n"
+"\t\t\t<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or "
+"this file has invalid\n"
+"\t\t\tpermissions and HTTP server cannot read it. Please read documentation "
+"to fix this problem.</i>"
+msgstr ""
+"データベースから設定を読み込めません。<b>include/config.php</b>ファイルのデータベース設定を確認してください。<i><br><br"
+">\n"
+"\t\t\t "
+"データベーススキーマは作成されているがデータが入っていない、データベースへのアクセス権限が無い、またはスキーマが古いといったことが考えられます。\n"
+"\t\t\t <br><br>または、Pandora FMS コンソールが <i>include/config.php</i> "
+"ファイルを見つけられないか、このファイルが不正な\n"
+"\t\t\t パーミッションで HTTP サーバが読むことができません。この問題の解決にはドキュメントを参照してください。</i>"
+
+#: ../../include/functions_ui.php:3744
+msgid ""
+"Pandora FMS Console cannot find <i>include/config.php</i> or this file has "
+"invalid\n"
+"\t\t\tpermissions and HTTP server cannot read it. Please read documentation "
+"to fix this problem."
+msgstr ""
+"Pandora FMS コンソールが <i>include/config.php</i> ファイルを見つけられないか、このファイルが不正な\n"
+"\t\t\t パーミッションで HTTP サーバが読むことができません。この問題の解決にはドキュメントを参照してください。</i>"
+
+#: ../../include/functions_ui.php:3759
+msgid ""
+"For security reasons, normal operation is not possible until you delete "
+"installer file.\n"
+"\t\t\tPlease delete the <i>./install.php</i> file before running Pandora FMS "
+"Console."
+msgstr ""
+"セキュリティ上の理由から、インストーラファイルを削除するまで通常の動作にはなりません。\n"
+"\t\t\t Pandora FMS コンソールを実行する前に <i>./install.php</i>ファイルを削除してください。"
+
+#: ../../include/functions_ui.php:3764
+msgid ""
+"For security reasons, <i>config.php</i> must have restrictive permissions, "
+"and \"other\" users\n"
+"\t\t\tshould not read it or write to it. It should be written only for "
+"owner\n"
+"\t\t\t(usually www-data or http daemon user), normal operation is not "
+"possible until you change\n"
+"\t\t\tpermissions for <i>include/config.php</i> file. Please do it, it is "
+"for your security."
+msgstr ""
+"セキュリティ上の理由により、 <i>config.php</i> は制限されたパーミッションである必要があります。\n"
+"\t\t\t\"other\"ユーザは読み書きできないようにし、所有者(通常は www-data や http デーモンの\n"
+"\t\t\tユーザ)のみが書き込みできるようにします。<i>include/config.php</i> ファイルの\n"
+"\t\t\tパーミッションを修正するまで通常の動作をしません。セキュリティのために調整をしてください。"
+
+#: ../../include/functions_db.php:90
+#, php-format
+msgid "Error connecting to database %s at %s."
+msgstr "データベース %s@%s への接続エラー。"
+
+#: ../../include/functions_db.php:1564
+msgid "Database debug"
+msgstr "DBのデバッグ"
+
+#: ../../include/functions_db.php:1580
+msgid "SQL sentence"
+msgstr "SQL 構文"
+
+#: ../../include/functions_db.php:1582
+msgid "Rows"
+msgstr "行"
+
+#: ../../include/functions_db.php:1583
+msgid "Saved"
+msgstr "保存"
+
+#: ../../include/functions_db.php:1584
+msgid "Time (ms)"
+msgstr "時間 (ミリ秒)"
+
+#: ../../include/functions_update_manager.php:202
+msgid "There is a unknown error."
+msgstr "不明なエラーがあります。"
+
+#: ../../include/functions_update_manager.php:316
+#: ../../include/functions_update_manager.php:319
+#: ../../include/functions_update_manager.php:445
+#: ../../include/functions_update_manager.php:449
+#: ../../enterprise/include/functions_update_manager.php:141
+#: ../../enterprise/include/functions_update_manager.php:317
+msgid "Could not connect to internet"
+msgstr "インターネットへ接続できません"
+
+#: ../../include/functions_update_manager.php:324
+#: ../../include/functions_update_manager.php:327
+#: ../../include/functions_update_manager.php:456
+#: ../../include/functions_update_manager.php:460
+#: ../../enterprise/include/functions_update_manager.php:144
+msgid "Server not found."
+msgstr "サーバが見つかりません。"
+
+#: ../../include/functions_update_manager.php:382
+msgid "Update to the last version"
+msgstr "最新版に更新"
+
+#: ../../include/functions_update_manager.php:385
+#: ../../enterprise/include/functions_update_manager.php:229
+msgid "There is no update available."
+msgstr "更新がありません。"
+
+#: ../../include/functions_update_manager.php:494
+#: ../../include/functions_update_manager.php:524
+msgid "Remote server error on newsletter request"
+msgstr "ニュースレターリクエストにおけるリモートサーバエラー"
+
+#: ../../include/functions_update_manager.php:502
+msgid "E-mail successfully subscribed to newsletter."
+msgstr "ニュースレターの購読登録が完了しました。"
+
+#: ../../include/functions_update_manager.php:504
+msgid "E-mail has already subscribed to newsletter."
+msgstr "設定メールアドレスはすでにニュースレター購読済です。"
+
+#: ../../include/functions_update_manager.php:506
+#: ../../include/functions_update_manager.php:546
+msgid "Update manager returns error code: "
+msgstr "アップデートマネージャがエラーコードを返しました: "
+
+#: ../../include/functions_update_manager.php:541
+msgid "Pandora successfully subscribed with UID: "
+msgstr "次のUIDで購読しました: "
+
+#: ../../include/functions_update_manager.php:543
+msgid "Unsuccessful subscription."
+msgstr "購読に失敗しました。"
+
+#: ../../include/functions_update_manager.php:670
+msgid "Failed extracting the package to temp directory."
+msgstr "テンポラリディレクトリへのパッケージ展開に失敗しました。"
+
+#: ../../include/functions_update_manager.php:709
+msgid "Failed the copying of the files."
+msgstr "ファイルのコピーに失敗しました。"
+
+#: ../../include/functions_update_manager.php:725
+msgid "Package extracted successfully."
+msgstr "パッケージを展開しました。"
+
+#: ../../include/functions_events.php:880
+#: ../../operation/agentes/tactical.php:188
+msgid "Latest events"
+msgstr "最新のイベント"
+
+#: ../../include/functions_events.php:895
+#: ../../include/functions_events.php:1509
+#: ../../include/functions_events.php:1711
+#: ../../include/functions_events.php:1717
+#: ../../include/functions_events.php:1721
+#: ../../include/functions_events.php:1726
+#: ../../include/functions_events.php:3250
+#: ../../include/functions_events.php:3258
+#: ../../include/functions_graph.php:3505
+#: ../../operation/snmpconsole/snmp_view.php:465
+#: ../../operation/snmpconsole/snmp_view.php:772
+#: ../../operation/snmpconsole/snmp_view.php:1027
+msgid "Validated"
+msgstr "承諾済み"
+
+#: ../../include/functions_events.php:895
+#: ../../enterprise/operation/agentes/policy_view.php:51
+msgid "V."
+msgstr "V."
+
+#: ../../include/functions_events.php:1015
+msgid "Events -by module-"
+msgstr "イベント -モジュールごと-"
+
+#: ../../include/functions_events.php:1025
+#: ../../operation/agentes/tactical.php:203
+#: ../../operation/events/event_statistics.php:37
+msgid "Event graph"
+msgstr "イベントグラフ"
+
+#: ../../include/functions_events.php:1030
+#: ../../operation/agentes/tactical.php:209
+#: ../../operation/events/event_statistics.php:57
+msgid "Event graph by agent"
+msgstr "エージェントごとのイベントグラフ"
+
+#: ../../include/functions_events.php:1135
+msgid "Going to unknown"
+msgstr "不明状態になりました。"
+
+#: ../../include/functions_events.php:1141
+msgid "Alert manually validated"
+msgstr "アラートは承諾されました。"
+
+#: ../../include/functions_events.php:1144
+msgid "Going from critical to warning"
+msgstr "障害が警告状態になりました。"
+
+#: ../../include/functions_events.php:1148
+msgid "Going down to critical state"
+msgstr "障害が発生しました。"
+
+#: ../../include/functions_events.php:1152
+msgid "Going up to normal state"
+msgstr "正常になりました。"
+
+#: ../../include/functions_events.php:1155
+msgid "Going down from normal to warning"
+msgstr "警告状態になりました。"
+
+#: ../../include/functions_events.php:1161
+#: ../../include/functions_graph.php:3630
+#: ../../include/functions_graph.php:3681
+msgid "SYSTEM"
+msgstr "システム"
+
+#: ../../include/functions_events.php:1164
+msgid "Recon server detected a new host"
+msgstr "自動検出サーバが新しいホストを見つけました。"
+
+#: ../../include/functions_events.php:1167
+msgid "New agent created"
+msgstr "新しいエージェントが作成されました。"
+
+#: ../../include/functions_events.php:1180
+msgid "Unknown type:"
+msgstr "不明なタイプ"
+
+#: ../../include/functions_events.php:1500
+#: ../../include/functions_events.php:1507
+#: ../../include/functions_events.php:1527
+#: ../../enterprise/dashboard/widgets/events_list.php:47
+msgid "All event"
+msgstr "全イベント"
+
+#: ../../include/functions_events.php:1501
+#: ../../include/functions_events.php:1530
+msgid "Only new"
+msgstr "新規のみ"
+
+#: ../../include/functions_events.php:1502
+#: ../../include/functions_events.php:1533
+#: ../../enterprise/dashboard/widgets/events_list.php:48
+msgid "Only validated"
+msgstr "承諾済み"
+
+#: ../../include/functions_events.php:1503
+#: ../../include/functions_events.php:1536
+msgid "Only in process"
+msgstr "処理中のみ"
+
+#: ../../include/functions_events.php:1504
+#: ../../include/functions_events.php:1539
+msgid "Only not validated"
+msgstr "未承諾のみ"
+
+#: ../../include/functions_events.php:1508
+#: ../../include/functions_events.php:1711
+#: ../../enterprise/godmode/reporting/cluster_builder.php:144
+#: ../../enterprise/godmode/reporting/cluster_builder.php:191
+#: ../../enterprise/godmode/reporting/cluster_builder.php:300
+#: ../../enterprise/godmode/reporting/cluster_builder.php:543
+#: ../../enterprise/meta/monitoring/wizard/wizard.php:97
+msgid "New"
+msgstr "新規"
+
+#: ../../include/functions_events.php:1510
+#: ../../include/functions_events.php:1711
+#: ../../include/functions_events.php:1717
+msgid "In process"
+msgstr "処理中"
+
+#: ../../include/functions_events.php:1511
+msgid "Not Validated"
+msgstr "未検証"
+
+#: ../../include/functions_events.php:1666
+msgid "Change owner"
+msgstr "所有者変更"
+
+#: ../../include/functions_events.php:1705
+msgid "Change status"
+msgstr "ステータス変更"
+
+#: ../../include/functions_events.php:1744
+#: ../../include/functions_events.php:2663
+msgid "Add comment"
+msgstr "コメントの追加"
+
+#: ../../include/functions_events.php:1751
+#: ../../include/functions_events.php:1753
+#: ../../include/functions_events.php:4132
+#: ../../operation/events/events.build_table.php:687
+msgid "Delete event"
+msgstr "削除"
+
+#: ../../include/functions_events.php:1763
+msgid "Custom responses"
+msgstr "カスタム応答"
+
+#: ../../include/functions_events.php:2073
+msgid "There was an error connecting to the node"
+msgstr "ノードへの接続エラーが発生しました"
+
+#: ../../include/functions_events.php:2112
+msgid "Agent details"
+msgstr "エージェント詳細"
+
+#: ../../include/functions_events.php:2144
+#: ../../operation/agentes/ver_agente.php:772
+#: ../../enterprise/extensions/vmware/ajax.php:105
+#: ../../enterprise/operation/agentes/ver_agente.php:76
+msgid "Last remote contact"
+msgstr "最終リモート接続"
+
+#: ../../include/functions_events.php:2150
+msgid "View custom fields"
+msgstr "カスタムフィールド表示"
+
+#: ../../include/functions_events.php:2162
+msgid "Module details"
+msgstr "モジュール詳細"
+
+#: ../../include/functions_events.php:2179
+msgid "No assigned"
+msgstr "未割当"
+
+#: ../../include/functions_events.php:2252
+#: ../../include/functions_events.php:2256
+msgid "Go to data overview"
+msgstr "データ概要表示"
+
+#: ../../include/functions_events.php:2342
+#, php-format
+msgid "Invalid custom data: %s"
+msgstr "不正なカスタムデータ: %s"
+
+#: ../../include/functions_events.php:2443
+#: ../../include/functions_events.php:3624
+#: ../../mobile/operation/events.php:469
+#: ../../operation/events/events.build_table.php:149
+msgid "Event ID"
+msgstr "イベントID"
+
+#: ../../include/functions_events.php:2455
+msgid "First event"
+msgstr "最初のイベント"
+
+#: ../../include/functions_events.php:2455
+msgid "Last event"
+msgstr "最後のイベント"
+
+#: ../../include/functions_events.php:2520
+#: ../../mobile/operation/events.php:497
+msgid "Acknowledged by"
+msgstr "承諾者"
+
+#: ../../include/functions_events.php:2558
+msgid "ID extra"
+msgstr "拡張 ID"
+
+#: ../../include/functions_events.php:2609
+#: ../../include/functions_events.php:2655
+msgid "There are no comments"
+msgstr "コメントがありません"
+
+#: ../../include/functions_events.php:2808
+#: ../../include/functions_reporting_html.php:878
+msgid "Pandora System"
+msgstr "Pandora System"
+
+#: ../../include/functions_events.php:3253
+#: ../../include/functions_events.php:3258
+#: ../../operation/snmpconsole/snmp_view.php:464
+#: ../../operation/snmpconsole/snmp_view.php:768
+#: ../../operation/snmpconsole/snmp_view.php:1030
+msgid "Not validated"
+msgstr "未承諾"
+
+#: ../../include/functions_events.php:3629
+#: ../../mobile/operation/events.php:108
+#: ../../operation/events/events.build_table.php:155
+msgid "Event Name"
+msgstr "イベント名"
+
+#: ../../include/functions_events.php:3667
+#: ../../operation/events/events.build_table.php:198
+msgid "Agent Module"
+msgstr "エージェントモジュール"
+
+#: ../../include/functions_events.php:3698
+#: ../../operation/events/events.build_table.php:235
+msgid "Extra ID"
+msgstr "拡張 ID"
+
+#: ../../include/functions_events.php:4122
+#: ../../operation/events/events.build_table.php:677
+msgid "Validate event"
+msgstr "承諾"
+
+#: ../../include/functions_events.php:4137
+#: ../../operation/events/events.build_table.php:692
+#: ../../operation/events/events.php:806 ../../operation/events/events.php:810
+#: ../../operation/events/events.php:980 ../../operation/events/events.php:984
+msgid "Is not allowed delete events in process"
+msgstr "処理中イベントは削除できません"
+
+#: ../../include/functions_events.php:4145
+#: ../../operation/events/events.build_table.php:700
+#: ../../operation/menu.php:199 ../../operation/snmpconsole/snmp_view.php:868
+#: ../../enterprise/operation/agentes/wux_console_view.php:448
+msgid "Show more"
+msgstr "詳細を表示する"
+
+#: ../../include/functions_users.php:527
+#, php-format
+msgid "User %s login at %s"
+msgstr "ユーザ %s が %s にログイン"
+
+#: ../../include/functions_users.php:588
+#, php-format
+msgid "User %s was deleted in the DB at %s"
+msgstr "ユーザ %s が %s にデータベースから削除されました"
+
+#: ../../include/functions_users.php:593
+#, php-format
+msgid "User %s logout at %s"
+msgstr "ユーザ %s が %s にログアウト"
+
+#: ../../include/functions_visual_map.php:1031
+#: ../../enterprise/dashboard/widgets/custom_graph.php:196
+msgid ""
+"Could not draw pie with labels contained inside canvas. Resize widget to "
+"500px width minimum"
+msgstr "キャンバス内にラベル付き円グラフを表示できません。ウィジェットを少なくとも 500px にリサイズしてください。"
+
+#: ../../include/functions_visual_map.php:1826
+msgid "Last value: "
+msgstr "最新の値: "
+
+#: ../../include/functions_visual_map.php:2618
+msgid "Agent successfully added to layout"
+msgstr "エージェントが追加されました。"
+
+#: ../../include/functions_visual_map.php:2773
+msgid "Modules successfully added to layout"
+msgstr "モジュールが追加されました。"
+
+#: ../../include/functions_visual_map.php:3060
+msgid "Agents successfully added to layout"
+msgstr "レイアウトにエージェントを追加しました"
+
+#: ../../include/functions_visual_map.php:3435
+msgid "Cannot load the visualmap"
+msgstr "ビジュアルマップを読み込めません"
+
+#: ../../include/functions_visual_map.php:3906
+#: ../../include/functions_visual_map_editor.php:62
+#: ../../include/functions_visual_map_editor.php:873
+msgid "Clock"
+msgstr "時計"
+
+#: ../../include/functions_visual_map.php:3910
+msgid "Bars graph"
+msgstr "棒グラフ"
+
+#: ../../include/functions_visual_map.php:3918
+msgid "Percentile bar"
+msgstr "パーセント(バー)"
+
+#: ../../include/functions_visual_map.php:3922
+msgid "Circular progress bar"
+msgstr ""
+
+#: ../../include/functions_visual_map.php:3926
+#: ../../include/functions_visual_map_editor.php:515
+msgid "Circular progress bar (interior)"
+msgstr ""
+
+#: ../../include/functions_visual_map.php:3930
+msgid "Static graph"
+msgstr "状態を表すアイコン"
+
+#: ../../include/functions_visual_map_editor.php:58
+msgid ""
+"To use 'label'field, you should write\n"
+"\t\t\t\t\ta text to replace '(_VALUE_)' and the value of the module will be "
+"printed at the end."
+msgstr ""
+"'ラベル' フィールドを利用するには、'(_VALUE_)'を\n"
+"\t\t\t\t\t置き換えるテキストを書きます。最終的にはモジュールの値が表示されます。"
+
+#: ../../include/functions_visual_map_editor.php:97
+#: ../../include/functions_visual_map_editor.php:121
+msgid "Border color"
+msgstr "枠の色"
+
+#: ../../include/functions_visual_map_editor.php:133
+msgid "Border width"
+msgstr "枠の幅"
+
+#: ../../include/functions_visual_map_editor.php:142
+msgid "Fill color"
+msgstr "塗りつぶしの色"
+
+#: ../../include/functions_visual_map_editor.php:193
+msgid ""
+"Scroll the mouse wheel over the label editor to change the background color"
+msgstr "背景色を変更するには、ラベルエディタの上でマウスのウィールをスクロースします"
+
+#: ../../include/functions_visual_map_editor.php:212
+msgid "Clock animation"
+msgstr "時計アニメーション"
+
+#: ../../include/functions_visual_map_editor.php:214
+msgid "Simple analogic"
+msgstr "シンプルアナログ"
+
+#: ../../include/functions_visual_map_editor.php:215
+msgid "Simple digital"
+msgstr "シンプルデジタル"
+
+#: ../../include/functions_visual_map_editor.php:221
+msgid "Time format"
+msgstr "時間書式"
+
+#: ../../include/functions_visual_map_editor.php:223
+msgid "Only time"
+msgstr "時間のみ"
+
+#: ../../include/functions_visual_map_editor.php:224
+msgid "Time and date"
+msgstr "時間および日付"
+
+#: ../../include/functions_visual_map_editor.php:241
+msgid "Time zone"
+msgstr "タイムゾーン"
+
+#: ../../include/functions_visual_map_editor.php:263
+msgid "Enable link"
+msgstr "リンクを有効にする"
+
+#: ../../include/functions_visual_map_editor.php:285
+msgid "White"
+msgstr "白"
+
+#: ../../include/functions_visual_map_editor.php:286
+msgid "Black"
+msgstr "黒"
+
+#: ../../include/functions_visual_map_editor.php:287
+msgid "Transparent"
+msgstr "透過"
+
+#: ../../include/functions_visual_map_editor.php:294
+msgid "Grid color"
+msgstr "グリッドの色"
+
+#: ../../include/functions_visual_map_editor.php:404
+msgid "Data image"
+msgstr "データ画像"
+
+#: ../../include/functions_visual_map_editor.php:411
+msgid "Resume data color"
+msgstr ""
+
+#: ../../include/functions_visual_map_editor.php:419
+msgid "24h"
+msgstr "24時間"
+
+#: ../../include/functions_visual_map_editor.php:420
+msgid "8h"
+msgstr "8時間"
+
+#: ../../include/functions_visual_map_editor.php:421
+msgid "2h"
+msgstr "2時間"
+
+#: ../../include/functions_visual_map_editor.php:422
+msgid "1h"
+msgstr "1時間"
+
+#: ../../include/functions_visual_map_editor.php:426
+msgid "Max. Time"
+msgstr "最大時間"
+
+#: ../../include/functions_visual_map_editor.php:480
+msgid "Original Size"
+msgstr "オリジナルのサイズ"
+
+#: ../../include/functions_visual_map_editor.php:487
+msgid "Aspect ratio"
+msgstr "縦横比:"
+
+#: ../../include/functions_visual_map_editor.php:488
+msgid "Width proportional"
+msgstr "幅に比例"
+
+#: ../../include/functions_visual_map_editor.php:494
+msgid "Height proportional"
+msgstr "高さに比例"
+
+#: ../../include/functions_visual_map_editor.php:515
+msgid "Circular porgress bar"
+msgstr ""
+
+#: ../../include/functions_visual_map_editor.php:552
+msgid "Element color"
+msgstr "要素の色"
+
+#: ../../include/functions_visual_map_editor.php:561
+msgid "Label color"
+msgstr "ラベルの色"
+
+#: ../../include/functions_visual_map_editor.php:582
+msgid "Show statistics"
+msgstr "統計表示"
+
+#: ../../include/functions_visual_map_editor.php:589
+msgid "Always show on top"
+msgstr "常に上に表示"
+
+#: ../../include/functions_visual_map_editor.php:605
+msgid "Vertical"
+msgstr "縦"
+
+#: ../../include/functions_visual_map_editor.php:605
+msgid "Horizontal"
+msgstr "横"
+
+#: ../../include/functions_visual_map_editor.php:673
+msgid "For use the original image file size, set 0 width and 0 height."
+msgstr "オリジナルの画像サイズを利用するためには、幅と高さを 0 に設定してください。"
+
+#: ../../include/functions_visual_map_editor.php:711
+msgid "Map linked weight"
+msgstr ""
+
+#: ../../include/functions_visual_map_editor.php:722
+msgid "By default"
+msgstr "デフォルト"
+
+#: ../../include/functions_visual_map_editor.php:728
+msgid "Lines haven't advanced options"
+msgstr "拡張オプションがありません"
+
+#: ../../include/functions_visual_map_editor.php:737
+msgid "Restrict access to group"
+msgstr "グループへの制限アクセス"
+
+#: ../../include/functions_visual_map_editor.php:740
+msgid ""
+"If selected, restrict visualization of this item in the visual console to "
+"users who have access to selected group. This is also used on calculating "
+"child visual consoles."
+msgstr ""
+"選択すると、ビジュアルコンソールでのこのアイテム表示を、選択したグループにアクセスできるユーザーに制限します。 "
+"これは、子ビジュアルコンソールにも使用されます。"
+
+#: ../../include/functions_visual_map_editor.php:767
+msgid "Click start point<br />of the line"
+msgstr "線の開始場所<br />をクリックしてください"
+
+#: ../../include/functions_visual_map_editor.php:772
+msgid "Click end point<br />of the line"
+msgstr "線の終了場所<br />をクリックしてください"
+
+#: ../../include/functions_visual_map_editor.php:867
+msgid "Serialized pie graph"
+msgstr ""
+
+#: ../../include/functions_visual_map_editor.php:868
+msgid "Bars Graph"
+msgstr "棒グラフ"
+
+#: ../../include/functions_visual_map_editor.php:889
+msgid "Show grid"
+msgstr "グリッド表示"
+
+#: ../../include/functions_visual_map_editor.php:891
+msgid "Delete item"
+msgstr "アイテムの削除"
+
+#: ../../include/functions_visual_map_editor.php:892
+msgid "Copy item"
+msgstr "アイテムのコピー"
+
+#: ../../include/functions_visual_map_editor.php:920
+msgid "No image or name defined."
+msgstr "画像や名前が定義されていません。"
+
+#: ../../include/functions_visual_map_editor.php:922
+msgid "No label defined."
+msgstr "ラベルが定義されていません。"
+
+#: ../../include/functions_visual_map_editor.php:924
+msgid "No image defined."
+msgstr "画像が定義されていません。"
+
+#: ../../include/functions_visual_map_editor.php:926
+msgid "No process defined."
+msgstr "処理が定義されていません。"
+
+#: ../../include/functions_visual_map_editor.php:928
+msgid "No Max value defined."
+msgstr "最大値が定義されていません"
+
+#: ../../include/functions_visual_map_editor.php:930
+msgid "No width defined."
+msgstr "幅が定義されていません"
+
+#: ../../include/functions_visual_map_editor.php:932
+msgid "No height defined."
+msgstr "高さが定義されていません。"
+
+#: ../../include/functions_visual_map_editor.php:934
+msgid "No period defined."
+msgstr "期間が定義されていません。"
+
+#: ../../include/functions_visual_map_editor.php:936
+msgid "No agent defined."
+msgstr "エージェントが定義されていません"
+
+#: ../../include/functions_visual_map_editor.php:938
+msgid "No module defined."
+msgstr "モジュールが定義されていません"
+
+#: ../../include/functions_visual_map_editor.php:941
+msgid "Successfully save the changes."
+msgstr "変更を保存しました。"
+
+#: ../../include/functions_visual_map_editor.php:943
+msgid "Could not be save"
+msgstr "保存できませんでした"
+
+#: ../../include/functions_filemanager.php:172
+#: ../../include/functions_filemanager.php:242
+#: ../../include/functions_filemanager.php:300
+#: ../../include/functions_filemanager.php:382
+msgid "Security error"
+msgstr "セキュリティエラー"
+
+#: ../../include/functions_filemanager.php:185
+msgid "Upload error"
+msgstr "アップロードエラー"
+
+#: ../../include/functions_filemanager.php:193
+#: ../../include/functions_filemanager.php:261
+#: ../../include/functions_filemanager.php:326
+msgid "Upload correct"
+msgstr "アップロードしました"
+
+#: ../../include/functions_filemanager.php:206
+msgid ""
+"File size seems to be too large. Please check your php.ini configuration or "
+"contact with the administrator"
+msgstr "ファイルサイズが大きすぎます。php.ini の設定を確認するか管理者に相談してください。"
+
+#: ../../include/functions_filemanager.php:254
+msgid "Error creating file"
+msgstr "ファイル作成エラー"
+
+#: ../../include/functions_filemanager.php:267
+#: ../../include/functions_filemanager.php:362
+msgid "Error creating file with empty name"
+msgstr "ファイル名未指定によるファイル作成エラー"
+
+#: ../../include/functions_filemanager.php:312
+msgid "Attach error"
+msgstr "添付エラー"
+
+#: ../../include/functions_filemanager.php:348
+#: ../../enterprise/godmode/agentes/collections.editor.php:142
+#: ../../enterprise/godmode/agentes/collections.editor.php:305
+msgid "Security error."
+msgstr "セキュリティエラー"
+
+#: ../../include/functions_filemanager.php:357
+msgid "Directory created"
+msgstr "ディレクトリを作成しました"
+
+#: ../../include/functions_filemanager.php:385
+#: ../../include/functions_reporting_html.php:1241
+#: ../../enterprise/include/functions_inventory.php:662
+#: ../../enterprise/include/functions_inventory.php:727
+#: ../../enterprise/include/functions_reporting_pdf.php:557
+msgid "Deleted"
+msgstr "削除しました"
+
+#: ../../include/functions_filemanager.php:550
+#, php-format
+msgid "Directory %s doesn't exist!"
+msgstr "%s ディレクトリは存在しません！"
+
+#: ../../include/functions_filemanager.php:565
+msgid "Index of images"
+msgstr "画像一覧"
+
+#: ../../include/functions_filemanager.php:603
+msgid "Parent directory"
+msgstr "親ディレクトリ"
+
+#: ../../include/functions_filemanager.php:632
+msgid "The zip upload in this dir, easy to upload multiple files."
+msgstr "このディレクトリに zip ファイルもアップロードできます。複数ファイルのアップロードも簡単です。"
+
+#: ../../include/functions_filemanager.php:636
+msgid "Decompress"
+msgstr "展開"
+
+#: ../../include/functions_filemanager.php:638
+#: ../../enterprise/extensions/csv_import/main.php:108
+#: ../../enterprise/extensions/csv_import_group/main.php:84
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1204
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1412
+#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1588
+msgid "Go"
+msgstr "実行"
+
+#: ../../include/functions_filemanager.php:679
+msgid "Directory"
+msgstr "ディレクトリ"
+
+#: ../../include/functions_filemanager.php:685
+msgid "Compressed file"
+msgstr "圧縮ファイル"
+
+#: ../../include/functions_filemanager.php:688
+#: ../../include/functions_filemanager.php:695
+msgid "Text file"
+msgstr "テキストファイル"
+
+#: ../../include/functions_filemanager.php:727
+msgid "This file could be executed by any user"
+msgstr "このファイルは任意のユーザで実行できます。"
+
+#: ../../include/functions_filemanager.php:728
+msgid "Make sure it can't perform dangerous tasks"
+msgstr "危険な処理はできないことを確認してください"
+
+#: ../../include/functions_filemanager.php:796
+msgid "Create directory"
+msgstr "ディレクトリの作成"
+
+#: ../../include/functions_filemanager.php:801
+msgid "Create text"
+msgstr "テキストの作成"
+
+#: ../../include/functions_filemanager.php:806
+msgid "Upload file/s"
+msgstr "ファイルのアップロード"
+
+#: ../../include/functions_filemanager.php:813
+msgid "The directory is read-only"
+msgstr "ディレクトリが読み出し専用です。"
+
+#: ../../include/functions_gis.php:27 ../../include/functions_gis.php:31
+#: ../../include/functions_gis.php:36
+msgid "Hierarchy of agents"
+msgstr "エージェントの階層"
+
+#: ../../include/functions_graph.php:805
+#: ../../include/functions_graph.php:4617
+#: ../../include/functions_reports.php:564
+msgid "Avg. Value"
+msgstr "平均値"
+
+#: ../../include/functions_graph.php:807
+msgid "Units. Value"
+msgstr "単位"
+
+#: ../../include/functions_graph.php:890
+#: ../../include/functions_graph.php:1917
+#: ../../include/functions_graph.php:2011
+#, php-format
+msgid "Percentile %dº"
+msgstr "%dパーセント"
+
+#: ../../include/functions_graph.php:940
+#: ../../include/functions_graph.php:4852
+#: ../../enterprise/include/functions_dashboard.php:851
+#: ../../enterprise/meta/monitoring/wizard/wizard.agent.php:160
+#: ../../enterprise/meta/monitoring/wizard/wizard.module.local.php:180
+#: ../../enterprise/meta/monitoring/wizard/wizard.module.network.php:208
+#: ../../enterprise/meta/monitoring/wizard/wizard.module.web.php:170
+msgid "Previous"
+msgstr "前へ"
+
+#: ../../include/functions_graph.php:1412
+#, php-format
+msgid "%s"
+msgstr "%s"
+
+#: ../../include/functions_graph.php:1917
+#: ../../include/functions_graph.php:2011
+msgid " of module "
+msgstr " のモジュール "
+
+#: ../../include/functions_graph.php:2221
+#: ../../include/functions_graph.php:2224
+#: ../../include/functions_graph.php:2231
+#: ../../include/functions_graph.php:2234
+#: ../../include/functions_graph.php:2241
+#: ../../include/functions_graph.php:2244
+#: ../../include/functions_graph.php:2267
+#: ../../include/functions_graph.php:2269
+#: ../../include/functions_graph.php:2275
+#: ../../include/functions_graph.php:2277
+#: ../../include/functions_graph.php:2282
+#: ../../include/functions_graph.php:2284
+msgid "summatory"
+msgstr ""
+
+#: ../../include/functions_graph.php:2222
+#: ../../include/functions_graph.php:2225
+#: ../../include/functions_graph.php:2232
+#: ../../include/functions_graph.php:2235
+#: ../../include/functions_graph.php:2240
+#: ../../include/functions_graph.php:2243
+#: ../../include/functions_graph.php:2307
+#: ../../include/functions_graph.php:2309
+#: ../../include/functions_graph.php:2315
+#: ../../include/functions_graph.php:2317
+#: ../../include/functions_graph.php:2322
+#: ../../include/functions_graph.php:2324
+msgid "average"
+msgstr "平均"
+
+#: ../../include/functions_graph.php:2589
+msgid "Not fired alerts"
+msgstr "未発報アラート"
+
+#: ../../include/functions_graph.php:2758
+#: ../../include/functions_graph.php:2804
+#: ../../include/graphs/functions_gd.php:165
+#: ../../include/graphs/functions_gd.php:256
+#: ../../enterprise/include/functions_reporting.php:1793
+#: ../../enterprise/include/functions_reporting_pdf.php:1849
+#: ../../enterprise/include/functions_reporting_pdf.php:1850
+msgid "Out of limits"
+msgstr "範囲外"
+
+#: ../../include/functions_graph.php:3037
+msgid "Today"
+msgstr "今日"
+
+#: ../../include/functions_graph.php:3038
+msgid "Week"
+msgstr "週"
+
+#: ../../include/functions_graph.php:3039 ../../include/functions_html.php:954
+#: ../../enterprise/include/functions_reporting_csv.php:1271
+#: ../../enterprise/include/functions_reporting_csv.php:1483
+msgid "Month"
+msgstr "月"
+
+#: ../../include/functions_graph.php:3040
+#: ../../include/functions_graph.php:3041
+msgid "Months"
+msgstr "月"
+
+#: ../../include/functions_graph.php:3063
+msgid "History db"
+msgstr "ヒストリデータベース"
+
+#: ../../include/functions_graph.php:3254
+#: ../../include/functions_incidents.php:29
+#: ../../include/functions_incidents.php:54
+msgid "Informative"
+msgstr "情報"
+
+#: ../../include/functions_graph.php:3255
+#: ../../include/functions_incidents.php:30
+#: ../../include/functions_incidents.php:57
+msgid "Low"
+msgstr "低い"
+
+#: ../../include/functions_graph.php:3256
+#: ../../include/functions_incidents.php:31
+#: ../../include/functions_incidents.php:60
+msgid "Medium"
+msgstr "中くらい"
+
+#: ../../include/functions_graph.php:3257
+#: ../../include/functions_incidents.php:32
+#: ../../include/functions_incidents.php:63
+msgid "Serious"
+msgstr "深刻"
+
+#: ../../include/functions_graph.php:3258
+#: ../../include/functions_incidents.php:33
+#: ../../include/functions_incidents.php:66
+msgid "Very serious"
+msgstr "とても深刻"
+
+#: ../../include/functions_graph.php:3281
+#: ../../include/functions_graph.php:3293
+msgid "Open incident"
+msgstr "オープンのインシデント"
+
+#: ../../include/functions_graph.php:3282
+#: ../../include/functions_graph.php:3295
+msgid "Closed incident"
+msgstr "クローズされたインシデント"
+
+#: ../../include/functions_graph.php:3283
+#: ../../include/functions_graph.php:3297
+msgid "Outdated"
+msgstr "期限切れ"
+
+#: ../../include/functions_graph.php:3284
+#: ../../include/functions_graph.php:3299
+#: ../../enterprise/godmode/setup/setup_acl.php:577
+#: ../../enterprise/godmode/setup/setup_acl.php:590
+msgid "Invalid"
+msgstr "無効"
+
+#: ../../include/functions_graph.php:4618
+msgid "Units"
+msgstr "単位"
+
+#: ../../include/functions_graph.php:5162
+#: ../../enterprise/dashboard/widgets/top_n.php:77
+msgid "Avg."
+msgstr "平均"
+
+#: ../../include/functions_graph.php:6457
+msgid "Main node"
+msgstr "メインノード"
+
+#: ../../include/get_file.php:46
+msgid "Security error. Please contact the administrator."
+msgstr "セキュリティエラー。管理者に連絡してください。"
+
+#: ../../include/get_file.php:56
+msgid "File is missing in disk storage. Please contact the administrator."
+msgstr "ファイルが存在しません。管理者に連絡してください。"
+
+#: ../../include/functions_groups.php:63
+msgid "Alert Actions"
+msgstr "アラートアクション"
+
+#: ../../include/functions_groups.php:78
+msgid "Alert Templates"
+msgstr "アラートテンプレート"
+
+#: ../../include/functions_groups.php:106
+#: ../../include/functions_groups.php:163
 #: ../../include/functions_reports.php:498
 #: ../../include/functions_reports.php:500
 #: ../../include/functions_reports.php:504
@@ -19456,23 +24435,1211 @@ msgstr "15 分"
 #: ../../include/functions_reports.php:518
 #: ../../include/functions_reports.php:522
 #: ../../include/functions_reports.php:525
-#: ../../include/functions_groups.php:106
-#: ../../include/functions_groups.php:163
-#: ../../operation/agentes/ver_agente.php:1058
+#: ../../operation/agentes/ver_agente.php:1152
 #: ../../operation/search_results.php:104
 msgid "Graphs"
 msgstr "グラフ"
 
-#: ../../include/functions_reports.php:499
-#: ../../include/functions_reporting.php:5783
-#: ../../include/functions_reporting.php:5905
-msgid "Simple graph"
-msgstr "単一グラフ"
+#: ../../include/functions_groups.php:120
+#: ../../operation/search_results.php:114
+#: ../../enterprise/extensions/cron/functions.php:593
+#: ../../enterprise/meta/general/main_header.php:136
+#: ../../enterprise/meta/general/main_header.php:151
+#: ../../enterprise/mobile/include/functions_web.php:15
+msgid "Reports"
+msgstr "レポート"
 
-#: ../../include/functions_reports.php:501
-#: ../../include/functions_reporting.php:3349
-msgid "Simple baseline graph"
-msgstr "シンプルベースライングラフ"
+#: ../../include/functions_groups.php:135
+msgid "Layout visual console"
+msgstr "ビジュアルコンソールレイアウト"
+
+#: ../../include/functions_groups.php:149
+msgid "Plannet down time"
+msgstr "計画停止時間"
+
+#: ../../include/functions_groups.php:176
+msgid "GIS maps"
+msgstr "GIS マップ"
+
+#: ../../include/functions_groups.php:190
+msgid "GIS connections"
+msgstr "GIS 利用マップ"
+
+#: ../../include/functions_groups.php:204
+msgid "GIS map layers"
+msgstr "GIS マップレイヤ"
+
+#: ../../include/functions_groups.php:217
+msgid "Network maps"
+msgstr "ネットワークマップ"
+
+#: ../../include/functions_groups.php:788
+#: ../../include/functions_groups.php:790
+#: ../../include/functions_groups.php:792
+#: ../../include/functions_groups.php:793
+#: ../../include/functions_groups.php:794
+#: ../../include/functions_reporting_html.php:3539
+#: ../../mobile/operation/groups.php:137
+msgid "Agents unknown"
+msgstr "不明なエージェント"
+
+#: ../../include/functions_groups.php:842
+#: ../../include/functions_groups.php:844
+#: ../../include/functions_groups.php:846
+#: ../../include/functions_groups.php:847
+#: ../../include/functions_groups.php:848
+#: ../../include/functions_reporting_html.php:3043
+#: ../../include/functions_reporting_html.php:3052
+#: ../../mobile/operation/groups.php:161
+#: ../../operation/agentes/ver_agente.php:848
+#: ../../enterprise/operation/agentes/ver_agente.php:152
+msgid "Alerts fired"
+msgstr "発生中アラート"
+
+#: ../../include/functions_groups.php:2143
+msgid "Show branch children"
+msgstr "子の表示"
+
+#: ../../include/functions_groups.php:2172
+msgid ""
+"You can not delete the last group in Pandora. A common installation must has "
+"almost one group."
+msgstr "最後のグループは削除できません。通常、1つはグループが設定されていなければなりません。"
+
+#: ../../include/functions_html.php:835
+msgid "weeks"
+msgstr "週"
+
+#: ../../include/functions_html.php:953
+msgid "Month day"
+msgstr "日にち"
+
+#: ../../include/functions_html.php:955
+msgid "Week day"
+msgstr "曜日"
+
+#: ../../include/functions_html.php:2261
+msgid "Type at least two characters to search the module."
+msgstr "モジュールを検索するには、少なくとも二文字入力してください。"
+
+#: ../../include/functions_incidents.php:88
+#: ../../include/functions_incidents.php:107
+msgid "Active incidents"
+msgstr "アクティブ"
+
+#: ../../include/functions_incidents.php:89
+#: ../../include/functions_incidents.php:110
+msgid "Active incidents, with comments"
+msgstr "アクティブ(コメント付き)"
+
+#: ../../include/functions_incidents.php:90
+#: ../../include/functions_incidents.php:113
+msgid "Rejected incidents"
+msgstr "却下"
+
+#: ../../include/functions_incidents.php:91
+#: ../../include/functions_incidents.php:116
+msgid "Expired incidents"
+msgstr "期限切れ"
+
+#: ../../include/functions_incidents.php:92
+#: ../../include/functions_incidents.php:119
+msgid "Closed incidents"
+msgstr "終了"
+
+#: ../../include/functions_maps.php:34
+#: ../../include/functions_networkmap.php:1678
+#: ../../include/functions_networkmap.php:1757
+#: ../../enterprise/meta/general/logon_ok.php:62
+msgid "Topology"
+msgstr "トポロジ"
+
+#: ../../include/functions_maps.php:37
+#: ../../include/functions_networkmap.php:1672 ../../operation/tree.php:80
+#: ../../enterprise/dashboard/widgets/tree_view.php:41
+#: ../../enterprise/include/functions_groups.php:32
+#: ../../enterprise/meta/advanced/policymanager.apply.php:200
+#: ../../enterprise/operation/agentes/ver_agente.php:208
+msgid "Policies"
+msgstr "ポリシー"
+
+#: ../../include/functions_menu.php:481
+msgid "Configure user"
+msgstr "ユーザ設定"
+
+#: ../../include/functions_menu.php:482
+msgid "Configure profile"
+msgstr "プロファイル設定"
+
+#: ../../include/functions_menu.php:486
+msgid "Module templates management"
+msgstr "モジュールテンプレート管理"
+
+#: ../../include/functions_menu.php:487
+msgid "Inventory modules management"
+msgstr "インベントリモジュール管理"
+
+#: ../../include/functions_menu.php:488
+#: ../../enterprise/meta/advanced/component_management.php:56
+msgid "Tags management"
+msgstr "タグ管理"
+
+#: ../../include/functions_menu.php:492
+msgid "View agent"
+msgstr "エージェント表示"
+
+#: ../../include/functions_menu.php:496
+msgid "Manage network map"
+msgstr "ネットワークマップ管理"
+
+#: ../../include/functions_menu.php:498
+msgid "Builder visual console"
+msgstr "ビジュアルコンソールビルダ"
+
+#: ../../include/functions_menu.php:500
+msgid "Administration events"
+msgstr "イベント管理"
+
+#: ../../include/functions_menu.php:502
+msgid "View reporting"
+msgstr "レポート表示"
+
+#: ../../include/functions_menu.php:503
+msgid "Graph viewer"
+msgstr "グラフ表示"
+
+#: ../../include/functions_menu.php:505
+msgid "Manage custom graphs"
+msgstr "カスタムグラフ管理"
+
+#: ../../include/functions_menu.php:506
+msgid "View graph containers"
+msgstr "グラフコンテナ表示"
+
+#: ../../include/functions_menu.php:507
+msgid "Manage graph containers"
+msgstr "グラフコンテナ管理"
+
+#: ../../include/functions_menu.php:508
+msgid "View graph templates"
+msgstr "グラフテンプレート表示"
+
+#: ../../include/functions_menu.php:509
+msgid "Manage graph templates"
+msgstr "グラフテンプレート管理"
+
+#: ../../include/functions_menu.php:510
+msgid "Graph template items"
+msgstr "グラフテンプレートアイテム"
+
+#: ../../include/functions_menu.php:511
+msgid "Graph template wizard"
+msgstr "グラフテンプレートウィザード"
+
+#: ../../include/functions_menu.php:514
+msgid "Copy dashboard"
+msgstr "ダッシュボードのコピー"
+
+#: ../../include/functions_menu.php:517
+msgid "Manage GIS Maps"
+msgstr "GIS マップ管理"
+
+#: ../../include/functions_menu.php:519
+msgid "Incidents statistics"
+msgstr "インシデント統計"
+
+#: ../../include/functions_menu.php:520
+msgid "Manage messages"
+msgstr "メッセージ管理"
+
+#: ../../include/functions_menu.php:522
+msgid "Manage groups"
+msgstr "グループ管理"
+
+#: ../../include/functions_menu.php:523
+msgid "Manage module groups"
+msgstr "モジュールグループ管理"
+
+#: ../../include/functions_menu.php:524
+msgid "Manage custom field"
+msgstr "カスタムフィールド管理"
+
+#: ../../include/functions_menu.php:526
+msgid "Manage alert actions"
+msgstr "アラートアクション管理"
+
+#: ../../include/functions_menu.php:527
+msgid "Manage commands"
+msgstr "コマンド管理"
+
+#: ../../include/functions_menu.php:528
+msgid "Manage event alerts"
+msgstr "イベントアラート管理"
+
+#: ../../include/functions_menu.php:530
+msgid "Manage export targets"
+msgstr "エクスポートターゲット管理"
+
+#: ../../include/functions_menu.php:532
+msgid "Manage services"
+msgstr "サービス管理"
+
+#: ../../include/functions_menu.php:534 ../../operation/menu.php:95
+msgid "SNMP filters"
+msgstr "SNMP フィルタ"
+
+#: ../../include/functions_menu.php:535
+#: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:22
+#: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:23
+#: ../../enterprise/operation/menu.php:135
+#: ../../enterprise/operation/snmpconsole/snmp_view.php:79
+msgid "SNMP trap editor"
+msgstr "SNMP トラップエディタ"
+
+#: ../../include/functions_menu.php:536 ../../operation/menu.php:96
+msgid "SNMP trap generator"
+msgstr "SNMPトラップジェネレータ"
+
+#: ../../include/functions_menu.php:538 ../../operation/menu.php:87
+msgid "SNMP console"
+msgstr "SNMPコンソール"
+
+#: ../../include/functions_menu.php:540
+msgid "Manage incident"
+msgstr "インシデント管理"
+
+#: ../../include/functions_menu.php:592
+msgid "Administration"
+msgstr "システム管理"
+
+#: ../../include/functions_modules.php:1952
+#: ../../mobile/operation/modules.php:451
+#: ../../mobile/operation/modules.php:504
+#: ../../operation/agentes/status_monitor.php:1151
+#: ../../operation/search_modules.php:104
+#: ../../enterprise/operation/agentes/tag_view.php:795
+msgid "NOT INIT"
+msgstr "未初期化"
+
+#: ../../include/functions_modules.php:1971
+#: ../../include/functions_modules.php:1975
+#: ../../include/functions_modules.php:1979
+#: ../../mobile/operation/modules.php:471
+#: ../../mobile/operation/modules.php:476
+#: ../../mobile/operation/modules.php:481
+#: ../../mobile/operation/modules.php:524
+#: ../../mobile/operation/modules.php:529
+#: ../../mobile/operation/modules.php:534
+#: ../../operation/agentes/pandora_networkmap.view.php:317
+#: ../../operation/agentes/pandora_networkmap.view.php:322
+#: ../../operation/agentes/pandora_networkmap.view.php:327
+#: ../../operation/agentes/status_monitor.php:1190
+#: ../../operation/agentes/status_monitor.php:1195
+#: ../../operation/agentes/status_monitor.php:1202
+#: ../../operation/agentes/status_monitor.php:1207
+#: ../../operation/agentes/status_monitor.php:1214
+#: ../../operation/agentes/status_monitor.php:1219
+#: ../../operation/search_modules.php:124
+#: ../../operation/search_modules.php:131
+#: ../../operation/search_modules.php:138
+#: ../../enterprise/include/functions_services.php:1703
+#: ../../enterprise/include/functions_services.php:1708
+#: ../../enterprise/include/functions_services.php:1712
+#: ../../enterprise/operation/agentes/policy_view.php:378
+#: ../../enterprise/operation/agentes/policy_view.php:382
+#: ../../enterprise/operation/agentes/policy_view.php:386
+#: ../../enterprise/operation/agentes/tag_view.php:834
+#: ../../enterprise/operation/agentes/tag_view.php:839
+#: ../../enterprise/operation/agentes/tag_view.php:846
+#: ../../enterprise/operation/agentes/tag_view.php:851
+#: ../../enterprise/operation/agentes/tag_view.php:858
+#: ../../enterprise/operation/agentes/tag_view.php:863
+#: ../../enterprise/operation/agentes/transactional_map.php:152
+msgid "Last status"
+msgstr "最新の状態"
+
+#: ../../include/functions_netflow.php:362
+msgid "Total flows"
+msgstr "全フロー数"
+
+#: ../../include/functions_netflow.php:367
+msgid "Total bytes"
+msgstr "全バイト数"
+
+#: ../../include/functions_netflow.php:372
+msgid "Total packets"
+msgstr "全パケット数"
+
+#: ../../include/functions_netflow.php:377
+msgid "Average bits per second"
+msgstr "平均ビット/秒"
+
+#: ../../include/functions_netflow.php:382
+msgid "Average packets per second"
+msgstr "平均パケット/秒"
+
+#: ../../include/functions_netflow.php:387
+msgid "Average bytes per packet"
+msgstr "平均バイト/パケット"
+
+#: ../../include/functions_netflow.php:1031
+msgid "Area graph"
+msgstr "塗り潰しグラフ"
+
+#: ../../include/functions_netflow.php:1032
+msgid "Pie graph and Summary table"
+msgstr "円グラフとサマリ表"
+
+#: ../../include/functions_netflow.php:1033
+msgid "Statistics table"
+msgstr "状態表"
+
+#: ../../include/functions_netflow.php:1034
+#: ../../operation/agentes/exportdata.php:330
+msgid "Data table"
+msgstr "データの表示"
+
+#: ../../include/functions_netflow.php:1035
+msgid "Circular mesh"
+msgstr "円形メッシュ"
+
+#: ../../include/functions_netflow.php:1036
+#: ../../include/functions_netflow.php:1390
+msgid "Host detailed traffic"
+msgstr "ホストの詳細トラフィック"
+
+#: ../../include/functions_netflow.php:1049
+#: ../../include/functions_netflow.php:1082
+msgid "10 mins"
+msgstr "10 分"
+
+#: ../../include/functions_netflow.php:1050
+#: ../../include/functions_netflow.php:1083
+msgid "15 mins"
+msgstr "15 分"
+
+#: ../../include/functions_netflow.php:1051
+#: ../../include/functions_netflow.php:1084
+msgid "30 mins"
+msgstr "30 分"
+
+#: ../../include/functions_netflow.php:1053
+#: ../../include/functions_netflow.php:1086
+#: ../../operation/gis_maps/render_view.php:143
+#: ../../enterprise/dashboard/widgets/top_n.php:62
+#: ../../enterprise/godmode/agentes/inventory_manager.php:177
+#: ../../enterprise/godmode/policies/policy_inventory_modules.php:191
+#: ../../enterprise/godmode/reporting/graph_template_editor.php:182
+msgid "2 hours"
+msgstr "2時間"
+
+#: ../../include/functions_netflow.php:1054
+#: ../../include/functions_netflow.php:1087
+#: ../../enterprise/dashboard/widgets/top_n.php:63
+msgid "5 hours"
+msgstr "5時間"
+
+#: ../../include/functions_netflow.php:1058
+#: ../../include/functions_netflow.php:1091
+msgid "5 days"
+msgstr "5日"
+
+#: ../../include/functions_netflow.php:1062
+#: ../../enterprise/godmode/reporting/graph_template_editor.php:192
+msgid "2 months"
+msgstr "2ヶ月"
+
+#: ../../include/functions_netflow.php:1065
+msgid "Last year"
+msgstr "過去1年"
+
+#: ../../include/functions_netflow.php:1079
+msgid "1 min"
+msgstr "1 分"
+
+#: ../../include/functions_netflow.php:1080
+msgid "2 mins"
+msgstr "2 分"
+
+#: ../../include/functions_netflow.php:1081
+msgid "5 mins"
+msgstr "5 分"
+
+#: ../../include/functions_netflow.php:1132
+#: ../../include/functions_netflow.php:1142
+#: ../../include/functions_netflow.php:1191
+#: ../../include/functions_netflow.php:1249
+#: ../../include/functions_netflow.php:1255
+#: ../../include/functions_netflow.php:1288
+msgid "Aggregate"
+msgstr "集約"
+
+#: ../../include/functions_netflow.php:1361
+msgid "Sent"
+msgstr "送信"
+
+#: ../../include/functions_netflow.php:1368
+msgid "Received"
+msgstr "受信"
+
+#: ../../include/functions_netflow.php:1435
+msgid "Error generating report"
+msgstr "レポート生成エラー"
+
+#: ../../include/functions_netflow.php:1632
+msgid "MB"
+msgstr "MB"
+
+#: ../../include/functions_netflow.php:1634
+msgid "MB/s"
+msgstr "MB/s"
+
+#: ../../include/functions_netflow.php:1636
+msgid "kB"
+msgstr "kB"
+
+#: ../../include/functions_netflow.php:1638
+msgid "kB/s"
+msgstr "kB/s"
+
+#: ../../include/functions_netflow.php:1642
+msgid "B/s"
+msgstr "B/s"
+
+#: ../../include/functions_netflow.php:1656
+msgid "Dst port"
+msgstr "宛先ポート"
+
+#: ../../include/functions_netflow.php:1658
+msgid "Dst IP"
+msgstr "宛先 IP"
+
+#: ../../include/functions_netflow.php:1662
+msgid "Src IP"
+msgstr "送信元 IP"
+
+#: ../../include/functions_netflow.php:1664
+msgid "Src port"
+msgstr "送信元ポート"
+
+#: ../../include/functions_planned_downtimes.php:560
+msgid "Succesful stopped the Downtime"
+msgstr "計画停止を中止しました"
+
+#: ../../include/functions_planned_downtimes.php:561
+msgid "Unsuccesful stopped the Downtime"
+msgstr "計画停止の中止に失敗しました"
+
+#: ../../include/functions_planned_downtimes.php:660
+#, php-format
+msgid "Enabled %s elements from the downtime"
+msgstr "計画停止から %s 件の要素が有効になりました"
+
+#: ../../include/functions_planned_downtimes.php:785
+msgid "This planned downtime are executed now. Can't delete in this moment."
+msgstr "この計画停止は実行中です。現在削除できません。"
+
+#: ../../include/functions_planned_downtimes.php:790
+msgid "Deleted this planned downtime successfully."
+msgstr "計画停止を削除しました。"
+
+#: ../../include/functions_planned_downtimes.php:792
+msgid "Problems for deleted this planned downtime."
+msgstr "計画停止の削除に失敗しました。"
+
+#: ../../include/functions_networkmap.php:1675
+#: ../../include/functions_networkmap.php:1761
+msgid "Radial dynamic"
+msgstr "放射状で動的"
+
+#: ../../include/functions_networkmap.php:1731
+msgid "Create a new topology map"
+msgstr "トポロジマップの新規作成"
+
+#: ../../include/functions_networkmap.php:1732
+msgid "Create a new group map"
+msgstr "グループマップの新規作成"
+
+#: ../../include/functions_networkmap.php:1733
+msgid "Create a new dynamic map"
+msgstr "新たな動的マップの作成"
+
+#: ../../include/functions_networkmap.php:1735
+msgid "Create a new radial dynamic map"
+msgstr "放射状の動的マップを新規作成"
+
+#: ../../include/functions_snmp_browser.php:145
+msgid "Target IP cannot be blank."
+msgstr "対象IPが指定されていません"
+
+#: ../../include/functions_snmp_browser.php:449
+msgid "Numeric OID"
+msgstr "数値 OID"
+
+#: ../../include/functions_snmp_browser.php:466
+msgid "Syntax"
+msgstr "書式"
+
+#: ../../include/functions_snmp_browser.php:471
+msgid "Display hint"
+msgstr "ヒント表示"
+
+#: ../../include/functions_snmp_browser.php:476
+msgid "Max access"
+msgstr "最大アクセス"
+
+#: ../../include/functions_snmp_browser.php:491
+msgid "OID Information"
+msgstr "OID 情報"
+
+#: ../../include/functions_snmp_browser.php:556
+msgid "Starting OID"
+msgstr "開始 OID"
+
+#: ../../include/functions_snmp_browser.php:585
+msgid "Server to execute"
+msgstr "実行サーバ"
+
+#: ../../include/functions_snmp_browser.php:588
+msgid "Browse"
+msgstr "参照"
+
+#: ../../include/functions_snmp_browser.php:625
+msgid "First match"
+msgstr "最初のマッチ"
+
+#: ../../include/functions_snmp_browser.php:627
+msgid "Previous match"
+msgstr "前のマッチ"
+
+#: ../../include/functions_snmp_browser.php:629
+msgid "Next match"
+msgstr "次のマッチ"
+
+#: ../../include/functions_snmp_browser.php:631
+msgid "Last match"
+msgstr "最後のマッチ"
+
+#: ../../include/functions_snmp_browser.php:636
+msgid "Expand the tree (can be slow)"
+msgstr "ツリーを展開する (遅くなります)"
+
+#: ../../include/functions_snmp_browser.php:638
+msgid "Collapse the tree"
+msgstr "ツリーを閉じる"
+
+#: ../../include/functions_snmp_browser.php:657
+msgid "SNMP v3 options"
+msgstr "SNMP v3 オプション"
+
+#: ../../include/functions_snmp_browser.php:660
+msgid "Search options"
+msgstr "検索オプション"
+
+#: ../../include/functions_reporting_html.php:93
+msgid "Label: "
+msgstr "ラベル: "
+
+#: ../../include/functions_reporting_html.php:111
+#: ../../enterprise/include/functions_netflow_pdf.php:157
+#: ../../enterprise/include/functions_reporting_csv.php:1617
+#: ../../enterprise/include/functions_reporting_csv.php:1621
+#: ../../enterprise/include/functions_reporting_pdf.php:2244
+msgid "Generated"
+msgstr "生成日"
+
+#: ../../include/functions_reporting_html.php:114
+#: ../../enterprise/include/functions_reporting_pdf.php:2247
+msgid "Report date"
+msgstr "レポート日"
+
+#: ../../include/functions_reporting_html.php:119
+#: ../../operation/reporting/reporting_viewer.php:197
+#: ../../enterprise/include/functions_reporting_pdf.php:2252
+msgid "Items period before"
+msgstr "次の日時以前"
+
+#: ../../include/functions_reporting_html.php:401
+#: ../../enterprise/include/functions_reporting.php:1649
+#: ../../enterprise/include/functions_reporting.php:2457
+#: ../../enterprise/include/functions_reporting.php:3234
+#: ../../enterprise/include/functions_reporting_pdf.php:1347
+#: ../../enterprise/include/functions_reporting_pdf.php:1690
+msgid "Max/Min Values"
+msgstr "最大/最小値"
+
+#: ../../include/functions_reporting_html.php:402
+#: ../../enterprise/include/functions_reporting.php:1650
+#: ../../enterprise/include/functions_reporting.php:2458
+#: ../../enterprise/include/functions_reporting.php:3235
+#: ../../enterprise/include/functions_reporting.php:4844
+#: ../../enterprise/include/functions_reporting.php:5145
+#: ../../enterprise/include/functions_reporting_csv.php:1043
+#: ../../enterprise/include/functions_reporting_csv.php:1090
+#: ../../enterprise/include/functions_reporting_csv.php:1162
+#: ../../enterprise/include/functions_reporting_csv.php:1278
+#: ../../enterprise/include/functions_reporting_csv.php:1490
+#: ../../enterprise/include/functions_reporting_pdf.php:1348
+#: ../../enterprise/include/functions_reporting_pdf.php:1691
+#: ../../enterprise/include/functions_reporting_pdf.php:2121
+msgid "SLA Limit"
+msgstr "SLA 制限"
+
+#: ../../include/functions_reporting_html.php:403
+#: ../../enterprise/include/functions_reporting.php:1650
+#: ../../enterprise/include/functions_reporting.php:1782
+#: ../../enterprise/include/functions_reporting.php:2458
+#: ../../enterprise/include/functions_reporting.php:3235
+#: ../../enterprise/include/functions_reporting.php:4845
+#: ../../enterprise/include/functions_reporting.php:5146
+#: ../../enterprise/include/functions_reporting_pdf.php:1349
+#: ../../enterprise/include/functions_reporting_pdf.php:1691
+#: ../../enterprise/include/functions_reporting_pdf.php:1840
+#: ../../enterprise/include/functions_reporting_pdf.php:2122
+msgid "SLA Compliance"
+msgstr "SLA準拠"
+
+#: ../../include/functions_reporting_html.php:428
+#: ../../enterprise/include/functions_reporting_pdf.php:1356
+msgid "Global Time"
+msgstr "グローバル時間"
+
+#: ../../include/functions_reporting_html.php:429
+#: ../../enterprise/include/functions_reporting_csv.php:1421
+#: ../../enterprise/include/functions_reporting_pdf.php:1357
+msgid "Time Total"
+msgstr "合計時間"
+
+#: ../../include/functions_reporting_html.php:430
+#: ../../enterprise/include/functions_reporting_pdf.php:1358
+#: ../../enterprise/include/functions_reporting_pdf.php:1931
+msgid "Time Failed"
+msgstr "障害時間"
+
+#: ../../include/functions_reporting_html.php:431
+#: ../../include/functions_reporting_html.php:2328
+#: ../../enterprise/include/functions_reporting_csv.php:1422
+#: ../../enterprise/include/functions_reporting_pdf.php:1359
+#: ../../enterprise/include/functions_reporting_pdf.php:1932
+msgid "Time OK"
+msgstr "正常時間"
+
+#: ../../include/functions_reporting_html.php:432
+#: ../../enterprise/include/functions_reporting_csv.php:1424
+#: ../../enterprise/include/functions_reporting_pdf.php:1360
+#: ../../enterprise/include/functions_reporting_pdf.php:1933
+msgid "Time Unknown"
+msgstr "不明時間"
+
+#: ../../include/functions_reporting_html.php:433
+#: ../../enterprise/include/functions_reporting_csv.php:1425
+#: ../../enterprise/include/functions_reporting_pdf.php:1361
+msgid "Time Not Init"
+msgstr "未初期化時間"
+
+#: ../../include/functions_reporting_html.php:434
+#: ../../enterprise/include/functions_reporting_pdf.php:1362
+msgid "Downtime"
+msgstr "停止時間"
+
+#: ../../include/functions_reporting_html.php:459
+#: ../../enterprise/include/functions_reporting_pdf.php:1368
+msgid "Checks Time"
+msgstr "確認数"
+
+#: ../../include/functions_reporting_html.php:460
+#: ../../enterprise/include/functions_reporting_csv.php:1427
+#: ../../enterprise/include/functions_reporting_pdf.php:1369
+msgid "Checks Total"
+msgstr "合計確認数"
+
+#: ../../include/functions_reporting_html.php:461
+#: ../../enterprise/include/functions_reporting_pdf.php:1370
+#: ../../enterprise/include/functions_reporting_pdf.php:1951
+msgid "Checks Failed"
+msgstr "障害確認数"
+
+#: ../../include/functions_reporting_html.php:462
+#: ../../include/functions_reporting_html.php:2371
+#: ../../enterprise/include/functions_reporting_csv.php:1428
+#: ../../enterprise/include/functions_reporting_pdf.php:1371
+#: ../../enterprise/include/functions_reporting_pdf.php:1952
+msgid "Checks OK"
+msgstr "正常確認数"
+
+#: ../../include/functions_reporting_html.php:463
+#: ../../enterprise/include/functions_reporting_csv.php:1430
+#: ../../enterprise/include/functions_reporting_pdf.php:1372
+#: ../../enterprise/include/functions_reporting_pdf.php:1953
+msgid "Checks Unknown"
+msgstr "不明確認数"
+
+#: ../../include/functions_reporting_html.php:688
+#: ../../include/functions_reporting_html.php:2607
+#: ../../enterprise/include/functions_reporting.php:2671
+#: ../../enterprise/include/functions_reporting.php:3440
+#: ../../enterprise/include/functions_reporting_pdf.php:1587
+#: ../../enterprise/include/functions_services.php:1360
+msgid "Unknow"
+msgstr "不明"
+
+#: ../../include/functions_reporting_html.php:693
+#: ../../include/functions_reporting_html.php:2612
+#: ../../operation/agentes/group_view.php:170
+#: ../../enterprise/include/functions_reporting.php:1680
+#: ../../enterprise/include/functions_reporting.php:2488
+#: ../../enterprise/include/functions_reporting.php:2676
+#: ../../enterprise/include/functions_reporting.php:3265
+#: ../../enterprise/include/functions_reporting.php:3445
+#: ../../enterprise/include/functions_reporting.php:4182
+#: ../../enterprise/include/functions_reporting_pdf.php:1589
+#: ../../enterprise/include/functions_reporting_pdf.php:1728
+msgid "Not Init"
+msgstr "未初期化"
+
+#: ../../include/functions_reporting_html.php:698
+#: ../../include/functions_reporting_html.php:2617
+#: ../../enterprise/include/functions_reporting.php:2681
+#: ../../enterprise/include/functions_reporting.php:3450
+#: ../../enterprise/include/functions_reporting_pdf.php:1591
+msgid "Downtimes"
+msgstr "停止時間"
+
+#: ../../include/functions_reporting_html.php:703
+#: ../../include/functions_reporting_html.php:2622
+#: ../../enterprise/include/functions_reporting.php:2686
+#: ../../enterprise/include/functions_reporting.php:3455
+#: ../../enterprise/include/functions_reporting_pdf.php:1593
+msgid "Ignore time"
+msgstr "除外時間"
+
+#: ../../include/functions_reporting_html.php:775
+#: ../../include/functions_reporting_html.php:1532
+#: ../../include/functions_reporting_html.php:2521
+#: ../../include/functions_reporting_html.php:2787
+#: ../../enterprise/include/functions_reporting_pdf.php:850
+#: ../../enterprise/include/functions_reporting_pdf.php:977
+#: ../../enterprise/include/functions_reporting_pdf.php:1033
+msgid "Min Value"
+msgstr "最小値"
+
+#: ../../include/functions_reporting_html.php:776
+#: ../../include/functions_reporting_html.php:1533
+#: ../../include/functions_reporting_html.php:2522
+#: ../../include/functions_reporting_html.php:2788
+#: ../../enterprise/include/functions_reporting_pdf.php:851
+#: ../../enterprise/include/functions_reporting_pdf.php:978
+#: ../../enterprise/include/functions_reporting_pdf.php:1034
+#: ../../enterprise/include/functions_reporting_pdf.php:2074
+msgid "Average Value"
+msgstr "平均値"
+
+#: ../../include/functions_reporting_html.php:777
+#: ../../include/functions_reporting_html.php:1534
+#: ../../include/functions_reporting_html.php:2519
+#: ../../include/functions_reporting_html.php:2790
+#: ../../enterprise/include/functions_reporting_pdf.php:852
+#: ../../enterprise/include/functions_reporting_pdf.php:979
+#: ../../enterprise/include/functions_reporting_pdf.php:1035
+#: ../../enterprise/include/functions_reporting_pdf.php:2071
+msgid "Max Value"
+msgstr "最大値"
+
+#: ../../include/functions_reporting_html.php:810
+#: ../../include/functions_reporting_html.php:1028
+#: ../../include/functions_reporting_html.php:1647
+#: ../../operation/snmpconsole/snmp_view.php:718
+#: ../../enterprise/godmode/alerts/configure_alert_rule.php:143
+msgid "Count"
+msgstr "回数"
+
+#: ../../include/functions_reporting_html.php:815
+#: ../../include/functions_reporting_html.php:824
+#: ../../include/functions_reporting_html.php:1652
+msgid "Val. by"
+msgstr "承諾ユーザ"
+
+#: ../../include/functions_reporting_html.php:918
+#: ../../include/functions_reporting_html.php:1114
+msgid "Events by agent"
+msgstr "エージェントで分類したイベント"
+
+#: ../../include/functions_reporting_html.php:937
+#: ../../include/functions_reporting_html.php:1133
+msgid "Events by user validator"
+msgstr "承諾したユーザごとのイベント"
+
+#: ../../include/functions_reporting_html.php:956
+#: ../../include/functions_reporting_html.php:1152
+msgid "Events by Severity"
+msgstr "重要度ごとのイベント"
+
+#: ../../include/functions_reporting_html.php:975
+#: ../../include/functions_reporting_html.php:1171
+msgid "Events validated vs unvalidated"
+msgstr "承諾済と未承諾イベント"
+
+#: ../../include/functions_reporting_html.php:1231
+#: ../../enterprise/include/functions_inventory.php:656
+#: ../../enterprise/include/functions_inventory.php:719
+#: ../../enterprise/include/functions_reporting_pdf.php:541
+msgid "Added"
+msgstr "追加済み"
+
+#: ../../include/functions_reporting_html.php:1382
+#: ../../enterprise/dashboard/widgets/agent_module.php:347
+#: ../../enterprise/include/functions_reporting_pdf.php:664
+#, php-format
+msgid "%s in %s : NORMAL"
+msgstr "%s (%s): 正常"
+
+#: ../../include/functions_reporting_html.php:1391
+#: ../../enterprise/dashboard/widgets/agent_module.php:355
+#: ../../enterprise/include/functions_reporting_pdf.php:673
+#, php-format
+msgid "%s in %s : CRITICAL"
+msgstr "%s (%s): 障害"
+
+#: ../../include/functions_reporting_html.php:1400
+#: ../../enterprise/dashboard/widgets/agent_module.php:363
+#: ../../enterprise/include/functions_reporting_pdf.php:682
+#, php-format
+msgid "%s in %s : WARNING"
+msgstr "%s (%s): 警告"
+
+#: ../../include/functions_reporting_html.php:1409
+#: ../../enterprise/dashboard/widgets/agent_module.php:371
+#: ../../enterprise/include/functions_reporting_pdf.php:691
+#, php-format
+msgid "%s in %s : UNKNOWN"
+msgstr "%s (%s): 不明"
+
+#: ../../include/functions_reporting_html.php:1420
+#: ../../enterprise/dashboard/widgets/agent_module.php:388
+#: ../../enterprise/include/functions_reporting_pdf.php:709
+#, php-format
+msgid "%s in %s : ALERTS FIRED"
+msgstr "%s (%s): アラート発生"
+
+#: ../../include/functions_reporting_html.php:1429
+#: ../../enterprise/dashboard/widgets/agent_module.php:379
+#: ../../enterprise/include/functions_reporting_pdf.php:700
+#, php-format
+msgid "%s in %s : Not initialize"
+msgstr "%s (%s): 未初期化"
+
+#: ../../include/functions_reporting_html.php:1453
+msgid "Cell turns grey when the module is in 'not initialize' status"
+msgstr "青色のセルは、不明状態を示します。"
+
+#: ../../include/functions_reporting_html.php:1559
+#: ../../include/functions_reporting_html.php:1574
+#: ../../operation/agentes/gis_view.php:214
+#: ../../operation/agentes/group_view.php:165 ../../operation/tree.php:295
+#: ../../enterprise/dashboard/widgets/tree_view.php:207
+#: ../../enterprise/include/functions_inventory.php:324
+#: ../../enterprise/include/functions_inventory.php:456
+#: ../../enterprise/include/functions_reporting_pdf.php:737
+#: ../../enterprise/include/functions_reporting_pdf.php:752
+#: ../../enterprise/meta/monitoring/group_view.php:145
+#: ../../enterprise/operation/agentes/agent_inventory.php:230
+msgid "Total"
+msgstr "合計"
+
+#: ../../include/functions_reporting_html.php:1588
+#: ../../include/functions_reporting_html.php:3385
+msgid "Monitors"
+msgstr "モニタ項目"
+
+#: ../../include/functions_reporting_html.php:1607
+#: ../../include/functions_reporting_html.php:1962
+#: ../../include/functions_reporting_html.php:1963
+#: ../../mobile/operation/alerts.php:38
+#: ../../operation/agentes/alerts_status.functions.php:74
+#: ../../operation/snmpconsole/snmp_view.php:194
+#: ../../operation/snmpconsole/snmp_view.php:1035
+#: ../../enterprise/include/functions_reporting_pdf.php:780
+msgid "Fired"
+msgstr "通知済"
+
+#: ../../include/functions_reporting_html.php:1620
+#: ../../enterprise/include/functions_reporting_pdf.php:795
+#, php-format
+msgid "Last %s"
+msgstr "最新日時 %s"
+
+#: ../../include/functions_reporting_html.php:1740
+msgid "Events validated by user"
+msgstr "ユーザで分類したイベント"
+
+#: ../../include/functions_reporting_html.php:1759
+#: ../../include/functions_reporting_html.php:3674
+msgid "Events by severity"
+msgstr "重要度ごとのイベント"
+
+#: ../../include/functions_reporting_html.php:1778
+#: ../../operation/events/event_statistics.php:61
+msgid "Amount events validated"
+msgstr "承諾済みイベントの割合"
+
+#: ../../include/functions_reporting_html.php:1908
+#, php-format
+msgid "Interface '%s' throughput graph"
+msgstr "インタフェース '%s' スループットグラフ"
+
+#: ../../include/functions_reporting_html.php:1911
+msgid "Mac"
+msgstr "Mac"
+
+#: ../../include/functions_reporting_html.php:1912
+msgid "Actual status"
+msgstr "現在の状態"
+
+#: ../../include/functions_reporting_html.php:2108
+msgid "Empty modules"
+msgstr "モジュールなし"
+
+#: ../../include/functions_reporting_html.php:2115
+msgid "Warning<br/>Critical"
+msgstr "警告<br/>障害"
+
+#: ../../include/functions_reporting_html.php:2236
+#: ../../enterprise/include/functions_reporting_csv.php:857
+#: ../../enterprise/include/functions_reporting_pdf.php:361
+msgid "From data"
+msgstr ""
+
+#: ../../include/functions_reporting_html.php:2237
+#: ../../enterprise/include/functions_reporting_csv.php:857
+#: ../../enterprise/include/functions_reporting_pdf.php:362
+msgid "To data"
+msgstr ""
+
+#: ../../include/functions_reporting_html.php:2265
+#: ../../enterprise/include/functions_reporting_csv.php:869
+#: ../../enterprise/include/functions_reporting_csv.php:887
+#: ../../enterprise/include/functions_reporting_pdf.php:374
+msgid "Negative increase: "
+msgstr "マイナス増加: "
+
+#: ../../include/functions_reporting_html.php:2268
+#: ../../enterprise/include/functions_reporting_csv.php:872
+#: ../../enterprise/include/functions_reporting_csv.php:890
+#: ../../enterprise/include/functions_reporting_pdf.php:377
+msgid "Positive increase: "
+msgstr "プラス増加: "
+
+#: ../../include/functions_reporting_html.php:2271
+#: ../../enterprise/include/functions_reporting_csv.php:875
+#: ../../enterprise/include/functions_reporting_csv.php:893
+#: ../../enterprise/include/functions_reporting_pdf.php:380
+msgid "Neutral increase: "
+msgstr "中立的な増加: "
+
+#: ../../include/functions_reporting_html.php:2326
+msgid "Total time"
+msgstr "合計時間"
+
+#: ../../include/functions_reporting_html.php:2327
+msgid "Time failed"
+msgstr "障害時間"
+
+#: ../../include/functions_reporting_html.php:2329
+msgid "Time Uknown"
+msgstr "不明時間"
+
+#: ../../include/functions_reporting_html.php:2330
+msgid "Time Not Init Module"
+msgstr "未初期化モジュール時間"
+
+#: ../../include/functions_reporting_html.php:2331
+#: ../../enterprise/include/functions_reporting_csv.php:1426
+msgid "Time Downtime"
+msgstr "計画停止時間"
+
+#: ../../include/functions_reporting_html.php:2332
+#: ../../enterprise/include/functions_reporting_pdf.php:1936
+msgid "% Ok"
+msgstr "正常%"
+
+#: ../../include/functions_reporting_html.php:2369
+msgid "Total checks"
+msgstr "全確認数"
+
+#: ../../include/functions_reporting_html.php:2370
+msgid "Checks failed"
+msgstr "障害確認数"
+
+#: ../../include/functions_reporting_html.php:2372
+msgid "Checks Uknown"
+msgstr "不明確認数"
+
+#: ../../include/functions_reporting_html.php:2518
+#: ../../enterprise/include/functions_reporting_pdf.php:2070
+msgid "Agent max value"
+msgstr "エージェント最大値"
+
+#: ../../include/functions_reporting_html.php:2520
+msgid "Agent min value"
+msgstr "エージェント最小値"
+
+#: ../../include/functions_reporting_html.php:2708
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:190
+#: ../../enterprise/include/functions_reporting_csv.php:531
+#: ../../enterprise/include/functions_reporting_pdf.php:913
+msgid "Sum"
+msgstr "合計"
+
+#: ../../include/functions_reporting_html.php:2799
+#: ../../include/functions_reporting_html.php:2902
+#: ../../enterprise/dashboard/widgets/tactical.php:44
+msgid "Summary"
+msgstr "サマリ"
+
+#: ../../include/functions_reporting_html.php:2865
+#: ../../operation/tree.php:178
+msgid "Module status"
+msgstr "モジュールの状態"
+
+#: ../../include/functions_reporting_html.php:2994
+#: ../../enterprise/meta/include/functions_wizard_meta.php:1224
+msgid "Alert description"
+msgstr "アラートの説明"
+
+#: ../../include/functions_reporting_html.php:3044
+msgid "Alerts not fired"
+msgstr "未通知アラート"
+
+#: ../../include/functions_reporting_html.php:3053
+msgid "Total alerts monitored"
+msgstr "モニタ中の全アラート"
+
+#: ../../include/functions_reporting_html.php:3104
+msgid "Total monitors"
+msgstr "全モニタ"
+
+#: ../../include/functions_reporting_html.php:3105
+msgid "Monitors down on period"
+msgstr "現時点で停止中のモニタ"
+
+#: ../../include/functions_reporting_html.php:3121
+msgid "Monitors OK"
+msgstr "正常"
+
+#: ../../include/functions_reporting_html.php:3122
+msgid "Monitors BAD"
+msgstr "障害"
+
+#: ../../include/functions_reporting_html.php:3148
+#: ../../include/functions_reporting_html.php:3288
+#: ../../mobile/include/functions_web.php:23
+#: ../../enterprise/meta/monitoring/wizard/wizard.create_module.php:146
+msgid "Monitor"
+msgstr "モニタ項目"
+
+#: ../../include/functions_reporting_html.php:3196
+#, php-format
+msgid "Agents in group: %s"
+msgstr "グループに含まれるエージェント: %s"
+
+#: ../../include/functions_reporting_html.php:3289
+msgid "Last failure"
+msgstr "最新の障害"
+
+#: ../../include/functions_reporting_html.php:3353
+msgid "N/A(*)"
+msgstr "N/A(*)"
+
+#: ../../include/functions_reporting_html.php:3527
+#: ../../mobile/operation/groups.php:133
+msgid "Agents critical"
+msgstr "障害状態エージェント"
+
+#: ../../include/functions_reporting_html.php:3530
+msgid "Agents warning"
+msgstr "警告状態エージェント"
+
+#: ../../include/functions_reporting_html.php:3536
+msgid "Agents ok"
+msgstr "正常状態エージェント"
+
+#: ../../include/functions_reporting_html.php:3545
+#: ../../mobile/operation/groups.php:129
+msgid "Agents not init"
+msgstr "未初期化エージェント"
+
+#: ../../include/functions_reporting_html.php:3556
+#: ../../include/functions_reporting_html.php:3565
+msgid "Agents by status"
+msgstr "状態ごとのエージェント"
+
+#: ../../include/functions_reporting_html.php:3602
+#: ../../operation/agentes/pandora_networkmap.php:565
+#: ../../enterprise/godmode/reporting/cluster_list.php:171
+msgid "Nodes"
+msgstr "ノード"
+
+#: ../../include/functions_reporting_html.php:3609
+#: ../../include/functions_reporting_html.php:3618
+msgid "Node overview"
+msgstr "ノードの概要"
+
+#: ../../include/functions_reporting_html.php:3636
+#: ../../include/functions_reporting_html.php:3653
+msgid "Critical events"
+msgstr "障害イベント"
+
+#: ../../include/functions_reporting_html.php:3640
+#: ../../include/functions_reporting_html.php:3657
+msgid "Warning events"
+msgstr "警告イベント"
+
+#: ../../include/functions_reporting_html.php:3644
+#: ../../include/functions_reporting_html.php:3661
+msgid "OK events"
+msgstr "正常イベント"
+
+#: ../../include/functions_reporting_html.php:3648
+#: ../../include/functions_reporting_html.php:3665
+msgid "Unknown events"
+msgstr "不明イベント"
+
+#: ../../include/functions_reporting_html.php:3688
+msgid "Important Events by Criticity"
+msgstr "重要度ごとのイベント"
+
+#: ../../include/functions_reporting_html.php:3714
+msgid "Last activity in Pandora FMS console"
+msgstr "Pandora FMS コンソールの最新の操作"
+
+#: ../../include/functions_reporting_html.php:3790
+#: ../../include/functions_reporting_html.php:3930
+msgid "Events info (1hr.)"
+msgstr "イベント情報 (1時間)"
+
+#: ../../include/functions_reporting_html.php:4096
+#: ../../enterprise/include/functions_reporting.php:4974
+#: ../../enterprise/include/functions_reporting_pdf.php:2499
+msgid "This SLA has been affected by the following planned downtimes"
+msgstr "この SLA は、次の計画停止によって影響を受けます"
+
+#: ../../include/functions_reporting_html.php:4101
+#: ../../enterprise/include/functions_reporting.php:4979
+#: ../../enterprise/include/functions_reporting_pdf.php:2504
+msgid "Dates"
+msgstr "日付"
+
+#: ../../include/functions_reporting_html.php:4142
+#: ../../enterprise/include/functions_reporting.php:5073
+#: ../../enterprise/include/functions_reporting_pdf.php:2543
+msgid "This item is affected by a malformed planned downtime"
+msgstr "この要素は不正な計画停止の影響を受けます"
+
+#: ../../include/functions_reporting_html.php:4143
+#: ../../enterprise/include/functions_reporting.php:5074
+#: ../../enterprise/include/functions_reporting_pdf.php:2544
+msgid "Go to the planned downtimes section to solve this"
+msgstr "これを解決するために計画停止画面へ行く"
 
 #: ../../include/functions_reports.php:511
 msgid "SQL vertical bar graph"
@@ -19505,78 +25672,38 @@ msgstr "モジュールヒストグラムグラフ"
 msgid "ITIL"
 msgstr "ITIL"
 
-#: ../../include/functions_reports.php:529
-#: ../../include/functions_reporting.php:3723
-#: ../../enterprise/include/functions_reporting_csv.php:618
-#: ../../enterprise/include/functions_reporting_csv.php:635
-#: ../../enterprise/include/functions_reporting_csv.php:642
-msgid "TTRT"
-msgstr "TTRT"
-
-#: ../../include/functions_reports.php:531
-#: ../../include/functions_reporting.php:3720
-#: ../../enterprise/include/functions_reporting_csv.php:582
-#: ../../enterprise/include/functions_reporting_csv.php:598
-#: ../../enterprise/include/functions_reporting_csv.php:605
-msgid "TTO"
-msgstr "TTO"
-
-#: ../../include/functions_reports.php:533
-#: ../../include/functions_reporting.php:3717
-#: ../../enterprise/include/functions_reporting_csv.php:546
-#: ../../enterprise/include/functions_reporting_csv.php:562
-#: ../../enterprise/include/functions_reporting_csv.php:569
-msgid "MTBF"
-msgstr "MTBF"
-
-#: ../../include/functions_reports.php:535
-#: ../../include/functions_reporting.php:3714
-#: ../../enterprise/include/functions_reporting_csv.php:511
-#: ../../enterprise/include/functions_reporting_csv.php:526
-#: ../../enterprise/include/functions_reporting_csv.php:533
-msgid "MTTR"
-msgstr "MTTR"
-
 #: ../../include/functions_reports.php:539
 #: ../../include/functions_reports.php:542
 #: ../../include/functions_reports.php:544
 #: ../../include/functions_reports.php:546
 #: ../../include/functions_reports.php:550
-#: ../../enterprise/include/functions_reporting_csv.php:1320
+#: ../../enterprise/include/functions_reporting_csv.php:1432
 #: ../../enterprise/operation/services/services.list.php:343
 #: ../../enterprise/operation/services/services.service.php:141
 msgid "SLA"
 msgstr "SLA"
 
-#: ../../include/functions_reports.php:540
-#: ../../include/functions_reporting.php:535
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:112
-#: ../../enterprise/godmode/services/services.service.php:301
-#: ../../enterprise/include/functions_reporting_csv.php:908
-msgid "S.L.A."
-msgstr "SLA"
-
 #: ../../include/functions_reports.php:543
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:113
-#: ../../enterprise/include/functions_reporting.php:1613
+#: ../../enterprise/include/functions_reporting.php:2015
 msgid "Monthly S.L.A."
 msgstr "月次 S.L.A."
 
 #: ../../include/functions_reports.php:545
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:114
-#: ../../enterprise/include/functions_reporting.php:2338
+#: ../../enterprise/include/functions_reporting.php:2740
 msgid "Weekly S.L.A."
 msgstr "週次 S.L.A."
 
 #: ../../include/functions_reports.php:547
-#: ../../enterprise/include/functions_reporting.php:3120
+#: ../../enterprise/include/functions_reporting.php:3522
 msgid "Hourly S.L.A."
 msgstr "1時間ごとの S.L.A."
 
 #: ../../include/functions_reports.php:551
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:119
-#: ../../enterprise/include/functions_reporting.php:4016
-#: ../../enterprise/include/functions_reporting.php:4480
+#: ../../enterprise/include/functions_reporting.php:4434
+#: ../../enterprise/include/functions_reporting.php:4898
 msgid "Services S.L.A."
 msgstr "サービス SLA"
 
@@ -19586,7 +25713,7 @@ msgid "Forecasting"
 msgstr "予測"
 
 #: ../../include/functions_reports.php:557
-#: ../../enterprise/include/functions_reporting_csv.php:316
+#: ../../enterprise/include/functions_reporting_csv.php:327
 msgid "Prediction date"
 msgstr "予測日"
 
@@ -19594,12 +25721,6 @@ msgstr "予測日"
 msgid "Projection graph"
 msgstr "予想グラフ"
 
-#: ../../include/functions_reports.php:564
-#: ../../include/functions_graph.php:704
-#: ../../include/functions_graph.php:3933
-msgid "Avg. Value"
-msgstr "平均値"
-
 #: ../../include/functions_reports.php:570
 msgid "Monitor report"
 msgstr "モニタ項目レポート"
@@ -19608,1159 +25729,174 @@ msgstr "モニタ項目レポート"
 msgid "Serialize data"
 msgstr "データの並び"
 
-#: ../../include/functions_reports.php:574
-#: ../../include/functions_reporting.php:3711
-#: ../../include/functions_reporting.php:5701
-#: ../../enterprise/include/functions_reporting_csv.php:687
-#: ../../enterprise/include/functions_reporting_csv.php:703
-#: ../../enterprise/include/functions_reporting_csv.php:710
-msgid "Summatory"
-msgstr "合計"
-
 #: ../../include/functions_reports.php:576
 msgid "Historical Data"
 msgstr "保存データ"
 
-#: ../../include/functions_reports.php:580
-#: ../../include/functions_reports.php:582
-#: ../../include/functions_reports.php:584
-#: ../../include/functions_reports.php:587
-#: ../../include/functions_reports.php:591
-#: ../../include/functions_reports.php:594
-#: ../../include/functions_reports.php:596
-#: ../../include/functions_reports.php:598
+#: ../../include/functions_reports.php:581
+#: ../../include/functions_reports.php:583
+#: ../../include/functions_reports.php:585
+#: ../../include/functions_reports.php:588
+#: ../../include/functions_reports.php:592
+#: ../../include/functions_reports.php:595
+#: ../../include/functions_reports.php:597
+#: ../../include/functions_reports.php:599
 msgid "Grouped"
 msgstr "グループ化"
 
-#: ../../include/functions_reports.php:583
-#: ../../enterprise/include/functions_reporting_csv.php:469
+#: ../../include/functions_reports.php:584
+#: ../../enterprise/include/functions_reporting_csv.php:482
 msgid "Group report"
 msgstr "グループレポート"
 
-#: ../../include/functions_reports.php:585
-#: ../../include/functions_reporting.php:1727
+#: ../../include/functions_reports.php:596
 #: ../../enterprise/godmode/reporting/reporting_builder.global.php:45
-#: ../../enterprise/include/functions_reporting_csv.php:390
-msgid "Exception"
-msgstr "例外"
-
-#: ../../include/functions_reports.php:595
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:44
 msgid "Top n"
 msgstr "トップ n"
 
-#: ../../include/functions_reports.php:597
+#: ../../include/functions_reports.php:598
 msgid "Network interfaces"
 msgstr "ネットワークインタフェース"
 
-#: ../../include/functions_reports.php:599
-#: ../../include/functions_reporting.php:4849
-#: ../../include/functions_reporting.php:5092
-#: ../../enterprise/include/functions_reporting.php:632
-#: ../../enterprise/include/functions_reporting_csv.php:248
-msgid "Availability"
-msgstr "可用性"
-
-#: ../../include/functions_reports.php:602
-#: ../../include/functions_reports.php:604
+#: ../../include/functions_reports.php:603
+#: ../../include/functions_reports.php:605
 msgid "Text/HTML "
 msgstr "テキスト/HTML "
 
-#: ../../include/functions_reports.php:605
+#: ../../include/functions_reports.php:606
 msgid "Import text from URL"
 msgstr "URL からテキストをインポート"
 
-#: ../../include/functions_reports.php:610
+#: ../../include/functions_reports.php:611
 msgid "Alert report module"
 msgstr "アラートレポートモジュール"
 
-#: ../../include/functions_reports.php:612
+#: ../../include/functions_reports.php:613
 msgid "Alert report agent"
 msgstr "アラートレポートエージェント"
 
-#: ../../include/functions_reports.php:615
+#: ../../include/functions_reports.php:616
 msgid "Alert report group"
 msgstr "アラートレポートグループ"
 
-#: ../../include/functions_reports.php:621
+#: ../../include/functions_reports.php:622
 msgid "Event report agent"
 msgstr "イベントレポートエージェント"
 
-#: ../../include/functions_reports.php:623
+#: ../../include/functions_reports.php:624
 msgid "Event report module"
 msgstr "イベントレポートモジュール"
 
-#: ../../include/functions_reports.php:625
+#: ../../include/functions_reports.php:626
 msgid "Event report group"
 msgstr "イベントレポートグループ"
 
-#: ../../include/functions_reports.php:632
+#: ../../include/functions_reports.php:633
 msgid "Inventory changes"
 msgstr "インベントリ変更"
 
-#: ../../include/functions_reports.php:638
-#: ../../include/functions_reporting.php:3554
-msgid "Agent configuration"
-msgstr "エージェント設定"
-
-#: ../../include/functions_reports.php:640
-#: ../../include/functions_reporting.php:2529
-msgid "Group configuration"
-msgstr "グループ設定"
-
-#: ../../include/functions_reports.php:642
+#: ../../include/functions_reports.php:643
 msgid "Netflow area chart"
 msgstr "Netflow 塗り潰しグラフ"
 
-#: ../../include/functions_reports.php:644
+#: ../../include/functions_reports.php:645
 msgid "Netflow pie chart"
 msgstr "Netflow 円グラフ"
 
-#: ../../include/functions_reports.php:646
+#: ../../include/functions_reports.php:647
 msgid "Netflow data table"
 msgstr "Netflow データ表"
 
-#: ../../include/functions_reports.php:648
+#: ../../include/functions_reports.php:649
 msgid "Netflow statistics table"
 msgstr "Netflow 統計表"
 
-#: ../../include/functions_reports.php:650
+#: ../../include/functions_reports.php:651
 msgid "Netflow summary table"
 msgstr "Netflow サマリ表"
 
-#: ../../include/functions_reports.php:654
-#: ../../enterprise/include/functions_reporting.php:1446
+#: ../../include/functions_reports.php:655
+#: ../../enterprise/include/functions_reporting.php:1831
 msgid "Log"
 msgstr "ログ"
 
-#: ../../include/functions_reports.php:655
-#: ../../enterprise/include/functions_reporting.php:1437
+#: ../../include/functions_reports.php:656
+#: ../../enterprise/include/functions_reporting.php:1822
 msgid "Log report"
 msgstr "ログレポート"
 
-#: ../../include/functions_agents.php:672
-msgid ""
-"There was an error copying the agent configuration, the copy has been "
-"cancelled"
-msgstr "エージェントの設定コピーに失敗しました。コピーを中止します。"
-
-#: ../../include/functions_agents.php:2203
-#: ../../include/functions_agents.php:2228
-#: ../../include/functions_agents.php:2253
-msgid "No Monitors"
-msgstr "モニタ項目なし"
-
-#: ../../include/functions_agents.php:2207
-#: ../../include/functions_agents.php:2232
-#: ../../include/functions_agents.php:2257
-#: ../../include/functions_reporting.php:7979
-msgid "At least one module in CRITICAL status"
-msgstr "一つ以上のモジュールが致命的な状態です。"
-
-#: ../../include/functions_agents.php:2211
-#: ../../include/functions_agents.php:2236
-#: ../../include/functions_agents.php:2261
-#: ../../include/functions_reporting.php:7983
-msgid "At least one module in WARNING status"
-msgstr "一つ以上のモジュールが警告状態です。"
-
-#: ../../include/functions_agents.php:2215
-#: ../../include/functions_agents.php:2240
-#: ../../include/functions_agents.php:2265
-#: ../../include/functions_reporting.php:7987
-msgid "At least one module is in UKNOWN status"
-msgstr "一つ以上のモジュールが不明な状態です。"
-
-#: ../../include/functions_agents.php:2219
-#: ../../include/functions_agents.php:2244
-#: ../../include/functions_agents.php:2269
-#: ../../include/functions_reporting.php:7991
-msgid "All Monitors OK"
-msgstr "全モニタ項目が正常"
-
-#: ../../include/functions_servers.php:363
+#: ../../include/functions_servers.php:364
 msgid "Data server"
 msgstr "データサーバ"
 
-#: ../../include/functions_servers.php:368
+#: ../../include/functions_servers.php:369
 msgid "Network server"
 msgstr "ネットワークサーバ"
 
-#: ../../include/functions_servers.php:373
+#: ../../include/functions_servers.php:374
 msgid "SNMP Trap server"
 msgstr "SNMPトラップサーバ"
 
-#: ../../include/functions_servers.php:383
+#: ../../include/functions_servers.php:384
 msgid "Plugin server"
 msgstr "プラグインサーバ"
 
-#: ../../include/functions_servers.php:388
+#: ../../include/functions_servers.php:389
 msgid "Prediction server"
 msgstr "予測サーバ"
 
-#: ../../include/functions_servers.php:393
+#: ../../include/functions_servers.php:394
 msgid "WMI server"
 msgstr "WMI サーバ"
 
-#: ../../include/functions_servers.php:398
+#: ../../include/functions_servers.php:399
 #: ../../enterprise/godmode/servers/manage_export_form.php:71
 msgid "Export server"
 msgstr "エクスポートサーバ"
 
-#: ../../include/functions_servers.php:403
+#: ../../include/functions_servers.php:404
 msgid "Inventory server"
 msgstr "インベントリサーバ"
 
-#: ../../include/functions_servers.php:408
+#: ../../include/functions_servers.php:409
 msgid "Web server"
 msgstr "ウェブサーバ"
 
-#: ../../include/functions_servers.php:413
+#: ../../include/functions_servers.php:414
 msgid "Event server"
 msgstr "イベントサーバ"
 
-#: ../../include/functions_servers.php:418
+#: ../../include/functions_servers.php:419
 msgid "Enterprise ICMP server"
 msgstr "エンタープライズ ICMP サーバ"
 
-#: ../../include/functions_servers.php:423
+#: ../../include/functions_servers.php:424
 msgid "Enterprise SNMP server"
 msgstr "エンタープライズSNMPサーバ"
 
-#: ../../include/functions_servers.php:428
+#: ../../include/functions_servers.php:429
 msgid "Enterprise Satellite server"
 msgstr "Enterprise サテライトサーバ"
 
-#: ../../include/functions_servers.php:433
+#: ../../include/functions_servers.php:434
 msgid "Enterprise Transactional server"
 msgstr "Enterprise トランザクションサーバ"
 
-#: ../../include/functions_servers.php:438
+#: ../../include/functions_servers.php:439
 msgid "Mainframe server"
 msgstr "メインフレームサーバ"
 
-#: ../../include/functions_servers.php:443
+#: ../../include/functions_servers.php:444
 msgid "Sync server"
 msgstr "同期サーバ"
 
-#: ../../include/functions_alerts.php:401
-#: ../../enterprise/include/functions_policies.php:456
-#: ../../enterprise/include/functions_policies.php:471
-msgid "copy"
-msgstr "コピー"
+#: ../../include/functions_servers.php:449
+msgid "Wux server"
+msgstr "Wux サーバ"
 
-#: ../../include/functions_alerts.php:567
-#: ../../enterprise/godmode/massive/massive_add_alerts_policy.php:113
-#: ../../enterprise/godmode/massive/massive_add_alerts_policy.php:114
-#: ../../enterprise/godmode/massive/massive_delete_alerts_policy.php:112
-#: ../../enterprise/godmode/massive/massive_delete_alerts_policy.php:113
-msgid "Regular expression"
-msgstr "正規表現"
-
-#: ../../include/functions_alerts.php:568
-msgid "Max and min"
-msgstr "最大および最小"
-
-#: ../../include/functions_alerts.php:571
-msgid "Equal to"
-msgstr "同じ値"
-
-#: ../../include/functions_alerts.php:572
-msgid "Not equal to"
-msgstr "異なる値"
-
-#: ../../include/functions_alerts.php:575
-msgid "Unknown status"
-msgstr "不明状態"
-
-#: ../../include/functions_alerts.php:576
-msgid "On Change"
-msgstr "変化発生"
-
-#: ../../include/functions_alerts.php:970
-#: ../../include/functions_network_components.php:507
-#: ../../enterprise/include/functions_local_components.php:284
-msgid "Copy of"
-msgstr "複製"
-
-#: ../../include/functions_alerts.php:1394
-msgid "No actions defined"
-msgstr "アクションが定義されていません"
-
-#: ../../include/functions_api.php:77
-msgid "No set or get or help operation."
-msgstr "設定、参照、ヘルプの操作がありません。"
-
-#: ../../include/functions_api.php:81
-msgid "This operation does not exist."
-msgstr "この操作は存在しません。"
-
-#: ../../include/functions_api.php:85
-msgid "Id does not exist in BD."
-msgstr "ID が存在しません。"
-
-#: ../../include/functions_api.php:976 ../../include/functions_api.php:1036
-msgid "Does not exist agent with this name."
-msgstr "この名前のエージェントが存在しません。"
-
-#: ../../include/functions_api.php:978 ../../include/functions_api.php:1038
-msgid "Does not exist module with this name."
-msgstr "この名前のモジュールがありません。"
-
-#: ../../include/functions_api.php:1454 ../../include/functions_api.php:6415
-msgid "Correct Delete"
-msgstr "削除しました。"
-
-#: ../../include/functions_api.php:2446
-msgid "Error in creation network module. Agent name doesn't exist."
-msgstr "ネットワークモジュール作成エラー。エージェント名が存在しません。"
-
-#: ../../include/functions_api.php:2452
-msgid ""
-"Error in creation network module. Id_module_type is not correct for network "
-"modules."
-msgstr "ネットワークモジュール作成エラー。ネットワークモジュールの id_module_type が不正です。"
-
-#: ../../include/functions_api.php:2507
-msgid "Error in creation network module."
-msgstr "ネットワークモジュールの作成に失敗しました。"
-
-#: ../../include/functions_api.php:2540
-msgid "Error updating network module. Module name cannot be left blank."
-msgstr "ネットワークモジュール更新エラー。モジュール名が指定されていません。"
-
-#: ../../include/functions_api.php:2548
-msgid "Error updating network module. Id_module doesn't exist."
-msgstr "ネットワークモジュール更新エラー。id_module が存在しません。"
-
-#: ../../include/functions_api.php:2563
-msgid "Error updating network module. Id_module exists in the new agent."
-msgstr "ネットワークモジュール更新エラー。id_module が新規エージェントにあります。"
-
-#: ../../include/functions_api.php:2570
-msgid "Error updating network module. Id_agent doesn't exist."
-msgstr "ネットワークモジュールの更新エラー。id_agent が存在しません。"
-
-#: ../../include/functions_api.php:2623
-msgid "Network module updated."
-msgstr "ネットワークモジュールを更新しました。"
-
-#: ../../include/functions_api.php:2652
-msgid "Error in creation plugin module. Id_plugin cannot be left blank."
-msgstr "ラグインモジュール作成エラー。id_plugin が指定されていません。"
-
-#: ../../include/functions_api.php:2659
-msgid "Error in creation plugin module. Agent name doesn't exist."
-msgstr "プラグインモジュール作成エラー。エージェント名が存在しません。"
-
-#: ../../include/functions_api.php:2719
-msgid "Error in creation plugin module."
-msgstr "プラグインモジュール作成エラー。"
-
-#: ../../include/functions_api.php:2750
-msgid "Error updating plugin module. Id_module cannot be left blank."
-msgstr "プラグインモジュール更新エラー。id_module が指定されていません。"
-
-#: ../../include/functions_api.php:2757
-msgid "Error updating plugin module. Id_module doesn't exist."
-msgstr "プラグインモジュール更新エラー。id_module が存在しません。"
-
-#: ../../include/functions_api.php:2769
-msgid "Error updating plugin module. Id_module exists in the new agent."
-msgstr "プラグインモジュール更新エラー。id_module が新規エージェントにあります。"
-
-#: ../../include/functions_api.php:2776
-msgid "Error updating plugin module. Id_agent doesn't exist."
-msgstr "プラグインモジュールの更新エラー。id_agent が存在しません。"
-
-#: ../../include/functions_api.php:2837
-msgid "Plugin module updated."
-msgstr "プラグインモジュールを更新しました。"
-
-#: ../../include/functions_api.php:2866
-msgid "Error in creation data module. Module_name cannot be left blank."
-msgstr "データモジュール作成エラー。module_name が指定されていません。"
-
-#: ../../include/functions_api.php:2873
-msgid "Error in creation data module. Agent name doesn't exist."
-msgstr "データモジュール作成エラー。エージェント名が存在しません。"
-
-#: ../../include/functions_api.php:2924 ../../include/functions_api.php:2990
-msgid "Error in creation data module."
-msgstr "データモジュール作成エラー。"
-
-#: ../../include/functions_api.php:2958
-msgid "Error in creation synthetic module. Module_name cannot be left blank."
-msgstr "統合モジュール作成エラー。モジュール名は空にできません。"
-
-#: ../../include/functions_api.php:2965
-msgid "Error in creation synthetic module. Agent name doesn't exist."
-msgstr "統合モジュール作成エラー。エージェント名が存在しません。"
-
-#: ../../include/functions_api.php:3102
-msgid "Synthetic module created ID: "
-msgstr "統合モジュールを作成しました。ID: "
-
-#: ../../include/functions_api.php:3133
-msgid "Error updating data module. Id_module cannot be left blank."
-msgstr "データモジュール更新エラー。id_module が指定されていません。"
-
-#: ../../include/functions_api.php:3140
-msgid "Error updating data module. Id_module doesn't exist."
-msgstr "データモジュール更新エラー。id_moduleが存在しません。"
-
-#: ../../include/functions_api.php:3152
-msgid "Error updating data module. Id_module exists in the new agent."
-msgstr "データモジュール更新エラー。id_module が新規エージェントにあります。"
-
-#: ../../include/functions_api.php:3159
-msgid "Error updating data module. Id_agent doesn't exist."
-msgstr "データモジュールの更新エラー。id_agent が存在しません。"
-
-#: ../../include/functions_api.php:3207
-msgid "Data module updated."
-msgstr "データモジュールを更新しました。"
-
-#: ../../include/functions_api.php:3244
-msgid "Error in creation SNMP module. Module_name cannot be left blank."
-msgstr "SNMPモジュール作成エラー。module_name が指定されていません。"
-
-#: ../../include/functions_api.php:3249
-msgid ""
-"Error in creation SNMP module. Invalid id_module_type for a SNMP module."
-msgstr "SNMPモジュール作成エラー。SNMPモジュールの id_module_type が不正です。"
-
-#: ../../include/functions_api.php:3256
-msgid "Error in creation SNMP module. Agent name doesn't exist."
-msgstr "SNMPモジュール作成エラー。エージェント名が存在しません。"
-
-#: ../../include/functions_api.php:3271 ../../include/functions_api.php:3434
-#: ../../include/functions_api.php:5894
-msgid ""
-"Error in creation SNMP module. snmp3_priv_method doesn't exist. Set it to "
-"'AES' or 'DES'. "
-msgstr "SNMPモジュール作成エラー。snmp3_priv_method がありません。'AES' または 'DES' を設定してください。 "
-
-#: ../../include/functions_api.php:3276 ../../include/functions_api.php:3443
-#: ../../include/functions_api.php:5899
-msgid ""
-"Error in creation SNMP module. snmp3_sec_level doesn't exist. Set it to "
-"'authNoPriv' or 'authPriv' or 'noAuthNoPriv'. "
-msgstr ""
-"SNMPモジュール作成エラー。snmp3_sec_level がありません。 'authNoPriv'、'authPriv'、noAuthNoPriv' "
-"のいずれかを設定してください。 "
-
-#: ../../include/functions_api.php:3281 ../../include/functions_api.php:3449
-#: ../../include/functions_api.php:5904
-msgid ""
-"Error in creation SNMP module. snmp3_auth_method doesn't exist. Set it to "
-"'MD5' or 'SHA'. "
-msgstr "SNMPモジュール作成エラー。snmp3_auth_method がありません。'MD5' または 'SHA' を設定してください。 "
-
-#: ../../include/functions_api.php:3365
-msgid "Error in creation SNMP module."
-msgstr "SNMPモジュール作成エラー。"
-
-#: ../../include/functions_api.php:3398
-msgid "Error updating SNMP module. Id_module cannot be left blank."
-msgstr "SNMPモジュール更新エラー。id_module が指定されていません。"
-
-#: ../../include/functions_api.php:3405
-msgid "Error updating SNMP module. Id_module doesn't exist."
-msgstr "SNMPモジュール更新エラー。id_module が存在しません。"
-
-#: ../../include/functions_api.php:3417
-msgid "Error updating SNMP module. Id_module exists in the new agent."
-msgstr "SNMPモジュール更新エラー。id_moduleが新規エージェントにあります。"
-
-#: ../../include/functions_api.php:3424
-msgid "Error updating snmp module. Id_agent doesn't exist."
-msgstr "snmp モジュールの更新エラー。id_agent が存在しません。"
-
-#: ../../include/functions_api.php:3537
-msgid "SNMP module updated."
-msgstr "SNMPモジュールを更新しました。"
-
-#: ../../include/functions_api.php:3565
-msgid ""
-"Error creating network component. Network component name cannot be left "
-"blank."
-msgstr "ネットワークコンポーネント作成エラー。ネットワークコンポーネント名が指定されていません。"
-
-#: ../../include/functions_api.php:3570
-msgid ""
-"Error creating network component. Incorrect value for Network component type "
-"field."
-msgstr "ネットワークコンポーネント作成エラー。ネットワークコンポーネントタイプが不正です。"
-
-#: ../../include/functions_api.php:3575
-msgid ""
-"Error creating network component. Network component group cannot be left "
-"blank."
-msgstr "ネットワークコンポーネント作成エラー。ネットワークコンポーネントグループが指定されていません。"
-
-#: ../../include/functions_api.php:3611
-msgid ""
-"Error creating network component. This network component already exists."
-msgstr "ネットワークコンポーネント作成エラー。ネットワークコンポーネントがすでに存在します。"
-
-#: ../../include/functions_api.php:3650
-msgid ""
-"Error creating plugin component. Plugin component name cannot be left blank."
-msgstr "プラグインコンポーネント作成エラー。プラグインコンポーネント名が指定されていません。"
-
-#: ../../include/functions_api.php:3655
-msgid "Error creating plugin component. Incorrect value for Id plugin."
-msgstr "プラグインコンポーネント作成エラー。プラグイン ID が不正です。"
-
-#: ../../include/functions_api.php:3660
-msgid ""
-"Error creating plugin component. Plugin component group cannot be left blank."
-msgstr "プラグインコンポーネント作成エラー。プラグインコンポーネントグループが指定されていません。"
-
-#: ../../include/functions_api.php:3700
-msgid ""
-"Error creating plugin component. This plugin component already exists."
-msgstr "プラグインコンポーネント作成エラー。プラグインコンポーネントがすでに存在します。"
-
-#: ../../include/functions_api.php:3738
-msgid ""
-"Error creating SNMP component. SNMP component name cannot be left blank."
-msgstr "SNMPコンポーネント作成エラー。SNMPコンポーネント名が指定されていません。"
-
-#: ../../include/functions_api.php:3743
-msgid ""
-"Error creating SNMP component. Incorrect value for Snmp component type field."
-msgstr "SNMPコンポーネント作成エラー。SNMPコンポーネントタイプが不正です。"
-
-#: ../../include/functions_api.php:3748
-msgid ""
-"Error creating SNMP component. Snmp component group cannot be left blank."
-msgstr "SNMPコンポーネント作成エラー。SNMPコンポーネントグループが指定されていません。"
-
-#: ../../include/functions_api.php:3760
-msgid ""
-"Error creating SNMP component. snmp3_priv_method doesn't exist. Set it to "
-"'AES' or 'DES'. "
-msgstr ""
-"SNMPコンポーネント作成エラー。snmp3_priv_methd が存在しません。'AES' または 'DES' を設定してください。 "
-
-#: ../../include/functions_api.php:3769
-msgid ""
-"Error creating SNMP component. snmp3_sec_level doesn't exist. Set it to "
-"'authNoPriv' or 'authPriv' or 'noAuthNoPriv'. "
-msgstr ""
-"SNMPコンポーネント作成エラー。snmp3_sec_level "
-"が存在しません。'authNoPriv'、'authPriv'、'noAuthNoPriv' のいずれかを設定してください。 "
-
-#: ../../include/functions_api.php:3775
-msgid ""
-"Error creating SNMP component. snmp3_auth_method doesn't exist. Set it to "
-"'MD5' or 'SHA'. "
-msgstr ""
-"SNMPコンポーネント作成エラー。snmp3_auth_method が存在しません。'MD5' または 'SHA' を設定してください。 "
-
-#: ../../include/functions_api.php:3850
-msgid "Error creating SNMP component. This SNMP component already exists."
-msgstr "SNMPコンポーネント作成エラー。このSNMPコンポーネントはすでに存在します。"
-
-#: ../../include/functions_api.php:3887
-msgid ""
-"Error creating local component. Local component name cannot be left blank."
-msgstr "ローカルコンポーネント作成エラー。ローカルコンポーネント名が指定されていません。"
-
-#: ../../include/functions_api.php:3893
-msgid ""
-"Error creating local component. Local component group cannot be left blank."
-msgstr "ローカルコンポーネント作成エラー。ローカルコンポーネントグループが指定されていません。"
-
-#: ../../include/functions_api.php:3917
-msgid "Error creating local component."
-msgstr "ローカルコンポーネント作成エラー。"
-
-#: ../../include/functions_api.php:3923
-msgid "Error creating local component. This local component already exists."
-msgstr "ローカルコンポーネント作成エラー。このローカルコンポーネントはすでに存在します。"
-
-#: ../../include/functions_api.php:3956
-msgid ""
-"Error getting module value from all agents. Module name cannot be left blank."
-msgstr "全エージェントからのモジュール値取得エラー。モジュール名が指定されていません。"
-
-#: ../../include/functions_api.php:3964
-msgid ""
-"Error getting module value from all agents. Module name doesn't exist."
-msgstr "全エージェントからのモジュール値取得エラー。モジュール名が存在しません。"
-
-#: ../../include/functions_api.php:4009
-msgid "Error creating alert template. Template name cannot be left blank."
-msgstr "アラートテンプレート作成エラー。テンプレート名が指定されていません。"
-
-#: ../../include/functions_api.php:4081
-msgid "Error creating alert template."
-msgstr "アラートテンプレート作成エラー。"
-
-#: ../../include/functions_api.php:4112
-msgid "Error updating alert template. Id_template cannot be left blank."
-msgstr "アラートテンプレート更新エラー。id_templateが指定されていません。"
-
-#: ../../include/functions_api.php:4120
-msgid "Error updating alert template. Id_template doesn't exist."
-msgstr "アラートテンプレート更新エラー。id_templateが存在しません。"
-
-#: ../../include/functions_api.php:4146
-msgid "Error updating alert template."
-msgstr "アラートテンプレート更新エラー。"
-
-#: ../../include/functions_api.php:4151
-msgid "Correct updating of alert template"
-msgstr "アラートテンプレートの更新内容を修正してください"
-
-#: ../../include/functions_api.php:4175
-msgid "Error deleting alert template. Id_template cannot be left blank."
-msgstr "アラートテンプレート削除エラー。id_templateが指定されていません。"
-
-#: ../../include/functions_api.php:4184
-msgid "Error deleting alert template."
-msgstr "アラートテンプレート削除エラー。"
-
-#: ../../include/functions_api.php:4188
-msgid "Correct deleting of alert template."
-msgstr "アラートテンプレートの削除内容を修正してください"
-
-#: ../../include/functions_api.php:4225
-msgid "Error getting all alert templates."
-msgstr "全アラートテンプレート取得エラー。"
-
-#: ../../include/functions_api.php:4257
-msgid "Error getting alert template. Id_template doesn't exist."
-msgstr "アラートテンプレート取得エラー。id_templateが存在しません。"
-
-#: ../../include/functions_api.php:4274
-msgid "Error getting alert template."
-msgstr "アラートテンプレート取得エラー。"
-
-#: ../../include/functions_api.php:4313
-msgid "Error getting module groups."
-msgstr "モジュールグループ取得エラー。"
-
-#: ../../include/functions_api.php:4358
-msgid "Error getting plugins."
-msgstr "プラグイン取得エラー。"
-
-#: ../../include/functions_api.php:4381
-msgid "Error creating module from network component. Agent doesn't exist."
-msgstr "ネットワークコンポーネントからのモジュール作成エラー。エージェントが存在しません。"
-
-#: ../../include/functions_api.php:4388
-msgid ""
-"Error creating module from network component. Network component doesn't "
-"exist."
-msgstr "ネットワークコンポーネントからのモジュール作成エラー。ネットワークコンポーネントが存在しません。"
-
-#: ../../include/functions_api.php:4406
-msgid "Error creating module from network component. Error creating module."
-msgstr "ネットワークコンポーネントからのモジュール作成エラー。モジュール作成エラー。"
-
-#: ../../include/functions_api.php:4433
-msgid "Error assigning module to template. Id_template cannot be left blank."
-msgstr "テンプレートへのモジュール割当エラー。id_templateが指定されていません。"
-
-#: ../../include/functions_api.php:4439
-msgid "Error assigning module to template. Id_module cannot be left blank."
-msgstr "テンプレートへのモジュール割当エラー。id_moduleが指定されていません。"
-
-#: ../../include/functions_api.php:4445
-msgid "Error assigning module to template. Id_agent cannot be left blank."
-msgstr "テンプレートへのモジュール割当エラー。id_agentが指定されていません。"
-
-#: ../../include/functions_api.php:4453
-msgid "Error assigning module to template. Id_template doensn't exists."
-msgstr "テンプレートへのモジュール割当エラー。id_templateが存在しません。"
-
-#: ../../include/functions_api.php:4463
-msgid "Error assigning module to template. Id_agent doesn't exist."
-msgstr "テンプレートへのモジュール割当エラー。id_agentが存在しません。"
-
-#: ../../include/functions_api.php:4470
-msgid "Error assigning module to template. Id_module doesn't exist."
-msgstr "テンプレートへのモジュール割当エラー。id_moduleが存在しません。"
-
-#: ../../include/functions_api.php:4478
-msgid "Error assigning module to template."
-msgstr "テンプレートへのモジュール割当エラー。"
-
-#: ../../include/functions_api.php:4504
-msgid ""
-"Error deleting module template. Id_module_template cannot be left blank."
-msgstr "モジュールテンプレート削除エラー。id_module_templateが指定されていません。"
-
-#: ../../include/functions_api.php:4511
-msgid "Error deleting module template. Id_module_template doesn't exist."
-msgstr "モジュールテンプレート削除エラー。id_module_templateが存在しません。"
-
-#: ../../include/functions_api.php:4519 ../../include/functions_api.php:4578
-msgid "Error deleting module template."
-msgstr "モジュールテンプレート削除エラー。"
-
-#: ../../include/functions_api.php:4522 ../../include/functions_api.php:4581
-msgid "Correct deleting of module template."
-msgstr "モジュールテンプレートの削除内容を修正してください。"
-
-#: ../../include/functions_api.php:4658
-msgid "Error validate all alerts. Failed "
-msgstr "全アラートの承諾エラー。失敗数: "
-
-#: ../../include/functions_api.php:4661
-msgid "Correct validating of all alerts."
-msgstr "全アラートの承諾内容を修正してください。"
-
-#: ../../include/functions_api.php:4688
-msgid "Error validating all alert policies."
-msgstr "全アラートポリシーの承諾エラー。"
-
-#: ../../include/functions_api.php:4746
-msgid "Error validate all policy alerts. Failed "
-msgstr "全ポリシーアラートの承諾エラー。失敗数: "
-
-#: ../../include/functions_api.php:4749
-msgid "Correct validating of all policy alerts."
-msgstr "全ポリシーアラートの承諾内容を修正してください。"
-
-#: ../../include/functions_api.php:4772
-msgid "Error stopping downtime. Id_downtime cannot be left blank."
-msgstr "計画停止の中断エラー。id_downtimeが指定されていません。"
-
-#: ../../include/functions_api.php:4788
-msgid "Downtime stopped."
-msgstr "計画停止を中断しました。"
-
-#: ../../include/functions_api.php:5103
-msgid "and this modules are doesn't exists or not applicable a this agents: "
-msgstr "これらのモジュールが存在しないかまたはエージェントに適用できません : "
-
-#: ../../include/functions_api.php:5105
-msgid "and this agents are generate problems: "
-msgstr "これらのエージェントでエラーです : "
-
-#: ../../include/functions_api.php:5107
-msgid "and this agents with ids are doesn't exists: "
-msgstr "これらのエージェントIDは存在しません : "
-
-#: ../../include/functions_api.php:5134
-msgid "Error adding agent to policy. Id_policy cannot be left blank."
-msgstr "ポリシーへのエージェント追加エラー。id_policyが指定されていません。"
-
-#: ../../include/functions_api.php:5139
-msgid "Error adding agent to policy. Id_agent cannot be left blank."
-msgstr "ポリシーへのエージェント追加エラー。id_agentが指定されていません。"
-
-#: ../../include/functions_api.php:5147
-msgid "Error adding agent to policy. Id_agent doesn't exist."
-msgstr "ポリシーへのエージェント追加エラー。id_agentが存在しません。"
-
-#: ../../include/functions_api.php:5155
-msgid "Error adding agent to policy."
-msgstr "ポリシーへのエージェント追加エラー。"
-
-#: ../../include/functions_api.php:5163
-msgid "Error adding agent to policy. The agent is already in the policy."
-msgstr "ポリシーへのエージェント追加エラー。指定のエージェントはすでにポリシー内にあります。"
-
-#: ../../include/functions_api.php:5198
-msgid "Error adding data module to policy. Id_policy cannot be left blank."
-msgstr "ポリシーへのデータモジュール追加エラー。id_policyが指定されていません。"
-
-#: ../../include/functions_api.php:5203
-msgid "Error adding data module to policy. Module_name cannot be left blank."
-msgstr "ポリシーへのデータモジュール追加エラー。module_nameが指定されていません。"
-
-#: ../../include/functions_api.php:5211
-msgid "Error adding data module to policy."
-msgstr "ポリシーへのデータモジュール追加エラー。"
-
-#: ../../include/functions_api.php:5247
-msgid ""
-"Error adding data module to policy. The module is already in the policy."
-msgstr "ポリシーへのデータモジュール追加エラー。指定のモジュールがすでにポリシー内にあります。"
-
-#: ../../include/functions_api.php:5287
-msgid "Error updating data module in policy. Id_policy cannot be left blank."
-msgstr "ポリシーのデータモジュール更新エラー。id_policyが指定されていません。"
-
-#: ../../include/functions_api.php:5292
-msgid ""
-"Error updating data module in policy. Id_policy_module cannot be left blank."
-msgstr "ポリシーのデータモジュール更新エラー。id_policy_moduleが指定されていません。"
-
-#: ../../include/functions_api.php:5300
-msgid "Error updating data module in policy. Module doesn't exist."
-msgstr "ポリシーのデータモジュール更新エラー。モジュールが存在しません。"
-
-#: ../../include/functions_api.php:5306
-msgid ""
-"Error updating data module in policy. Module type is not network type."
-msgstr "ポリシー内のデータモジュールの更新エラー。モジュールタイプがネットワークタイプではありません。"
-
-#: ../../include/functions_api.php:5335
-msgid "Data policy module updated."
-msgstr "データポリシーモジュールを更新しました。"
-
-#: ../../include/functions_api.php:5364
-msgid ""
-"Error adding network module to policy. Id_policy cannot be left blank."
-msgstr "ポリシーへのネットワークモジュール追加エラー。id_policyが指定されていません。"
-
-#: ../../include/functions_api.php:5370
-msgid ""
-"Error adding network module to policy. Module_name cannot be left blank."
-msgstr "ポリシーへのネットワークモジュール追加エラー。module_nameが指定されていません。"
-
-#: ../../include/functions_api.php:5376
-msgid ""
-"Error adding network module to policy. Id_module_type is not correct for "
-"network modules."
-msgstr "ポリシーへのネットワークモジュール追加エラー。id_module_typeがネットワークモジュールとして不正です。"
-
-#: ../../include/functions_api.php:5386
-msgid "Error adding network module to policy."
-msgstr "ポリシーへのネットワークモジュール追加エラー。"
-
-#: ../../include/functions_api.php:5424
-msgid ""
-"Error adding network module to policy. The module is already in the policy."
-msgstr "ポリシーへのネットワークモジュール追加エラー。指定したモジュールはすでにポリシー内にあります。"
-
-#: ../../include/functions_api.php:5462
-msgid ""
-"Error updating network module in policy. Id_policy cannot be left blank."
-msgstr "ポリシーのネットワークモジュール更新エラー。id_policyが指定されていません。"
-
-#: ../../include/functions_api.php:5468
-msgid ""
-"Error updating network module in policy. Id_policy_module cannot be left "
-"blank."
-msgstr "ポリシーのネットワークモジュール更新エラー。id_policy_moduleが指定されていません。"
-
-#: ../../include/functions_api.php:5477
-msgid "Error updating network module in policy. Module doesn't exist."
-msgstr "ポリシーのネットワークモジュール更新エラー。モジュールが存在しません。"
-
-#: ../../include/functions_api.php:5483
-msgid ""
-"Error updating network module in policy. Module type is not network type."
-msgstr "ポリシーのネットワークモジュール更新エラー。モジュールタイプがネットワークのタイプではありません。"
-
-#: ../../include/functions_api.php:5509
-msgid "Network policy module updated."
-msgstr "ネットワークポリシーモジュールを更新しました。"
-
-#: ../../include/functions_api.php:5536
-msgid "Error adding plugin module to policy. Id_policy cannot be left blank."
-msgstr "ポリシーへのプラグインモジュール追加エラー。id_policyが指定されていません。"
-
-#: ../../include/functions_api.php:5541
-msgid ""
-"Error adding plugin module to policy. Module_name cannot be left blank."
-msgstr "ポリシーへのプラグインモジュール追加エラー。module_nameが指定されていません。"
-
-#: ../../include/functions_api.php:5546
-msgid "Error adding plugin module to policy. Id_plugin cannot be left blank."
-msgstr "ポリシーへのプラグインモジュール追加エラー。id_pluginが指定されていません。"
-
-#: ../../include/functions_api.php:5554
-msgid "Error adding plugin module to policy."
-msgstr "ポリシーへのプラグインモジュール追加エラー。"
-
-#: ../../include/functions_api.php:5597
-msgid ""
-"Error adding plugin module to policy. The module is already in the policy."
-msgstr "ポリシーへのプラグインモジュール追加エラー。指定のモジュールはすでにポリシー内にあります。"
-
-#: ../../include/functions_api.php:5636
-msgid ""
-"Error updating plugin module in policy. Id_policy cannot be left blank."
-msgstr "ポリシーのプラグインモジュール更新エラー。id_policyが指定されていません。"
-
-#: ../../include/functions_api.php:5642
-msgid ""
-"Error updating plugin module in policy. Id_policy_module cannot be left "
-"blank."
-msgstr "ポリシーのプラグインモジュール更新エラー。id_policy_moduleが指定されていません。"
-
-#: ../../include/functions_api.php:5651
-msgid "Error updating plugin module in policy. Module doesn't exist."
-msgstr "ポリシーのプラグインモジュール更新エラー。モジュールが存在しません。"
-
-#: ../../include/functions_api.php:5657
-msgid ""
-"Error updating plugin module in policy. Module type is not network type."
-msgstr "ポリシーのプラグインモジュール更新エラー。モジュールタイプがネットワークのタイプではありません。"
-
-#: ../../include/functions_api.php:5689
-msgid "Plugin policy module updated."
-msgstr "プラグインポリシーモジュールを更新しました。"
-
-#: ../../include/functions_api.php:5864
-msgid "Error adding SNMP module to policy. Id_policy cannot be left blank."
-msgstr "SNMPモジュールのポリシーへの追加エラー。id_policyが指定されていません。"
-
-#: ../../include/functions_api.php:5869
-msgid "Error adding SNMP module to policy. Module_name cannot be left blank."
-msgstr "SNMPモジュールのポリシーへの追加エラー。module_nameが指定されていません。"
-
-#: ../../include/functions_api.php:5877
-msgid "Error adding SNMP module to policy."
-msgstr "SNMPモジュールのポリシーへの追加エラー。"
-
-#: ../../include/functions_api.php:5882
-msgid ""
-"Error adding SNMP module to policy. Id_module_type is not correct for SNMP "
-"modules."
-msgstr "SNMPモジュールのポリシーへの追加エラー。id_module_type が SNMP モジュール用になっていません。"
-
-#: ../../include/functions_api.php:5976
-msgid ""
-"Error adding SNMP module to policy. The module is already in the policy."
-msgstr "SNMPモジュールのポリシーへの追加エラー。モジュールはすでにポリシー内に存在します。"
-
-#: ../../include/functions_api.php:6015
-msgid "Error updating SNMP module in policy. Id_policy cannot be left blank."
-msgstr "ポリシー内のSNMPモジュール更新エラー。id_policyが指定されていません。"
-
-#: ../../include/functions_api.php:6020
-msgid ""
-"Error updating SNMP module in policy. Id_policy_module cannot be left blank."
-msgstr "ポリシー内のSNMPモジュール更新エラー。id_policy_moduleが指定されていません。"
-
-#: ../../include/functions_api.php:6028
-msgid "Error updating SNMP module in policy. Module doesn't exist."
-msgstr "ポリシー内のSNMPモジュール更新エラー。モジュールが存在しません。"
-
-#: ../../include/functions_api.php:6033
-msgid "Error updating SNMP module in policy. Module type is not SNMP type."
-msgstr "ポリシー内のSNMPモジュール更新エラー。モジュールタイプが SNMP ではありません。"
-
-#: ../../include/functions_api.php:6043
-msgid ""
-"Error updating SNMP module. snmp3_priv_method doesn't exist. Set it to 'AES' "
-"or 'DES'. "
-msgstr "SNMPモジュール更新エラー。snmp3_priv_methodがありません。'AES' または 'DES' を指定してください。 "
-
-#: ../../include/functions_api.php:6053
-msgid ""
-"Error updating SNMP module. snmp3_sec_level doesn't exist. Set it to "
-"'authNoPriv' or 'authPriv' or 'noAuthNoPriv'. "
-msgstr ""
-"SNMPモジュール更新エラー。snmp3_sec_level がありません。'authNoPriv'、'authPriv'、'noAuthNoPriv' "
-"のいずれかを指定してください。 "
-
-#: ../../include/functions_api.php:6060
-msgid ""
-"Error updating SNMP module. snmp3_auth_method doesn't exist. Set it to 'MD5' "
-"or 'SHA'. "
-msgstr "SNMPモジュール更新エラー。snmp3_auth_method がありません。'MD5' または 'SHA' を指定してください。 "
-
-#: ../../include/functions_api.php:6100
-msgid "SNMP policy module updated."
-msgstr "SNMPポリシーモジュールを更新しました。"
-
-#: ../../include/functions_api.php:6123
-msgid "Error applying policy. Id_policy cannot be left blank."
-msgstr "ポリシー適用エラー。id_policy が指定されていません。"
-
-#: ../../include/functions_api.php:6136 ../../include/functions_api.php:6161
-msgid "Error applying policy."
-msgstr "ポリシー適用エラー。"
-
-#: ../../include/functions_api.php:6148
-msgid "Error applying policy. This policy is already pending to apply."
-msgstr "ポリシー適用エラー。このポリシーは適用が保留されています。"
-
-#: ../../include/functions_api.php:6206
-msgid "Error applying all policies."
-msgstr "全ポリシーの適用エラー。"
-
-#: ../../include/functions_api.php:6258
-msgid "Error in group creation. Group_name cannot be left blank."
-msgstr "グループ作成エラー。group_name が指定されていません。"
-
-#: ../../include/functions_api.php:6264
-msgid "Error in group creation. Icon_name cannot be left blank."
-msgstr "グループ作成エラー。icon_name が指定されていません。"
-
-#: ../../include/functions_api.php:6277 ../../include/functions_api.php:6453
-msgid "Error in group creation. Id_parent_group doesn't exist."
-msgstr "グループ作成エラー。id_parent_group が存在しません。"
-
-#: ../../include/functions_api.php:6305
-msgid "Error in group creation."
-msgstr "グループ作成エラー。"
-
-#: ../../include/functions_api.php:6441
-msgid "Error in netflow filter creation. Filter name cannot be left blank."
-msgstr "Netflow フィルタ作成エラー。フィルタ名が空です。"
-
-#: ../../include/functions_api.php:6446
-msgid "Error in netflow filter creation. Group id cannot be left blank."
-msgstr "Netflow フィルタ作成エラー。グループ ID が空です。"
-
-#: ../../include/functions_api.php:6459
-msgid "Error in netflow filter creation. Filter cannot be left blank."
-msgstr "Netflow フィルタ作成エラー。フィルタが空です。"
-
-#: ../../include/functions_api.php:6464
-msgid "Error in netflow filter creation. Aggregate_by cannot be left blank."
-msgstr "Netflow フィルタ作成エラー。集約設定が空です。"
-
-#: ../../include/functions_api.php:6469
-msgid "Error in netflow filter creation. Output_format cannot be left blank."
-msgstr "Netflow フィルタ作成エラー。出力フォーマットが空です。"
-
-#: ../../include/functions_api.php:6487
-msgid "Error in netflow filter creation."
-msgstr "Netflow フィルタ作成エラー。"
-
-#: ../../include/functions_api.php:6671
-msgid "Create user."
-msgstr "ユーザ作成"
-
-#: ../../include/functions_api.php:6710
-msgid "Error updating user. Id_user cannot be left blank."
-msgstr "ユーザ更新エラー。id_user が指定されていません。"
-
-#: ../../include/functions_api.php:6718
-msgid "Error updating user. Id_user doesn't exist."
-msgstr "ユーザ更新エラー。id_user が存在しません。"
-
-#: ../../include/functions_api.php:6734
-msgid "Error updating user. Password info incorrect."
-msgstr "ユーザ更新エラー。パスワード情報が不正です。"
-
-#: ../../include/functions_api.php:6742
-msgid "Updated user."
-msgstr "ユーザを更新しました。"
-
-#: ../../include/functions_api.php:6773
-msgid "Error enable/disable user. Id_user cannot be left blank."
-msgstr "ユーザの有効化/無効化エラー。id_user は空にできません。"
-
-#: ../../include/functions_api.php:6780
-msgid "Error enable/disable user. Enable/disable value cannot be left blank."
-msgstr "ユーザの有効化/無効化エラー。有効化/無効化の値は空にできません。"
-
-#: ../../include/functions_api.php:6786
-msgid "Error enable/disable user. The user doesn't exist."
-msgstr "ユーザの有効化/無効化エラー。ユーザが存在しません。"
-
-#: ../../include/functions_api.php:6795
-msgid "Error in user enabling/disabling."
-msgstr "ユーザの有効化/無効化エラー。"
-
-#: ../../include/functions_api.php:6800
-msgid "Enabled user."
-msgstr "ユーザを有効化しました。"
-
-#: ../../include/functions_api.php:6804
-msgid "Disabled user."
-msgstr "ユーザを無効化しました。"
-
-#: ../../include/functions_api.php:8268
-msgid "Delete user."
-msgstr "ユーザ削除"
-
-#: ../../include/functions_api.php:8297
-msgid "Add user profile."
-msgstr "ユーザプロファイル追加"
-
-#: ../../include/functions_api.php:8330
-msgid "Delete user profile."
-msgstr "ユーザプロファイル削除"
-
-#: ../../include/functions_api.php:8428
-msgid "Correct module disable"
-msgstr "モジュールを無効にしました"
-
-#: ../../include/functions_api.php:8431
-msgid "Error disabling module"
-msgstr "モジュール無効化エラー"
-
-#: ../../include/functions_api.php:8457
-msgid "Correct module enable"
-msgstr "モジュールを有効にしました"
-
-#: ../../include/functions_api.php:8460
-msgid "Error enabling module"
-msgstr "モジュール有効化エラー"
-
-#: ../../include/functions_api.php:9024
-msgid "Error adding event comment."
-msgstr "イベントコメント追加エラー"
-
-#: ../../include/functions_api.php:9263
-msgid "Error enable/disable agent. Id_agent cannot be left blank."
-msgstr "エージェント有効化/無効化エラー。id_agent は空にできません。"
-
-#: ../../include/functions_api.php:9270
-msgid ""
-"Error enable/disable agent. Enable/disable value cannot be left blank."
-msgstr "エージェント有効化/無効化エラー。有効化/無効化は空にできません。"
-
-#: ../../include/functions_api.php:9276
-msgid "Error enable/disable agent. The agent doesn't exist."
-msgstr "エージェント有効化/無効化エラー。エージェントが存在しません。"
-
-#: ../../include/functions_api.php:9287
-msgid "Error in agent enabling/disabling."
-msgstr "エージェント有効化/無効化エラー"
-
-#: ../../include/functions_api.php:9293
-msgid "Enabled agent."
-msgstr "エージェントを有効化しました"
-
-#: ../../include/functions_api.php:9298
-msgid "Disabled agent."
-msgstr "エージェントを無効化しました"
-
-#: ../../include/functions_api.php:9394
-msgid "Error getting special_days."
-msgstr "特別日取得エラー。"
-
-#: ../../include/functions_api.php:9429
-msgid "Error creating special day. Specified day already exists."
-msgstr "特別日作成エラー。特別日はすでに存在します。"
-
-#: ../../include/functions_api.php:9434
-msgid "Error creating special day. Invalid date format."
-msgstr "特別日作成エラー。日付の書式が不正です。"
-
-#: ../../include/functions_api.php:9446
-msgid "Error in creation special day."
-msgstr "特別日作成エラー。"
-
-#: ../../include/functions_api.php:9479
-msgid "Error updating special day. Id cannot be left blank."
-msgstr "特別日更新エラー。IDは空にできません。"
-
-#: ../../include/functions_api.php:9486
-msgid "Error updating special day. Id doesn't exist."
-msgstr "特別日更新エラー。IDが存在しません。"
-
-#: ../../include/functions_api.php:9491
-msgid "Error updating special day. Invalid date format."
-msgstr "特別日更新エラー。日付の書式が不正です。"
-
-#: ../../include/functions_api.php:9525
-msgid "Error deleting special day. Id cannot be left blank."
-msgstr "特別日削除エラー。IDは空にできません。"
-
-#: ../../include/functions_api.php:9532
-msgid "Error deleting special day. Id doesn't exist."
-msgstr "特別日削除エラー。IDが存在しません。"
-
-#: ../../include/functions_api.php:9539
-msgid "Error in deletion special day."
-msgstr "特別日削除エラー。"
+#: ../../include/functions_servers.php:454
+msgid "Syslog server"
+msgstr "Syslog サーバ"
 
 #: ../../include/functions_snmp.php:67
 msgid "Load Average (Last minute)"
@@ -20842,1606 +25978,51 @@ msgstr "idle CPU時間"
 msgid "system Up time"
 msgstr "システムアップタイム"
 
-#: ../../include/functions_clippy.php:163
-#: ../../include/functions_clippy.php:168
-msgid "End wizard"
-msgstr "ウィザードの終了"
-
-#: ../../include/functions_clippy.php:195
-msgid "Next &rarr;"
-msgstr "次へ &rarr;"
-
-#: ../../include/functions_clippy.php:196
-msgid "&larr; Back"
-msgstr "&larr; 戻る"
-
-#: ../../include/functions_clippy.php:208
-msgid "Do you want to exit the help tour?"
-msgstr "ヘルプツアーを終了しますか。"
-
-#: ../../include/functions_update_manager.php:202
-msgid "There is a unknown error."
-msgstr "不明なエラーがあります。"
-
-#: ../../include/functions_update_manager.php:316
-#: ../../include/functions_update_manager.php:319
-#: ../../include/functions_update_manager.php:438
-#: ../../include/functions_update_manager.php:442
-#: ../../enterprise/include/functions_update_manager.php:141
-#: ../../enterprise/include/functions_update_manager.php:310
-msgid "Could not connect to internet"
-msgstr "インターネットへ接続できません"
-
-#: ../../include/functions_update_manager.php:324
-#: ../../include/functions_update_manager.php:327
-#: ../../include/functions_update_manager.php:449
-#: ../../include/functions_update_manager.php:453
-#: ../../enterprise/include/functions_update_manager.php:144
-msgid "Server not found."
-msgstr "サーバが見つかりません。"
-
-#: ../../include/functions_update_manager.php:375
-msgid "Update to the last version"
-msgstr "最新版に更新"
-
-#: ../../include/functions_update_manager.php:378
-#: ../../enterprise/include/functions_update_manager.php:222
-msgid "There is no update available."
-msgstr "更新がありません。"
-
-#: ../../include/functions_update_manager.php:487
-#: ../../include/functions_update_manager.php:517
-msgid "Remote server error on newsletter request"
-msgstr "ニュースレターリクエストにおけるリモートサーバエラー"
-
-#: ../../include/functions_update_manager.php:495
-msgid "E-mail successfully subscribed to newsletter."
-msgstr "ニュースレターの購読登録が完了しました。"
-
-#: ../../include/functions_update_manager.php:497
-msgid "E-mail has already subscribed to newsletter."
-msgstr "設定メールアドレスはすでにニュースレター購読済です。"
-
-#: ../../include/functions_update_manager.php:499
-#: ../../include/functions_update_manager.php:539
-msgid "Update manager returns error code: "
-msgstr "アップデートマネージャがエラーコードを返しました: "
-
-#: ../../include/functions_update_manager.php:534
-msgid "Pandora successfully subscribed with UID: "
-msgstr "次のUIDで購読しました: "
-
-#: ../../include/functions_update_manager.php:536
-msgid "Unsuccessful subscription."
-msgstr "購読に失敗しました。"
-
-#: ../../include/functions_update_manager.php:663
-msgid "Failed extracting the package to temp directory."
-msgstr "テンポラリディレクトリへのパッケージ展開に失敗しました。"
-
-#: ../../include/functions_update_manager.php:702
-msgid "Failed the copying of the files."
-msgstr "ファイルのコピーに失敗しました。"
-
-#: ../../include/functions_update_manager.php:718
-msgid "Package extracted successfully."
-msgstr "パッケージを展開しました。"
-
-#: ../../include/functions_config.php:94
-msgid "Failed updated: User did not login."
-msgstr "更新失敗: ユーザがログインしていません。"
-
-#: ../../include/functions_config.php:102
-msgid "Failed updated: User is not admin."
-msgstr "更新失敗: ユーザは管理者ではありません。"
-
-#: ../../include/functions_config.php:140
-msgid "SSL cert path"
-msgstr "SSL証明書パス"
-
-#: ../../include/functions_config.php:144
-msgid "Use cert."
-msgstr "証明書利用"
-
-#: ../../include/functions_config.php:154
-msgid "Enable Integria incidents in Pandora Console"
-msgstr "PandoraコンソールでIntegriaインシデントを有効にする"
-
-#: ../../include/functions_config.php:156
-msgid "Integria inventory"
-msgstr "Integria インベントリ"
-
-#: ../../include/functions_config.php:158
-msgid "Integria API password"
-msgstr "Integria API パスワード"
-
-#: ../../include/functions_config.php:160
-msgid "Integria URL"
-msgstr "Integria URL"
-
-#: ../../include/functions_config.php:184
-msgid "License information"
-msgstr "ライセンス情報"
-
-#: ../../include/functions_config.php:204
-msgid "Identification_reminder"
-msgstr "識別リマインダ"
-
-#: ../../include/functions_config.php:206
-msgid "Include_agents"
-msgstr "エージェントのインクルード"
-
-#: ../../include/functions_config.php:208
-msgid "Audit log directory"
-msgstr "監査ログディレクトリ"
-
-#: ../../include/functions_config.php:213
-#: ../../enterprise/godmode/setup/setup.php:30
-msgid "Forward SNMP traps to agent (if exist)"
-msgstr "SNMP トラップのエージェント(存在する場合)への転送"
-
-#: ../../include/functions_config.php:215
-#: ../../enterprise/godmode/setup/setup.php:38
-msgid "Use Enterprise ACL System"
-msgstr "エンタープライズ ACL システムを利用する"
-
-#: ../../include/functions_config.php:217
-#: ../../enterprise/meta/include/functions_meta.php:348
-msgid "Activate Metaconsole"
-msgstr "メタコンソールの有効化"
-
-#: ../../include/functions_config.php:219
-#: ../../enterprise/godmode/setup/setup.php:47
-msgid "Size of collection"
-msgstr "コレクションのサイズ"
-
-#: ../../include/functions_config.php:221
-#: ../../enterprise/godmode/setup/setup.php:54
-#: ../../enterprise/meta/advanced/metasetup.consoles.php:384
-msgid "Events replication"
-msgstr "イベント複製"
-
-#: ../../include/functions_config.php:224
-#: ../../enterprise/godmode/setup/setup.php:63
-msgid "Replication interval"
-msgstr "複製間隔"
-
-#: ../../include/functions_config.php:226
-#: ../../enterprise/godmode/setup/setup.php:70
-msgid "Replication limit"
-msgstr "複製制限"
-
-#: ../../include/functions_config.php:228
-#: ../../enterprise/godmode/setup/setup.php:89
-msgid "Replication mode"
-msgstr "複製モード"
-
-#: ../../include/functions_config.php:230
-#: ../../enterprise/godmode/setup/setup.php:138
-msgid "Show events list in local console (read only)"
-msgstr "ローカルコンソールでのイベント一覧表示 (参照のみ)"
-
-#: ../../include/functions_config.php:233
-msgid "Replication DB engine"
-msgstr "複製 DB エンジン"
-
-#: ../../include/functions_config.php:235
-msgid "Replication DB host"
-msgstr "複製 DB ホスト"
-
-#: ../../include/functions_config.php:237
-msgid "Replication DB database"
-msgstr "複製データベース"
-
-#: ../../include/functions_config.php:239
-msgid "Replication DB user"
-msgstr "複製 DB ユーザ"
-
-#: ../../include/functions_config.php:241
-msgid "Replication DB password"
-msgstr "複製 DB パスワード"
-
-#: ../../include/functions_config.php:243
-msgid "Replication DB port"
-msgstr "複製 DB ポート"
-
-#: ../../include/functions_config.php:245
-msgid "Metaconsole agent cache"
-msgstr "メタコンソールエージェントキャッシュ"
-
-#: ../../include/functions_config.php:247
-#: ../../enterprise/godmode/setup/setup.php:203
-msgid "Activate Log Collector"
-msgstr "ログ収集の有効化"
-
-#: ../../include/functions_config.php:251
-#: ../../enterprise/godmode/setup/setup.php:147
-msgid "Inventory changes blacklist"
-msgstr "インベントリブラックリスト変更"
-
-#: ../../include/functions_config.php:258
-#: ../../enterprise/godmode/setup/setup.php:243
-#: ../../enterprise/meta/advanced/metasetup.password.php:78
-#: ../../enterprise/meta/include/functions_meta.php:499
-msgid "Enable password policy"
-msgstr "パスワードポリシーを利用する"
-
-#: ../../include/functions_config.php:261
-#: ../../enterprise/godmode/setup/setup.php:248
-#: ../../enterprise/meta/advanced/metasetup.password.php:84
-#: ../../enterprise/meta/include/functions_meta.php:509
-msgid "Min. size password"
-msgstr "最小パスワードサイズ"
-
-#: ../../include/functions_config.php:263
-#: ../../enterprise/godmode/setup/setup.php:262
-#: ../../enterprise/meta/advanced/metasetup.password.php:101
-#: ../../enterprise/meta/include/functions_meta.php:539
-msgid "Password expiration"
-msgstr "パスワードの期限切れ"
-
-#: ../../include/functions_config.php:265
-#: ../../enterprise/godmode/setup/setup.php:266
-#: ../../enterprise/meta/advanced/metasetup.password.php:106
-#: ../../enterprise/meta/include/functions_meta.php:549
-msgid "Force change password on first login"
-msgstr "初回ログイン時にパスワードを変更する"
-
-#: ../../include/functions_config.php:267
-#: ../../enterprise/godmode/setup/setup.php:271
-#: ../../enterprise/meta/advanced/metasetup.password.php:112
-#: ../../enterprise/meta/include/functions_meta.php:559
-msgid "User blocked if login fails"
-msgstr "ログインに失敗するとユーザをブロックします"
-
-#: ../../include/functions_config.php:269
-#: ../../enterprise/godmode/setup/setup.php:275
-#: ../../enterprise/meta/advanced/metasetup.password.php:117
-#: ../../enterprise/meta/include/functions_meta.php:569
-msgid "Number of failed login attempts"
-msgstr "ログイン失敗回数"
-
-#: ../../include/functions_config.php:271
-#: ../../enterprise/godmode/setup/setup.php:252
-#: ../../enterprise/meta/advanced/metasetup.password.php:89
-#: ../../enterprise/meta/include/functions_meta.php:519
-msgid "Password must have numbers"
-msgstr "パスワードには数字を含む必要があります"
-
-#: ../../include/functions_config.php:273
-#: ../../enterprise/godmode/setup/setup.php:257
-#: ../../enterprise/meta/advanced/metasetup.password.php:95
-#: ../../enterprise/meta/include/functions_meta.php:529
-msgid "Password must have symbols"
-msgstr "パスワードには記号を含む必要があります"
-
-#: ../../include/functions_config.php:275
-#: ../../enterprise/godmode/setup/setup.php:280
-#: ../../enterprise/meta/advanced/metasetup.password.php:122
-#: ../../enterprise/meta/include/functions_meta.php:486
-msgid "Apply password policy to admin users"
-msgstr "管理者ユーザへパスワードポリシーを適用"
-
-#: ../../include/functions_config.php:277
-#: ../../enterprise/godmode/setup/setup.php:285
-#: ../../enterprise/meta/advanced/metasetup.password.php:128
-#: ../../enterprise/meta/include/functions_meta.php:579
-msgid "Enable password history"
-msgstr "パスワード履歴の有効化"
-
-#: ../../include/functions_config.php:279
-#: ../../enterprise/godmode/setup/setup.php:290
-#: ../../enterprise/meta/advanced/metasetup.password.php:134
-#: ../../enterprise/meta/include/functions_meta.php:589
-msgid "Compare previous password"
-msgstr "以前のパスワードとの比較"
-
-#: ../../include/functions_config.php:289
-#: ../../enterprise/godmode/setup/setup_auth.php:52
-#: ../../enterprise/godmode/setup/setup_auth.php:369
-#: ../../enterprise/meta/include/functions_meta.php:632
-msgid "Autocreate profile"
-msgstr "プロファイルの自動作成"
-
-#: ../../include/functions_config.php:291
-#: ../../enterprise/godmode/setup/setup_auth.php:58
-#: ../../enterprise/godmode/setup/setup_auth.php:375
-#: ../../enterprise/meta/include/functions_meta.php:642
-msgid "Autocreate profile group"
-msgstr "プロファイルグループの自動作成"
-
-#: ../../include/functions_config.php:293
-#: ../../enterprise/godmode/setup/setup_auth.php:65
-#: ../../enterprise/godmode/setup/setup_auth.php:382
-#: ../../enterprise/meta/include/functions_meta.php:652
-msgid "Autocreate profile tags"
-msgstr "自動作成プロファイルタグ"
-
-#: ../../include/functions_config.php:295
-#: ../../enterprise/godmode/setup/setup_auth.php:491
-#: ../../enterprise/meta/include/functions_meta.php:662
-msgid "Autocreate blacklist"
-msgstr "ブラックリストの自動作成"
-
-#: ../../include/functions_config.php:298
-#: ../../enterprise/godmode/setup/setup_auth.php:499
-#: ../../enterprise/meta/include/functions_meta.php:694
-msgid "Active directory server"
-msgstr "アクティブディレクトリサーバ"
-
-#: ../../include/functions_config.php:300
-#: ../../enterprise/godmode/setup/setup_auth.php:505
-#: ../../enterprise/meta/include/functions_meta.php:704
-msgid "Active directory port"
-msgstr "アクティブディレクトリポート"
-
-#: ../../include/functions_config.php:304
-#: ../../enterprise/godmode/setup/setup_auth.php:354
-#: ../../enterprise/meta/include/functions_meta.php:724
-msgid "Advanced Config AD"
-msgstr "拡張 AD 設定"
-
-#: ../../include/functions_config.php:306
-#: ../../enterprise/godmode/setup/setup_auth.php:518
-#: ../../enterprise/meta/include/functions_meta.php:734
-msgid "Domain"
-msgstr "ドメイン"
-
-#: ../../include/functions_config.php:308
-#: ../../enterprise/godmode/setup/setup_auth.php:416
-#: ../../enterprise/meta/include/functions_meta.php:744
-msgid "Advanced Permisions AD"
-msgstr "AD 拡張パーミッション"
-
-#: ../../include/functions_config.php:326
-#: ../../enterprise/godmode/setup/setup_auth.php:254
-msgid "MySQL host"
-msgstr "MySQL ホスト"
-
-#: ../../include/functions_config.php:328
-#: ../../include/functions_config.php:339
-#: ../../include/functions_config.php:349
-#: ../../enterprise/godmode/setup/setup_auth.php:260
-#: ../../enterprise/godmode/setup/setup_auth.php:291
-#: ../../enterprise/godmode/setup/setup_auth.php:322
-#: ../../enterprise/meta/include/functions_meta.php:839
-#: ../../enterprise/meta/include/functions_meta.php:892
-#: ../../enterprise/meta/include/functions_meta.php:945
-msgid "MySQL port"
-msgstr "MySQL ポート"
-
-#: ../../include/functions_config.php:330
-#: ../../include/functions_config.php:341
-#: ../../include/functions_config.php:351
-#: ../../include/functions_config.php:697
-#: ../../enterprise/godmode/setup/setup_auth.php:266
-#: ../../enterprise/godmode/setup/setup_auth.php:297
-#: ../../enterprise/godmode/setup/setup_auth.php:328
-#: ../../enterprise/godmode/setup/setup_history.php:59
-#: ../../enterprise/meta/include/functions_meta.php:849
-#: ../../enterprise/meta/include/functions_meta.php:902
-#: ../../enterprise/meta/include/functions_meta.php:955
-msgid "Database name"
-msgstr "データベース名"
-
-#: ../../include/functions_config.php:337
-#: ../../enterprise/godmode/setup/setup_auth.php:285
-#: ../../enterprise/meta/include/functions_meta.php:882
-msgid "Babel Enterprise host"
-msgstr "Babel Enterprise ホスト"
-
-#: ../../include/functions_config.php:347
-#: ../../enterprise/godmode/setup/setup_auth.php:316
-#: ../../enterprise/meta/include/functions_meta.php:935
-msgid "Integria host"
-msgstr "Integria ホスト"
-
-#: ../../include/functions_config.php:357
-msgid "Saml path"
-msgstr "SAML パス"
-
-#: ../../include/functions_config.php:361
-#: ../../enterprise/meta/include/functions_meta.php:682
-msgid "Session timeout"
-msgstr "セッションタイムアウト"
-
-#: ../../include/functions_config.php:387
-msgid "Max. days before autodisable deletion"
-msgstr "自動無効化エージェントの保持日数"
-
-#: ../../include/functions_config.php:389
-msgid "Item limit for realtime reports)"
-msgstr "リアルタイムレポートのアイテム制限"
-
-#: ../../include/functions_config.php:405
-msgid "Big Operatiopn Step to purge old data"
-msgstr "古いデータ削除のための大きな操作ステップ"
-
-#: ../../include/functions_config.php:446
-#: ../../enterprise/meta/advanced/metasetup.visual.php:111
-#: ../../enterprise/meta/include/functions_meta.php:1048
-msgid "Graphic resolution (1-low, 5-high)"
-msgstr "グラフ解像度 (1-低い,5-高い)"
-
-#: ../../include/functions_config.php:447
-#: ../../include/functions_config.php:1543
-#: ../../include/functions_netflow.php:1640
-#: ../../operation/netflow/nf_live_view.php:406
-msgid "Bytes"
-msgstr "バイト"
-
-#: ../../include/functions_config.php:461
-msgid "Show QR code header"
-msgstr "QR コードヘッダー表示"
-
-#: ../../include/functions_config.php:474
-#: ../../enterprise/meta/include/functions_meta.php:1141
-msgid "Custom logo login"
-msgstr "ログイン時のカスタムロゴ"
-
-#: ../../include/functions_config.php:476
-#: ../../enterprise/meta/include/functions_meta.php:1151
-msgid "Custom splash login"
-msgstr "カスタムスプラッシュログイン"
-
-#: ../../include/functions_config.php:478
-#: ../../enterprise/meta/include/functions_meta.php:1161
-msgid "Custom title1 login"
-msgstr "カスタムタイトル1 ログイン"
-
-#: ../../include/functions_config.php:480
-#: ../../enterprise/meta/include/functions_meta.php:1171
-msgid "Custom title2 login"
-msgstr "カスタムタイトル2 ログイン"
-
-#: ../../include/functions_config.php:485
-msgid "Custom logo metaconsole"
-msgstr "メタコンソールカスタムロゴ"
-
-#: ../../include/functions_config.php:487
-msgid "Custom logo login metaconsole"
-msgstr "メタコンソールログイン カスタムロゴ"
-
-#: ../../include/functions_config.php:489
-msgid "Custom splash login metaconsole"
-msgstr "メタコンソールカスタムスプラッシュログイン"
-
-#: ../../include/functions_config.php:491
-msgid "Custom title1 login metaconsole"
-msgstr "メタコンソール カスタムタイトル1 ログイン"
-
-#: ../../include/functions_config.php:493
-msgid "Custom title2 login metaconsole"
-msgstr "メタコンソール カスタムタイトル2 ログイン"
-
-#: ../../include/functions_config.php:495
-msgid "Login background metaconsole"
-msgstr "メタコンソールログイン背景"
-
-#: ../../include/functions_config.php:516
-msgid "Show units in values report"
-msgstr "値のレポートに単位を表示"
-
-#: ../../include/functions_config.php:522
-msgid "Fixed graph"
-msgstr "グラフの固定"
-
-#: ../../include/functions_config.php:528
-msgid "Paginate module"
-msgstr "モジュール画面分割"
-
-#: ../../include/functions_config.php:540
-msgid "Default type of module charts."
-msgstr "モジュールグラフのデフォルトタイプ"
-
-#: ../../include/functions_config.php:542
-msgid "Default type of interface charts."
-msgstr "インタフェースグラフのデフォルトタイプ"
-
-#: ../../include/functions_config.php:544
-msgid "Default show only average or min and max"
-msgstr "平均のみまたは最小と最大のみ表示のデフォルト"
-
-#: ../../include/functions_config.php:549
-#: ../../include/functions_config.php:1603
-#: ../../include/functions_reporting_html.php:502
-#: ../../include/functions_reporting_html.php:581
-#: ../../enterprise/include/functions_reporting.php:1276
-#: ../../enterprise/include/functions_reporting.php:1312
-#: ../../enterprise/include/functions_reporting.php:2068
-#: ../../enterprise/include/functions_reporting.php:2104
-#: ../../enterprise/include/functions_reporting.php:2845
-#: ../../enterprise/include/functions_reporting.php:2881
-#: ../../enterprise/include/functions_reporting.php:4452
-#: ../../enterprise/include/functions_reporting.php:4786
-#: ../../enterprise/include/functions_reporting_csv.php:967
-#: ../../enterprise/include/functions_reporting_csv.php:1014
-#: ../../enterprise/include/functions_reporting_pdf.php:1328
-#: ../../enterprise/include/functions_reporting_pdf.php:1409
-#: ../../enterprise/include/functions_reporting_pdf.php:1629
-#: ../../enterprise/include/functions_reporting_pdf.php:1665
-#: ../../enterprise/include/functions_reporting_pdf.php:2068
-msgid "Fail"
-msgstr "失敗"
-
-#: ../../include/functions_config.php:553
-msgid "Display lateral menus with left click"
-msgstr "クリックでサイドメニューを表示"
-
-#: ../../include/functions_config.php:559
-msgid "Service item padding size"
-msgstr "サービス要素の間隔"
-
-#: ../../include/functions_config.php:562
-msgid "Default percentil"
-msgstr "デフォルトのパーセンテージ"
-
-#: ../../include/functions_config.php:582
-msgid "Add the custom post process"
-msgstr "カスタム保存倍率を追加"
-
-#: ../../include/functions_config.php:589
-msgid "Delete the custom post process"
-msgstr "カスタム保存倍率を削除"
-
-#: ../../include/functions_config.php:638
-msgid "Custom report info"
-msgstr "カスタムレポート情報"
-
-#: ../../include/functions_config.php:685
-#: ../../enterprise/godmode/setup/setup_log_collector.php:47
-msgid "Log max lifetime"
-msgstr "ログ最大保存期間"
-
-#: ../../include/functions_config.php:689
-#: ../../enterprise/godmode/setup/setup_history.php:45
-msgid "Enable history database"
-msgstr "ヒストリデータベースの有効化"
-
-#: ../../include/functions_config.php:691
-msgid "Enable history event"
-msgstr "ヒストリイベントの有効化"
-
-#: ../../include/functions_config.php:693
-#: ../../enterprise/godmode/setup/setup_history.php:53
-msgid "Host"
-msgstr "ホスト"
-
-#: ../../include/functions_config.php:699
-#: ../../enterprise/godmode/setup/setup_history.php:62
-msgid "Database user"
-msgstr "データベースユーザ"
-
-#: ../../include/functions_config.php:701
-#: ../../enterprise/godmode/setup/setup_history.php:65
-msgid "Database password"
-msgstr "データベースパスワード"
-
-#: ../../include/functions_config.php:705
-msgid "Event Days"
-msgstr "イベント日数"
-
-#: ../../include/functions_config.php:709
-#: ../../enterprise/godmode/setup/setup_history.php:74
-msgid "Delay"
-msgstr "遅延"
-
-#: ../../include/functions_config.php:715
-msgid "eHorus user"
-msgstr "eHorus ユーザ"
-
-#: ../../include/functions_config.php:717
-msgid "eHorus password"
-msgstr "eHorus パスワード"
-
-#: ../../include/functions_config.php:719
-msgid "eHorus API hostname"
-msgstr "eHorus API ホスト名"
-
-#: ../../include/functions_config.php:721
-msgid "eHorus API port"
-msgstr "eHorus API ポート"
-
-#: ../../include/functions_config.php:723
-msgid "eHorus request timeout"
-msgstr "eHorus リクエストタイムアウト"
-
-#: ../../include/functions_config.php:725
-msgid "eHorus id custom field"
-msgstr "eHorus id カスタムフィールド"
-
-#: ../../include/functions_config.php:737
-#, php-format
-msgid "Failed updated: the next values cannot update: %s"
-msgstr "更新失敗: 次の値は更新できません: %s"
-
-#: ../../include/functions_config.php:1140
-#: ../../enterprise/meta/general/login_page.php:133
-msgid "PANDORA FMS NEXT GENERATION"
-msgstr "PANDORA FMS NEXT GENERATION"
-
-#: ../../include/functions_config.php:1144
-#: ../../enterprise/meta/general/login_page.php:141
-msgid "METACONSOLE"
-msgstr "メタコンソール"
-
-#: ../../include/functions_config.php:1745
-msgid ""
-"Click <a style=\"font-weight:bold; text-decoration:underline\" "
-"href=\"javascript: force_run_register();\"> here</a> to start the "
-"registration process"
-msgstr ""
-"登録処理を開始するには <a style=\"font-weight:bold; text-decoration:underline\" "
-"href=\"javascript: force_run_register();\"> こちら</a> をクリックしてください"
-
-#: ../../include/functions_config.php:1746
-msgid "This instance is not registered in the Update manager"
-msgstr "このインスタンスはアップデートマネージャに登録されていません"
-
-#: ../../include/functions_config.php:1753
-msgid ""
-"Click <a style=\"font-weight:bold; text-decoration:underline\" "
-"href=\"javascript: force_run_newsletter();\"> here</a> to start the "
-"newsletter subscription process"
-msgstr ""
-"ニュースレターの購読を開始するには <a style=\"font-weight:bold; text-decoration:underline\" "
-"href=\"javascript: force_run_newsletter();\"> こちら</a> をクリックしてください"
-
-#: ../../include/functions_config.php:1754
-msgid "Not subscribed to the newsletter"
-msgstr "ニュースレターを購読していません"
-
-#: ../../include/functions_config.php:1765
-msgid "Default password for \"Admin\" user has not been changed."
-msgstr "\"Admin\" ユーザのデフォルトパスワードが変更されていません。"
-
-#: ../../include/functions_config.php:1766
-msgid ""
-"Please change the default password because is a common vulnerability "
-"reported."
-msgstr "脆弱性となるため、デフォルトのパスワードは変更してください。"
-
-#: ../../include/functions_config.php:1772
-msgid "You can not get updates until you renew the license."
-msgstr "ライセンスを更新するまで更新は入手できません。"
-
-#: ../../include/functions_config.php:1773
-msgid "This license has expired."
-msgstr "このライセンスは期限切れです。"
-
-#: ../../include/functions_config.php:1778
-msgid ""
-"Please check that the web server has write rights on the "
-"{HOMEDIR}/attachment directory"
-msgstr "{HOMEDIR}/attachment ディレクトリに、ウェブサーバの書き込み権限があるか確認してください。"
-
-#: ../../include/functions_config.php:1791
-msgid "Remote configuration directory is not readble for the console"
-msgstr "リモート設定ディレクトリがコンソールから読めません"
-
-#: ../../include/functions_config.php:1797
-#: ../../include/functions_config.php:1804
-msgid "Remote configuration directory is not writtable for the console"
-msgstr "コンソールから、リモート設定ディレクトリに書き込めません。"
-
-#: ../../include/functions_config.php:1815
-msgid ""
-"There are too much files in attachment directory. This is not fatal, but you "
-"should consider cleaning up your attachment directory manually"
-msgstr "添付ディレクトリに大量のファイルがあります。障害ではありませんが、添付ディレクトリの手動での整理をお勧めします。"
-
-#: ../../include/functions_config.php:1815
-msgid "files"
-msgstr "ファイル"
-
-#: ../../include/functions_config.php:1816
-msgid "Too much files in your tempora/attachment directory"
-msgstr "attachmentディレクトリにあるファイルが多すぎます。"
-
-#: ../../include/functions_config.php:1833
-msgid ""
-"Your database is not well maintained. Seems that it have more than 48hr "
-"without a proper maintance. Please review Pandora FMS documentation about "
-"how to execute this maintance process (pandora_db.pl) and enable it as soon "
-"as possible"
-msgstr ""
-"データベースがあまりメンテナンスされていません。48時間以上適切なメンテナンスがされていないように見受けられます。メンテナンスプロセス(pandora_d"
-"b.pl)の実行に関しては Pandora FMS ドキュメントを参照し、メンテナンス処理を早急に有効にしてください。"
-
-#: ../../include/functions_config.php:1834
-msgid "Database maintance problem"
-msgstr "データベースメンテナンスにおける問題"
-
-#: ../../include/functions_config.php:1840
-msgid ""
-"Your defined font doesnt exist or is not defined. Please check font "
-"parameters in your config"
-msgstr "定義したフォントが存在しないかフォントが定義されていません。フォントパラメータの設定を確認してください。"
-
-#: ../../include/functions_config.php:1841
-msgid "Default font doesnt exist"
-msgstr "デフォルトのフォントがありません"
-
-#: ../../include/functions_config.php:1846
-msgid "You need to restart server after altering this configuration setting."
-msgstr "この設定を変更したあとは、サーバを再起動する必要があります。"
-
-#: ../../include/functions_config.php:1847
-msgid ""
-"Event storm protection is activated. No events will be generated during this "
-"mode."
-msgstr "イベントストーム保護が有効です。このモードではイベントが生成されません。"
-
-#: ../../include/functions_config.php:1854
-msgid ""
-"Your Pandora FMS has the \"develop_bypass\" mode enabled. This is a "
-"developer mode and should be disabled in a production system. This value is "
-"written in the main index.php file"
-msgstr ""
-"この Pandora FMS は、\"develop_bypass\" "
-"モードが有効になっています。これは、これは開発用のモードであるため本番システムでは無効にしてください。この設定は、メインの index.php "
-"ファイルに書かれています。"
-
-#: ../../include/functions_config.php:1855
-msgid "Developer mode is enabled"
-msgstr "開発モードが有効です"
-
-#: ../../include/functions_config.php:1864
-msgid "Error first setup Open update"
-msgstr "オープンアップデートの初期設定エラー"
-
-#: ../../include/functions_config.php:1870
-msgid ""
-"There is a new update available. Please<a style=\"font-weight:bold;\" "
-"href=\"index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=on"
-"line\"> go to Administration:Setup:Update Manager</a> for more details."
-msgstr ""
-"新たな更新があります。詳細は、<a style=\"font-weight:bold;\" "
-"href=\"index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=on"
-"line\">管理メニューのアップデートマネージャ</a>を参照してください。"
-
-#: ../../include/functions_config.php:1871
-msgid "New update of Pandora Console"
-msgstr "Pandora コンソールの新たな更新"
-
-#: ../../include/functions_config.php:1885
-msgid ""
-"To disable, change it on your PHP configuration file (php.ini) and put "
-"safe_mode = Off (Dont forget restart apache process after changes)"
-msgstr ""
-"無効化するには、PHP 設定ファイル (php.ini) を変更し、safe_mode = Off を設定します。 (変更後、apache "
-"プロセスの再起動を忘れずに行ってください)"
-
-#: ../../include/functions_config.php:1886
-msgid "PHP safe mode is enabled. Some features may not properly work."
-msgstr "PHP safe モードが有効です。いくつかの機能は正しく動作しません。"
-
-#: ../../include/functions_config.php:1891
-#, php-format
-msgid "Recommended value is %s"
-msgstr "推奨値は %s です"
-
-#: ../../include/functions_config.php:1891
-#: ../../include/functions_config.php:1897
-msgid "Unlimited"
-msgstr "無制限"
-
-#: ../../include/functions_config.php:1891
-#: ../../include/functions_config.php:1897
-#: ../../include/functions_config.php:1905
-#: ../../include/functions_config.php:1920
-msgid ""
-"Please, change it on your PHP configuration file (php.ini) or contact with "
-"administrator (Dont forget restart apache process after changes)"
-msgstr ""
-"PHP 設定ファイル (php.ini) を変更するか、管理者へ連絡してください。(変更後は apache プロセスの再起動を忘れないでください)"
-
-#: ../../include/functions_config.php:1892
-#: ../../include/functions_config.php:1898
-#: ../../include/functions_config.php:1906
-#: ../../include/functions_config.php:1914
-#, php-format
-msgid "Not recommended '%s' value in PHP configuration"
-msgstr "PHP 設定における値 '%s' はおすすめしません"
-
-#: ../../include/functions_config.php:1897
-#: ../../include/functions_config.php:1905
-#: ../../include/functions_config.php:1913
-#, php-format
-msgid "Recommended value is: %s"
-msgstr "推奨値: %s"
-
-#: ../../include/functions_config.php:1905
-#: ../../include/functions_config.php:1913
-#, php-format
-msgid "%s or greater"
-msgstr "%s または大きい"
-
-#: ../../include/functions_config.php:1913
-msgid ""
-"Please, change it on your PHP configuration file (php.ini) or contact with "
-"administrator"
-msgstr "PHP 設定ファイル (php.ini) を変更するか、管理者へ連絡してください。"
-
-#: ../../include/functions_config.php:1919
-msgid ""
-"Variable disable_functions containts functions system() or exec(), in PHP "
-"configuration file (php.ini)"
-msgstr ""
-"PHP 設定ファイル(php.ini)において、disable_functions 変数に system() または exec() 関数が含まれています。"
-
-#: ../../include/functions_config.php:1920
-msgid "Problems with disable functions in PHP.INI"
-msgstr "PHP.INI で無効化された機能の問題"
-
-#: ../../include/functions_users.php:377
-#, php-format
-msgid "User %s login at %s"
-msgstr "ユーザ %s が %s にログイン"
-
-#: ../../include/functions_users.php:438
-#, php-format
-msgid "User %s was deleted in the DB at %s"
-msgstr "ユーザ %s が %s にデータベースから削除されました"
-
-#: ../../include/functions_users.php:443
-#, php-format
-msgid "User %s logout at %s"
-msgstr "ユーザ %s が %s にログアウト"
-
-#: ../../include/functions_db.php:75
-#, php-format
-msgid "Error connecting to database %s at %s."
-msgstr "データベース %s@%s への接続エラー。"
-
-#: ../../include/functions_db.php:1515
-msgid "SQL sentence"
-msgstr "SQL 構文"
-
-#: ../../include/functions_db.php:1517
-msgid "Rows"
-msgstr "行"
-
-#: ../../include/functions_db.php:1518
-msgid "Saved"
-msgstr "保存"
-
-#: ../../include/functions_db.php:1519
-msgid "Time (ms)"
-msgstr "時間 (ミリ秒)"
-
-#: ../../include/functions_visual_map.php:1150
-msgid "Last value: "
-msgstr "最新の値: "
-
-#: ../../include/functions_visual_map.php:1723
-msgid "Agent successfully added to layout"
-msgstr "エージェントが追加されました。"
-
-#: ../../include/functions_visual_map.php:1870
-msgid "Modules successfully added to layout"
-msgstr "モジュールが追加されました。"
-
-#: ../../include/functions_visual_map.php:2067
-msgid "Agents successfully added to layout"
-msgstr "レイアウトにエージェントを追加しました"
-
-#: ../../include/functions_visual_map.php:2408
-msgid "Cannot load the visualmap"
-msgstr "ビジュアルマップを読み込めません"
-
-#: ../../include/functions_visual_map.php:2744
-msgid "Percentile bar"
-msgstr "パーセント(バー)"
-
-#: ../../include/functions_visual_map.php:2748
-msgid "Static graph"
-msgstr "状態を表すアイコン"
-
-#: ../../include/functions_events.php:865
-#: ../../include/functions_events.php:869
-#: ../../include/functions_reporting.php:1332
-#: ../../include/functions_reporting.php:1500
-#: ../../include/functions_reporting_html.php:3779
-#: ../../mobile/operation/events.php:790
-#: ../../operation/events/events.build_table.php:118
-#: ../../operation/events/events.build_table.php:787
-msgid "No events"
-msgstr "イベントがありません。"
-
-#: ../../include/functions_events.php:880
-#: ../../operation/agentes/tactical.php:188
-msgid "Latest events"
-msgstr "最新のイベント"
-
-#: ../../include/functions_events.php:895
-#: ../../include/functions_events.php:1505
-#: ../../include/functions_events.php:1719
-#: ../../include/functions_events.php:1725
-#: ../../include/functions_events.php:1729
-#: ../../include/functions_events.php:1734
-#: ../../include/functions_events.php:3151
-#: ../../include/functions_events.php:3159
-#: ../../include/functions_graph.php:3024
-#: ../../operation/snmpconsole/snmp_view.php:408
-#: ../../operation/snmpconsole/snmp_view.php:664
-#: ../../operation/snmpconsole/snmp_view.php:915
-msgid "Validated"
-msgstr "承諾済み"
-
-#: ../../include/functions_events.php:895
-#: ../../enterprise/operation/agentes/policy_view.php:51
-msgid "V."
-msgstr "V."
-
-#: ../../include/functions_events.php:1015
-msgid "Events -by module-"
-msgstr "イベント -モジュールごと-"
-
-#: ../../include/functions_events.php:1025
-#: ../../operation/agentes/tactical.php:203
-#: ../../operation/events/event_statistics.php:37
-msgid "Event graph"
-msgstr "イベントグラフ"
-
-#: ../../include/functions_events.php:1030
-#: ../../operation/agentes/tactical.php:209
-#: ../../operation/events/event_statistics.php:57
-msgid "Event graph by agent"
-msgstr "エージェントごとのイベントグラフ"
-
-#: ../../include/functions_events.php:1135
-msgid "Going to unknown"
-msgstr "不明状態になりました。"
-
-#: ../../include/functions_events.php:1141
-msgid "Alert manually validated"
-msgstr "アラートは承諾されました。"
-
-#: ../../include/functions_events.php:1144
-msgid "Going from critical to warning"
-msgstr "障害が警告状態になりました。"
-
-#: ../../include/functions_events.php:1148
-msgid "Going down to critical state"
-msgstr "障害が発生しました。"
-
-#: ../../include/functions_events.php:1152
-msgid "Going up to normal state"
-msgstr "正常になりました。"
-
-#: ../../include/functions_events.php:1155
-msgid "Going down from normal to warning"
-msgstr "警告状態になりました。"
-
-#: ../../include/functions_events.php:1161
-#: ../../include/functions_graph.php:3149
-#: ../../include/functions_graph.php:3200
-msgid "SYSTEM"
-msgstr "システム"
-
-#: ../../include/functions_events.php:1164
-msgid "Recon server detected a new host"
-msgstr "自動検出サーバが新しいホストを見つけました。"
-
-#: ../../include/functions_events.php:1167
-msgid "New agent created"
-msgstr "新しいエージェントが作成されました。"
-
-#: ../../include/functions_events.php:1180
-msgid "Unknown type:"
-msgstr "不明なタイプ"
-
-#: ../../include/functions_events.php:1496
-#: ../../include/functions_events.php:1503
-#: ../../include/functions_events.php:1523
-#: ../../enterprise/dashboard/widgets/events_list.php:47
-msgid "All event"
-msgstr "全イベント"
-
-#: ../../include/functions_events.php:1497
-#: ../../include/functions_events.php:1526
-msgid "Only new"
-msgstr "新規のみ"
-
-#: ../../include/functions_events.php:1498
-#: ../../include/functions_events.php:1529
-#: ../../enterprise/dashboard/widgets/events_list.php:48
-msgid "Only validated"
-msgstr "承諾済み"
-
-#: ../../include/functions_events.php:1499
-#: ../../include/functions_events.php:1532
-msgid "Only in process"
-msgstr "処理中のみ"
-
-#: ../../include/functions_events.php:1500
-#: ../../include/functions_events.php:1535
-msgid "Only not validated"
-msgstr "未承諾のみ"
-
-#: ../../include/functions_events.php:1504
-#: ../../include/functions_events.php:1719
-#: ../../enterprise/meta/monitoring/wizard/wizard.php:97
-msgid "New"
-msgstr "新規"
-
-#: ../../include/functions_events.php:1506
-#: ../../include/functions_events.php:1719
-#: ../../include/functions_events.php:1725
-msgid "In process"
-msgstr "処理中"
-
-#: ../../include/functions_events.php:1507
-msgid "Not Validated"
-msgstr "未検証"
-
-#: ../../include/functions_events.php:1579
-msgid "Agent address"
-msgstr "エージェントアドレス"
-
-#: ../../include/functions_events.php:1580
-msgid "Agent id"
-msgstr "エージェント ID"
-
-#: ../../include/functions_events.php:1582
-msgid "Module Agent address"
-msgstr "モジュールエージェントアドレス"
-
-#: ../../include/functions_events.php:1674
-msgid "Change owner"
-msgstr "所有者変更"
-
-#: ../../include/functions_events.php:1713
-msgid "Change status"
-msgstr "ステータス変更"
-
-#: ../../include/functions_events.php:1752
-#: ../../include/functions_events.php:2564
-msgid "Add comment"
-msgstr "コメントの追加"
-
-#: ../../include/functions_events.php:1759
-#: ../../include/functions_events.php:1761
-#: ../../include/functions_events.php:4033
-#: ../../operation/events/events.build_table.php:687
-msgid "Delete event"
-msgstr "削除"
-
-#: ../../include/functions_events.php:1771
-msgid "Custom responses"
-msgstr "カスタム応答"
-
-#: ../../include/functions_events.php:1973
-msgid "There was an error connecting to the node"
-msgstr "ノードへの接続エラーが発生しました"
-
-#: ../../include/functions_events.php:2012
-msgid "Agent details"
-msgstr "エージェント詳細"
-
-#: ../../include/functions_events.php:2043
-#: ../../operation/agentes/ver_agente.php:697
-#: ../../enterprise/operation/agentes/ver_agente.php:76
-msgid "Last remote contact"
-msgstr "最終リモート接続"
-
-#: ../../include/functions_events.php:2049
-msgid "View custom fields"
-msgstr "カスタムフィールド表示"
-
-#: ../../include/functions_events.php:2061
-msgid "Module details"
-msgstr "モジュール詳細"
-
-#: ../../include/functions_events.php:2078
-msgid "No assigned"
-msgstr "未割当"
-
-#: ../../include/functions_events.php:2151
-#: ../../include/functions_events.php:2155
-msgid "Go to data overview"
-msgstr "データ概要表示"
-
-#: ../../include/functions_events.php:2298
-#, php-format
-msgid "Invalid custom data: %s"
-msgstr "不正なカスタムデータ: %s"
-
-#: ../../include/functions_events.php:2333
-#: ../../include/functions_events.php:3525
-#: ../../mobile/operation/events.php:469
-#: ../../operation/events/events.build_table.php:149
-msgid "Event ID"
-msgstr "イベントID"
-
-#: ../../include/functions_events.php:2345
-msgid "First event"
-msgstr "最初のイベント"
-
-#: ../../include/functions_events.php:2345
-msgid "Last event"
-msgstr "最後のイベント"
-
-#: ../../include/functions_events.php:2421
-#: ../../mobile/operation/events.php:497
-msgid "Acknowledged by"
-msgstr "承諾者"
-
-#: ../../include/functions_events.php:2459
-msgid "ID extra"
-msgstr "拡張 ID"
-
-#: ../../include/functions_events.php:2510
-#: ../../include/functions_events.php:2556
-msgid "There are no comments"
-msgstr "コメントがありません"
-
-#: ../../include/functions_events.php:2709
-#: ../../include/functions_reporting_html.php:875
-msgid "Pandora System"
-msgstr "Pandora System"
-
-#: ../../include/functions_events.php:3154
-#: ../../include/functions_events.php:3159
-#: ../../operation/snmpconsole/snmp_view.php:407
-#: ../../operation/snmpconsole/snmp_view.php:660
-#: ../../operation/snmpconsole/snmp_view.php:918
-msgid "Not validated"
-msgstr "未承諾"
-
-#: ../../include/functions_events.php:3530
-#: ../../mobile/operation/events.php:108
-#: ../../operation/events/events.build_table.php:155
-msgid "Event Name"
-msgstr "イベント名"
-
-#: ../../include/functions_events.php:3568
-#: ../../operation/events/events.build_table.php:198
-msgid "Agent Module"
-msgstr "エージェントモジュール"
-
-#: ../../include/functions_events.php:3599
-#: ../../operation/events/events.build_table.php:235
-msgid "Extra ID"
-msgstr "拡張 ID"
-
-#: ../../include/functions_events.php:4023
-#: ../../operation/events/events.build_table.php:677
-msgid "Validate event"
-msgstr "承諾"
-
-#: ../../include/functions_events.php:4038
-#: ../../operation/events/events.build_table.php:692
-#: ../../operation/events/events.php:780 ../../operation/events/events.php:784
-#: ../../operation/events/events.php:954 ../../operation/events/events.php:958
-msgid "Is not allowed delete events in process"
-msgstr "処理中イベントは削除できません"
-
-#: ../../include/functions_events.php:4046
-#: ../../operation/events/events.build_table.php:700
-#: ../../operation/snmpconsole/snmp_view.php:760
-msgid "Show more"
-msgstr "詳細を表示する"
-
-#: ../../include/functions_visual_map_editor.php:57
-msgid ""
-"To use 'label'field, you should write\n"
-"\t\t\t\t\ta text to replace '(_VALUE_)' and the value of the module will be "
-"printed at the end."
-msgstr ""
-"'ラベル' フィールドを利用するには、'(_VALUE_)'を\n"
-"\t\t\t\t\t置き換えるテキストを書きます。最終的にはモジュールの値が表示されます。"
-
-#: ../../include/functions_visual_map_editor.php:95
-#: ../../include/functions_visual_map_editor.php:119
-msgid "Border color"
-msgstr "枠の色"
-
-#: ../../include/functions_visual_map_editor.php:131
-msgid "Border width"
-msgstr "枠の幅"
-
-#: ../../include/functions_visual_map_editor.php:140
-msgid "Fill color"
-msgstr "塗りつぶしの色"
-
-#: ../../include/functions_visual_map_editor.php:218
-msgid "Enable link"
-msgstr "リンクを有効にする"
-
-#: ../../include/functions_visual_map_editor.php:239
-msgid "White"
-msgstr "白"
-
-#: ../../include/functions_visual_map_editor.php:240
-msgid "Black"
-msgstr "黒"
-
-#: ../../include/functions_visual_map_editor.php:241
-msgid "Transparent"
-msgstr "透過"
-
-#: ../../include/functions_visual_map_editor.php:366
-msgid "Original Size"
-msgstr "オリジナルのサイズ"
-
-#: ../../include/functions_visual_map_editor.php:373
-msgid "Aspect ratio"
-msgstr "縦横比:"
-
-#: ../../include/functions_visual_map_editor.php:374
-msgid "Width proportional"
-msgstr "幅に比例"
-
-#: ../../include/functions_visual_map_editor.php:380
-msgid "Height proportional"
-msgstr "高さに比例"
-
-#: ../../include/functions_visual_map_editor.php:513
-msgid "For use the original image file size, set 0 width and 0 height."
-msgstr "オリジナルの画像サイズを利用するためには、幅と高さを 0 に設定してください。"
-
-#: ../../include/functions_visual_map_editor.php:549
-msgid "Lines haven't advanced options"
-msgstr "拡張オプションがありません"
-
-#: ../../include/functions_visual_map_editor.php:576
-msgid "Click start point<br />of the line"
-msgstr "線の開始場所<br />をクリックしてください"
-
-#: ../../include/functions_visual_map_editor.php:581
-msgid "Click end point<br />of the line"
-msgstr "線の終了場所<br />をクリックしてください"
-
-#: ../../include/functions_visual_map_editor.php:672
-msgid "Show grid"
-msgstr "グリッド表示"
-
-#: ../../include/functions_visual_map_editor.php:674
-msgid "Delete item"
-msgstr "アイテムの削除"
-
-#: ../../include/functions_visual_map_editor.php:675
-msgid "Copy item"
-msgstr "アイテムのコピー"
-
-#: ../../include/functions_visual_map_editor.php:703
-msgid "No image or name defined."
-msgstr "画像や名前が定義されていません。"
-
-#: ../../include/functions_visual_map_editor.php:705
-msgid "No label defined."
-msgstr "ラベルが定義されていません。"
-
-#: ../../include/functions_visual_map_editor.php:707
-msgid "No image defined."
-msgstr "画像が定義されていません。"
-
-#: ../../include/functions_visual_map_editor.php:709
-msgid "No process defined."
-msgstr "処理が定義されていません。"
-
-#: ../../include/functions_visual_map_editor.php:711
-msgid "No Max value defined."
-msgstr "最大値が定義されていません"
-
-#: ../../include/functions_visual_map_editor.php:713
-msgid "No width defined."
-msgstr "幅が定義されていません"
-
-#: ../../include/functions_visual_map_editor.php:715
-msgid "No period defined."
-msgstr "期間が定義されていません。"
-
-#: ../../include/functions_visual_map_editor.php:717
-msgid "No agent defined."
-msgstr "エージェントが定義されていません"
-
-#: ../../include/functions_visual_map_editor.php:719
-msgid "No module defined."
-msgstr "モジュールが定義されていません"
-
-#: ../../include/functions_visual_map_editor.php:722
-msgid "Successfully save the changes."
-msgstr "変更を保存しました。"
-
-#: ../../include/functions_visual_map_editor.php:724
-msgid "Could not be save"
-msgstr "保存できませんでした"
-
-#: ../../include/get_file.php:46
-msgid "Security error. Please contact the administrator."
-msgstr "セキュリティエラー。管理者に連絡してください。"
-
-#: ../../include/get_file.php:56
-msgid "File is missing in disk storage. Please contact the administrator."
-msgstr "ファイルが存在しません。管理者に連絡してください。"
-
-#: ../../include/functions_filemanager.php:172
-#: ../../include/functions_filemanager.php:242
-#: ../../include/functions_filemanager.php:300
-#: ../../include/functions_filemanager.php:382
-msgid "Security error"
-msgstr "セキュリティエラー"
-
-#: ../../include/functions_filemanager.php:185
-msgid "Upload error"
-msgstr "アップロードエラー"
-
-#: ../../include/functions_filemanager.php:193
-#: ../../include/functions_filemanager.php:261
-#: ../../include/functions_filemanager.php:326
-msgid "Upload correct"
-msgstr "アップロードしました"
-
-#: ../../include/functions_filemanager.php:206
-msgid ""
-"File size seems to be too large. Please check your php.ini configuration or "
-"contact with the administrator"
-msgstr "ファイルサイズが大きすぎます。php.ini の設定を確認するか管理者に相談してください。"
-
-#: ../../include/functions_filemanager.php:254
-msgid "Error creating file"
-msgstr "ファイル作成エラー"
-
-#: ../../include/functions_filemanager.php:267
-#: ../../include/functions_filemanager.php:362
-msgid "Error creating file with empty name"
-msgstr "ファイル名未指定によるファイル作成エラー"
-
-#: ../../include/functions_filemanager.php:312
-msgid "Attach error"
-msgstr "添付エラー"
-
-#: ../../include/functions_filemanager.php:348
-#: ../../enterprise/godmode/agentes/collections.editor.php:148
-#: ../../enterprise/godmode/agentes/collections.editor.php:311
-msgid "Security error."
-msgstr "セキュリティエラー"
-
-#: ../../include/functions_filemanager.php:357
-msgid "Directory created"
-msgstr "ディレクトリを作成しました"
-
-#: ../../include/functions_filemanager.php:385
-#: ../../include/functions_reporting_html.php:1238
-#: ../../enterprise/include/functions_inventory.php:517
-#: ../../enterprise/include/functions_inventory.php:582
-#: ../../enterprise/include/functions_reporting_pdf.php:511
-msgid "Deleted"
-msgstr "削除しました"
-
-#: ../../include/functions_filemanager.php:550
-#, php-format
-msgid "Directory %s doesn't exist!"
-msgstr "%s ディレクトリは存在しません！"
-
-#: ../../include/functions_filemanager.php:565
-msgid "Index of images"
-msgstr "画像一覧"
-
-#: ../../include/functions_filemanager.php:603
-msgid "Parent directory"
-msgstr "親ディレクトリ"
-
-#: ../../include/functions_filemanager.php:632
-msgid "The zip upload in this dir, easy to upload multiple files."
-msgstr "このディレクトリに zip ファイルもアップロードできます。複数ファイルのアップロードも簡単です。"
-
-#: ../../include/functions_filemanager.php:636
-msgid "Decompress"
-msgstr "展開"
-
-#: ../../include/functions_filemanager.php:638
-#: ../../enterprise/extensions/csv_import/main.php:88
-#: ../../enterprise/extensions/csv_import_group/main.php:84
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1204
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1412
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1588
-msgid "Go"
-msgstr "実行"
-
-#: ../../include/functions_filemanager.php:679
-msgid "Directory"
-msgstr "ディレクトリ"
-
-#: ../../include/functions_filemanager.php:685
-msgid "Compressed file"
-msgstr "圧縮ファイル"
-
-#: ../../include/functions_filemanager.php:688
-#: ../../include/functions_filemanager.php:695
-msgid "Text file"
-msgstr "テキストファイル"
-
-#: ../../include/functions_filemanager.php:785
-msgid "Create directory"
-msgstr "ディレクトリの作成"
-
-#: ../../include/functions_filemanager.php:790
-msgid "Create text"
-msgstr "テキストの作成"
-
-#: ../../include/functions_filemanager.php:795
-msgid "Upload file/s"
-msgstr "ファイルのアップロード"
-
-#: ../../include/functions_filemanager.php:802
-msgid "The directory is read-only"
-msgstr "ディレクトリが読み出し専用です。"
-
-#: ../../include/functions_gis.php:27 ../../include/functions_gis.php:31
-#: ../../include/functions_gis.php:36
-msgid "Hierarchy of agents"
-msgstr "エージェントの階層"
-
-#: ../../include/functions_graph.php:706
-msgid "Units. Value"
-msgstr "単位"
-
-#: ../../include/functions_graph.php:781
-#: ../../include/functions_graph.php:1753
-#, php-format
-msgid "Percentile %dº"
-msgstr "%dパーセント"
-
-#: ../../include/functions_graph.php:815
-#: ../../include/functions_graph.php:4019
-#: ../../enterprise/dashboard/full_dashboard.php:234
-#: ../../enterprise/dashboard/public_dashboard.php:256
-#: ../../enterprise/meta/monitoring/wizard/wizard.agent.php:160
-#: ../../enterprise/meta/monitoring/wizard/wizard.module.local.php:180
-#: ../../enterprise/meta/monitoring/wizard/wizard.module.network.php:208
-#: ../../enterprise/meta/monitoring/wizard/wizard.module.web.php:170
-msgid "Previous"
-msgstr "前へ"
-
-#: ../../include/functions_graph.php:1246
-#, php-format
-msgid "%s"
-msgstr "%s"
-
-#: ../../include/functions_graph.php:1753
-msgid " of module "
-msgstr " のモジュール "
-
-#: ../../include/functions_graph.php:2111
-msgid "Not fired alerts"
-msgstr "未発報アラート"
-
-#: ../../include/functions_graph.php:2111
-#: ../../include/functions_reporting.php:7093
-#: ../../include/functions_reporting.php:7114 ../../operation/tree.php:276
-#: ../../operation/tree.php:277 ../../operation/tree.php:278
-#: ../../enterprise/dashboard/widgets/tree_view.php:200
-#: ../../enterprise/dashboard/widgets/tree_view.php:201
-#: ../../enterprise/dashboard/widgets/tree_view.php:202
-#: ../../enterprise/include/functions_reporting_csv.php:465
-msgid "Fired alerts"
-msgstr "発生したアラート"
-
-#: ../../include/functions_graph.php:2120
-#: ../../include/functions_graph.php:2200
-#: ../../include/functions_graph.php:2273
-#: ../../include/functions_graph.php:3039
-#: ../../include/functions_graph.php:3475
-#: ../../include/functions_reporting.php:1212
-#: ../../include/functions_reporting.php:1365
-#: ../../include/functions_reporting.php:1384
-#: ../../include/functions_reporting.php:1405
-#: ../../include/functions_reporting.php:1426
-#: ../../include/functions_reporting.php:2092
-#: ../../include/functions_reporting.php:2274
-#: ../../include/functions_reporting.php:2295
-#: ../../include/functions_reporting.php:2316
-#: ../../include/functions_reporting.php:6211
-#: ../../include/functions_reporting.php:6231
-#: ../../include/functions_reporting.php:6251
-#: ../../include/functions_reporting_html.php:2934
-#: ../../include/functions_reporting_html.php:3012
-#: ../../enterprise/dashboard/widgets/top_n_events_by_group.php:180
-#: ../../enterprise/dashboard/widgets/top_n_events_by_module.php:197
-msgid "other"
-msgstr "その他"
-
-#: ../../include/functions_graph.php:2280
-#: ../../include/functions_graph.php:2327
-#: ../../include/graphs/functions_gd.php:165
-#: ../../include/graphs/functions_gd.php:256
-#: ../../enterprise/include/functions_reporting.php:1407
-#: ../../enterprise/include/functions_reporting_pdf.php:1768
-#: ../../enterprise/include/functions_reporting_pdf.php:1769
-msgid "Out of limits"
-msgstr "範囲外"
-
-#: ../../include/functions_graph.php:2560
-msgid "Today"
-msgstr "今日"
-
-#: ../../include/functions_graph.php:2561
-msgid "Week"
-msgstr "週"
-
-#: ../../include/functions_graph.php:2562 ../../include/functions_html.php:864
-#: ../../enterprise/include/functions_reporting_csv.php:1159
-#: ../../enterprise/include/functions_reporting_csv.php:1371
-msgid "Month"
-msgstr "月"
-
-#: ../../include/functions_graph.php:2563
-#: ../../include/functions_graph.php:2564
-msgid "Months"
-msgstr "月"
-
-#: ../../include/functions_graph.php:2586
-msgid "History db"
-msgstr "ヒストリデータベース"
-
-#: ../../include/functions_graph.php:2773
-#: ../../include/functions_incidents.php:29
-#: ../../include/functions_incidents.php:54
-msgid "Informative"
-msgstr "情報"
-
-#: ../../include/functions_graph.php:2774
-#: ../../include/functions_incidents.php:30
-#: ../../include/functions_incidents.php:57
-msgid "Low"
-msgstr "低い"
-
-#: ../../include/functions_graph.php:2775
-#: ../../include/functions_incidents.php:31
-#: ../../include/functions_incidents.php:60
-msgid "Medium"
-msgstr "中くらい"
-
-#: ../../include/functions_graph.php:2776
-#: ../../include/functions_incidents.php:32
-#: ../../include/functions_incidents.php:63
-msgid "Serious"
-msgstr "深刻"
-
-#: ../../include/functions_graph.php:2777
-#: ../../include/functions_incidents.php:33
-#: ../../include/functions_incidents.php:66
-msgid "Very serious"
-msgstr "とても深刻"
-
-#: ../../include/functions_graph.php:2800
-#: ../../include/functions_graph.php:2812
-msgid "Open incident"
-msgstr "オープンのインシデント"
-
-#: ../../include/functions_graph.php:2801
-#: ../../include/functions_graph.php:2814
-msgid "Closed incident"
-msgstr "クローズされたインシデント"
-
-#: ../../include/functions_graph.php:2802
-#: ../../include/functions_graph.php:2816
-msgid "Outdated"
-msgstr "期限切れ"
-
-#: ../../include/functions_graph.php:2803
-#: ../../include/functions_graph.php:2818
-#: ../../enterprise/godmode/setup/setup_acl.php:368
-#: ../../enterprise/godmode/setup/setup_acl.php:381
-msgid "Invalid"
-msgstr "無効"
-
-#: ../../include/functions_graph.php:3934
-msgid "Units"
-msgstr "単位"
-
-#: ../../include/functions_graph.php:4322
-#: ../../enterprise/dashboard/widgets/top_n.php:77
-msgid "Avg."
-msgstr "平均"
-
-#: ../../include/functions_graph.php:5579
-msgid "Main node"
-msgstr "メインノード"
+#: ../../include/functions_snmp.php:312
+msgid "Pagination"
+msgstr "ページ"
+
+#: ../../include/functions_snmp.php:333 ../../include/functions_snmp.php:339
+msgid "Group by Enterprise String / IP"
+msgstr "Enterprise 文字列/IP でのグループ"
+
+#: ../../include/functions_snmp.php:384
+#: ../../enterprise/include/functions_events.php:212
+msgid "Active filter"
+msgstr "有効なフィルタ"
+
+#: ../../include/functions_snmp.php:385
+#: ../../enterprise/include/functions_events.php:213
+msgid "Active filters"
+msgstr "有効なフィルタ"
+
+#: ../../include/graphs/export_data.php:71
+#: ../../include/graphs/export_data.php:126
+msgid "An error occured exporting the data"
+msgstr "データエクスポートエラー"
+
+#: ../../include/graphs/export_data.php:76
+#: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:106
+msgid "Selected"
+msgstr "選択済"
+
+#: ../../include/graphs/functions_flot.php:257
+#: ../../include/graphs/functions_flot.php:287
+msgid "Cancel zoom"
+msgstr "ズーム中止"
+
+#: ../../include/graphs/functions_flot.php:259
+msgid "Warning and Critical thresholds"
+msgstr "警告と障害の閾値"
+
+#: ../../include/graphs/functions_flot.php:262
+msgid "Overview graph"
+msgstr "概要グラフ"
+
+#: ../../include/graphs/functions_pchart.php:200
+#: ../../include/graphs/functions_pchart.php:1466
+msgid "Actual"
+msgstr "実績"
 
 #: ../../include/help/clippy/agent_out_of_limits.php:39
 msgid "Agent contact date passed it's ETA!."
@@ -22484,10 +26065,11 @@ msgstr ""
 "。"
 
 #: ../../include/help/clippy/extension_cron_send_email.php:39
-msgid "The configuration of email for the task email is in the file:"
-msgstr "メール送信タスクのメール設定はこのファイルにあります:"
+msgid ""
+"The configuration of email for the task email is in the enterprise setup:"
+msgstr "タスクメールの設定は、Enterprise 設定にあります:"
 
-#: ../../include/help/clippy/extension_cron_send_email.php:41
+#: ../../include/help/clippy/extension_cron_send_email.php:40
 msgid "Please check if the email configuration is correct."
 msgstr "メール設定が正しいか確認してください。"
 
@@ -22552,7 +26134,7 @@ msgstr ""
 
 #: ../../include/help/clippy/godmode_agentes_configurar_agente.php:126
 #: ../../include/help/clippy/operation_agentes_ver_agente.php:42
-#: ../../operation/servers/recon_view.php:137
+#: ../../operation/servers/recon_view.php:140
 msgid "Done"
 msgstr "完了"
 
@@ -22854,2223 +26436,16 @@ msgid ""
 msgstr ""
 "グループトポロジマップはノード間の親子関係を表示しないことに注意してください。グループの親子関係とその中にあるエージェントのみを表示します。 "
 
-#: ../../include/functions_groups.php:63
-msgid "Alert Actions"
-msgstr "アラートアクション"
-
-#: ../../include/functions_groups.php:78
-msgid "Alert Templates"
-msgstr "アラートテンプレート"
-
-#: ../../include/functions_groups.php:120
-#: ../../operation/search_results.php:114
-#: ../../enterprise/extensions/cron/functions.php:543
-#: ../../enterprise/meta/general/main_header.php:136
-#: ../../enterprise/meta/general/main_header.php:151
-#: ../../enterprise/mobile/include/functions_web.php:15
-msgid "Reports"
-msgstr "レポート"
-
-#: ../../include/functions_groups.php:135
-msgid "Layout visual console"
-msgstr "ビジュアルコンソールレイアウト"
-
-#: ../../include/functions_groups.php:149
-msgid "Plannet down time"
-msgstr "計画停止時間"
-
-#: ../../include/functions_groups.php:176
-msgid "GIS maps"
-msgstr "GIS マップ"
-
-#: ../../include/functions_groups.php:190
-msgid "GIS connections"
-msgstr "GIS 利用マップ"
-
-#: ../../include/functions_groups.php:204
-msgid "GIS map layers"
-msgstr "GIS マップレイヤ"
-
-#: ../../include/functions_groups.php:217
-msgid "Network maps"
-msgstr "ネットワークマップ"
-
-#: ../../include/functions_groups.php:794
-#: ../../include/functions_groups.php:796
-#: ../../include/functions_groups.php:798
-#: ../../include/functions_groups.php:799
-#: ../../include/functions_groups.php:800
-#: ../../include/functions_reporting_html.php:3426
-#: ../../mobile/operation/groups.php:137
-msgid "Agents unknown"
-msgstr "不明なエージェント"
-
-#: ../../include/functions_groups.php:848
-#: ../../include/functions_groups.php:850
-#: ../../include/functions_groups.php:852
-#: ../../include/functions_groups.php:853
-#: ../../include/functions_groups.php:854
-#: ../../include/functions_reporting_html.php:2930
-#: ../../include/functions_reporting_html.php:2939
-#: ../../mobile/operation/groups.php:161
-#: ../../operation/agentes/ver_agente.php:773
-#: ../../enterprise/operation/agentes/ver_agente.php:152
-msgid "Alerts fired"
-msgstr "発生中アラート"
-
-#: ../../include/functions_groups.php:2149
-msgid "Show branch children"
-msgstr "子の表示"
-
-#: ../../include/functions_groups.php:2178
-msgid ""
-"You can not delete the last group in Pandora. A common installation must has "
-"almost one group."
-msgstr "最後のグループは削除できません。通常、1つはグループが設定されていなければなりません。"
-
-#: ../../include/functions_html.php:732
-msgid "weeks"
-msgstr "週"
-
-#: ../../include/functions_html.php:863
-msgid "Month day"
-msgstr "日にち"
-
-#: ../../include/functions_html.php:865
-msgid "Week day"
-msgstr "曜日"
-
-#: ../../include/functions_html.php:2168
-msgid "Type at least two characters to search the module."
-msgstr "モジュールを検索するには、少なくとも二文字入力してください。"
-
-#: ../../include/functions_incidents.php:88
-#: ../../include/functions_incidents.php:107
-msgid "Active incidents"
-msgstr "アクティブ"
-
-#: ../../include/functions_incidents.php:89
-#: ../../include/functions_incidents.php:110
-msgid "Active incidents, with comments"
-msgstr "アクティブ(コメント付き)"
-
-#: ../../include/functions_incidents.php:90
-#: ../../include/functions_incidents.php:113
-msgid "Rejected incidents"
-msgstr "却下"
-
-#: ../../include/functions_incidents.php:91
-#: ../../include/functions_incidents.php:116
-msgid "Expired incidents"
-msgstr "期限切れ"
-
-#: ../../include/functions_incidents.php:92
-#: ../../include/functions_incidents.php:119
-msgid "Closed incidents"
-msgstr "終了"
-
-#: ../../include/functions_maps.php:34
-#: ../../include/functions_networkmap.php:1641
-#: ../../include/functions_networkmap.php:1720
-#: ../../enterprise/meta/general/logon_ok.php:62
-msgid "Topology"
-msgstr "トポロジ"
-
-#: ../../include/functions_maps.php:37
-#: ../../include/functions_networkmap.php:1635 ../../operation/tree.php:80
-#: ../../enterprise/dashboard/widgets/tree_view.php:39
-#: ../../enterprise/include/functions_groups.php:32
-#: ../../enterprise/meta/advanced/policymanager.apply.php:200
-#: ../../enterprise/operation/agentes/ver_agente.php:208
-msgid "Policies"
-msgstr "ポリシー"
-
-#: ../../include/functions_maps.php:43
-#: ../../include/functions_networkmap.php:1722
-#: ../../include/functions_reporting.php:624
-#: ../../include/functions_reporting.php:5158
-#: ../../enterprise/include/functions_reporting.php:1734
-#: ../../enterprise/include/functions_reporting.php:2460
-#: ../../enterprise/include/functions_reporting.php:3241
-msgid "Dynamic"
-msgstr "動的"
-
-#: ../../include/functions_maps.php:62
-#: ../../include/functions_pandora_networkmap.php:953
-msgid "Copy of "
-msgstr "コピー: "
-
-#: ../../include/functions_menu.php:470
-msgid "Configure user"
-msgstr "ユーザ設定"
-
-#: ../../include/functions_menu.php:471
-msgid "Configure profile"
-msgstr "プロファイル設定"
-
-#: ../../include/functions_menu.php:475
-msgid "Module templates management"
-msgstr "モジュールテンプレート管理"
-
-#: ../../include/functions_menu.php:476
-msgid "Inventory modules management"
-msgstr "インベントリモジュール管理"
-
-#: ../../include/functions_menu.php:477
-#: ../../enterprise/meta/advanced/component_management.php:56
-msgid "Tags management"
-msgstr "タグ管理"
-
-#: ../../include/functions_menu.php:481
-msgid "View agent"
-msgstr "エージェント表示"
-
-#: ../../include/functions_menu.php:485
-msgid "Manage network map"
-msgstr "ネットワークマップ管理"
-
-#: ../../include/functions_menu.php:487
-msgid "Builder visual console"
-msgstr "ビジュアルコンソールビルダ"
-
-#: ../../include/functions_menu.php:489
-msgid "Administration events"
-msgstr "イベント管理"
-
-#: ../../include/functions_menu.php:491
-msgid "View reporting"
-msgstr "レポート表示"
-
-#: ../../include/functions_menu.php:492
-msgid "Manage custom graphs"
-msgstr "カスタムグラフ管理"
-
-#: ../../include/functions_menu.php:493
-msgid "Copy dashboard"
-msgstr "ダッシュボードのコピー"
-
-#: ../../include/functions_menu.php:496
-msgid "Manage GIS Maps"
-msgstr "GIS マップ管理"
-
-#: ../../include/functions_menu.php:498
-msgid "Incidents statistics"
-msgstr "インシデント統計"
-
-#: ../../include/functions_menu.php:499
-msgid "Manage messages"
-msgstr "メッセージ管理"
-
-#: ../../include/functions_menu.php:501
-msgid "Manage groups"
-msgstr "グループ管理"
-
-#: ../../include/functions_menu.php:502
-msgid "Manage module groups"
-msgstr "モジュールグループ管理"
-
-#: ../../include/functions_menu.php:503
-msgid "Manage custom field"
-msgstr "カスタムフィールド管理"
-
-#: ../../include/functions_menu.php:505
-msgid "Manage alert actions"
-msgstr "アラートアクション管理"
-
-#: ../../include/functions_menu.php:506
-msgid "Manage commands"
-msgstr "コマンド管理"
-
-#: ../../include/functions_menu.php:507
-msgid "Manage event alerts"
-msgstr "イベントアラート管理"
-
-#: ../../include/functions_menu.php:509
-msgid "Manage export targets"
-msgstr "エクスポートターゲット管理"
-
-#: ../../include/functions_menu.php:511
-msgid "Manage services"
-msgstr "サービス管理"
-
-#: ../../include/functions_menu.php:513 ../../operation/menu.php:92
-msgid "SNMP filters"
-msgstr "SNMP フィルタ"
-
-#: ../../include/functions_menu.php:514
-#: ../../enterprise/godmode/snmpconsole/snmp_trap_editor.php:22
-#: ../../enterprise/godmode/snmpconsole/snmp_trap_editor_form.php:23
-#: ../../enterprise/operation/menu.php:119
-#: ../../enterprise/operation/snmpconsole/snmp_view.php:79
-msgid "SNMP trap editor"
-msgstr "SNMP トラップエディタ"
-
-#: ../../include/functions_menu.php:515 ../../operation/menu.php:93
-msgid "SNMP trap generator"
-msgstr "SNMPトラップジェネレータ"
-
-#: ../../include/functions_menu.php:517 ../../operation/menu.php:84
-msgid "SNMP console"
-msgstr "SNMPコンソール"
-
-#: ../../include/functions_menu.php:519
-msgid "Manage incident"
-msgstr "インシデント管理"
-
-#: ../../include/functions_menu.php:571
-msgid "Administration"
-msgstr "システム管理"
-
-#: ../../include/functions_modules.php:1871
-#: ../../mobile/operation/modules.php:451
-#: ../../mobile/operation/modules.php:504
-#: ../../operation/agentes/status_monitor.php:1143
-#: ../../operation/search_modules.php:104
-msgid "NOT INIT"
-msgstr "未初期化"
-
-#: ../../include/functions_modules.php:1890
-#: ../../include/functions_modules.php:1894
-#: ../../include/functions_modules.php:1898
-#: ../../mobile/operation/modules.php:471
-#: ../../mobile/operation/modules.php:476
-#: ../../mobile/operation/modules.php:481
-#: ../../mobile/operation/modules.php:524
-#: ../../mobile/operation/modules.php:529
-#: ../../mobile/operation/modules.php:534
-#: ../../operation/agentes/pandora_networkmap.view.php:301
-#: ../../operation/agentes/pandora_networkmap.view.php:306
-#: ../../operation/agentes/pandora_networkmap.view.php:311
-#: ../../operation/agentes/status_monitor.php:1182
-#: ../../operation/agentes/status_monitor.php:1187
-#: ../../operation/agentes/status_monitor.php:1194
-#: ../../operation/agentes/status_monitor.php:1199
-#: ../../operation/agentes/status_monitor.php:1206
-#: ../../operation/agentes/status_monitor.php:1211
-#: ../../operation/search_modules.php:124
-#: ../../operation/search_modules.php:131
-#: ../../operation/search_modules.php:138
-#: ../../enterprise/include/functions_services.php:1614
-#: ../../enterprise/include/functions_services.php:1619
-#: ../../enterprise/include/functions_services.php:1623
-#: ../../enterprise/operation/agentes/policy_view.php:378
-#: ../../enterprise/operation/agentes/policy_view.php:382
-#: ../../enterprise/operation/agentes/policy_view.php:386
-#: ../../enterprise/operation/agentes/transactional_map.php:152
-msgid "Last status"
-msgstr "最新の状態"
-
-#: ../../include/functions_netflow.php:362
-msgid "Total flows"
-msgstr "全フロー数"
-
-#: ../../include/functions_netflow.php:367
-msgid "Total bytes"
-msgstr "全バイト数"
-
-#: ../../include/functions_netflow.php:372
-msgid "Total packets"
-msgstr "全パケット数"
-
-#: ../../include/functions_netflow.php:377
-msgid "Average bits per second"
-msgstr "平均ビット/秒"
-
-#: ../../include/functions_netflow.php:382
-msgid "Average packets per second"
-msgstr "平均パケット/秒"
-
-#: ../../include/functions_netflow.php:387
-msgid "Average bytes per packet"
-msgstr "平均バイト/パケット"
-
-#: ../../include/functions_netflow.php:1031
-msgid "Area graph"
-msgstr "塗り潰しグラフ"
-
-#: ../../include/functions_netflow.php:1032
-msgid "Pie graph and Summary table"
-msgstr "円グラフとサマリ表"
-
-#: ../../include/functions_netflow.php:1033
-msgid "Statistics table"
-msgstr "状態表"
-
-#: ../../include/functions_netflow.php:1034
-#: ../../operation/agentes/exportdata.php:330
-msgid "Data table"
-msgstr "データの表示"
-
-#: ../../include/functions_netflow.php:1035
-msgid "Circular mesh"
-msgstr "円形メッシュ"
-
-#: ../../include/functions_netflow.php:1036
-#: ../../include/functions_netflow.php:1390
-msgid "Host detailed traffic"
-msgstr "ホストの詳細トラフィック"
-
-#: ../../include/functions_netflow.php:1049
-#: ../../include/functions_netflow.php:1082
-msgid "10 mins"
-msgstr "10 分"
-
-#: ../../include/functions_netflow.php:1050
-#: ../../include/functions_netflow.php:1083
-msgid "15 mins"
-msgstr "15 分"
-
-#: ../../include/functions_netflow.php:1051
-#: ../../include/functions_netflow.php:1084
-msgid "30 mins"
-msgstr "30 分"
-
-#: ../../include/functions_netflow.php:1053
-#: ../../include/functions_netflow.php:1086
-#: ../../operation/gis_maps/render_view.php:143
-#: ../../enterprise/dashboard/widgets/top_n.php:62
-#: ../../enterprise/godmode/agentes/inventory_manager.php:177
-#: ../../enterprise/godmode/policies/policy_inventory_modules.php:191
-#: ../../enterprise/godmode/reporting/graph_template_editor.php:182
-msgid "2 hours"
-msgstr "2時間"
-
-#: ../../include/functions_netflow.php:1054
-#: ../../include/functions_netflow.php:1087
-#: ../../enterprise/dashboard/widgets/top_n.php:63
-msgid "5 hours"
-msgstr "5時間"
-
-#: ../../include/functions_netflow.php:1058
-#: ../../include/functions_netflow.php:1091
-msgid "5 days"
-msgstr "5日"
-
-#: ../../include/functions_netflow.php:1062
-#: ../../enterprise/godmode/reporting/graph_template_editor.php:192
-msgid "2 months"
-msgstr "2ヶ月"
-
-#: ../../include/functions_netflow.php:1065
-msgid "Last year"
-msgstr "過去1年"
-
-#: ../../include/functions_netflow.php:1079
-msgid "1 min"
-msgstr "1 分"
-
-#: ../../include/functions_netflow.php:1080
-msgid "2 mins"
-msgstr "2 分"
-
-#: ../../include/functions_netflow.php:1081
-msgid "5 mins"
-msgstr "5 分"
-
-#: ../../include/functions_netflow.php:1132
-#: ../../include/functions_netflow.php:1142
-#: ../../include/functions_netflow.php:1191
-#: ../../include/functions_netflow.php:1249
-#: ../../include/functions_netflow.php:1255
-#: ../../include/functions_netflow.php:1288
-msgid "Aggregate"
-msgstr "集約"
-
-#: ../../include/functions_netflow.php:1361
-msgid "Sent"
-msgstr "送信"
-
-#: ../../include/functions_netflow.php:1368
-msgid "Received"
-msgstr "受信"
-
-#: ../../include/functions_netflow.php:1435
-msgid "Error generating report"
-msgstr "レポート生成エラー"
-
-#: ../../include/functions_netflow.php:1632
-msgid "MB"
-msgstr "MB"
-
-#: ../../include/functions_netflow.php:1634
-msgid "MB/s"
-msgstr "MB/s"
-
-#: ../../include/functions_netflow.php:1636
-msgid "kB"
-msgstr "kB"
-
-#: ../../include/functions_netflow.php:1638
-msgid "kB/s"
-msgstr "kB/s"
-
-#: ../../include/functions_netflow.php:1642
-msgid "B/s"
-msgstr "B/s"
-
-#: ../../include/functions_netflow.php:1656
-msgid "Dst port"
-msgstr "宛先ポート"
-
-#: ../../include/functions_netflow.php:1658
-msgid "Dst IP"
-msgstr "宛先 IP"
-
-#: ../../include/functions_netflow.php:1662
-msgid "Src IP"
-msgstr "送信元 IP"
-
-#: ../../include/functions_netflow.php:1664
-msgid "Src port"
-msgstr "送信元ポート"
-
-#: ../../include/graphs/export_data.php:71
-#: ../../include/graphs/export_data.php:126
-msgid "An error occured exporting the data"
-msgstr "データエクスポートエラー"
-
-#: ../../include/graphs/export_data.php:76
-#: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:106
-msgid "Selected"
-msgstr "選択済"
-
-#: ../../include/graphs/functions_flot.php:251
-msgid "Cancel zoom"
-msgstr "ズーム中止"
-
-#: ../../include/graphs/functions_flot.php:253
-msgid "Warning and Critical thresholds"
-msgstr "警告と障害の閾値"
-
-#: ../../include/graphs/functions_flot.php:256
-msgid "Overview graph"
-msgstr "概要グラフ"
-
-#: ../../include/graphs/functions_flot.php:595
-#: ../../include/functions_treeview.php:294
-#: ../../enterprise/extensions/vmware/vmware_view.php:873
-#: ../../enterprise/extensions/vmware/vmware_view.php:889
-#: ../../enterprise/extensions/vmware/vmware_view.php:905
-#: ../../enterprise/extensions/vmware/vmware_view.php:921
-msgid "No data"
-msgstr "データがありません"
-
-#: ../../include/graphs/functions_pchart.php:205
-#: ../../include/graphs/functions_pchart.php:1183
-msgid "Actual"
-msgstr "実績"
-
-#: ../../include/functions_networkmap.php:1638
-#: ../../include/functions_networkmap.php:1724
-msgid "Radial dynamic"
-msgstr "放射状で動的"
-
-#: ../../include/functions_networkmap.php:1694
-msgid "Create a new topology map"
-msgstr "トポロジマップの新規作成"
-
-#: ../../include/functions_networkmap.php:1695
-msgid "Create a new group map"
-msgstr "グループマップの新規作成"
-
-#: ../../include/functions_networkmap.php:1696
-msgid "Create a new dynamic map"
-msgstr "新たな動的マップの作成"
-
-#: ../../include/functions_networkmap.php:1698
-msgid "Create a new radial dynamic map"
-msgstr "放射状の動的マップを新規作成"
-
-#: ../../include/functions_reporting.php:568
-#: ../../include/functions_reporting.php:5118
-#: ../../enterprise/include/functions_reporting.php:1690
-#: ../../enterprise/include/functions_reporting.php:2416
-#: ../../enterprise/include/functions_reporting.php:3197
-#: ../../enterprise/include/functions_reporting.php:4516
-#: ../../enterprise/include/functions_reporting.php:4522
-msgid "There are no SLAs defined"
-msgstr "SLA が定義されていません。"
-
-#: ../../include/functions_reporting.php:635
-#: ../../include/functions_reporting.php:5169
-#: ../../enterprise/include/functions_reporting.php:1745
-#: ../../enterprise/include/functions_reporting.php:2471
-#: ../../enterprise/include/functions_reporting.php:3252
-msgid "Inverse"
-msgstr "反転"
-
-#: ../../include/functions_reporting.php:945
-#: ../../enterprise/dashboard/widgets/top_n.php:31
-msgid "Top N"
-msgstr "トップ N"
-
-#: ../../include/functions_reporting.php:964
-#: ../../operation/snmpconsole/snmp_statistics.php:127
-#: ../../operation/snmpconsole/snmp_statistics.php:185
-#: ../../enterprise/include/functions_reporting_csv.php:417
-#, php-format
-msgid "Top %d"
-msgstr "トップ %d"
-
-#: ../../include/functions_reporting.php:1002
-#: ../../include/functions_reporting.php:1821
-#: ../../include/functions_reporting_html.php:2432
-#: ../../include/functions_reporting_html.php:2664
-#: ../../enterprise/dashboard/widgets/top_n.php:468
-#: ../../enterprise/include/functions_reporting_pdf.php:825
-#: ../../enterprise/include/functions_reporting_pdf.php:1258
-#: ../../enterprise/include/functions_reporting_pdf.php:2013
-msgid "There are no Agent/Modules defined"
-msgstr "定義済のエージェント/モジュールがありません"
-
-#: ../../include/functions_reporting.php:1055
-#: ../../enterprise/dashboard/widgets/top_n.php:534
-msgid "Insuficient data"
-msgstr "不十分なデータ"
-
-#: ../../include/functions_reporting.php:1288
-msgid "Event Report Group"
-msgstr "イベントレポートグループ"
-
-#: ../../include/functions_reporting.php:1465
-msgid "Event Report Module"
-msgstr "イベントレポートモジュール"
-
-#: ../../include/functions_reporting.php:1527
-#: ../../enterprise/include/functions_reporting_csv.php:292
-msgid "Inventory Changes"
-msgstr "インベントリ変更"
-
-#: ../../include/functions_reporting.php:1569
-#: ../../enterprise/extensions/ipam/ipam_action.php:198
-msgid "No changes found."
-msgstr "変更が見つかりません。"
-
-#: ../../include/functions_reporting.php:1656
-msgid "Agent/Modules"
-msgstr "エージェント/モジュール"
-
-#: ../../include/functions_reporting.php:1745
-msgid "Exception - Everything"
-msgstr "例外 - 全て"
-
-#: ../../include/functions_reporting.php:1750
-#, php-format
-msgid "Exception - Modules over or equal to %s"
-msgstr "例外 - モジュールが %s 以上"
-
-#: ../../include/functions_reporting.php:1752
-#, php-format
-msgid "Modules over or equal to %s"
-msgstr "%s 以上のモジュール"
-
-#: ../../include/functions_reporting.php:1756
-#, php-format
-msgid "Exception - Modules under or equal to %s"
-msgstr "例外 - モジュールが %s 以下"
-
-#: ../../include/functions_reporting.php:1758
-#, php-format
-msgid "Modules under or equal to %s"
-msgstr "%s 以下のモジュール"
-
-#: ../../include/functions_reporting.php:1762
-#, php-format
-msgid "Exception - Modules under %s"
-msgstr "例外 - モジュールが %s 未満"
-
-#: ../../include/functions_reporting.php:1764
-#, php-format
-msgid "Modules under %s"
-msgstr "%s 未満のモジュール"
-
-#: ../../include/functions_reporting.php:1768
-#, php-format
-msgid "Exception - Modules over %s"
-msgstr "例外 - モジュールが %s より大きい"
-
-#: ../../include/functions_reporting.php:1770
-#, php-format
-msgid "Modules over %s"
-msgstr "%s を超えるモジュール"
-
-#: ../../include/functions_reporting.php:1774
-#, php-format
-msgid "Exception - Equal to %s"
-msgstr "例外 - %s と同じ"
-
-#: ../../include/functions_reporting.php:1776
-#, php-format
-msgid "Equal to %s"
-msgstr "%s と同じ"
-
-#: ../../include/functions_reporting.php:1780
-#, php-format
-msgid "Exception - Not equal to %s"
-msgstr "例外 - %s と異なる"
-
-#: ../../include/functions_reporting.php:1782
-#, php-format
-msgid "Not equal to %s"
-msgstr "%s と異なる"
-
-#: ../../include/functions_reporting.php:1786
-msgid "Exception - Modules at normal status"
-msgstr "例外 - モジュールが正常状態"
-
-#: ../../include/functions_reporting.php:1787
-msgid "Modules at normal status"
-msgstr "正常状態のモジュール"
-
-#: ../../include/functions_reporting.php:1791
-msgid "Exception - Modules at critical or warning status"
-msgstr "例外 - モジュールが障害または警告状態"
-
-#: ../../include/functions_reporting.php:1792
-msgid "Modules at critical or warning status"
-msgstr "障害または警告状態のモジュール"
-
-#: ../../include/functions_reporting.php:1981
-msgid "There are no Modules under those conditions."
-msgstr "これらの条件のモジュールはありません。"
-
-#: ../../include/functions_reporting.php:1984
-#, php-format
-msgid "There are no Modules over or equal to %s."
-msgstr "%s 以上のモジュールがありません。"
-
-#: ../../include/functions_reporting.php:1987
-#, php-format
-msgid "There are no Modules less or equal to %s."
-msgstr "%s 以下のモジュールがありません。"
-
-#: ../../include/functions_reporting.php:1990
-#, php-format
-msgid "There are no Modules less %s."
-msgstr "%s 未満のモジュールがありません。"
-
-#: ../../include/functions_reporting.php:1993
-#, php-format
-msgid "There are no Modules over %s."
-msgstr "%s を超えるモジュールがありません。"
-
-#: ../../include/functions_reporting.php:1996
-#, php-format
-msgid "There are no Modules equal to %s"
-msgstr "%s と同じモジュールがありません。"
-
-#: ../../include/functions_reporting.php:1999
-#, php-format
-msgid "There are no Modules not equal to %s"
-msgstr "%s と異なるモジュールがありません。"
-
-#: ../../include/functions_reporting.php:2002
-msgid "There are no Modules normal status"
-msgstr "正常状態のモジュールがありません"
-
-#: ../../include/functions_reporting.php:2005
-msgid "There are no Modules at critial or warning status"
-msgstr "障害または警告状態のモジュールはありません"
-
-#: ../../include/functions_reporting.php:2153
-#: ../../enterprise/include/functions_reporting_csv.php:443
-msgid "Group Report"
-msgstr "グループレポート"
-
-#: ../../include/functions_reporting.php:2207
-msgid "Event Report Agent"
-msgstr "イベントレポートエージェント"
-
-#: ../../include/functions_reporting.php:2409
-msgid "Database Serialized"
-msgstr "データベースの並び"
-
-#: ../../include/functions_reporting.php:2605
-msgid "Network interfaces report"
-msgstr "ネットワークインタフェースレポート"
-
-#: ../../include/functions_reporting.php:2624
-msgid ""
-"The group has no agents or none of the agents has any network interface"
-msgstr "グループにエージェントが無いか、ネットワークインタフェースのあるエージェントがありません"
-
-#: ../../include/functions_reporting.php:2673
-#: ../../include/functions_reporting.php:2696
-msgid "bytes/s"
-msgstr "バイト/秒"
-
-#: ../../include/functions_reporting.php:2748
-msgid "Alert Report Group"
-msgstr "アラートレポートグループ"
-
-#: ../../include/functions_reporting.php:2894
-msgid "Alert Report Agent"
-msgstr "アラートレポートエージェント"
-
-#: ../../include/functions_reporting.php:3011
-msgid "Alert Report Module"
-msgstr "アラートレポートモジュール"
-
-#: ../../include/functions_reporting.php:3144
-msgid "SQL Graph Vertical Bars"
-msgstr "SQL縦棒グラフ"
-
-#: ../../include/functions_reporting.php:3147
-msgid "SQL Graph Horizontal Bars"
-msgstr "SQL横棒グラフ"
-
-#: ../../include/functions_reporting.php:3150
-msgid "SQL Graph Pie"
-msgstr "SQL円グラフ"
-
-#: ../../include/functions_reporting.php:3197
-#: ../../enterprise/include/functions_reporting_csv.php:831
-#: ../../enterprise/include/functions_reporting_csv.php:847
-#: ../../enterprise/include/functions_reporting_csv.php:855
-msgid "Monitor Report"
-msgstr "モニタレポート"
-
-#: ../../include/functions_reporting.php:3274
-msgid "Netflow Area"
-msgstr "Netflow塗りつぶしグラフ"
-
-#: ../../include/functions_reporting.php:3277
-msgid "Netflow Pie"
-msgstr "NetFlow円グラフ"
-
-#: ../../include/functions_reporting.php:3280
-msgid "Netflow Data"
-msgstr "Netflowデータ"
-
-#: ../../include/functions_reporting.php:3283
-msgid "Netflow Statistics"
-msgstr "Netflow 統計"
-
-#: ../../include/functions_reporting.php:3286
-msgid "Netflow Summary"
-msgstr "Netflow 概要"
-
-#: ../../include/functions_reporting.php:3416
-msgid "Prediction Date"
-msgstr "予測日時"
-
-#: ../../include/functions_reporting.php:3467
-#: ../../enterprise/include/functions_reporting_csv.php:333
-msgid "Projection Graph"
-msgstr "予想グラフ"
-
-#: ../../include/functions_reporting.php:3708
-#: ../../enterprise/include/functions_reporting_csv.php:795
-#: ../../enterprise/include/functions_reporting_csv.php:811
-#: ../../enterprise/include/functions_reporting_csv.php:818
-msgid "AVG. Value"
-msgstr "平均値"
-
-#: ../../include/functions_reporting.php:3898
-#: ../../enterprise/godmode/reporting/mysql_builder.php:142
-#: ../../enterprise/include/functions_reporting_csv.php:653
-msgid "SQL"
-msgstr "SQL"
-
-#: ../../include/functions_reporting.php:3969
-msgid ""
-"Illegal query: Due security restrictions, there are some tokens or words you "
-"cannot use: *, delete, drop, alter, modify, union, password, pass, insert or "
-"update."
-msgstr ""
-"不正なクエリ。セキュリティ上の制約により次のトークンやワードは利用でません: *, delete, drop, alter, modify, "
-"union, password, pass, insert または update"
-
-#: ../../include/functions_reporting.php:4960
-msgid "No Address"
-msgstr "アドレスがありません"
-
-#: ../../include/functions_reporting.php:5711
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:194
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:264
-msgid "Rate"
-msgstr "率"
-
-#: ../../include/functions_reporting.php:6356
-msgid "Maximum of events shown"
-msgstr "最大表示イベント"
-
-#: ../../include/functions_reporting.php:6996
-#: ../../include/functions_reporting.php:7033
-msgid "Server health"
-msgstr "サーバの正常性"
-
-#: ../../include/functions_reporting.php:6996
-#, php-format
-msgid "%d Downed servers"
-msgstr "停止サーバ数 %d"
-
-#: ../../include/functions_reporting.php:7004
-#: ../../include/functions_reporting.php:7036
-msgid "Monitor health"
-msgstr "モニタ項目の正常性"
-
-#: ../../include/functions_reporting.php:7004
-#, php-format
-msgid "%d Not Normal monitors"
-msgstr "非正常数 %d"
-
-#: ../../include/functions_reporting.php:7006
-#: ../../include/functions_reporting.php:7037
-msgid "of monitors up"
-msgstr "のモニタ項目が正常です。"
-
-#: ../../include/functions_reporting.php:7012
-#: ../../include/functions_reporting.php:7039
-msgid "Module sanity"
-msgstr "モジュール"
-
-#: ../../include/functions_reporting.php:7012
-#, php-format
-msgid "%d Not inited monitors"
-msgstr "未初期化数 %d"
-
-#: ../../include/functions_reporting.php:7014
-#: ../../include/functions_reporting.php:7040
-msgid "of total modules inited"
-msgstr "のモジュールが初期化済みです。"
-
-#: ../../include/functions_reporting.php:7020
-#: ../../include/functions_reporting.php:7042
-#: ../../include/functions_reporting_html.php:2762
-msgid "Alert level"
-msgstr "アラートレベル"
-
-#: ../../include/functions_reporting.php:7020
-#: ../../include/functions_reporting.php:8040
-#: ../../include/functions_reporting.php:8049
-#, php-format
-msgid "%d Fired alerts"
-msgstr "アラート発報数 %d"
-
-#: ../../include/functions_reporting.php:7022
-#: ../../include/functions_reporting.php:7043
-msgid "of defined alerts not fired"
-msgstr "の定義済みアラートが未発生です。"
-
-#: ../../include/functions_reporting.php:7080
-#: ../../enterprise/include/functions_reporting_csv.php:464
-msgid "Defined alerts"
-msgstr "定義済みアラート"
-
-#: ../../include/functions_reporting.php:7102
-msgid "Defined and fired alerts"
-msgstr "定義済・発報アラート"
-
-#: ../../include/functions_reporting.php:7157
-#: ../../operation/events/sound_events.php:84
-msgid "Monitor critical"
-msgstr "障害状態"
-
-#: ../../include/functions_reporting.php:7161
-#: ../../operation/events/sound_events.php:86
-msgid "Monitor warning"
-msgstr "警告状態"
-
-#: ../../include/functions_reporting.php:7168
-msgid "Monitor normal"
-msgstr "正常状態"
-
-#: ../../include/functions_reporting.php:7172
-#: ../../operation/events/sound_events.php:85
-msgid "Monitor unknown"
-msgstr "不明状態"
-
-#: ../../include/functions_reporting.php:7179
-msgid "Monitor not init"
-msgstr "未初期化状態"
-
-#: ../../include/functions_reporting.php:7203
-#: ../../include/functions_reporting.php:7214
-msgid "Monitors by status"
-msgstr "状態ごとの監視項目"
-
-#: ../../include/functions_reporting.php:7261
-#: ../../include/functions_reporting_html.php:3471
-#: ../../enterprise/dashboard/widgets/tactical.php:32
-msgid "Monitor checks"
-msgstr "モニタ項目"
-
-#: ../../include/functions_reporting.php:7279
-#: ../../include/functions_reporting_html.php:3476
-msgid "Total agents and monitors"
-msgstr "全エージェントと監視項目"
-
-#: ../../include/functions_reporting.php:7302
-msgid "Defined users"
-msgstr "定義済ユーザ"
-
-#: ../../include/functions_reporting.php:7940
-msgid "Agent without data"
-msgstr "データの無いエージェント"
-
-#: ../../include/functions_reporting.php:8027
-#: ../../include/functions_reporting.php:8035
-#, php-format
-msgid "%d Total modules"
-msgstr "全モジュール数 %d"
-
-#: ../../include/functions_reporting.php:8028
-#, php-format
-msgid "%d Modules in normal status"
-msgstr "%d モジュールが正常状態"
-
-#: ../../include/functions_reporting.php:8029
-#, php-format
-msgid "%d Modules in critical status"
-msgstr "%d モジュールが障害状態"
-
-#: ../../include/functions_reporting.php:8030
-#, php-format
-msgid "%d Modules in warning status"
-msgstr "%d モジュールが警告状態"
-
-#: ../../include/functions_reporting.php:8031
-#, php-format
-msgid "%d Modules in unknown status"
-msgstr "%d モジュールが不明状態"
-
-#: ../../include/functions_reporting.php:8032
-#, php-format
-msgid "%d Modules in not init status"
-msgstr "%d モジュールが未初期化状態"
-
-#: ../../include/functions_reporting.php:8036
-#, php-format
-msgid "%d Normal modules"
-msgstr "正常モジュール数 %d"
-
-#: ../../include/functions_reporting.php:8037
-#, php-format
-msgid "%d Critical modules"
-msgstr "障害モジュール数 %d"
-
-#: ../../include/functions_reporting.php:8038
-#, php-format
-msgid "%d Warning modules"
-msgstr "警告モジュール数 %d"
-
-#: ../../include/functions_reporting.php:8039
-#, php-format
-msgid "%d Unknown modules"
-msgstr "不明モジュール数 %d"
-
-#: ../../include/functions_reporting.php:8043
-#, php-format
-msgid "%d Total agents"
-msgstr "全エージェント数 %d"
-
-#: ../../include/functions_reporting.php:8044
-#, php-format
-msgid "%d Normal agents"
-msgstr "正常エージェント数 %d"
-
-#: ../../include/functions_reporting.php:8045
-#, php-format
-msgid "%d Critical agents"
-msgstr "障害エージェント数 %d"
-
-#: ../../include/functions_reporting.php:8046
-#, php-format
-msgid "%d Warning agents"
-msgstr "警告エージェント数 %d"
-
-#: ../../include/functions_reporting.php:8047
-#, php-format
-msgid "%d Unknown agents"
-msgstr "不明エージェント数 %d"
-
-#: ../../include/functions_reporting.php:8048
-#, php-format
-msgid "%d not init agents"
-msgstr "%d 未初期化エージェント"
-
-#: ../../include/functions_reporting.php:9750
-msgid "Total running modules"
-msgstr "全実行中モジュール数"
-
-#: ../../include/functions_reporting.php:9753
-#: ../../include/functions_reporting.php:9769
-#: ../../include/functions_reporting.php:9785
-#: ../../include/functions_reporting.php:9808
-#: ../../include/functions_reporting.php:9827
-#: ../../include/functions_reporting.php:9839
-#: ../../include/functions_reporting.php:9851
-#: ../../include/functions_reporting.php:9867
-msgid "Ratio"
-msgstr "比率"
-
-#: ../../include/functions_reporting.php:9753
-#: ../../include/functions_reporting.php:9769
-#: ../../include/functions_reporting.php:9785
-#: ../../include/functions_reporting.php:9808
-#: ../../include/functions_reporting.php:9827
-#: ../../include/functions_reporting.php:9839
-#: ../../include/functions_reporting.php:9851
-#: ../../include/functions_reporting.php:9867
-msgid "Modules by second"
-msgstr "秒ごとのモジュール"
-
-#: ../../include/functions_reporting.php:9765
-msgid "Local modules"
-msgstr "ローカルモジュール数"
-
-#: ../../include/functions_reporting.php:9776
-msgid "Remote modules"
-msgstr "リモートモジュール数"
-
-#: ../../include/functions_reporting.php:9800
-msgid "Network modules"
-msgstr "ネットワークモジュール"
-
-#: ../../include/functions_reporting.php:9823
-msgid "Plugin modules"
-msgstr "プラグインモジュール"
-
-#: ../../include/functions_reporting.php:9835
-msgid "Prediction modules"
-msgstr "予測モジュール"
-
-#: ../../include/functions_reporting.php:9847
-msgid "WMI modules"
-msgstr "WMIモジュール"
-
-#: ../../include/functions_reporting.php:9859
-msgid "Web modules"
-msgstr "Webモジュール"
-
-#: ../../include/functions_reporting.php:9921
-#: ../../enterprise/dashboard/widgets/tactical.php:39
-msgid "Server performance"
-msgstr "サーバパフォーマンス"
-
-#: ../../include/functions_reporting.php:10003
-#: ../../enterprise/include/functions_reporting.php:4593
-msgid "Weekly:"
-msgstr "週次:"
-
-#: ../../include/functions_reporting.php:10037
-#: ../../enterprise/include/functions_reporting.php:4627
-msgid "Monthly:"
-msgstr "月次:"
-
-#: ../../include/functions_reporting.php:10038
-#: ../../enterprise/include/functions_reporting.php:4628
-msgid "From day"
-msgstr "開始日"
-
-#: ../../include/functions_reporting.php:10039
-#: ../../enterprise/include/functions_reporting.php:4629
-msgid "To day"
-msgstr "終了日"
-
-#: ../../include/functions_pandora_networkmap.php:103
-#: ../../mobile/operation/networkmap.php:110
-#: ../../mobile/operation/networkmap.php:129
-#: ../../mobile/operation/networkmap.php:146
-#: ../../operation/agentes/networkmap.dinamic.php:130
-#: ../../enterprise/include/class/NetworkmapEnterprise.class.php:227
-#: ../../enterprise/operation/policies/networkmap.policies.php:64
-msgid "Pandora FMS"
-msgstr "Pandora FMS"
-
-#: ../../include/functions_pandora_networkmap.php:754
-#, php-format
-msgid "Edit node %s"
-msgstr "ノード編集 %s"
-
-#: ../../include/functions_pandora_networkmap.php:755
-msgid "Holding Area"
-msgstr "保持エリア"
-
-#: ../../include/functions_pandora_networkmap.php:756
-msgid "Show details and options"
-msgstr "詳細とオプションの表示"
-
-#: ../../include/functions_pandora_networkmap.php:757
-msgid "Add a interface link"
-msgstr "インタフェースリンクを追加"
-
-#: ../../include/functions_pandora_networkmap.php:758
-msgid "Set parent interface"
-msgstr "親インタフェースを設定"
-
-#: ../../include/functions_pandora_networkmap.php:759
-msgid "Set as children"
-msgstr "子に設定"
-
-#: ../../include/functions_pandora_networkmap.php:760
-msgid "Set parent"
-msgstr "親を設定"
-
-#: ../../include/functions_pandora_networkmap.php:761
-#: ../../include/functions_pandora_networkmap.php:768
-msgid "Abort the action of set relationship"
-msgstr "関係設定動作の中止"
-
-#: ../../include/functions_pandora_networkmap.php:763
-#: ../../include/functions_pandora_networkmap.php:1546
-msgid "Add node"
-msgstr "ノード追加"
-
-#: ../../include/functions_pandora_networkmap.php:764
-msgid "Set center"
-msgstr "中心設定"
-
-#: ../../include/functions_pandora_networkmap.php:766
-msgid "Refresh Holding area"
-msgstr "保持エリアの更新"
-
-#: ../../include/functions_pandora_networkmap.php:767
-msgid "Abort the action of set interface relationship"
-msgstr "インタフェースの関係設定のアクションについて"
-
-#: ../../include/functions_pandora_networkmap.php:1276
-msgid "Open Minimap"
-msgstr "ミニマップを開く"
-
-#: ../../include/functions_pandora_networkmap.php:1283
-msgid "Hide Labels"
-msgstr "ラベルを隠す"
-
-#: ../../include/functions_pandora_networkmap.php:1374
-msgid "Edit node"
-msgstr "ノード編集"
-
-#: ../../include/functions_pandora_networkmap.php:1385
-msgid "Adresses"
-msgstr "アドレス"
-
-#: ../../include/functions_pandora_networkmap.php:1387
-msgid "OS type"
-msgstr "OS 種別"
-
-#: ../../include/functions_pandora_networkmap.php:1392
-#: ../../include/functions_pandora_networkmap.php:1393
-msgid "Node Details"
-msgstr "ノード詳細"
-
-#: ../../include/functions_pandora_networkmap.php:1402
-msgid "Ip"
-msgstr "IP"
-
-#: ../../include/functions_pandora_networkmap.php:1403
-msgid "MAC"
-msgstr "MAC"
-
-#: ../../include/functions_pandora_networkmap.php:1412
-#: ../../include/functions_pandora_networkmap.php:1413
-msgid "Interface Information (SNMP)"
-msgstr "インタフェース情報 (SNMP)"
-
-#: ../../include/functions_pandora_networkmap.php:1420
-msgid "Shape"
-msgstr "形"
-
-#: ../../include/functions_pandora_networkmap.php:1422
-msgid "Circle"
-msgstr "円"
-
-#: ../../include/functions_pandora_networkmap.php:1423
-msgid "Square"
-msgstr "四角"
-
-#: ../../include/functions_pandora_networkmap.php:1424
-msgid "Rhombus"
-msgstr "ひしがた"
-
-#: ../../include/functions_pandora_networkmap.php:1434
-msgid "name node"
-msgstr "ノード名"
-
-#: ../../include/functions_pandora_networkmap.php:1436
-msgid "Update node"
-msgstr "ノードの更新"
-
-#: ../../include/functions_pandora_networkmap.php:1441
-#: ../../include/functions_pandora_networkmap.php:1602
-msgid "name fictional node"
-msgstr "仮想ノード名"
-
-#: ../../include/functions_pandora_networkmap.php:1442
-#: ../../include/functions_pandora_networkmap.php:1603
-msgid "Networkmap to link"
-msgstr "リンクするネットワークマップ"
-
-#: ../../include/functions_pandora_networkmap.php:1448
-msgid "Update fictional node"
-msgstr "仮想ノード更新"
-
-#: ../../include/functions_pandora_networkmap.php:1451
-#: ../../include/functions_pandora_networkmap.php:1452
-msgid "Node options"
-msgstr "ノードオプション"
-
-#: ../../include/functions_pandora_networkmap.php:1459
-#: ../../include/functions_pandora_networkmap.php:1514
-msgid "Node source"
-msgstr "ノードソース"
-
-#: ../../include/functions_pandora_networkmap.php:1460
-#: ../../include/functions_pandora_networkmap.php:1515
-msgid "Interface source"
-msgstr "インタフェースソース"
-
-#: ../../include/functions_pandora_networkmap.php:1461
-#: ../../include/functions_pandora_networkmap.php:1516
-msgid "Interface Target"
-msgstr "インタフェースターゲット"
-
-#: ../../include/functions_pandora_networkmap.php:1463
-#: ../../include/functions_pandora_networkmap.php:1517
-msgid "Node target"
-msgstr "ノードターゲット"
-
-#: ../../include/functions_pandora_networkmap.php:1464
-msgid "E."
-msgstr "E."
-
-#: ../../include/functions_pandora_networkmap.php:1495
-msgid "There are not relations"
-msgstr "関連付がありません。"
-
-#: ../../include/functions_pandora_networkmap.php:1502
-#: ../../include/functions_pandora_networkmap.php:1503
-msgid "Relations"
-msgstr "関連付"
-
-#: ../../include/functions_pandora_networkmap.php:1538
-msgid "Add interface link"
-msgstr "インタフェースリンクを追加"
-
-#: ../../include/functions_pandora_networkmap.php:1565
-#: ../../include/functions_pandora_networkmap.php:1569
-#: ../../include/functions_pandora_networkmap.php:1570
-#: ../../include/functions_pandora_networkmap.php:1590
-#: ../../include/functions_pandora_networkmap.php:1595
-#: ../../include/functions_pandora_networkmap.php:1613
-msgid "Add agent node"
-msgstr "エージェントノード追加"
-
-#: ../../include/functions_pandora_networkmap.php:1594
-msgid "Add agent node (filter by group)"
-msgstr "エージェントノード追加 (グループによるフィルタ)"
-
-#: ../../include/functions_pandora_networkmap.php:1609
-msgid "Add fictional node"
-msgstr "仮想ノード追加"
-
-#: ../../include/functions_pandora_networkmap.php:1612
-msgid "Add fictional point"
-msgstr "仮想ポイント追加"
-
-#: ../../include/functions_reporting_html.php:70
-#: ../../include/functions_reporting_html.php:3383
-#: ../../include/functions_treeview.php:298
-#: ../../enterprise/include/functions_reporting_pdf.php:2260
-#: ../../enterprise/include/functions_reporting_pdf.php:2298
-msgid "Last data"
-msgstr "最新データ"
-
-#: ../../include/functions_reporting_html.php:93
-msgid "Label: "
-msgstr "ラベル: "
-
-#: ../../include/functions_reporting_html.php:111
-#: ../../enterprise/include/functions_netflow_pdf.php:157
-#: ../../enterprise/include/functions_reporting_csv.php:1505
-#: ../../enterprise/include/functions_reporting_csv.php:1509
-#: ../../enterprise/include/functions_reporting_pdf.php:2163
-msgid "Generated"
-msgstr "生成日"
-
-#: ../../include/functions_reporting_html.php:114
-#: ../../enterprise/include/functions_reporting_pdf.php:2166
-msgid "Report date"
-msgstr "レポート日"
-
-#: ../../include/functions_reporting_html.php:119
-#: ../../operation/reporting/reporting_viewer.php:197
-#: ../../enterprise/include/functions_reporting_pdf.php:2171
-msgid "Items period before"
-msgstr "次の日時以前"
-
-#: ../../include/functions_reporting_html.php:398
-#: ../../enterprise/include/functions_reporting.php:1263
-#: ../../enterprise/include/functions_reporting.php:2055
-#: ../../enterprise/include/functions_reporting.php:2832
-#: ../../enterprise/include/functions_reporting_pdf.php:1266
-#: ../../enterprise/include/functions_reporting_pdf.php:1609
-msgid "Max/Min Values"
-msgstr "最大/最小値"
-
-#: ../../include/functions_reporting_html.php:399
-#: ../../enterprise/include/functions_reporting.php:1264
-#: ../../enterprise/include/functions_reporting.php:2056
-#: ../../enterprise/include/functions_reporting.php:2833
-#: ../../enterprise/include/functions_reporting.php:4426
-#: ../../enterprise/include/functions_reporting.php:4727
-#: ../../enterprise/include/functions_reporting_csv.php:931
-#: ../../enterprise/include/functions_reporting_csv.php:978
-#: ../../enterprise/include/functions_reporting_csv.php:1050
-#: ../../enterprise/include/functions_reporting_csv.php:1166
-#: ../../enterprise/include/functions_reporting_csv.php:1378
-#: ../../enterprise/include/functions_reporting_pdf.php:1267
-#: ../../enterprise/include/functions_reporting_pdf.php:1610
-#: ../../enterprise/include/functions_reporting_pdf.php:2040
-msgid "SLA Limit"
-msgstr "SLA 制限"
-
-#: ../../include/functions_reporting_html.php:400
-#: ../../enterprise/include/functions_reporting.php:1264
-#: ../../enterprise/include/functions_reporting.php:1396
-#: ../../enterprise/include/functions_reporting.php:2056
-#: ../../enterprise/include/functions_reporting.php:2833
-#: ../../enterprise/include/functions_reporting.php:4427
-#: ../../enterprise/include/functions_reporting.php:4728
-#: ../../enterprise/include/functions_reporting_pdf.php:1268
-#: ../../enterprise/include/functions_reporting_pdf.php:1610
-#: ../../enterprise/include/functions_reporting_pdf.php:1759
-#: ../../enterprise/include/functions_reporting_pdf.php:2041
-msgid "SLA Compliance"
-msgstr "SLA準拠"
-
-#: ../../include/functions_reporting_html.php:425
-#: ../../enterprise/include/functions_reporting_pdf.php:1275
-msgid "Global Time"
-msgstr "グローバル時間"
-
-#: ../../include/functions_reporting_html.php:426
-#: ../../enterprise/include/functions_reporting_csv.php:1309
-#: ../../enterprise/include/functions_reporting_pdf.php:1276
-msgid "Time Total"
-msgstr "合計時間"
-
-#: ../../include/functions_reporting_html.php:427
-#: ../../enterprise/include/functions_reporting_pdf.php:1277
-#: ../../enterprise/include/functions_reporting_pdf.php:1850
-msgid "Time Failed"
-msgstr "障害時間"
-
-#: ../../include/functions_reporting_html.php:428
-#: ../../include/functions_reporting_html.php:2262
-#: ../../enterprise/include/functions_reporting_csv.php:1310
-#: ../../enterprise/include/functions_reporting_pdf.php:1278
-#: ../../enterprise/include/functions_reporting_pdf.php:1851
-msgid "Time OK"
-msgstr "正常時間"
-
-#: ../../include/functions_reporting_html.php:429
-#: ../../enterprise/include/functions_reporting_csv.php:1312
-#: ../../enterprise/include/functions_reporting_pdf.php:1279
-#: ../../enterprise/include/functions_reporting_pdf.php:1852
-msgid "Time Unknown"
-msgstr "不明時間"
-
-#: ../../include/functions_reporting_html.php:430
-#: ../../enterprise/include/functions_reporting_csv.php:1313
-#: ../../enterprise/include/functions_reporting_pdf.php:1280
-msgid "Time Not Init"
-msgstr "未初期化時間"
-
-#: ../../include/functions_reporting_html.php:431
-#: ../../enterprise/include/functions_reporting_pdf.php:1281
-msgid "Downtime"
-msgstr "停止時間"
-
-#: ../../include/functions_reporting_html.php:456
-#: ../../enterprise/include/functions_reporting_pdf.php:1287
-msgid "Checks Time"
-msgstr "確認数"
-
-#: ../../include/functions_reporting_html.php:457
-#: ../../enterprise/include/functions_reporting_csv.php:1315
-#: ../../enterprise/include/functions_reporting_pdf.php:1288
-msgid "Checks Total"
-msgstr "合計確認数"
-
-#: ../../include/functions_reporting_html.php:458
-#: ../../enterprise/include/functions_reporting_pdf.php:1289
-#: ../../enterprise/include/functions_reporting_pdf.php:1870
-msgid "Checks Failed"
-msgstr "障害確認数"
-
-#: ../../include/functions_reporting_html.php:459
-#: ../../include/functions_reporting_html.php:2305
-#: ../../enterprise/include/functions_reporting_csv.php:1316
-#: ../../enterprise/include/functions_reporting_pdf.php:1290
-#: ../../enterprise/include/functions_reporting_pdf.php:1871
-msgid "Checks OK"
-msgstr "正常確認数"
-
-#: ../../include/functions_reporting_html.php:460
-#: ../../enterprise/include/functions_reporting_csv.php:1318
-#: ../../enterprise/include/functions_reporting_pdf.php:1291
-#: ../../enterprise/include/functions_reporting_pdf.php:1872
-msgid "Checks Unknown"
-msgstr "不明確認数"
-
-#: ../../include/functions_reporting_html.php:685
-#: ../../include/functions_reporting_html.php:2541
-#: ../../enterprise/include/functions_reporting.php:2269
-#: ../../enterprise/include/functions_reporting.php:3038
-#: ../../enterprise/include/functions_reporting_pdf.php:1506
-#: ../../enterprise/include/functions_services.php:1271
-msgid "Unknow"
-msgstr "不明"
-
-#: ../../include/functions_reporting_html.php:690
-#: ../../include/functions_reporting_html.php:2546
-#: ../../operation/agentes/group_view.php:170
-#: ../../enterprise/include/functions_reporting.php:1294
-#: ../../enterprise/include/functions_reporting.php:2086
-#: ../../enterprise/include/functions_reporting.php:2274
-#: ../../enterprise/include/functions_reporting.php:2863
-#: ../../enterprise/include/functions_reporting.php:3043
-#: ../../enterprise/include/functions_reporting.php:3764
-#: ../../enterprise/include/functions_reporting_pdf.php:1508
-#: ../../enterprise/include/functions_reporting_pdf.php:1647
-msgid "Not Init"
-msgstr "未初期化"
-
-#: ../../include/functions_reporting_html.php:695
-#: ../../include/functions_reporting_html.php:2551
-#: ../../enterprise/include/functions_reporting.php:2279
-#: ../../enterprise/include/functions_reporting.php:3048
-#: ../../enterprise/include/functions_reporting_pdf.php:1510
-msgid "Downtimes"
-msgstr "停止時間"
-
-#: ../../include/functions_reporting_html.php:700
-#: ../../include/functions_reporting_html.php:2556
-#: ../../enterprise/include/functions_reporting.php:2284
-#: ../../enterprise/include/functions_reporting.php:3053
-#: ../../enterprise/include/functions_reporting_pdf.php:1512
-msgid "Ignore time"
-msgstr "除外時間"
-
-#: ../../include/functions_reporting_html.php:772
-#: ../../include/functions_reporting_html.php:1529
-#: ../../include/functions_reporting_html.php:2455
-#: ../../include/functions_reporting_html.php:2683
-#: ../../enterprise/include/functions_reporting_pdf.php:804
-#: ../../enterprise/include/functions_reporting_pdf.php:896
-#: ../../enterprise/include/functions_reporting_pdf.php:952
-msgid "Min Value"
-msgstr "最小値"
-
-#: ../../include/functions_reporting_html.php:773
-#: ../../include/functions_reporting_html.php:1530
-#: ../../include/functions_reporting_html.php:2456
-#: ../../include/functions_reporting_html.php:2684
-#: ../../enterprise/include/functions_reporting_pdf.php:805
-#: ../../enterprise/include/functions_reporting_pdf.php:897
-#: ../../enterprise/include/functions_reporting_pdf.php:953
-#: ../../enterprise/include/functions_reporting_pdf.php:1993
-msgid "Average Value"
-msgstr "平均値"
-
-#: ../../include/functions_reporting_html.php:774
-#: ../../include/functions_reporting_html.php:1531
-#: ../../include/functions_reporting_html.php:2453
-#: ../../include/functions_reporting_html.php:2686
-#: ../../enterprise/include/functions_reporting_pdf.php:806
-#: ../../enterprise/include/functions_reporting_pdf.php:898
-#: ../../enterprise/include/functions_reporting_pdf.php:954
-#: ../../enterprise/include/functions_reporting_pdf.php:1990
-msgid "Max Value"
-msgstr "最大値"
-
-#: ../../include/functions_reporting_html.php:807
-#: ../../include/functions_reporting_html.php:1025
-#: ../../include/functions_reporting_html.php:1644
-#: ../../operation/snmpconsole/snmp_view.php:610
-#: ../../enterprise/godmode/alerts/configure_alert_rule.php:143
-msgid "Count"
-msgstr "回数"
-
-#: ../../include/functions_reporting_html.php:812
-#: ../../include/functions_reporting_html.php:821
-#: ../../include/functions_reporting_html.php:1649
-msgid "Val. by"
-msgstr "承諾ユーザ"
-
-#: ../../include/functions_reporting_html.php:915
-#: ../../include/functions_reporting_html.php:1111
-msgid "Events by agent"
-msgstr "エージェントで分類したイベント"
-
-#: ../../include/functions_reporting_html.php:934
-#: ../../include/functions_reporting_html.php:1130
-msgid "Events by user validator"
-msgstr "承諾したユーザごとのイベント"
-
-#: ../../include/functions_reporting_html.php:953
-#: ../../include/functions_reporting_html.php:1149
-msgid "Events by Severity"
-msgstr "重要度ごとのイベント"
-
-#: ../../include/functions_reporting_html.php:972
-#: ../../include/functions_reporting_html.php:1168
-msgid "Events validated vs unvalidated"
-msgstr "承諾済と未承諾イベント"
-
-#: ../../include/functions_reporting_html.php:1228
-#: ../../enterprise/include/functions_inventory.php:511
-#: ../../enterprise/include/functions_inventory.php:574
-#: ../../enterprise/include/functions_reporting_pdf.php:495
-msgid "Added"
-msgstr "追加済み"
-
-#: ../../include/functions_reporting_html.php:1379
-#: ../../enterprise/dashboard/widgets/agent_module.php:309
-#: ../../enterprise/include/functions_reporting_pdf.php:618
-#, php-format
-msgid "%s in %s : NORMAL"
-msgstr "%s (%s): 正常"
-
-#: ../../include/functions_reporting_html.php:1388
-#: ../../enterprise/dashboard/widgets/agent_module.php:317
-#: ../../enterprise/include/functions_reporting_pdf.php:627
-#, php-format
-msgid "%s in %s : CRITICAL"
-msgstr "%s (%s): 障害"
-
-#: ../../include/functions_reporting_html.php:1397
-#: ../../enterprise/dashboard/widgets/agent_module.php:325
-#: ../../enterprise/include/functions_reporting_pdf.php:636
-#, php-format
-msgid "%s in %s : WARNING"
-msgstr "%s (%s): 警告"
-
-#: ../../include/functions_reporting_html.php:1406
-#: ../../enterprise/dashboard/widgets/agent_module.php:333
-#: ../../enterprise/include/functions_reporting_pdf.php:645
-#, php-format
-msgid "%s in %s : UNKNOWN"
-msgstr "%s (%s): 不明"
-
-#: ../../include/functions_reporting_html.php:1417
-#: ../../enterprise/dashboard/widgets/agent_module.php:350
-#: ../../enterprise/include/functions_reporting_pdf.php:663
-#, php-format
-msgid "%s in %s : ALERTS FIRED"
-msgstr "%s (%s): アラート発生"
-
-#: ../../include/functions_reporting_html.php:1426
-#: ../../enterprise/dashboard/widgets/agent_module.php:341
-#: ../../enterprise/include/functions_reporting_pdf.php:654
-#, php-format
-msgid "%s in %s : Not initialize"
-msgstr "%s (%s): 未初期化"
-
-#: ../../include/functions_reporting_html.php:1585
-#: ../../include/functions_reporting_html.php:3272
-msgid "Monitors"
-msgstr "モニタ項目"
-
-#: ../../include/functions_reporting_html.php:1604
-#: ../../include/functions_reporting_html.php:1959
-#: ../../include/functions_reporting_html.php:1960
-#: ../../mobile/operation/alerts.php:38
-#: ../../operation/agentes/alerts_status.functions.php:74
-#: ../../operation/snmpconsole/snmp_view.php:162
-#: ../../operation/snmpconsole/snmp_view.php:923
-#: ../../enterprise/include/functions_reporting_pdf.php:734
-msgid "Fired"
-msgstr "通知済"
-
-#: ../../include/functions_reporting_html.php:1617
-#: ../../enterprise/include/functions_reporting_pdf.php:749
-#, php-format
-msgid "Last %s"
-msgstr "最新日時 %s"
-
-#: ../../include/functions_reporting_html.php:1737
-msgid "Events validated by user"
-msgstr "ユーザで分類したイベント"
-
-#: ../../include/functions_reporting_html.php:1756
-#: ../../include/functions_reporting_html.php:3561
-msgid "Events by severity"
-msgstr "重要度ごとのイベント"
-
-#: ../../include/functions_reporting_html.php:1775
-#: ../../operation/events/event_statistics.php:61
-msgid "Amount events validated"
-msgstr "承諾済みイベントの割合"
-
-#: ../../include/functions_reporting_html.php:1905
-#, php-format
-msgid "Interface '%s' throughput graph"
-msgstr "インタフェース '%s' スループットグラフ"
-
-#: ../../include/functions_reporting_html.php:1908
-msgid "Mac"
-msgstr "Mac"
-
-#: ../../include/functions_reporting_html.php:1909
-msgid "Actual status"
-msgstr "現在の状態"
-
-#: ../../include/functions_reporting_html.php:2105
-msgid "Empty modules"
-msgstr "モジュールなし"
-
-#: ../../include/functions_reporting_html.php:2112
-msgid "Warning<br/>Critical"
-msgstr "警告<br/>障害"
-
-#: ../../include/functions_reporting_html.php:2260
-msgid "Total time"
-msgstr "合計時間"
-
-#: ../../include/functions_reporting_html.php:2261
-msgid "Time failed"
-msgstr "障害時間"
-
-#: ../../include/functions_reporting_html.php:2263
-msgid "Time Uknown"
-msgstr "不明時間"
-
-#: ../../include/functions_reporting_html.php:2264
-msgid "Time Not Init Module"
-msgstr "未初期化モジュール時間"
-
-#: ../../include/functions_reporting_html.php:2265
-#: ../../enterprise/include/functions_reporting_csv.php:1314
-msgid "Time Downtime"
-msgstr "計画停止時間"
-
-#: ../../include/functions_reporting_html.php:2266
-#: ../../enterprise/include/functions_reporting_pdf.php:1855
-msgid "% Ok"
-msgstr "正常%"
-
-#: ../../include/functions_reporting_html.php:2303
-msgid "Total checks"
-msgstr "全確認数"
-
-#: ../../include/functions_reporting_html.php:2304
-msgid "Checks failed"
-msgstr "障害確認数"
-
-#: ../../include/functions_reporting_html.php:2306
-msgid "Checks Uknown"
-msgstr "不明確認数"
-
-#: ../../include/functions_reporting_html.php:2452
-#: ../../enterprise/include/functions_reporting_pdf.php:1989
-msgid "Agent max value"
-msgstr "エージェント最大値"
-
-#: ../../include/functions_reporting_html.php:2454
-msgid "Agent min value"
-msgstr "エージェント最小値"
-
-#: ../../include/functions_reporting_html.php:2695
-#: ../../include/functions_reporting_html.php:2789
-#: ../../enterprise/dashboard/widgets/tactical.php:44
-msgid "Summary"
-msgstr "サマリ"
-
-#: ../../include/functions_reporting_html.php:2761
-#: ../../operation/tree.php:163
-msgid "Module status"
-msgstr "モジュールの状態"
-
-#: ../../include/functions_reporting_html.php:2881
-#: ../../enterprise/meta/include/functions_wizard_meta.php:1224
-msgid "Alert description"
-msgstr "アラートの説明"
-
-#: ../../include/functions_reporting_html.php:2931
-msgid "Alerts not fired"
-msgstr "未通知アラート"
-
-#: ../../include/functions_reporting_html.php:2940
-msgid "Total alerts monitored"
-msgstr "モニタ中の全アラート"
-
-#: ../../include/functions_reporting_html.php:2991
-msgid "Total monitors"
-msgstr "全モニタ"
-
-#: ../../include/functions_reporting_html.php:2992
-msgid "Monitors down on period"
-msgstr "現時点で停止中のモニタ"
-
-#: ../../include/functions_reporting_html.php:3008
-msgid "Monitors OK"
-msgstr "正常"
-
-#: ../../include/functions_reporting_html.php:3009
-msgid "Monitors BAD"
-msgstr "障害"
-
-#: ../../include/functions_reporting_html.php:3035
-#: ../../include/functions_reporting_html.php:3175
-#: ../../mobile/include/functions_web.php:23
-#: ../../enterprise/meta/monitoring/wizard/wizard.create_module.php:146
-msgid "Monitor"
-msgstr "モニタ項目"
-
-#: ../../include/functions_reporting_html.php:3083
-#, php-format
-msgid "Agents in group: %s"
-msgstr "グループに含まれるエージェント: %s"
-
-#: ../../include/functions_reporting_html.php:3176
-msgid "Last failure"
-msgstr "最新の障害"
-
-#: ../../include/functions_reporting_html.php:3240
-msgid "N/A(*)"
-msgstr "N/A(*)"
-
-#: ../../include/functions_reporting_html.php:3414
-#: ../../mobile/operation/groups.php:133
-msgid "Agents critical"
-msgstr "障害状態エージェント"
-
-#: ../../include/functions_reporting_html.php:3417
-msgid "Agents warning"
-msgstr "警告状態エージェント"
-
-#: ../../include/functions_reporting_html.php:3423
-msgid "Agents ok"
-msgstr "正常状態エージェント"
-
-#: ../../include/functions_reporting_html.php:3432
-#: ../../mobile/operation/groups.php:129
-msgid "Agents not init"
-msgstr "未初期化エージェント"
-
-#: ../../include/functions_reporting_html.php:3443
-#: ../../include/functions_reporting_html.php:3452
-msgid "Agents by status"
-msgstr "状態ごとのエージェント"
-
-#: ../../include/functions_reporting_html.php:3489
-#: ../../operation/agentes/pandora_networkmap.php:403
-msgid "Nodes"
-msgstr "ノード"
-
-#: ../../include/functions_reporting_html.php:3496
-#: ../../include/functions_reporting_html.php:3505
-msgid "Node overview"
-msgstr "ノードの概要"
-
-#: ../../include/functions_reporting_html.php:3523
-#: ../../include/functions_reporting_html.php:3540
-msgid "Critical events"
-msgstr "障害イベント"
-
-#: ../../include/functions_reporting_html.php:3527
-#: ../../include/functions_reporting_html.php:3544
-msgid "Warning events"
-msgstr "警告イベント"
-
-#: ../../include/functions_reporting_html.php:3531
-#: ../../include/functions_reporting_html.php:3548
-msgid "OK events"
-msgstr "正常イベント"
-
-#: ../../include/functions_reporting_html.php:3535
-#: ../../include/functions_reporting_html.php:3552
-msgid "Unknown events"
-msgstr "不明イベント"
-
-#: ../../include/functions_reporting_html.php:3575
-msgid "Important Events by Criticity"
-msgstr "重要度ごとのイベント"
-
-#: ../../include/functions_reporting_html.php:3601
-msgid "Last activity in Pandora FMS console"
-msgstr "Pandora FMS コンソールの最新の操作"
-
-#: ../../include/functions_reporting_html.php:3677
-msgid "Events info (1hr.)"
-msgstr "イベント情報 (1時間)"
-
-#: ../../include/functions_reporting_html.php:3817
-#: ../../enterprise/include/functions_reporting.php:4556
-#: ../../enterprise/include/functions_reporting_pdf.php:2418
-msgid "This SLA has been affected by the following planned downtimes"
-msgstr "この SLA は、次の計画停止によって影響を受けます"
-
-#: ../../include/functions_reporting_html.php:3822
-#: ../../enterprise/include/functions_reporting.php:4561
-#: ../../enterprise/include/functions_reporting_pdf.php:2423
-msgid "Dates"
-msgstr "日付"
-
-#: ../../include/functions_reporting_html.php:3863
-#: ../../enterprise/include/functions_reporting.php:4655
-#: ../../enterprise/include/functions_reporting_pdf.php:2462
-msgid "This item is affected by a malformed planned downtime"
-msgstr "この要素は不正な計画停止の影響を受けます"
-
-#: ../../include/functions_reporting_html.php:3864
-#: ../../enterprise/include/functions_reporting.php:4656
-#: ../../enterprise/include/functions_reporting_pdf.php:2463
-msgid "Go to the planned downtimes section to solve this"
-msgstr "これを解決するために計画停止画面へ行く"
-
-#: ../../include/functions_planned_downtimes.php:560
-msgid "Succesful stopped the Downtime"
-msgstr "計画停止を中止しました"
-
-#: ../../include/functions_planned_downtimes.php:561
-msgid "Unsuccesful stopped the Downtime"
-msgstr "計画停止の中止に失敗しました"
-
-#: ../../include/functions_planned_downtimes.php:660
-#, php-format
-msgid "Enabled %s elements from the downtime"
-msgstr "計画停止から %s 件の要素が有効になりました"
-
-#: ../../include/functions_planned_downtimes.php:785
-msgid "This planned downtime are executed now. Can't delete in this moment."
-msgstr "この計画停止は実行中です。現在削除できません。"
-
-#: ../../include/functions_planned_downtimes.php:790
-msgid "Deleted this planned downtime successfully."
-msgstr "計画停止を削除しました。"
-
-#: ../../include/functions_planned_downtimes.php:792
-msgid "Problems for deleted this planned downtime."
-msgstr "計画停止の削除に失敗しました。"
-
-#: ../../include/functions_snmp_browser.php:145
-msgid "Target IP cannot be blank."
-msgstr "対象IPが指定されていません"
-
-#: ../../include/functions_snmp_browser.php:403
-msgid "Numeric OID"
-msgstr "数値 OID"
-
-#: ../../include/functions_snmp_browser.php:420
-msgid "Syntax"
-msgstr "書式"
-
-#: ../../include/functions_snmp_browser.php:425
-msgid "Display hint"
-msgstr "ヒント表示"
-
-#: ../../include/functions_snmp_browser.php:430
-msgid "Max access"
-msgstr "最大アクセス"
-
-#: ../../include/functions_snmp_browser.php:445
-msgid "OID Information"
-msgstr "OID 情報"
-
-#: ../../include/functions_snmp_browser.php:510
-msgid "Starting OID"
-msgstr "開始 OID"
-
-#: ../../include/functions_snmp_browser.php:521
-msgid "Browse"
-msgstr "参照"
-
-#: ../../include/functions_snmp_browser.php:558
-msgid "First match"
-msgstr "最初のマッチ"
-
-#: ../../include/functions_snmp_browser.php:560
-msgid "Previous match"
-msgstr "前のマッチ"
-
-#: ../../include/functions_snmp_browser.php:562
-msgid "Next match"
-msgstr "次のマッチ"
-
-#: ../../include/functions_snmp_browser.php:564
-msgid "Last match"
-msgstr "最後のマッチ"
-
-#: ../../include/functions_snmp_browser.php:569
-msgid "Expand the tree (can be slow)"
-msgstr "ツリーを展開する (遅くなります)"
-
-#: ../../include/functions_snmp_browser.php:571
-msgid "Collapse the tree"
-msgstr "ツリーを閉じる"
-
-#: ../../include/functions_snmp_browser.php:590
-msgid "SNMP v3 options"
-msgstr "SNMP v3 オプション"
-
-#: ../../include/functions_snmp_browser.php:593
-msgid "Search options"
-msgstr "検索オプション"
-
-#: ../../include/functions_tags.php:602
-msgid "Click here to open a popup window with URL tag"
-msgstr "URLタグのポップアップウインドウを開くにはここをクリックしてください"
-
-#: ../../include/functions_treeview.php:54
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1347
-msgid "There was a problem loading module"
-msgstr "モジュールの読み込みで問題が発生しました。"
-
-#: ../../include/functions_treeview.php:279
-#: ../../include/functions_treeview.php:286
-#: ../../include/functions_ui.php:3684 ../../include/functions_ui.php:3691
-#: ../../mobile/operation/modules.php:610
-#: ../../mobile/operation/modules.php:617
-#: ../../operation/agentes/status_monitor.php:1362
-#: ../../operation/agentes/status_monitor.php:1369
-#: ../../enterprise/include/functions_services.php:1569
-#: ../../enterprise/operation/agentes/ux_console_view.php:185
-#: ../../enterprise/operation/agentes/ux_console_view.php:257
-msgid "Snapshot view"
-msgstr "スナップショット表示"
-
-#: ../../include/functions_treeview.php:313
-msgid "Go to module edition"
-msgstr "モジュールの編集へ行く"
-
-#: ../../include/functions_treeview.php:362
-msgid "There was a problem loading alerts"
-msgstr "アラートの読み込みで問題が発生しました。"
-
-#: ../../include/functions_treeview.php:446
-msgid "Go to alerts edition"
-msgstr "アラートの編集へ行く"
-
-#: ../../include/functions_treeview.php:506
-#: ../../operation/agentes/agent_fields.php:28
-#: ../../operation/agentes/custom_fields.php:28
-#: ../../operation/agentes/estado_generalagente.php:46
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1057
-msgid "There was a problem loading agent"
-msgstr "エージェントのロードに失敗しました。"
-
-#: ../../include/functions_treeview.php:571
-#: ../../operation/agentes/estado_generalagente.php:268
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1102
-msgid "Other IP addresses"
-msgstr "他のIPアドレス"
-
-#: ../../include/functions_treeview.php:602
-#: ../../operation/agentes/estado_agente.php:501
-#: ../../operation/agentes/estado_generalagente.php:205
-#: ../../operation/gis_maps/ajax.php:332
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1149
-msgid "Remote"
-msgstr "リモート"
-
-#: ../../include/functions_treeview.php:610
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1170
-msgid "Next agent contact"
-msgstr "次の接続予定"
-
-#: ../../include/functions_treeview.php:620
-msgid "Go to agent edition"
-msgstr "エージェントの編集へ行く"
-
-#: ../../include/functions_treeview.php:629
-msgid "Agent data"
-msgstr "エージェントデータ"
-
-#: ../../include/functions_treeview.php:642
-#: ../../operation/agentes/estado_generalagente.php:159
-#: ../../operation/gis_maps/ajax.php:315
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1117
-msgid "Agent Version"
-msgstr "エージェントバージョン"
-
-#: ../../include/functions_treeview.php:659
-#: ../../operation/agentes/estado_generalagente.php:310
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1124
-msgid "Position (Long, Lat)"
-msgstr "位置 (経度、緯度)"
-
-#: ../../include/functions_treeview.php:676
-#: ../../operation/agentes/estado_generalagente.php:338
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1164
-msgid "Timezone Offset"
-msgstr "タイムゾーンオフセット"
-
-#: ../../include/functions_treeview.php:691
-#: ../../operation/agentes/agent_fields.php:45
-#: ../../operation/agentes/estado_generalagente.php:354
-#: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1180
-msgid "Custom field"
-msgstr "カスタムフィールド"
-
-#: ../../include/functions_treeview.php:702
-msgid "Advanced information"
-msgstr "拡張情報"
-
-#: ../../include/functions_treeview.php:714
-#: ../../operation/agentes/estado_generalagente.php:256
-msgid "Agent access rate (24h)"
-msgstr "エージェントアクセス頻度(過去24時間)"
-
-#: ../../include/functions_treeview.php:722
-#: ../../mobile/operation/agent.php:214
-#: ../../operation/agentes/estado_generalagente.php:602
-msgid "Events (24h)"
-msgstr "イベント (24時間)"
-
-#: ../../include/functions_treeview.php:774
-#: ../../operation/agentes/estado_generalagente.php:478
-#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:645
-msgid "Interface traffic"
-msgstr "インタフェーストラフィック"
-
-#: ../../include/functions_treeview.php:796
-#: ../../operation/agentes/estado_generalagente.php:448
-msgid "Interface information"
-msgstr "インタフェース情報"
-
-#: ../../include/functions_ui.php:225
-msgid "Information"
-msgstr "情報"
-
-#: ../../include/functions_ui.php:231
-#: ../../enterprise/include/functions_visual_map.php:622
-msgid "Success"
-msgstr "成功"
-
-#: ../../include/functions_ui.php:367
-msgid "Request successfully processed"
-msgstr "要求された処理を実行しました。"
-
-#: ../../include/functions_ui.php:370
-msgid "Error processing request"
-msgstr "要求された処理の実行に失敗しました。"
-
-#: ../../include/functions_ui.php:508
-msgid ""
-"Is possible that this view uses part of information which your user has not "
-"access"
-msgstr "あなたのユーザでアクセスできない情報の一部を利用している可能性があります"
-
-#: ../../include/functions_ui.php:1028
-msgid "The alert would fire when the value is over <span id=\"max\"></span>"
-msgstr "取得した値が <span id=\"max\"></span> 以上になったら、アラートを発生させます。"
-
-#: ../../include/functions_ui.php:1033
-msgid "The alert would fire when the value is under <span id=\"min\"></span>"
-msgstr "取得した値が <span id=\"min\"></span> 未満になったら、アラートを発生させます。"
-
-#: ../../include/functions_ui.php:1307
-#: ../../enterprise/meta/include/functions_ui_meta.php:54
-msgid "the Flexible Monitoring System"
-msgstr "the Flexible Monitoring System"
-
-#: ../../include/functions_ui.php:1627 ../../include/functions_ui.php:1661
-#, php-format
-msgid "Total items: %s"
-msgstr "全アイテム数: %s"
-
-#: ../../include/functions_ui.php:1968
-msgid "Unknown type"
-msgstr "不明なタイプ"
-
-#: ../../include/functions_ui.php:2781
-msgid "Type at least two characters to search."
-msgstr "2文字以上入力するとマッチするエージェント名が検索されます"
-
-#: ../../include/functions_ui.php:3575
-msgid ""
-"Cannot connect to the database, please check your database setup in the "
-"<b>include/config.php</b> file.<i><br/><br/>\n"
-"\t\t\tProbably your database, hostname, user or password values are "
-"incorrect or\n"
-"\t\t\tthe database server is not running."
-msgstr ""
-"データベースに接続できません。 <b>include/config.php</b> "
-"ファイル内のデータベースの設定を確認してください。<i><br/><br/>\n"
-"\t\t\tおそらく、データベース名、ホスト名、ユーザ名またはパスワードの値が不正か、\n"
-"\t\t\tデータベースが動作していません。"
-
-#: ../../include/functions_ui.php:3590
-msgid ""
-"Cannot load configuration variables from database. Please check your "
-"database setup in the\n"
-"\t\t\t<b>include/config.php</b> file.<i><br><br>\n"
-"\t\t\tMost likely your database schema has been created but there are is no "
-"data in it, you have a problem with the database access credentials or your "
-"schema is out of date.\n"
-"\t\t\t<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or "
-"this file has invalid\n"
-"\t\t\tpermissions and HTTP server cannot read it. Please read documentation "
-"to fix this problem.</i>"
-msgstr ""
-"データベースから設定を読み込めません。<b>include/config.php</b>ファイルのデータベース設定を確認してください。<i><br><br"
-">\n"
-"\t\t\t "
-"データベーススキーマは作成されているがデータが入っていない、データベースへのアクセス権限が無い、またはスキーマが古いといったことが考えられます。\n"
-"\t\t\t <br><br>または、Pandora FMS コンソールが <i>include/config.php</i> "
-"ファイルを見つけられないか、このファイルが不正な\n"
-"\t\t\t パーミッションで HTTP サーバが読むことができません。この問題の解決にはドキュメントを参照してください。</i>"
-
-#: ../../include/functions_ui.php:3598
-msgid ""
-"Pandora FMS Console cannot find <i>include/config.php</i> or this file has "
-"invalid\n"
-"\t\t\tpermissions and HTTP server cannot read it. Please read documentation "
-"to fix this problem."
-msgstr ""
-"Pandora FMS コンソールが <i>include/config.php</i> ファイルを見つけられないか、このファイルが不正な\n"
-"\t\t\t パーミッションで HTTP サーバが読むことができません。この問題の解決にはドキュメントを参照してください。</i>"
-
-#: ../../include/functions_ui.php:3613
-msgid ""
-"For security reasons, normal operation is not possible until you delete "
-"installer file.\n"
-"\t\t\tPlease delete the <i>./install.php</i> file before running Pandora FMS "
-"Console."
-msgstr ""
-"セキュリティ上の理由から、インストーラファイルを削除するまで通常の動作にはなりません。\n"
-"\t\t\t Pandora FMS コンソールを実行する前に <i>./install.php</i>ファイルを削除してください。"
-
-#: ../../include/functions_ui.php:3618
-msgid ""
-"For security reasons, <i>config.php</i> must have restrictive permissions, "
-"and \"other\" users\n"
-"\t\t\tshould not read it or write to it. It should be written only for "
-"owner\n"
-"\t\t\t(usually www-data or http daemon user), normal operation is not "
-"possible until you change\n"
-"\t\t\tpermissions for <i>include/config.php</i> file. Please do it, it is "
-"for your security."
-msgstr ""
-"セキュリティ上の理由により、 <i>config.php</i> は制限されたパーミッションである必要があります。\n"
-"\t\t\t\"other\"ユーザは読み書きできないようにし、所有者(通常は www-data や http デーモンの\n"
-"\t\t\tユーザ)のみが書き込みできるようにします。<i>include/config.php</i> ファイルの\n"
-"\t\t\tパーミッションを修正するまで通常の動作をしません。セキュリティのために調整をしてください。"
-
-#: ../../mobile/include/functions_web.php:21
-#: ../../operation/users/user_edit.php:284
-#: ../../enterprise/extensions/vmware/vmware_view.php:1109
-#: ../../enterprise/extensions/vmware/vmware_view.php:1128
-#: ../../enterprise/mobile/operation/dashboard.php:221
-#: ../../enterprise/operation/menu.php:89
-msgid "Dashboard"
-msgstr "ダッシュボード"
-
 #: ../../mobile/include/functions_web.php:81
 #: ../../mobile/include/ui.class.php:257
-#: ../../enterprise/meta/general/footer.php:26
 #, php-format
 msgid "Pandora FMS %s - Build %s"
 msgstr "Pandora FMS %s - ビルド %s"
 
 #: ../../mobile/include/functions_web.php:82
 #: ../../mobile/include/ui.class.php:258
-#: ../../enterprise/extensions/cron/functions.php:451
-#: ../../enterprise/extensions/cron/functions.php:549
+#: ../../enterprise/extensions/cron/functions.php:493
+#: ../../enterprise/extensions/cron/functions.php:599
 msgid "Generated at"
 msgstr "更新日時:"
 
@@ -25078,7 +26453,7 @@ msgstr "更新日時:"
 msgid "Pandora FMS mobile"
 msgstr "Pandora FMS モバイル"
 
-#: ../../mobile/include/ui.class.php:185 ../../mobile/operation/home.php:128
+#: ../../mobile/include/ui.class.php:185 ../../mobile/operation/home.php:161
 msgid "Home"
 msgstr "ホーム"
 
@@ -25149,8 +26524,8 @@ msgstr "パスワード"
 msgid "Authenticator code"
 msgstr "認証コード"
 
-#: ../../mobile/index.php:241 ../../mobile/operation/agent.php:67
-#: ../../mobile/operation/agents.php:146 ../../mobile/operation/alerts.php:142
+#: ../../mobile/index.php:233 ../../mobile/operation/agent.php:88
+#: ../../mobile/operation/agents.php:167 ../../mobile/operation/alerts.php:142
 #: ../../mobile/operation/events.php:431 ../../mobile/operation/groups.php:54
 #: ../../mobile/operation/module_graph.php:271
 #: ../../mobile/operation/modules.php:174
@@ -25168,7 +26543,7 @@ msgstr ""
 "このページへのアクセスは認証されたユーザのみに制限されています。必要であればシステム管理者へ連絡してください。<br><br>このページへのアクセスは、P"
 "andoraシステムデータベースのセキュリティログに記録されますので注意してください。"
 
-#: ../../mobile/operation/agent.php:108 ../../mobile/operation/agents.php:162
+#: ../../mobile/operation/agent.php:135 ../../mobile/operation/agents.php:183
 #: ../../mobile/operation/alerts.php:158 ../../mobile/operation/events.php:568
 #: ../../mobile/operation/groups.php:69
 #: ../../mobile/operation/module_graph.php:368
@@ -25189,47 +26564,47 @@ msgstr ""
 msgid "Back"
 msgstr "戻る"
 
-#: ../../mobile/operation/agent.php:112
+#: ../../mobile/operation/agent.php:139
 msgid "PandoraFMS: Agents"
 msgstr "PandoraFMS: エージェント"
 
-#: ../../mobile/operation/agent.php:118
+#: ../../mobile/operation/agent.php:145
 msgid "No agent found"
 msgstr "エージェントがありません"
 
-#: ../../mobile/operation/agent.php:200
+#: ../../mobile/operation/agent.php:231
 msgid "Modules by status"
 msgstr "状態ごとのモジュール"
 
-#: ../../mobile/operation/agent.php:269
+#: ../../mobile/operation/agent.php:302
 #, php-format
 msgid "Last %s Events"
 msgstr "最新の %s イベント"
 
-#: ../../mobile/operation/agents.php:166
+#: ../../mobile/operation/agents.php:187
 #, php-format
 msgid "Filter Agents by %s"
 msgstr "%s によるエージェントフィルタ"
 
-#: ../../mobile/operation/agents.php:201 ../../mobile/operation/alerts.php:213
+#: ../../mobile/operation/agents.php:222 ../../mobile/operation/alerts.php:213
 #: ../../mobile/operation/events.php:659
 #: ../../mobile/operation/modules.php:261
 #: ../../mobile/operation/networkmaps.php:150
 msgid "Apply Filter"
 msgstr "フィルタの適用"
 
-#: ../../mobile/operation/agents.php:370
+#: ../../mobile/operation/agents.php:393
 msgid "No agents"
 msgstr "エージェントがありません"
 
-#: ../../mobile/operation/agents.php:460 ../../mobile/operation/alerts.php:306
+#: ../../mobile/operation/agents.php:483 ../../mobile/operation/alerts.php:306
 #: ../../mobile/operation/events.php:1070
 #: ../../mobile/operation/modules.php:786
 #: ../../mobile/operation/networkmaps.php:216
 msgid "(Default)"
 msgstr "(デフォルト)"
 
-#: ../../mobile/operation/agents.php:466 ../../mobile/operation/alerts.php:316
+#: ../../mobile/operation/agents.php:489 ../../mobile/operation/alerts.php:316
 #: ../../mobile/operation/events.php:1096
 #: ../../mobile/operation/modules.php:793
 #: ../../mobile/operation/networkmaps.php:222
@@ -25237,14 +26612,14 @@ msgstr "(デフォルト)"
 msgid "Group: %s"
 msgstr "グループ: %s"
 
-#: ../../mobile/operation/agents.php:470 ../../mobile/operation/alerts.php:320
+#: ../../mobile/operation/agents.php:493 ../../mobile/operation/alerts.php:320
 #: ../../mobile/operation/events.php:1112
 #: ../../mobile/operation/modules.php:805
 #, php-format
 msgid "Status: %s"
 msgstr "状態: %s"
 
-#: ../../mobile/operation/agents.php:474 ../../mobile/operation/alerts.php:324
+#: ../../mobile/operation/agents.php:497 ../../mobile/operation/alerts.php:324
 #: ../../mobile/operation/modules.php:809
 #, php-format
 msgid "Free Search: %s"
@@ -25257,8 +26632,8 @@ msgstr "全て(有効状態のもの)"
 
 #: ../../mobile/operation/alerts.php:39
 #: ../../operation/agentes/alerts_status.functions.php:75
-#: ../../operation/snmpconsole/snmp_view.php:162
-#: ../../operation/snmpconsole/snmp_view.php:926
+#: ../../operation/snmpconsole/snmp_view.php:194
+#: ../../operation/snmpconsole/snmp_view.php:1038
 msgid "Not fired"
 msgstr "未通知"
 
@@ -25336,47 +26711,58 @@ msgstr "検索: %s"
 msgid "Hours: %s"
 msgstr "時間: %s"
 
-#: ../../mobile/operation/groups.php:141 ../../operation/tree.php:292
-#: ../../enterprise/dashboard/widgets/tree_view.php:216
-#: ../../enterprise/include/functions_reporting_csv.php:462
+#: ../../mobile/operation/groups.php:141 ../../operation/tree.php:314
+#: ../../enterprise/dashboard/widgets/tree_view.php:226
+#: ../../enterprise/include/functions_reporting_csv.php:475
 msgid "Unknown modules"
 msgstr "不明モジュール"
 
-#: ../../mobile/operation/groups.php:145 ../../operation/tree.php:297
-#: ../../enterprise/dashboard/widgets/tree_view.php:221
-#: ../../enterprise/include/functions_reporting_csv.php:463
+#: ../../mobile/operation/groups.php:145 ../../operation/tree.php:319
+#: ../../enterprise/dashboard/widgets/tree_view.php:231
+#: ../../enterprise/include/functions_reporting_csv.php:476
 msgid "Not init modules"
 msgstr "未初期化モジュール"
 
-#: ../../mobile/operation/groups.php:149 ../../operation/tree.php:302
-#: ../../enterprise/dashboard/widgets/tree_view.php:226
-#: ../../enterprise/include/functions_reporting_csv.php:459
+#: ../../mobile/operation/groups.php:149 ../../operation/tree.php:324
+#: ../../enterprise/dashboard/widgets/tree_view.php:236
+#: ../../enterprise/include/functions_reporting_csv.php:472
 msgid "Normal modules"
 msgstr "正常モジュール"
 
-#: ../../mobile/operation/groups.php:153 ../../operation/tree.php:287
-#: ../../enterprise/dashboard/widgets/tree_view.php:211
-#: ../../enterprise/include/functions_reporting_csv.php:461
+#: ../../mobile/operation/groups.php:153 ../../operation/tree.php:309
+#: ../../enterprise/dashboard/widgets/tree_view.php:221
+#: ../../enterprise/include/functions_reporting_csv.php:474
 msgid "Warning modules"
 msgstr "警告モジュール"
 
-#: ../../mobile/operation/groups.php:157 ../../operation/tree.php:282
-#: ../../enterprise/dashboard/widgets/tree_view.php:206
-#: ../../enterprise/include/functions_reporting_csv.php:460
+#: ../../mobile/operation/groups.php:157 ../../operation/tree.php:304
+#: ../../enterprise/dashboard/widgets/tree_view.php:216
+#: ../../enterprise/include/functions_reporting_csv.php:473
 msgid "Critical modules"
 msgstr "障害モジュール"
 
-#: ../../mobile/operation/home.php:38 ../../mobile/operation/tactical.php:84
-#: ../../operation/agentes/tactical.php:55 ../../operation/menu.php:45
-#: ../../operation/users/user_edit.php:280
-#: ../../enterprise/dashboard/widgets/tactical.php:27
-#: ../../enterprise/dashboard/widgets/tactical.php:29
-#: ../../enterprise/meta/general/main_header.php:93
-#: ../../enterprise/meta/monitoring/tactical.php:60
-msgid "Tactical view"
-msgstr "モニタリング概要"
+#: ../../mobile/operation/home.php:78
+#: ../../mobile/operation/networkmaps.php:112
+msgid "Networkmaps"
+msgstr "ネットワークマップ"
 
-#: ../../mobile/operation/home.php:135 ../../operation/search_results.php:64
+#: ../../mobile/operation/home.php:84 ../../mobile/operation/visualmaps.php:96
+msgid "Visual consoles"
+msgstr "ビジュアルコンソール"
+
+#: ../../mobile/operation/home.php:104
+#: ../../operation/agentes/pandora_networkmap.editor.php:174
+#: ../../operation/agentes/pandora_networkmap.php:526
+#: ../../operation/agentes/pandora_networkmap.view.php:744
+#: ../../enterprise/godmode/agentes/pandora_networkmap_empty.editor.php:76
+msgid "Networkmap"
+msgstr "ネットワークマップ"
+
+#: ../../mobile/operation/home.php:110
+msgid "Visualmap"
+msgstr "ビジュアルマップ"
+
+#: ../../mobile/operation/home.php:168 ../../operation/search_results.php:64
 msgid "Global search"
 msgstr "グローバル検索"
 
@@ -25400,12 +26786,12 @@ msgid "Show Events"
 msgstr "イベント表示"
 
 #: ../../mobile/operation/module_graph.php:410
-#: ../../operation/agentes/stat_win.php:389
+#: ../../operation/agentes/stat_win.php:414
 msgid "Time compare (Separated)"
 msgstr "時間比較 (分割)"
 
 #: ../../mobile/operation/module_graph.php:426
-#: ../../operation/agentes/stat_win.php:395
+#: ../../operation/agentes/stat_win.php:420
 msgid "Show unknown graph"
 msgstr "不明グラフ表示"
 
@@ -25419,9 +26805,9 @@ msgstr "時間範囲 (時間)"
 
 #: ../../mobile/operation/module_graph.php:452
 #: ../../operation/agentes/exportdata.php:310
-#: ../../operation/agentes/graphs.php:132
-#: ../../operation/agentes/interface_traffic_graph_win.php:235
-#: ../../operation/agentes/stat_win.php:314
+#: ../../operation/agentes/graphs.php:162
+#: ../../operation/agentes/interface_traffic_graph_win.php:249
+#: ../../operation/agentes/stat_win.php:339
 msgid "Begin date"
 msgstr "開始日時"
 
@@ -25433,17 +26819,6 @@ msgstr "グラフ更新"
 msgid "Error get the graph"
 msgstr "グラフ生成エラー"
 
-#: ../../mobile/operation/modules.php:151
-#: ../../mobile/operation/modules.php:152
-#: ../../mobile/operation/modules.php:244
-#: ../../mobile/operation/modules.php:245
-#: ../../operation/agentes/group_view.php:249
-#: ../../enterprise/godmode/alerts/alert_events_rules.php:410
-#: ../../enterprise/godmode/alerts/configure_alert_rule.php:161
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:308
-msgid "Tag"
-msgstr "タグ"
-
 #: ../../mobile/operation/modules.php:194
 #, php-format
 msgid "Filter Modules by %s"
@@ -25474,19 +26849,14 @@ msgstr "ネットワークマップがありません"
 
 #: ../../mobile/operation/networkmap.php:222
 #: ../../mobile/operation/networkmap.php:234
-#: ../../enterprise/extensions/vmware/vmware_view.php:1362
-#: ../../enterprise/extensions/vmware/vmware_view.php:1394
-#: ../../enterprise/extensions/vmware/vmware_view.php:1410
+#: ../../enterprise/extensions/vmware/vmware_view.php:1439
+#: ../../enterprise/godmode/reporting/cluster_view.php:485
 #: ../../enterprise/operation/policies/networkmap.policies.php:70
 #: ../../enterprise/operation/policies/networkmap.policies.php:119
 #: ../../enterprise/operation/policies/networkmap.policies.php:133
 msgid "Map could not be generated"
 msgstr "マップを生成できません。"
 
-#: ../../mobile/operation/networkmaps.php:112
-msgid "Networkmaps"
-msgstr "ネットワークマップ"
-
 #: ../../mobile/operation/networkmaps.php:120
 #, php-format
 msgid "Filter Networkmaps by %s"
@@ -25496,16 +26866,13 @@ msgstr "ネットワークマップフィルタ: %s"
 msgid "Last activity"
 msgstr "最近の操作"
 
-#: ../../mobile/operation/visualmaps.php:96
-msgid "Visual consoles"
-msgstr "ビジュアルコンソール"
-
 #: ../../mobile/operation/visualmaps.php:146
 msgid "No maps defined"
 msgstr "定義済マップがありません"
 
 #: ../../operation/agentes/agent_fields.php:38
-#: ../../operation/agentes/status_monitor.php:539
+#: ../../operation/agentes/status_monitor.php:548
+#: ../../enterprise/operation/agentes/tag_view.php:318
 msgid "Agent custom fields"
 msgstr "エージェントカスタムフィールド"
 
@@ -25525,13 +26892,16 @@ msgid "Error processing alert(s)"
 msgstr "アラート処理エラー"
 
 #: ../../operation/agentes/alerts_status.functions.php:86
-#: ../../operation/agentes/status_monitor.php:341
-#: ../../operation/agentes/status_monitor.php:344
+#: ../../operation/agentes/status_monitor.php:339
+#: ../../operation/agentes/status_monitor.php:342
+#: ../../enterprise/operation/agentes/tag_view.php:144
+#: ../../enterprise/operation/agentes/tag_view.php:147
 msgid "Only it is show tags in use."
 msgstr "利用中のタグのみ表示します。"
 
 #: ../../operation/agentes/alerts_status.functions.php:91
-#: ../../operation/agentes/status_monitor.php:349
+#: ../../operation/agentes/status_monitor.php:347
+#: ../../enterprise/operation/agentes/tag_view.php:150
 msgid "No tags"
 msgstr "タグ無し"
 
@@ -25548,25 +26918,20 @@ msgstr "エージェント名、モジュール名、テンプレート名およ
 msgid "No actions"
 msgstr "アクションがありません"
 
-#: ../../operation/agentes/alerts_status.php:108
+#: ../../operation/agentes/alerts_status.php:141
 msgid "Full list of alerts"
 msgstr "アラートのフィルタ一覧"
 
-#: ../../operation/agentes/alerts_status.php:132 ../../operation/menu.php:62
-#: ../../operation/users/user_edit.php:281
-msgid "Alert detail"
-msgstr "アラート詳細"
-
-#: ../../operation/agentes/alerts_status.php:135
+#: ../../operation/agentes/alerts_status.php:168
 #: ../../enterprise/meta/general/main_header.php:103
 msgid "Alerts view"
 msgstr "アラート表示"
 
-#: ../../operation/agentes/alerts_status.php:144
+#: ../../operation/agentes/alerts_status.php:177
 msgid "Insufficient permissions to validate alerts"
 msgstr "アラートを承諾するのに必要な権限がありません。"
 
-#: ../../operation/agentes/alerts_status.php:599
+#: ../../operation/agentes/alerts_status.php:632
 msgid "No alerts found"
 msgstr "該当するアラートがありません。"
 
@@ -25603,44 +26968,51 @@ msgstr "エージェントIDがありません"
 msgid "Missing ehorus agent id"
 msgstr "ehorus エージェントIDがありません"
 
-#: ../../operation/agentes/ehorus.php:80
+#: ../../operation/agentes/ehorus.php:89
+#: ../../operation/agentes/ehorus.php:126
 msgid "There was an error retrieving an authorization token"
 msgstr "認証トークン取得中にエラーが発生しました"
 
-#: ../../operation/agentes/ehorus.php:93
-#: ../../operation/agentes/ehorus.php:129
+#: ../../operation/agentes/ehorus.php:102
+#: ../../operation/agentes/ehorus.php:139
+#: ../../operation/agentes/ehorus.php:175
 msgid "There was an error processing the response"
 msgstr "応答処理エラーが発生しました"
 
-#: ../../operation/agentes/ehorus.php:116
+#: ../../operation/agentes/ehorus.php:162
 msgid "There was an error retrieving the agent data"
 msgstr "エージェントデータ取得エラーが発生しました"
 
-#: ../../operation/agentes/ehorus.php:134
+#: ../../operation/agentes/ehorus.php:180
 msgid "Remote management of this agent with eHorus"
 msgstr "このエージェントの eHorus でのリモート管理"
 
-#: ../../operation/agentes/ehorus.php:136
+#: ../../operation/agentes/ehorus.php:182
 msgid "Launch"
 msgstr "起動"
 
-#: ../../operation/agentes/ehorus.php:142
+#: ../../operation/agentes/ehorus.php:188
 msgid "The connection was lost and the authorization token was expired"
 msgstr "接続が切れました、認証トークンが期限切れです"
 
-#: ../../operation/agentes/ehorus.php:144
+#: ../../operation/agentes/ehorus.php:190
 msgid "Reload the page to request a new authorization token"
 msgstr "新たな認証トークンの取得にはページを再読み込みしてください"
 
-#: ../../operation/agentes/estado_agente.php:156
+#: ../../operation/agentes/estado_agente.php:184
 msgid "Sucessfully deleted agent"
 msgstr "エージェントを削除しました"
 
-#: ../../operation/agentes/estado_agente.php:158
+#: ../../operation/agentes/estado_agente.php:186
 msgid "There was an error message deleting the agent"
 msgstr "エージェント削除においてエラーが発生しました"
 
-#: ../../operation/agentes/estado_agente.php:594
+#: ../../operation/agentes/estado_agente.php:226
+msgid "Search in custom fields"
+msgstr "カスタムフィールド検索"
+
+#: ../../operation/agentes/estado_agente.php:656
+#: ../../enterprise/operation/agentes/tag_view.php:505
 msgid "Remote config"
 msgstr "リモート設定"
 
@@ -25648,56 +27020,56 @@ msgstr "リモート設定"
 msgid "The agent has not assigned server. Maybe agent does not run fine."
 msgstr "エージェントがサーバに割り当てられていません。エージェントが正しく動作しない可能性があります。"
 
-#: ../../operation/agentes/estado_generalagente.php:119
+#: ../../operation/agentes/estado_generalagente.php:148
 msgid ""
 "Agent statuses are re-calculated by the server, they are not  shown in real "
 "time."
 msgstr "サーバにてエージェント状態が再計算されました。リアルタイムでは表示されません。"
 
-#: ../../operation/agentes/estado_generalagente.php:196
+#: ../../operation/agentes/estado_generalagente.php:225
 msgid "Agent contact"
 msgstr "エージェント接続"
 
-#: ../../operation/agentes/estado_generalagente.php:218
+#: ../../operation/agentes/estado_generalagente.php:247
 msgid "Next contact"
 msgstr "次回接続"
 
-#: ../../operation/agentes/estado_generalagente.php:241
+#: ../../operation/agentes/estado_generalagente.php:270
 msgid "Agent info"
 msgstr "エージェント情報"
 
-#: ../../operation/agentes/estado_generalagente.php:313
+#: ../../operation/agentes/estado_generalagente.php:342
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1128
 msgid "There is no GIS data."
 msgstr "GIS データがありません。"
 
-#: ../../operation/agentes/estado_generalagente.php:388
+#: ../../operation/agentes/estado_generalagente.php:417
 msgid "Active incident on this agent"
 msgstr "このエージェントにおけるアクティブインシデント"
 
-#: ../../operation/agentes/estado_generalagente.php:397
+#: ../../operation/agentes/estado_generalagente.php:426
 #: ../../enterprise/dashboard/widget.php:63
-#: ../../enterprise/include/functions_reporting_csv.php:1033
-#: ../../enterprise/include/functions_reporting_csv.php:1146
-#: ../../enterprise/include/functions_reporting_csv.php:1293
-#: ../../enterprise/include/functions_reporting_csv.php:1358
+#: ../../enterprise/include/functions_reporting_csv.php:1145
+#: ../../enterprise/include/functions_reporting_csv.php:1258
+#: ../../enterprise/include/functions_reporting_csv.php:1405
+#: ../../enterprise/include/functions_reporting_csv.php:1470
 msgid "Title"
 msgstr "タイトル"
 
-#: ../../operation/agentes/estado_generalagente.php:539
+#: ../../operation/agentes/estado_generalagente.php:568
 msgid "Events info (24hr.)"
 msgstr "イベント情報 (24時間)"
 
-#: ../../operation/agentes/estado_generalagente.php:553
-#: ../../operation/agentes/pandora_networkmap.view.php:373
+#: ../../operation/agentes/estado_generalagente.php:582
+#: ../../operation/agentes/pandora_networkmap.view.php:389
 msgid "Last contact: "
 msgstr "最新の接続: "
 
-#: ../../operation/agentes/estado_generalagente.php:621
+#: ../../operation/agentes/estado_generalagente.php:650
 msgid "Refresh data"
 msgstr "最新情報に更新"
 
-#: ../../operation/agentes/estado_generalagente.php:623
+#: ../../operation/agentes/estado_generalagente.php:652
 msgid "Force remote checks"
 msgstr "リモートチェックを強制する"
 
@@ -25723,30 +27095,31 @@ msgstr "モニタ項目一覧"
 msgid "List of modules"
 msgstr "モジュールの一覧"
 
-#: ../../operation/agentes/estado_monitores.php:367
-#: ../../operation/agentes/status_monitor.php:1530
-#: ../../operation/tree.php:357
-#: ../../enterprise/dashboard/widgets/tree_view.php:283
+#: ../../operation/agentes/estado_monitores.php:380
+#: ../../operation/agentes/status_monitor.php:1550
+#: ../../operation/tree.php:379
+#: ../../enterprise/dashboard/widgets/tree_view.php:293
+#: ../../enterprise/godmode/reporting/cluster_view.php:661
 msgid "Module: "
 msgstr "モジュール: "
 
-#: ../../operation/agentes/estado_monitores.php:445
+#: ../../operation/agentes/estado_monitores.php:458
 msgid "Status:"
 msgstr "状態:"
 
-#: ../../operation/agentes/estado_monitores.php:451
+#: ../../operation/agentes/estado_monitores.php:464
 msgid "Not Normal"
 msgstr "非正常"
 
-#: ../../operation/agentes/estado_monitores.php:459
+#: ../../operation/agentes/estado_monitores.php:472
 msgid "Free text for search (*):"
 msgstr "検索文字列 (*):"
 
-#: ../../operation/agentes/estado_monitores.php:460
+#: ../../operation/agentes/estado_monitores.php:473
 msgid "Search by module name, list matches."
 msgstr "モジュール名による検索にマッチした一覧を表示"
 
-#: ../../operation/agentes/estado_monitores.php:475
+#: ../../operation/agentes/estado_monitores.php:488
 msgid "Reset"
 msgstr "リセット"
 
@@ -25762,17 +27135,22 @@ msgstr "時間が正しくありません。"
 msgid "No modules specified"
 msgstr "モジュールが指定されていません。"
 
-#: ../../operation/agentes/exportdata.php:36 ../../operation/menu.php:399
+#: ../../operation/agentes/exportdata.php:36 ../../operation/menu.php:436
 msgid "Export data"
 msgstr "データのエクスポート"
 
+#: ../../operation/agentes/exportdata.php:244
+#: ../../enterprise/godmode/agentes/manage_config_remote.php:154
+msgid "Source agent"
+msgstr "対象エージェント"
+
 #: ../../operation/agentes/exportdata.php:276
 msgid "No modules of type string. You can not calculate their average"
 msgstr "文字列タイプのモジュールは対象外です。また、平均の計算はできません。"
 
 #: ../../operation/agentes/exportdata.php:319
 #: ../../enterprise/include/functions_netflow_pdf.php:163
-#: ../../enterprise/operation/log/log_viewer.php:223
+#: ../../enterprise/operation/log/log_viewer.php:239
 msgid "End date"
 msgstr "終了日時"
 
@@ -25804,104 +27182,112 @@ msgstr "更新"
 msgid "Positional data from the last"
 msgstr "位置データ参照期間:"
 
-#: ../../operation/agentes/gis_view.php:144
+#: ../../operation/agentes/gis_view.php:156
 msgid "This agent doesn't have any GIS data."
 msgstr "このエージェントには、GIS データがありません。"
 
-#: ../../operation/agentes/gis_view.php:172
+#: ../../operation/agentes/gis_view.php:192
 #, php-format
 msgid "%s Km"
 msgstr "%s Km"
 
-#: ../../operation/agentes/gis_view.php:184
+#: ../../operation/agentes/gis_view.php:204
 msgid "Distance"
 msgstr "距離"
 
-#: ../../operation/agentes/gis_view.php:185
+#: ../../operation/agentes/gis_view.php:205
 msgid "# of Packages"
 msgstr "パッケージ数"
 
-#: ../../operation/agentes/gis_view.php:186
+#: ../../operation/agentes/gis_view.php:206
 #: ../../operation/gis_maps/ajax.php:222
 msgid "Manual placement"
 msgstr "手動位置設定"
 
-#: ../../operation/agentes/gis_view.php:189
+#: ../../operation/agentes/gis_view.php:209
 msgid "positional data"
 msgstr "位置データ"
 
-#: ../../operation/agentes/graphs.php:86
+#: ../../operation/agentes/graphs.php:112
 msgid "Other modules"
 msgstr "他のモジュール"
 
-#: ../../operation/agentes/graphs.php:91
+#: ../../operation/agentes/graphs.php:117
 msgid "Modules network no proc"
 msgstr "proc以外のネットワークモジュール"
 
-#: ../../operation/agentes/graphs.php:136
-#: ../../operation/agentes/interface_traffic_graph_win.php:248
-#: ../../operation/agentes/stat_win.php:338
-#: ../../operation/reporting/graph_viewer.php:217
+#: ../../operation/agentes/graphs.php:122
+msgid "Modules boolean"
+msgstr "ブーリアン(二値)モジュール"
+
+#: ../../operation/agentes/graphs.php:166
+#: ../../operation/agentes/interface_traffic_graph_win.php:262
+#: ../../operation/agentes/stat_win.php:363
+#: ../../operation/reporting/graph_viewer.php:219
 msgid "Time range"
 msgstr "時間範囲"
 
-#: ../../operation/agentes/graphs.php:140
-#: ../../operation/agentes/stat_win.php:345
+#: ../../operation/agentes/graphs.php:170
+#: ../../operation/agentes/stat_win.php:370
 msgid "Show events"
 msgstr "イベント表示"
 
-#: ../../operation/agentes/graphs.php:142
-#: ../../operation/agentes/stat_win.php:362
+#: ../../operation/agentes/graphs.php:172
+#: ../../operation/agentes/stat_win.php:387
 msgid "Show alerts"
 msgstr "アラート表示"
 
-#: ../../operation/agentes/graphs.php:143
+#: ../../operation/agentes/graphs.php:173
 msgid "the combined graph does not show the alerts into this graph"
 msgstr "組み合わせグラフは、グラフ内にアラートを表示しません"
 
-#: ../../operation/agentes/graphs.php:145
+#: ../../operation/agentes/graphs.php:175
 msgid "Show as one combined graph"
 msgstr "一つの組み合わせグラフとして表示"
 
-#: ../../operation/agentes/graphs.php:147
-msgid "one combined graph"
-msgstr "一つの組み合わせグラフ"
-
-#: ../../operation/agentes/graphs.php:150
+#: ../../operation/agentes/graphs.php:176
 msgid "several graphs for each module"
 msgstr "モジュールごとの複数のグラフ"
 
-#: ../../operation/agentes/graphs.php:157
+#: ../../operation/agentes/graphs.php:176
+msgid "One combined graph"
+msgstr ""
+
+#: ../../operation/agentes/graphs.php:181
+#: ../../operation/agentes/graphs.php:337
+msgid "Area stack"
+msgstr "塗りつぶし積み重ね"
+
+#: ../../operation/agentes/graphs.php:181
+#: ../../operation/agentes/graphs.php:345
+msgid "Line stack"
+msgstr "線の積み重ね"
+
+#: ../../operation/agentes/graphs.php:192
 msgid "Save as custom graph"
 msgstr "カスタムグラフとして保存"
 
-#: ../../operation/agentes/graphs.php:163
+#: ../../operation/agentes/graphs.php:198
 msgid "Filter graphs"
 msgstr "グラフフィルタ"
 
-#: ../../operation/agentes/graphs.php:210
+#: ../../operation/agentes/graphs.php:245
 msgid "There was an error loading the graph"
 msgstr "グラフロード中にエラーが発生しました"
 
-#: ../../operation/agentes/graphs.php:218
-#: ../../operation/agentes/graphs.php:221
+#: ../../operation/agentes/graphs.php:253
+#: ../../operation/agentes/graphs.php:256
 msgid "Name custom graph"
 msgstr "カスタムグラフ名"
 
-#: ../../operation/agentes/graphs.php:243
+#: ../../operation/agentes/graphs.php:278
 msgid "Save custom graph"
 msgstr "カスタムグラフの保存"
 
-#: ../../operation/agentes/graphs.php:264
+#: ../../operation/agentes/graphs.php:299
 msgid "Custom graph create from the tab graphs in the agent."
 msgstr "エージェントのグラフタブからカスタムグラフを作成"
 
-#: ../../operation/agentes/group_view.php:70 ../../operation/menu.php:48
-#: ../../operation/users/user_edit.php:279
-#: ../../enterprise/meta/monitoring/group_view.php:46
-msgid "Group view"
-msgstr "グループ"
-
 #: ../../operation/agentes/group_view.php:117
 msgid "Summary of the status groups"
 msgstr "グループの状態概要"
@@ -25919,203 +27305,286 @@ msgstr "入力"
 msgid "Out"
 msgstr "出力"
 
-#: ../../operation/agentes/interface_traffic_graph_win.php:210
-#: ../../operation/agentes/stat_win.php:268
+#: ../../operation/agentes/interface_traffic_graph_win.php:224
+#: ../../operation/agentes/stat_win.php:293
 msgid "Pandora FMS Graph configuration menu"
 msgstr "Pandora FMS グラフ設定メニュー"
 
-#: ../../operation/agentes/interface_traffic_graph_win.php:212
-#: ../../operation/agentes/stat_win.php:270
+#: ../../operation/agentes/interface_traffic_graph_win.php:226
+#: ../../operation/agentes/stat_win.php:295
 msgid "Please, make your changes and apply with the <i>Reload</i> button"
 msgstr "変更後、<i>再読み込み</i>ボタンを押してください。"
 
-#: ../../operation/agentes/interface_traffic_graph_win.php:229
-#: ../../operation/agentes/stat_win.php:297
+#: ../../operation/agentes/interface_traffic_graph_win.php:243
+#: ../../operation/agentes/stat_win.php:322
 msgid "Refresh time"
 msgstr "更新時間"
 
-#: ../../operation/agentes/interface_traffic_graph_win.php:242
-#: ../../operation/agentes/stat_win.php:320
+#: ../../operation/agentes/interface_traffic_graph_win.php:256
+#: ../../operation/agentes/stat_win.php:345
 msgid "Begin time"
 msgstr "開始時間"
 
-#: ../../operation/agentes/interface_traffic_graph_win.php:254
-#: ../../operation/agentes/stat_win.php:377
+#: ../../operation/agentes/interface_traffic_graph_win.php:268
+#: ../../operation/agentes/stat_win.php:402
 msgid "Show percentil"
 msgstr "パーセント表示"
 
-#: ../../operation/agentes/interface_traffic_graph_win.php:260
-#: ../../operation/agentes/stat_win.php:326
+#: ../../operation/agentes/interface_traffic_graph_win.php:286
+#: ../../operation/agentes/stat_win.php:351
 msgid "Zoom factor"
 msgstr "ズーム倍率"
 
-#: ../../operation/agentes/interface_traffic_graph_win.php:287
-#: ../../operation/agentes/stat_win.php:421
+#: ../../operation/agentes/interface_traffic_graph_win.php:313
+#: ../../operation/agentes/stat_win.php:453
 msgid "Reload"
 msgstr "再読み込み"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:133
-#: ../../operation/agentes/pandora_networkmap.php:369
-#: ../../operation/agentes/pandora_networkmap.view.php:701
-msgid "Networkmap"
-msgstr "ネットワークマップ"
+#: ../../operation/agentes/networkmap.dinamic.php:93
+#: ../../operation/agentes/pandora_networkmap.view.php:774
+#: ../../operation/snmpconsole/snmp_browser.php:108
+#: ../../operation/snmpconsole/snmp_statistics.php:45
+#: ../../operation/snmpconsole/snmp_view.php:86
+msgid "Normal screen"
+msgstr "通常画面"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:162
-#: ../../operation/agentes/pandora_networkmap.view.php:703
+#: ../../operation/agentes/networkmap.dinamic.php:109
+#: ../../operation/agentes/pandora_networkmap.view.php:790
+msgid "List of networkmap"
+msgstr "ネットワークマップ一覧"
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:203
+#: ../../operation/agentes/pandora_networkmap.view.php:746
+#: ../../enterprise/godmode/agentes/pandora_networkmap_empty.editor.php:80
 msgid "Not found networkmap."
 msgstr "ネットワークマップがありません。"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:187
+#: ../../operation/agentes/pandora_networkmap.editor.php:228
+#: ../../enterprise/extensions/vmware/vmware_view.php:1424
+#: ../../enterprise/godmode/agentes/pandora_networkmap_empty.editor.php:105
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:75
 msgid "Node radius"
 msgstr "ノード半径"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:198
+#: ../../operation/agentes/pandora_networkmap.editor.php:235
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:94
+msgid "Position X"
+msgstr "X 位置"
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:237
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:96
+msgid "Position Y"
+msgstr "Y 位置"
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:240
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:99
+msgid "Zoom scale"
+msgstr "拡大スケール"
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:244
+#: ../../enterprise/dashboard/widgets/network_map.php:57
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:101
+msgid ""
+"Introduce zoom level. 1 = Highest resolution. Figures may include decimals"
+msgstr "拡大率を設定します。1=高解像度。数字には小数点を含めることができます。"
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:250
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:107
 msgid "CIDR IP mask"
 msgstr "CIDR IPマスク"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:200
+#: ../../operation/agentes/pandora_networkmap.editor.php:252
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:131
 msgid "Source from recon task"
 msgstr "自動検出タスクからのソース"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:202
+#: ../../operation/agentes/pandora_networkmap.editor.php:254
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:133
 msgid ""
 "It is setted any recon task, the nodes get from the recontask IP mask "
 "instead from the group."
 msgstr "自動検出タスクで設定されます。ノードは、グループではなく自動検出タスクの IP マスクから取得します。"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:206
+#: ../../operation/agentes/pandora_networkmap.editor.php:258
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:137
 msgid "Show only the task with the recon script \"SNMP L2 Recon\"."
 msgstr "自動検出スクリプト \"SNMP L2 Recon\" のタスクのみ表示。"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:208
+#: ../../operation/agentes/pandora_networkmap.editor.php:260
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:139
 msgid "Source from CIDR IP mask"
 msgstr "CIDR IPマスクからのソース"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:212
+#: ../../operation/agentes/pandora_networkmap.editor.php:264
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:143
 msgid "Don't show subgroups:"
 msgstr "サブグループを表示しない:"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:225
+#: ../../operation/agentes/pandora_networkmap.editor.php:277
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:173
 msgid "Method generation networkmap"
 msgstr "ネットワークマップ生成手法"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:237
+#: ../../operation/agentes/pandora_networkmap.editor.php:286
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:178
+msgid "Node separation"
+msgstr "ノード分離"
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:287
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:179
+msgid "Separation between nodes. By default 0.25"
+msgstr "ノード間の分離。デフォルトは 0.25 です。"
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:289
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:181
+msgid "Rank separation"
+msgstr "ランク分け"
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:290
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:182
+msgid ""
+"Only flat and radial. Separation between arrows. By default 0.5 in flat and "
+"1.0 in radial"
+msgstr "フラットおよびラジアルのみ。 矢印の間の分離です。 デフォルトでは、フラットが 0.5、ラジアルが 1.0 です。"
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:292
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:184
+msgid "Min nodes dist"
+msgstr "最小ノード間隔"
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:293
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:185
+msgid "Only circular. Minimum separation between all nodes. By default 1.0"
+msgstr "円のみ。ノード間の最小距離です。デフォルトは 1.0 です。"
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:295
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:187
+msgid "Default ideal node separation"
+msgstr ""
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:296
+#: ../../enterprise/operation/agentes/pandora_networkmap.view.php:188
+msgid "Only fdp. Default ideal node separation in the layout. By default 0.3"
+msgstr ""
+
+#: ../../operation/agentes/pandora_networkmap.editor.php:305
+#: ../../enterprise/godmode/agentes/pandora_networkmap_empty.editor.php:119
 msgid "Save networkmap"
 msgstr "ネットワークマップの保存"
 
-#: ../../operation/agentes/pandora_networkmap.editor.php:243
+#: ../../operation/agentes/pandora_networkmap.editor.php:311
+#: ../../enterprise/godmode/agentes/pandora_networkmap_empty.editor.php:125
 msgid "Update networkmap"
 msgstr "ネットワークマップの更新"
 
-#: ../../operation/agentes/pandora_networkmap.php:153
+#: ../../operation/agentes/pandora_networkmap.php:112
+#: ../../operation/agentes/pandora_networkmap.php:305
 msgid "Succesfully created"
 msgstr "作成しました"
 
-#: ../../operation/agentes/pandora_networkmap.php:247
+#: ../../operation/agentes/pandora_networkmap.php:166
+#: ../../operation/agentes/pandora_networkmap.php:401
 msgid "Succesfully updated"
 msgstr "更新しました"
 
-#: ../../operation/agentes/pandora_networkmap.php:264
+#: ../../operation/agentes/pandora_networkmap.php:418
 msgid "Succesfully duplicate"
 msgstr "複製しました"
 
-#: ../../operation/agentes/pandora_networkmap.php:264
-#: ../../enterprise/godmode/policies/policy_modules.php:1173
+#: ../../operation/agentes/pandora_networkmap.php:418
+#: ../../enterprise/godmode/policies/policy_modules.php:1204
 msgid "Could not be duplicated"
 msgstr "複製できませんでした"
 
-#: ../../operation/agentes/pandora_networkmap.php:273
+#: ../../operation/agentes/pandora_networkmap.php:427
 msgid "Succesfully deleted"
 msgstr "削除しました"
 
-#: ../../operation/agentes/pandora_networkmap.php:470
+#: ../../operation/agentes/pandora_networkmap.php:635
+msgid "Empty map"
+msgstr "空マップ"
+
+#: ../../operation/agentes/pandora_networkmap.php:638
 msgid "Pending to generate"
 msgstr "生成の保留"
 
-#: ../../operation/agentes/pandora_networkmap.php:490
+#: ../../operation/agentes/pandora_networkmap.php:660
 #: ../../enterprise/operation/services/services.list.php:458
 msgid "Config"
 msgstr "設定"
 
-#: ../../operation/agentes/pandora_networkmap.php:506
+#: ../../operation/agentes/pandora_networkmap.php:676
 msgid "There are no maps defined."
 msgstr "定義済マップがありません。"
 
-#: ../../operation/agentes/pandora_networkmap.php:513
+#: ../../operation/agentes/pandora_networkmap.php:683
 msgid "Create networkmap"
 msgstr "ネットワークマップの作成"
 
-#: ../../operation/agentes/pandora_networkmap.view.php:111
+#: ../../operation/agentes/pandora_networkmap.php:691
+msgid "Create empty networkmap"
+msgstr "空ネットワークマップ作成"
+
+#: ../../operation/agentes/pandora_networkmap.view.php:127
 msgid "Success be updated."
 msgstr "更新しました。"
 
-#: ../../operation/agentes/pandora_networkmap.view.php:114
+#: ../../operation/agentes/pandora_networkmap.view.php:130
 #: ../../enterprise/extensions/ipam/ipam_action.php:190
 msgid "Could not be updated."
 msgstr "更新できませんでした。"
 
-#: ../../operation/agentes/pandora_networkmap.view.php:227
+#: ../../operation/agentes/pandora_networkmap.view.php:243
 msgid "Name: "
 msgstr "名前: "
 
-#: ../../operation/agentes/pandora_networkmap.view.php:258
-#: ../../operation/agentes/status_monitor.php:1035
+#: ../../operation/agentes/pandora_networkmap.view.php:274
+#: ../../operation/agentes/status_monitor.php:1043
 msgid "(Adopt) "
 msgstr "(適用) "
 
-#: ../../operation/agentes/pandora_networkmap.view.php:268
-#: ../../operation/agentes/status_monitor.php:1045
+#: ../../operation/agentes/pandora_networkmap.view.php:284
+#: ../../operation/agentes/status_monitor.php:1053
 msgid "(Unlinked) (Adopt) "
 msgstr "(未リンク) (適用) "
 
-#: ../../operation/agentes/pandora_networkmap.view.php:272
-#: ../../operation/agentes/status_monitor.php:1049
+#: ../../operation/agentes/pandora_networkmap.view.php:288
+#: ../../operation/agentes/status_monitor.php:1057
 msgid "(Unlinked) "
 msgstr "(未リンク) "
 
-#: ../../operation/agentes/pandora_networkmap.view.php:277
+#: ../../operation/agentes/pandora_networkmap.view.php:293
 msgid "Policy: "
 msgstr "ポリシー: "
 
-#: ../../operation/agentes/pandora_networkmap.view.php:326
+#: ../../operation/agentes/pandora_networkmap.view.php:342
 #: ../../enterprise/extensions/vmware/vmware_manager.php:202
 msgid "Status: "
 msgstr "状態: "
 
-#: ../../operation/agentes/pandora_networkmap.view.php:370
+#: ../../operation/agentes/pandora_networkmap.view.php:386
 msgid "Data: "
 msgstr "データ: "
 
-#: ../../operation/agentes/pandora_networkmap.view.php:731
-#: ../../operation/snmpconsole/snmp_browser.php:86
-#: ../../operation/snmpconsole/snmp_statistics.php:45
-#: ../../operation/snmpconsole/snmp_view.php:78
-msgid "Normal screen"
-msgstr "通常画面"
-
-#: ../../operation/agentes/pandora_networkmap.view.php:747
-msgid "List of networkmap"
-msgstr "ネットワークマップ一覧"
-
-#: ../../operation/agentes/snapshot_view.php:66
+#: ../../operation/agentes/snapshot_view.php:76
 msgid "Current data at"
 msgstr "次の日時のデータ:"
 
-#: ../../operation/agentes/stat_win.php:115
+#: ../../operation/agentes/stat_win.php:123
 msgid "There was a problem locating the source of the graph"
 msgstr "グラフの場所に問題があります。"
 
-#: ../../operation/agentes/stat_win.php:305
+#: ../../operation/agentes/stat_win.php:330
 msgid "Avg. Only"
 msgstr "平均のみ"
 
-#: ../../operation/agentes/stat_win.php:356
+#: ../../operation/agentes/stat_win.php:381
 msgid ""
 "Show events is disabled because this Pandora node is set the event "
 "replication."
 msgstr "この Pandora ノードは、イベントの複製が設定されているためイベント表示は無効です。"
 
-#: ../../operation/agentes/stat_win.php:368
+#: ../../operation/agentes/stat_win.php:393
 msgid "Show event graph"
 msgstr "イベントグラフ表示"
 
@@ -26124,7 +27593,7 @@ msgstr "イベントグラフ表示"
 msgid "Latest events for this agent"
 msgstr "このエージェントにおける最新イベント"
 
-#: ../../operation/agentes/status_monitor.php:40 ../../operation/menu.php:59
+#: ../../operation/agentes/status_monitor.php:40 ../../operation/menu.php:60
 msgid "Monitor detail"
 msgstr "モニタ項目詳細"
 
@@ -26132,43 +27601,55 @@ msgstr "モニタ項目詳細"
 msgid "Monitor view"
 msgstr "モニタ表示"
 
-#: ../../operation/agentes/status_monitor.php:306
+#: ../../operation/agentes/status_monitor.php:304
+#: ../../enterprise/operation/agentes/tag_view.php:89
 msgid "Monitor status"
 msgstr "モニタ項目の状態"
 
-#: ../../operation/agentes/status_monitor.php:327
+#: ../../operation/agentes/status_monitor.php:325
 #: ../../operation/incidents/incident.php:238
-#: ../../enterprise/extensions/vmware/vmware_view.php:1247
+#: ../../enterprise/extensions/vmware/vmware_view.php:1354
+#: ../../enterprise/operation/agentes/tag_view.php:112
 msgid "Show"
 msgstr "表示"
 
-#: ../../operation/agentes/status_monitor.php:390
+#: ../../operation/agentes/status_monitor.php:391
 #: ../../enterprise/godmode/agentes/module_manager_editor_web.php:38
+#: ../../enterprise/operation/agentes/tag_view.php:194
 msgid "Web server module"
 msgstr "ウェブサーバモジュール"
 
-#: ../../operation/agentes/status_monitor.php:394
-#: ../../operation/agentes/status_monitor.php:962
+#: ../../operation/agentes/status_monitor.php:393
+msgid "Wux server module"
+msgstr "Wux サーバモジュール"
+
+#: ../../operation/agentes/status_monitor.php:398
+#: ../../operation/agentes/status_monitor.php:970
+#: ../../enterprise/operation/agentes/tag_view.php:197
+#: ../../enterprise/operation/agentes/tag_view.php:533
 msgid "Server type"
 msgstr "サーバの種類"
 
-#: ../../operation/agentes/status_monitor.php:400
+#: ../../operation/agentes/status_monitor.php:404
+#: ../../enterprise/operation/agentes/tag_view.php:203
 msgid "Show monitors..."
 msgstr "監視の有効・無効"
 
-#: ../../operation/agentes/status_monitor.php:410
+#: ../../operation/agentes/status_monitor.php:414
+#: ../../enterprise/operation/agentes/tag_view.php:213
+#: ../../enterprise/operation/agentes/tag_view.php:532
 msgid "Data type"
 msgstr "データのタイプ"
 
-#: ../../operation/agentes/status_monitor.php:529
+#: ../../operation/agentes/status_monitor.php:538
 msgid "Advanced Options"
 msgstr "高度なオプション"
 
-#: ../../operation/agentes/status_monitor.php:952
+#: ../../operation/agentes/status_monitor.php:960
 msgid "Data Type"
 msgstr "データのタイプ"
 
-#: ../../operation/agentes/status_monitor.php:1443
+#: ../../operation/agentes/status_monitor.php:1463
 msgid "This group doesn't have any monitor"
 msgstr "該当するモニタ項目がありません。"
 
@@ -26176,61 +27657,63 @@ msgstr "該当するモニタ項目がありません。"
 msgid "Report of State"
 msgstr "状態レポート"
 
-#: ../../operation/agentes/ver_agente.php:686
+#: ../../operation/agentes/ver_agente.php:761
+#: ../../enterprise/extensions/vmware/ajax.php:87
+#: ../../enterprise/extensions/vmware/ajax.php:90
 #: ../../enterprise/operation/agentes/ver_agente.php:70
 msgid "Main IP"
 msgstr "代表 IP"
 
-#: ../../operation/agentes/ver_agente.php:737
+#: ../../operation/agentes/ver_agente.php:812
 #: ../../enterprise/operation/agentes/ver_agente.php:113
 msgid "Monitors down"
 msgstr "停止中のモニタ項目"
 
-#: ../../operation/agentes/ver_agente.php:822
+#: ../../operation/agentes/ver_agente.php:897
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:152
 #: ../../enterprise/extensions/ipam/ipam_calculator.php:41
-#: ../../enterprise/extensions/ipam/ipam_excel.php:116
+#: ../../enterprise/extensions/ipam/ipam_excel.php:120
 #: ../../enterprise/extensions/ipam/ipam_network.php:535
 #: ../../enterprise/godmode/servers/manage_export.php:131
 #: ../../enterprise/godmode/servers/manage_export_form.php:84
 msgid "Address"
 msgstr "アドレス"
 
-#: ../../operation/agentes/ver_agente.php:863
+#: ../../operation/agentes/ver_agente.php:938
 msgid "Sons"
 msgstr "子"
 
-#: ../../operation/agentes/ver_agente.php:947
-#: ../../operation/search_agents.php:111
-#: ../../operation/servers/recon_view.php:46
+#: ../../operation/agentes/ver_agente.php:1022
+#: ../../operation/search_agents.php:127
+#: ../../operation/servers/recon_view.php:49
 msgid "Manage"
 msgstr "設定"
 
-#: ../../operation/agentes/ver_agente.php:1076
+#: ../../operation/agentes/ver_agente.php:1170
 msgid "Log Viewer"
 msgstr "ログビューア"
 
-#: ../../operation/agentes/ver_agente.php:1096
+#: ../../operation/agentes/ver_agente.php:1190
 msgid "Terminal"
 msgstr "端末"
 
-#: ../../operation/agentes/ver_agente.php:1116
+#: ../../operation/agentes/ver_agente.php:1210
 #: ../../enterprise/godmode/agentes/collections.agents.php:53
 #: ../../enterprise/godmode/agentes/collections.data.php:104
 #: ../../enterprise/godmode/agentes/collections.data.php:216
 #: ../../enterprise/godmode/agentes/collections.data.php:256
-#: ../../enterprise/godmode/agentes/collections.editor.php:46
-#: ../../enterprise/godmode/agentes/collections.editor.php:350
-#: ../../enterprise/godmode/agentes/collections.editor.php:375
+#: ../../enterprise/godmode/agentes/collections.editor.php:45
+#: ../../enterprise/godmode/agentes/collections.editor.php:344
+#: ../../enterprise/godmode/agentes/collections.editor.php:369
 #: ../../enterprise/include/functions_collection.php:129
 msgid "Files"
 msgstr "ファイル"
 
 #: ../../operation/events/event_statistics.php:32
 #: ../../operation/incidents/incident_statistics.php:30
-#: ../../operation/menu.php:278 ../../operation/menu.php:365
+#: ../../operation/menu.php:315 ../../operation/menu.php:402
 #: ../../operation/snmpconsole/snmp_statistics.php:61
-#: ../../operation/snmpconsole/snmp_view.php:72
+#: ../../operation/snmpconsole/snmp_view.php:80
 #: ../../enterprise/extensions/ipam/ipam_network.php:171
 msgid "Statistics"
 msgstr "統計"
@@ -26263,160 +27746,176 @@ msgid "Validate selected"
 msgstr "選択したものを承諾"
 
 #: ../../operation/events/events.php:71
+#: ../../operation/events/sound_events.php:91
 #: ../../enterprise/godmode/alerts/configure_alert_rule.php:137
 msgid "Event"
 msgstr "イベント"
 
-#: ../../operation/events/events.php:195
+#: ../../operation/events/events.php:168
+msgid "Alert fired in module "
+msgstr "モジュールのアラートフィールド "
+
+#: ../../operation/events/events.php:179 ../../operation/events/events.php:190
+#: ../../operation/events/events.php:201
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:58
+msgid "Module "
+msgstr "モジュール "
+
+#: ../../operation/events/events.php:179
+msgid " is going to critical"
+msgstr " は障害状態になりました"
+
+#: ../../operation/events/events.php:190
+msgid " is going to warning"
+msgstr " は警告状態になりました"
+
+#: ../../operation/events/events.php:201
+msgid " is going to unknown"
+msgstr " は不明状態になりました"
+
+#: ../../operation/events/events.php:223
 msgid ""
 "Event viewer is disabled due event replication. For more information, please "
 "contact with the administrator"
 msgstr "イベントの複製のためイベント表示は無効化されています。より詳細は管理者に連絡してください。"
 
-#: ../../operation/events/events.php:339
+#: ../../operation/events/events.php:365
 msgid "History event list"
 msgstr "イベント一覧履歴"
 
-#: ../../operation/events/events.php:344
+#: ../../operation/events/events.php:370
 msgid "RSS Events"
 msgstr "RSS イベント"
 
-#: ../../operation/events/events.php:349
+#: ../../operation/events/events.php:375
 msgid "Marquee display"
 msgstr "スクリーンセーバ表示"
 
-#: ../../operation/events/events.php:354
+#: ../../operation/events/events.php:380
 msgid "Export to CSV file"
 msgstr "CSV ファイルに書き出す"
 
-#: ../../operation/events/events.php:358 ../../operation/events/events.php:397
+#: ../../operation/events/events.php:384 ../../operation/events/events.php:423
 msgid "Sound events"
 msgstr "サウンドイベント"
 
-#: ../../operation/events/events.php:401
+#: ../../operation/events/events.php:427
 msgid "History"
 msgstr "履歴"
 
-#: ../../operation/events/events.php:439 ../../operation/menu.php:319
+#: ../../operation/events/events.php:465 ../../operation/menu.php:356
 msgid "Sound Alerts"
 msgstr "サウンドアラート"
 
-#: ../../operation/events/events.php:472
+#: ../../operation/events/events.php:498
 msgid "Event viewer"
 msgstr "イベントビューワ"
 
-#: ../../operation/events/events.php:492
+#: ../../operation/events/events.php:518
 msgid "No events selected"
 msgstr "イベントが選択されていません。"
 
-#: ../../operation/events/events.php:518
+#: ../../operation/events/events.php:544
 msgid "Successfully validated"
 msgstr "承諾しました。"
 
-#: ../../operation/events/events.php:519 ../../operation/events/events.php:843
-#: ../../operation/events/events.php:995
+#: ../../operation/events/events.php:545 ../../operation/events/events.php:869
+#: ../../operation/events/events.php:1021
 msgid "Could not be validated"
 msgstr "承諾に失敗しました。"
 
-#: ../../operation/events/events.php:523
+#: ../../operation/events/events.php:549
 msgid "Successfully set in process"
 msgstr "処理中に設定しました。"
 
-#: ../../operation/events/events.php:524
+#: ../../operation/events/events.php:550
 msgid "Could not be set in process"
 msgstr "処理中に設定できませんでした。"
 
-#: ../../operation/events/events.php:875
+#: ../../operation/events/events.php:605
+#: ../../operation/visual_console/public_console.php:153
+#: ../../operation/visual_console/render_view.php:241
+msgid "Until refresh"
+msgstr "リフレッシュまで"
+
+#: ../../operation/events/events.php:901
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:226
 msgid "Successfully delete"
 msgstr "削除しました"
 
-#: ../../operation/events/events.php:878
+#: ../../operation/events/events.php:904
 msgid "Error deleting event"
 msgstr "イベントの削除エラー"
 
-#: ../../operation/events/events_list.php:191
-#: ../../operation/events/events_list.php:636
+#: ../../operation/events/events_list.php:256
+#: ../../operation/events/events_list.php:704
 msgid "No filter loaded"
 msgstr "フィルタが読み込まれていません"
 
-#: ../../operation/events/events_list.php:193
-#: ../../operation/events/events_list.php:637
+#: ../../operation/events/events_list.php:258
+#: ../../operation/events/events_list.php:705
 msgid "Filter loaded"
 msgstr "フィルタを読み込みました"
 
-#: ../../operation/events/events_list.php:195
-#: ../../operation/events/events_list.php:258
-#: ../../operation/events/events_list.php:608
+#: ../../operation/events/events_list.php:260
+#: ../../operation/events/events_list.php:326
+#: ../../operation/events/events_list.php:673
 msgid "Save filter"
 msgstr "フィルタの保存"
 
-#: ../../operation/events/events_list.php:197
-#: ../../operation/events/events_list.php:281
-#: ../../operation/events/events_list.php:283
-#: ../../operation/events/events_list.php:612
+#: ../../operation/events/events_list.php:262
+#: ../../operation/events/events_list.php:350
+#: ../../operation/events/events_list.php:352
+#: ../../operation/events/events_list.php:677
 #: ../../operation/netflow/nf_live_view.php:329
 msgid "Load filter"
 msgstr "フィルタ読み込み"
 
-#: ../../operation/events/events_list.php:218
+#: ../../operation/events/events_list.php:284
 msgid "New filter"
 msgstr "新規フィルタ"
 
-#: ../../operation/events/events_list.php:228
+#: ../../operation/events/events_list.php:294
 msgid "Save in Group"
 msgstr "保存グループ"
 
-#: ../../operation/events/events_list.php:245
+#: ../../operation/events/events_list.php:313
 msgid "Overwrite filter"
 msgstr "フィルタの上書き"
 
-#: ../../operation/events/events_list.php:584
+#: ../../operation/events/events_list.php:649
 msgid "Group agents"
 msgstr "グループエージェント"
 
-#: ../../operation/events/events_list.php:614
-msgid "Show events graph"
-msgstr "イベントグラフ表示"
-
-#: ../../operation/events/events_list.php:643
-#: ../../operation/events/events_list.php:645
+#: ../../operation/events/events_list.php:711
+#: ../../operation/events/events_list.php:713
 msgid "Event control filter"
 msgstr "イベントフィルタ"
 
-#: ../../operation/events/events_list.php:652
+#: ../../operation/events/events_list.php:720
 msgid "Error creating filter."
 msgstr "フィルタ作成エラー。"
 
-#: ../../operation/events/events_list.php:653
+#: ../../operation/events/events_list.php:721
 msgid "Error creating filter is duplicated."
 msgstr "フィルタ作成エラー、重複しています。"
 
-#: ../../operation/events/events_list.php:654
+#: ../../operation/events/events_list.php:722
 msgid "Filter created."
 msgstr "フィルタを作成しました。"
 
-#: ../../operation/events/events_list.php:656
+#: ../../operation/events/events_list.php:724
 msgid "Filter updated."
 msgstr "フィルタを更新しました。"
 
-#: ../../operation/events/events_list.php:657
+#: ../../operation/events/events_list.php:725
 msgid "Error updating filter."
 msgstr "フィルタ更新エラー。"
 
-#: ../../operation/events/events_list.php:1091
+#: ../../operation/events/events_list.php:1105
 msgid "Filter name cannot be left blank"
 msgstr "フィルタ名は空にできません"
 
-#: ../../operation/events/events_list.php:1160
-#: ../../operation/events/events_list.php:1246
-msgid "none"
-msgstr "なし"
-
-#: ../../operation/events/events_list.php:1568
-msgid "Events generated -by agent-"
-msgstr "エージェントごとに生成されたイベント"
-
 #: ../../operation/events/events_rss.php:32
 msgid "Your IP is not into the IP list with API access."
 msgstr "API アクセスできる IP 一覧に入っていません。"
@@ -26425,11 +27924,11 @@ msgstr "API アクセスできる IP 一覧に入っていません。"
 msgid "The URL of your feed has bad hash."
 msgstr "フィードの URL に不正はハッシュがあります。"
 
-#: ../../operation/events/events_rss.php:185 ../../operation/menu.php:98
+#: ../../operation/events/events_rss.php:185 ../../operation/menu.php:101
 msgid "SNMP"
 msgstr "SNMP"
 
-#: ../../operation/events/sound_events.php:51 ../../operation/menu.php:307
+#: ../../operation/events/sound_events.php:51 ../../operation/menu.php:344
 msgid "Sound Events"
 msgstr "サウンドイベント"
 
@@ -26453,7 +27952,7 @@ msgstr "レポート数"
 msgid "Default position of map."
 msgstr "マップのデフォルト位置"
 
-#: ../../operation/gis_maps/gis_map.php:31 ../../operation/menu.php:185
+#: ../../operation/gis_maps/gis_map.php:31 ../../operation/menu.php:222
 msgid "GIS Maps"
 msgstr "GIS マップ"
 
@@ -26482,9 +27981,9 @@ msgid "Show agents by state: "
 msgstr "表示するエージェントの状態: "
 
 #: ../../operation/gis_maps/render_view.php:157
-#: ../../enterprise/dashboard/widgets/network_map.php:38
-#: ../../enterprise/extensions/vmware/vmware_view.php:1104
-#: ../../enterprise/extensions/vmware/vmware_view.php:1124
+#: ../../enterprise/dashboard/widgets/network_map.php:39
+#: ../../enterprise/extensions/vmware/vmware_view.php:1207
+#: ../../enterprise/extensions/vmware/vmware_view.php:1232
 msgid "Map"
 msgstr "マップ"
 
@@ -26537,6 +28036,10 @@ msgstr "全ユーザ"
 msgid "Agents:"
 msgstr "エージェント:"
 
+#: ../../operation/incidents/incident.php:279
+msgid "All agents"
+msgstr "全エージェント"
+
 #: ../../operation/incidents/incident.php:284
 msgid "Groups:"
 msgstr "グループ:"
@@ -26563,7 +28066,7 @@ msgid "Create incident"
 msgstr "インシデント作成"
 
 #: ../../operation/incidents/incident_detail.php:120
-#: ../../enterprise/meta/include/ajax/wizard.ajax.php:486
+#: ../../enterprise/meta/include/ajax/wizard.ajax.php:489
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:93
 msgid "No description available"
 msgstr "説明なし"
@@ -26589,7 +28092,7 @@ msgid "Opened at"
 msgstr "登録日時"
 
 #: ../../operation/incidents/incident_detail.php:261
-#: ../../operation/servers/recon_view.php:107
+#: ../../operation/servers/recon_view.php:110
 #: ../../enterprise/operation/agentes/transactional_map.php:154
 msgid "Updated at"
 msgstr "更新日時"
@@ -26649,7 +28152,8 @@ msgstr "ユーザで分類したインシデント"
 msgid "Incidents by source"
 msgstr "発生元で分類したインシデント"
 
-#: ../../operation/menu.php:31 ../../operation/menu.php:106
+#: ../../operation/menu.php:32 ../../operation/menu.php:111
+#: ../../enterprise/godmode/reporting/cluster_list.php:25
 #: ../../enterprise/meta/general/logon_ok.php:56
 #: ../../enterprise/meta/general/main_header.php:82
 #: ../../enterprise/operation/services/services.list.php:60
@@ -26659,83 +28163,83 @@ msgstr "発生元で分類したインシデント"
 msgid "Monitoring"
 msgstr "モニタリング"
 
-#: ../../operation/menu.php:37
+#: ../../operation/menu.php:38
 msgid "Views"
 msgstr "表示"
 
-#: ../../operation/menu.php:51 ../../operation/tree.php:87
+#: ../../operation/menu.php:52 ../../operation/tree.php:87
 #: ../../enterprise/meta/general/main_header.php:88
 msgid "Tree view"
 msgstr "ツリー表示"
 
-#: ../../operation/menu.php:70
+#: ../../operation/menu.php:73
 msgid "Netflow Live View"
 msgstr "Netflow ライブビュー"
 
-#: ../../operation/menu.php:85
+#: ../../operation/menu.php:88
 msgid "SNMP browser"
 msgstr "SNMP ブラウザ"
 
-#: ../../operation/menu.php:89
+#: ../../operation/menu.php:92
 #: ../../operation/snmpconsole/snmp_mib_uploader.php:30
 msgid "MIB uploader"
 msgstr "MIB アップローダ"
 
-#: ../../operation/menu.php:117
-#: ../../enterprise/dashboard/widgets/network_map.php:26
+#: ../../operation/menu.php:122
+#: ../../enterprise/dashboard/widgets/network_map.php:27
 #: ../../enterprise/operation/policies/networkmap.policies.php:128
 msgid "Network map"
 msgstr "ネットワークマップ"
 
-#: ../../operation/menu.php:190
+#: ../../operation/menu.php:227
 msgid "List of Gis maps"
 msgstr "GISマップ一覧"
 
-#: ../../operation/menu.php:224
+#: ../../operation/menu.php:261
 msgid "Topology maps"
 msgstr "トポロジーマップ"
 
-#: ../../operation/menu.php:288
+#: ../../operation/menu.php:325
 msgid "RSS"
 msgstr "RSS"
 
-#: ../../operation/menu.php:293
+#: ../../operation/menu.php:330
 msgid "Marquee"
 msgstr "スクリーンセーバー"
 
-#: ../../operation/menu.php:299
+#: ../../operation/menu.php:336
 msgid "CSV File"
 msgstr "CSVファイル"
 
-#: ../../operation/menu.php:329
+#: ../../operation/menu.php:366
 msgid "Workspace"
 msgstr "ワークスペース"
 
-#: ../../operation/menu.php:342
+#: ../../operation/menu.php:379
 msgid "WebChat"
 msgstr "ウェブチャット"
 
-#: ../../operation/menu.php:364
+#: ../../operation/menu.php:401
 msgid "List of Incidents"
 msgstr "インシデント一覧"
 
-#: ../../operation/menu.php:379
+#: ../../operation/menu.php:416
 msgid "Messages List"
 msgstr "メッセージ一覧"
 
-#: ../../operation/menu.php:380
+#: ../../operation/menu.php:417
 msgid "New message"
 msgstr "新規メッセージ"
 
-#: ../../operation/menu.php:405
+#: ../../operation/menu.php:442
 msgid "Scheduled downtime"
 msgstr "計画停止"
 
-#: ../../operation/menu.php:410
+#: ../../operation/menu.php:447
 msgid "Recon view"
 msgstr "自動検出表示"
 
-#: ../../operation/menu.php:485
+#: ../../operation/menu.php:522
 msgid "Tools"
 msgstr "ツール"
 
@@ -26923,64 +28427,64 @@ msgstr "ルータIP"
 msgid "Bytes per second"
 msgstr "バイト/秒"
 
-#: ../../operation/netflow/nf_live_view.php:417
+#: ../../operation/netflow/nf_live_view.php:415
 msgid "Draw"
 msgstr "描画"
 
-#: ../../operation/netflow/nf_live_view.php:421
+#: ../../operation/netflow/nf_live_view.php:419
 msgid "Save as new filter"
 msgstr "新規フィルタとして保存"
 
-#: ../../operation/netflow/nf_live_view.php:422
+#: ../../operation/netflow/nf_live_view.php:420
 msgid "Update current filter"
 msgstr "現在のフィルタを更新"
 
-#: ../../operation/netflow/nf_live_view.php:436
+#: ../../operation/netflow/nf_live_view.php:434
 msgid "No filter selected"
 msgstr "フィルタが選択されていません"
 
 #: ../../operation/reporting/custom_reporting.php:32
-#: ../../operation/reporting/graph_viewer.php:354
+#: ../../operation/reporting/graph_viewer.php:356
 msgid "There are no defined reportings"
 msgstr "定義されたレポートがありません"
 
-#: ../../operation/reporting/graph_viewer.php:194
+#: ../../operation/reporting/graph_viewer.php:196
 msgid "No data."
 msgstr "データがありません。"
 
-#: ../../operation/reporting/graph_viewer.php:226
-#: ../../operation/reporting/graph_viewer.php:249
+#: ../../operation/reporting/graph_viewer.php:228
+#: ../../operation/reporting/graph_viewer.php:251
 msgid "Graph defined"
 msgstr "定義済みグラフ"
 
-#: ../../operation/reporting/graph_viewer.php:233
+#: ../../operation/reporting/graph_viewer.php:235
 #: ../../enterprise/dashboard/widgets/custom_graph.php:45
 msgid "Horizontal Bars"
 msgstr "水平バー"
 
-#: ../../operation/reporting/graph_viewer.php:234
+#: ../../operation/reporting/graph_viewer.php:236
 #: ../../enterprise/dashboard/widgets/custom_graph.php:46
 msgid "Vertical Bars"
 msgstr "垂直バー"
 
-#: ../../operation/reporting/graph_viewer.php:250
+#: ../../operation/reporting/graph_viewer.php:252
 msgid "Zoom x1"
 msgstr "ズーム x1"
 
-#: ../../operation/reporting/graph_viewer.php:251
+#: ../../operation/reporting/graph_viewer.php:253
 msgid "Zoom x2"
 msgstr "ズーム x2"
 
-#: ../../operation/reporting/graph_viewer.php:252
+#: ../../operation/reporting/graph_viewer.php:254
 msgid "Zoom x3"
 msgstr "ズーム x3"
 
-#: ../../operation/reporting/graph_viewer.php:320
+#: ../../operation/reporting/graph_viewer.php:322
 #: ../../operation/reporting/reporting_viewer.php:314
 msgid "Invalid date selected"
 msgstr "不正なデータが選択されました。"
 
-#: ../../operation/reporting/graph_viewer.php:327
+#: ../../operation/reporting/graph_viewer.php:329
 msgid "Custom graph viewer"
 msgstr "カスタムグラフ参照"
 
@@ -27079,30 +28583,47 @@ msgstr "ヘルプ"
 msgid "Profile"
 msgstr "プロファイル"
 
-#: ../../operation/servers/recon_view.php:36
-#: ../../operation/servers/recon_view.php:51
+#: ../../operation/servers/recon_view.php:32
+#: ../../operation/servers/recon_view.php:39
+#: ../../operation/servers/recon_view.php:54
 msgid "Recon View"
 msgstr "自動検出表示"
 
-#: ../../operation/servers/recon_view.php:104
-#: ../../operation/servers/recon_view.php:158
+#: ../../operation/servers/recon_view.php:33
+msgid "Recon Server is disabled"
+msgstr "自動検出サーバが無効です"
+
+#: ../../operation/servers/recon_view.php:107
+#: ../../operation/servers/recon_view.php:161
 #: ../../enterprise/extensions/ipam/ipam_network.php:151
 #: ../../enterprise/extensions/ipam/ipam_network.php:167
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:613
-#: ../../enterprise/godmode/policies/policy_queue.php:377
+#: ../../enterprise/godmode/policies/policy_queue.php:397
 #: ../../enterprise/meta/advanced/policymanager.queue.php:259
 msgid "Progress"
 msgstr "進捗状況"
 
-#: ../../operation/servers/recon_view.php:140
+#: ../../operation/servers/recon_view.php:143
 msgid "Pending"
 msgstr "保留中"
 
-#: ../../operation/servers/recon_view.php:173
+#: ../../operation/servers/recon_view.php:176
 msgid "has no recon tasks assigned"
 msgstr "は自動検出タスクが割り当てられていません"
 
-#: ../../operation/snmpconsole/snmp_browser.php:92
+#: ../../operation/snmpconsole/snmp_browser.php:52
+msgid "Create network components"
+msgstr "ネットワークコンポーネント作成"
+
+#: ../../operation/snmpconsole/snmp_browser.php:59
+msgid "Error creating the following modules:"
+msgstr "以下のモジュール作成エラー:"
+
+#: ../../operation/snmpconsole/snmp_browser.php:69
+msgid "Modules successfully created"
+msgstr "モジュールを作成しました"
+
+#: ../../operation/snmpconsole/snmp_browser.php:114
 msgid "SNMP Browser"
 msgstr "SNMP ブラウザ"
 
@@ -27115,7 +28636,7 @@ msgstr ""
 "に依存する可能性があることに注意してください。トラップの定義をカスタマイズするには、SNMP トラップエディタを使ってください。"
 
 #: ../../operation/snmpconsole/snmp_statistics.php:116
-#: ../../operation/snmpconsole/snmp_view.php:468
+#: ../../operation/snmpconsole/snmp_view.php:561
 msgid "There are no SNMP traps in database"
 msgstr "SNMP トラップデータがありません。"
 
@@ -27129,7 +28650,7 @@ msgid "Number"
 msgstr "数"
 
 #: ../../operation/snmpconsole/snmp_statistics.php:156
-#: ../../operation/snmpconsole/snmp_view.php:680
+#: ../../operation/snmpconsole/snmp_view.php:788
 msgid "View agent details"
 msgstr "エージェント概要の参照"
 
@@ -27141,7 +28662,7 @@ msgstr "Enterprise文字列ごとの受信トラップ"
 msgid "Trap Enterprise String"
 msgstr "Enterprise文字列トラップ"
 
-#: ../../operation/snmpconsole/snmp_view.php:414
+#: ../../operation/snmpconsole/snmp_view.php:471
 msgid ""
 "Search by any alphanumeric field in the trap.\n"
 "\t\tREMEMBER trap sources need to be searched by IP Address"
@@ -27149,73 +28670,92 @@ msgstr ""
 "トラップの英数字フィールドで検索。\n"
 "\t\tトラップの発信元は IPアドレスで検索する必要があることに注意してください。"
 
-#: ../../operation/snmpconsole/snmp_view.php:421
+#: ../../operation/snmpconsole/snmp_view.php:476
+msgid "From (Date)"
+msgstr "開始 (日付)"
+
+#: ../../operation/snmpconsole/snmp_view.php:478
+msgid "To (Date)"
+msgstr "終了 (日付)"
+
+#: ../../operation/snmpconsole/snmp_view.php:481
+msgid "From (Time)"
+msgstr "開始 (時間)"
+
+#: ../../operation/snmpconsole/snmp_view.php:483
+msgid "To (Time)"
+msgstr "終了 (時間)"
+
+#: ../../operation/snmpconsole/snmp_view.php:488
 msgid "Search by trap type"
 msgstr "トラップタイプによる検索"
 
-#: ../../operation/snmpconsole/snmp_view.php:435
+#: ../../operation/snmpconsole/snmp_view.php:502
 msgid "Group by Enterprise String/IP"
 msgstr "Enterprise 文字列/IP ごとのグループ"
 
-#: ../../operation/snmpconsole/snmp_view.php:495
-#: ../../enterprise/dashboard/full_dashboard.php:147
+#: ../../operation/snmpconsole/snmp_view.php:559
+msgid "There are no SNMP traps in database that contains this filter"
+msgstr "このフィルタを含む SNMP トラップがデータベース内にありません。"
+
+#: ../../operation/snmpconsole/snmp_view.php:593
+#: ../../enterprise/include/functions_dashboard.php:649
 msgid "Exit fullscreen"
 msgstr "全画面表示を終了"
 
-#: ../../operation/snmpconsole/snmp_view.php:521
-#: ../../enterprise/dashboard/full_dashboard.php:250
-#: ../../enterprise/dashboard/public_dashboard.php:276
+#: ../../operation/snmpconsole/snmp_view.php:623
+#: ../../enterprise/include/functions_dashboard.php:880
 msgid "Refresh every"
 msgstr "更新周期"
 
-#: ../../operation/snmpconsole/snmp_view.php:533
+#: ../../operation/snmpconsole/snmp_view.php:635
 msgid "SNMP Traps"
 msgstr "SNMP トラップ"
 
-#: ../../operation/snmpconsole/snmp_view.php:615
+#: ../../operation/snmpconsole/snmp_view.php:723
 msgid "Trap subtype"
 msgstr "トラップサブタイプ"
 
-#: ../../operation/snmpconsole/snmp_view.php:772
+#: ../../operation/snmpconsole/snmp_view.php:880
 msgid "Variable bindings:"
 msgstr "バインド変数:"
 
-#: ../../operation/snmpconsole/snmp_view.php:785
+#: ../../operation/snmpconsole/snmp_view.php:897
 msgid "See more details"
 msgstr "詳細表示"
 
-#: ../../operation/snmpconsole/snmp_view.php:798
+#: ../../operation/snmpconsole/snmp_view.php:910
 msgid "Enterprise String:"
 msgstr "Enterprise文字列:"
 
-#: ../../operation/snmpconsole/snmp_view.php:804
+#: ../../operation/snmpconsole/snmp_view.php:916
 #: ../../enterprise/godmode/agentes/collections.data.php:379
+#: ../../enterprise/meta/include/functions_autoprovision.php:473
 msgid "Description:"
 msgstr "説明:"
 
-#: ../../operation/snmpconsole/snmp_view.php:836
+#: ../../operation/snmpconsole/snmp_view.php:948
 msgid "Trap type:"
 msgstr "トラップタイプ:"
 
-#: ../../operation/snmpconsole/snmp_view.php:864
+#: ../../operation/snmpconsole/snmp_view.php:976
 msgid "Count:"
 msgstr "件数:"
 
-#: ../../operation/snmpconsole/snmp_view.php:868
+#: ../../operation/snmpconsole/snmp_view.php:980
 msgid "First trap:"
 msgstr "最初のトラップ:"
 
-#: ../../operation/snmpconsole/snmp_view.php:872
+#: ../../operation/snmpconsole/snmp_view.php:984
 msgid "Last trap:"
 msgstr "最新のトラップ:"
 
-#: ../../operation/snmpconsole/snmp_view.php:892
+#: ../../operation/snmpconsole/snmp_view.php:1004
 msgid "No matching traps found"
 msgstr "条件にマッチするトラップがありません。"
 
-#: ../../operation/snmpconsole/snmp_view.php:960
-#: ../../enterprise/dashboard/full_dashboard.php:361
-#: ../../enterprise/dashboard/public_dashboard.php:387
+#: ../../operation/snmpconsole/snmp_view.php:1114
+#: ../../enterprise/include/functions_dashboard.php:1007
 msgid "Until next"
 msgstr "次まで"
 
@@ -27240,182 +28780,188 @@ msgstr "モジュールグループ"
 msgid "policies"
 msgstr "ポリシー"
 
-#: ../../operation/tree.php:138
-msgid "Agent status"
-msgstr "エージェント状態"
+#: ../../operation/tree.php:144
+msgid "Search group"
+msgstr "検索グループ"
 
-#: ../../operation/tree.php:140
+#: ../../operation/tree.php:150
 msgid "Search agent"
 msgstr "エージェント検索"
 
-#: ../../operation/tree.php:165
+#: ../../operation/tree.php:153
+msgid "Show full hirearchy"
+msgstr "全階層表示"
+
+#: ../../operation/tree.php:156
+msgid "Agent status"
+msgstr "エージェント状態"
+
+#: ../../operation/tree.php:176
 msgid "Search module"
 msgstr "モジュール検索"
 
-#: ../../operation/tree.php:189
+#: ../../operation/tree.php:202
 msgid "Tree search"
 msgstr "ツリー検索"
 
-#: ../../operation/tree.php:272
-#: ../../enterprise/dashboard/widgets/tree_view.php:196
-#: ../../enterprise/include/functions_reporting_csv.php:458
+#: ../../operation/tree.php:286
+#: ../../enterprise/dashboard/widgets/tree_view.php:198
+msgid "Found items"
+msgstr "アイテムを見つけました"
+
+#: ../../operation/tree.php:294
+#: ../../enterprise/dashboard/widgets/tree_view.php:206
+#: ../../enterprise/include/functions_reporting_csv.php:471
 msgid "Total modules"
 msgstr "全モジュール"
 
-#: ../../operation/tree.php:281
-#: ../../enterprise/dashboard/widgets/tree_view.php:205
+#: ../../operation/tree.php:303
+#: ../../enterprise/dashboard/widgets/tree_view.php:215
 msgid "Critical agents"
 msgstr "障害エージェント数"
 
-#: ../../operation/tree.php:286
-#: ../../enterprise/dashboard/widgets/tree_view.php:210
+#: ../../operation/tree.php:308
+#: ../../enterprise/dashboard/widgets/tree_view.php:220
 msgid "Warning agents"
 msgstr "警告エージェント数"
 
-#: ../../operation/tree.php:291
-#: ../../enterprise/dashboard/widgets/tree_view.php:215
+#: ../../operation/tree.php:313
+#: ../../enterprise/dashboard/widgets/tree_view.php:225
 msgid "Unknown agents"
 msgstr "不明エージェント数"
 
-#: ../../operation/tree.php:296
-#: ../../enterprise/dashboard/widgets/tree_view.php:220
+#: ../../operation/tree.php:318
+#: ../../enterprise/dashboard/widgets/tree_view.php:230
 msgid "Not init agents"
 msgstr "未初期化エージェント数"
 
-#: ../../operation/tree.php:301
-#: ../../enterprise/dashboard/widgets/tree_view.php:225
+#: ../../operation/tree.php:323
+#: ../../enterprise/dashboard/widgets/tree_view.php:235
 msgid "Normal agents"
 msgstr "正常エージェント数"
 
-#: ../../operation/users/user_edit.php:130
-#: ../../operation/users/user_edit.php:137
+#: ../../operation/users/user_edit.php:132
+#: ../../operation/users/user_edit.php:139
 msgid "Password successfully updated"
 msgstr "パスワードを更新しました。"
 
-#: ../../operation/users/user_edit.php:131
-#: ../../operation/users/user_edit.php:138
+#: ../../operation/users/user_edit.php:133
+#: ../../operation/users/user_edit.php:140
 #, php-format
 msgid "Error updating passwords: %s"
 msgstr "パスワードの更新に失敗しました。:%s"
 
-#: ../../operation/users/user_edit.php:143
+#: ../../operation/users/user_edit.php:145
 msgid ""
 "Passwords didn't match or other problem encountered while updating passwords"
 msgstr "パスワードが一致しない、または他の原因でパスワードの更新に失敗しました。"
 
-#: ../../operation/users/user_edit.php:155
-#: ../../operation/users/user_edit.php:165
+#: ../../operation/users/user_edit.php:157
+#: ../../operation/users/user_edit.php:167
 msgid "Error updating user info"
 msgstr "ユーザ情報の更新に失敗しました。"
 
-#: ../../operation/users/user_edit.php:175
+#: ../../operation/users/user_edit.php:177
 msgid "Edit my User"
 msgstr "ユーザ編集"
 
-#: ../../operation/users/user_edit.php:219
+#: ../../operation/users/user_edit.php:221
+#: ../../enterprise/include/process_reset_pass.php:99
+#: ../../enterprise/meta/include/process_reset_pass.php:76
 msgid "New Password"
 msgstr "新しいパスワード"
 
-#: ../../operation/users/user_edit.php:229
+#: ../../operation/users/user_edit.php:231
 msgid ""
 "You can not change your password from Pandora FMS under the current "
 "authentication scheme"
 msgstr "現在の認証方式では、Pandora FMS からパスワードを変更できません。"
 
-#: ../../operation/users/user_edit.php:238
+#: ../../operation/users/user_edit.php:240
 msgid "If checkbox is clicked then block size global configuration is used"
 msgstr "チェックボックスをクリックすると、システム全体の設定が利用されます"
 
-#: ../../operation/users/user_edit.php:274
-msgid "Home screen"
-msgstr "ホーム画面"
-
-#: ../../operation/users/user_edit.php:274
-msgid ""
-"User can customize the home page. By default, will display 'Agent Detail'. "
-"Example: Select 'Other' and type "
-"sec=estado&sec2=operation/agentes/estado_agente to show agent detail view"
-msgstr ""
-"ユーザはホームページをカスタマイズできます。デフォルトでは、'エージェント詳細' が表示されます。例: 'その他' "
-"を選択し、sec=estado&sec2=operation/agentes/estado_agente を入力すると、エージェント詳細が表示されます。"
-
-#: ../../operation/users/user_edit.php:339
+#: ../../operation/users/user_edit.php:342
 msgid "Show information"
 msgstr "情報表示"
 
-#: ../../operation/users/user_edit.php:345
+#: ../../operation/users/user_edit.php:348
 msgid "Event filter"
 msgstr "イベントフィルタ"
 
-#: ../../operation/users/user_edit.php:350
+#: ../../operation/users/user_edit.php:353
 msgid "Newsletter Subscribed"
 msgstr "ニュースレター購読済"
 
-#: ../../operation/users/user_edit.php:352
+#: ../../operation/users/user_edit.php:355
 msgid "Already subscribed to Pandora FMS newsletter"
 msgstr "Pandora FMS ニュースレターは購読済です"
 
-#: ../../operation/users/user_edit.php:358
+#: ../../operation/users/user_edit.php:361
 msgid "Newsletter Reminder"
 msgstr "ニュースレターリマインダ"
 
-#: ../../operation/users/user_edit.php:414
+#: ../../operation/users/user_edit.php:422
 msgid "Autorefresh"
 msgstr "自動更新"
 
-#: ../../operation/users/user_edit.php:414
+#: ../../operation/users/user_edit.php:422
 msgid "This will activate autorefresh in selected pages"
 msgstr "選択したページで自動更新を有効にします"
 
-#: ../../operation/users/user_edit.php:421
+#: ../../operation/users/user_edit.php:429
 msgid "Full list of pages"
 msgstr "全ページ一覧"
 
-#: ../../operation/users/user_edit.php:423
+#: ../../operation/users/user_edit.php:431
 msgid "List of pages with autorefresh"
 msgstr "自動更新ページ一覧"
 
-#: ../../operation/users/user_edit.php:429
+#: ../../operation/users/user_edit.php:437
 msgid "Push selected pages into autorefresh list"
 msgstr "選択したページを自動更新にする"
 
-#: ../../operation/users/user_edit.php:433
+#: ../../operation/users/user_edit.php:441
 msgid "Pop selected pages out of autorefresh list"
 msgstr "選択したページを自動更新から外す"
 
-#: ../../operation/users/user_edit.php:469
+#: ../../operation/users/user_edit.php:451
+msgid "Time autorefresh"
+msgstr "自動更新時間"
+
+#: ../../operation/users/user_edit.php:480
 msgid ""
 "You can not change your user info from Pandora FMS under the current "
 "authentication scheme"
 msgstr "現在の認証方式では、Pandora FMS からユーザ情報を変更できません。"
 
-#: ../../operation/users/user_edit.php:541
+#: ../../operation/users/user_edit.php:552
 msgid "This user doesn't have any assigned profile/group."
 msgstr "このユーザにはプロファイル・グループが割り当てられていません。"
 
-#: ../../operation/users/user_edit.php:710
+#: ../../operation/users/user_edit.php:721
 msgid "Double autentication information"
 msgstr "二段階認証情報"
 
-#: ../../operation/users/user_edit.php:773
-#: ../../operation/users/user_edit.php:849
+#: ../../operation/users/user_edit.php:784
+#: ../../operation/users/user_edit.php:860
 msgid "Double autentication activation"
 msgstr "二段階認証の有効化"
 
-#: ../../operation/users/user_edit.php:799
+#: ../../operation/users/user_edit.php:810
 msgid "The double authentication will be deactivated"
 msgstr "二段階認証は無効化されます"
 
-#: ../../operation/users/user_edit.php:800
+#: ../../operation/users/user_edit.php:811
 msgid "Deactivate"
 msgstr "無効化"
 
-#: ../../operation/users/user_edit.php:832
+#: ../../operation/users/user_edit.php:843
 msgid "The double autentication was deactivated successfully"
 msgstr "二段階認証を無効化しました"
 
-#: ../../operation/users/user_edit.php:835
-#: ../../operation/users/user_edit.php:839
+#: ../../operation/users/user_edit.php:846
+#: ../../operation/users/user_edit.php:850
 msgid "There was an error deactivating the double autentication"
 msgstr "二段階認証の無効化でエラーが発生しました"
 
@@ -27443,138 +28989,135 @@ msgstr "メッセージ送信エラー"
 msgid "Error login."
 msgstr "ログインエラー"
 
-#: ../../enterprise/dashboard/dashboards.php:33
+#: ../../enterprise/dashboard/dashboards.php:34
 #: ../../enterprise/mobile/operation/home.php:35
 msgid "Dashboards"
 msgstr "ダッシュボード"
 
-#: ../../enterprise/dashboard/dashboards.php:59
+#: ../../enterprise/dashboard/dashboards.php:61
 msgid "Successfully duplicate"
 msgstr "複製しました"
 
-#: ../../enterprise/dashboard/dashboards.php:60
+#: ../../enterprise/dashboard/dashboards.php:62
 msgid "Could not be duplicate"
 msgstr "複製に失敗しました"
 
-#: ../../enterprise/dashboard/dashboards.php:83
-#: ../../enterprise/dashboard/main_dashboard.php:281
-#: ../../enterprise/dashboard/main_dashboard.php:290
+#: ../../enterprise/dashboard/dashboards.php:87
+#: ../../enterprise/dashboard/main_dashboard.php:297
+#: ../../enterprise/dashboard/main_dashboard.php:306
 msgid "Cells"
 msgstr "セル"
 
-#: ../../enterprise/dashboard/dashboards.php:109
+#: ../../enterprise/dashboard/dashboards.php:114
 msgid "There are no dashboards defined."
 msgstr "定義済のダッシュボードがありません。"
 
-#: ../../enterprise/dashboard/dashboards.php:123
+#: ../../enterprise/dashboard/dashboards.php:132
 #, php-format
 msgid "Private for (%s)"
 msgstr "個人のみ (%s)"
 
-#: ../../enterprise/dashboard/dashboards.php:154
+#: ../../enterprise/dashboard/dashboards.php:169
 msgid "New dashboard"
 msgstr "新規ダッシュボード"
 
-#: ../../enterprise/dashboard/full_dashboard.php:47
-#: ../../enterprise/dashboard/public_dashboard.php:70
+#: ../../enterprise/dashboard/full_dashboard.php:51
+#: ../../enterprise/dashboard/public_dashboard.php:67
 msgid "No slides selected"
 msgstr "スライドが選択されていません"
 
-#: ../../enterprise/dashboard/full_dashboard.php:201
-#: ../../enterprise/dashboard/public_dashboard.php:217
-msgid "Change every"
-msgstr "変更周期"
-
-#: ../../enterprise/dashboard/full_dashboard.php:222
-#: ../../enterprise/dashboard/public_dashboard.php:244
-#: ../../enterprise/operation/agentes/transactional_map.php:307
-msgid "Stop"
-msgstr "停止"
-
-#: ../../enterprise/dashboard/full_dashboard.php:228
-#: ../../enterprise/dashboard/public_dashboard.php:250
-msgid "Pause"
-msgstr "一時停止"
-
-#: ../../enterprise/dashboard/full_dashboard.php:258
-#: ../../enterprise/dashboard/main_dashboard.php:183
-#: ../../enterprise/dashboard/public_dashboard.php:284
-msgid "Slides mode"
-msgstr "スライドモード"
-
-#: ../../enterprise/dashboard/full_dashboard.php:349
-#: ../../enterprise/dashboard/main_dashboard.php:502
-#: ../../enterprise/dashboard/public_dashboard.php:375
-msgid "Slides"
-msgstr "スライド"
-
-#: ../../enterprise/dashboard/main_dashboard.php:151
+#: ../../enterprise/dashboard/main_dashboard.php:159
 msgid "Show link to public dashboard"
 msgstr "公開ダッシュボードへのリンク表示"
 
-#: ../../enterprise/dashboard/main_dashboard.php:168
+#: ../../enterprise/dashboard/main_dashboard.php:176
+msgid "Back to dashboards list"
+msgstr "ダッシュボード一覧へ戻る"
+
+#: ../../enterprise/dashboard/main_dashboard.php:182
 msgid "Save the actual layout design"
 msgstr "現在のレイアウトデザインの保存"
 
-#: ../../enterprise/dashboard/main_dashboard.php:336
+#: ../../enterprise/dashboard/main_dashboard.php:197
+#: ../../enterprise/include/functions_dashboard.php:890
+msgid "Slides mode"
+msgstr "スライドモード"
+
+#: ../../enterprise/dashboard/main_dashboard.php:326
+msgid "Items slideshow"
+msgstr "アイテムスライドショー"
+
+#: ../../enterprise/dashboard/main_dashboard.php:331
+msgid ""
+"If enabled, all items of this dashboard will be shown individually into "
+"fullscreen mode"
+msgstr "有効化すると、このダッシュボードの全アイテムが全画面モードで個別に表示されます。"
+
+#: ../../enterprise/dashboard/main_dashboard.php:361
 msgid "Private dashboard"
 msgstr "プライベートダッシュボード"
 
-#: ../../enterprise/dashboard/main_dashboard.php:356
+#: ../../enterprise/dashboard/main_dashboard.php:381
 msgid "Error: there are cells not empty."
 msgstr "エラー: 空でないセルがあります。"
 
-#: ../../enterprise/dashboard/main_dashboard.php:361
+#: ../../enterprise/dashboard/main_dashboard.php:386
 msgid "Error save conf dashboard"
-msgstr "ダッシュボード設定保存エラー"
+msgstr "ダッシュボード設定の保存エラー"
 
-#: ../../enterprise/dashboard/main_dashboard.php:427
+#: ../../enterprise/dashboard/main_dashboard.php:468
 msgid "Add widget"
 msgstr "ウィジェット追加"
 
-#: ../../enterprise/dashboard/main_dashboard.php:434
+#: ../../enterprise/dashboard/main_dashboard.php:475
 msgid "Add new widget"
 msgstr "新規ウィジェットの追加"
 
-#: ../../enterprise/dashboard/main_dashboard.php:436
+#: ../../enterprise/dashboard/main_dashboard.php:477
 msgid ""
 "Error, you are trying to add a widget in a empty cell. Please save the "
 "layout before to add any widget in this cell."
 msgstr "エラー、空のセルにウィジェットを追加しようとしています。このセルにウィジェットを追加するには、先にレイアウトを保存してください。"
 
-#: ../../enterprise/dashboard/main_dashboard.php:440
+#: ../../enterprise/dashboard/main_dashboard.php:481
 msgid "There are unsaved changes"
 msgstr "保存されていない変更があります"
 
+#: ../../enterprise/dashboard/main_dashboard.php:539
+#: ../../enterprise/include/functions_dashboard.php:995
+msgid "Slides"
+msgstr "スライド"
+
 #: ../../enterprise/dashboard/widget.php:68
 msgid "Empty for a transparent background color or CSS compatible value"
 msgstr "透明な背景色またはCSSに合う値が空です"
 
-#: ../../enterprise/dashboard/widget.php:316
+#: ../../enterprise/dashboard/widget.php:317
 msgid "Configure widget"
 msgstr "ウィジェット設定"
 
-#: ../../enterprise/dashboard/widget.php:324
+#: ../../enterprise/dashboard/widget.php:325
 msgid "Delete widget"
 msgstr "ウェジェットの削除"
 
-#: ../../enterprise/dashboard/widget.php:346
+#: ../../enterprise/dashboard/widget.php:379
 msgid "Config widget"
 msgstr "ウィジェット設定"
 
-#: ../../enterprise/dashboard/widget.php:356
+#: ../../enterprise/dashboard/widget.php:389
+#: ../../enterprise/dashboard/widgets/agent_module.php:404
 msgid "Please configure this widget before usage"
 msgstr "使用前にこのウィジェットを設定してください"
 
-#: ../../enterprise/dashboard/widget.php:359
+#: ../../enterprise/dashboard/widget.php:392
 msgid "Widget cannot be loaded"
 msgstr "ウィジェットをロードできません"
 
-#: ../../enterprise/dashboard/widget.php:360
+#: ../../enterprise/dashboard/widget.php:393
 msgid "Please, configure the widget again to recover it"
 msgstr "復旧するためにウィジェットを設定しなおしてください"
 
-#: ../../enterprise/dashboard/widget.php:456
+#: ../../enterprise/dashboard/widget.php:495
 msgid ""
 "If propagate acl is activated, this group will include its child groups"
 msgstr "ACLの伝播を有効にすると、このグループは子グループを含みます"
@@ -27584,23 +29127,23 @@ msgstr "ACLの伝播を有効にすると、このグループは子グループ
 msgid "Show Agent/Module View"
 msgstr "エージェント/モジュール表示"
 
-#: ../../enterprise/dashboard/widgets/agent_module.php:375
-#: ../../enterprise/dashboard/widgets/custom_graph.php:72
+#: ../../enterprise/dashboard/widgets/agent_module.php:427
+#: ../../enterprise/dashboard/widgets/custom_graph.php:93
 #: ../../enterprise/dashboard/widgets/events_list.php:80
 #: ../../enterprise/dashboard/widgets/events_list.php:86
 #: ../../enterprise/dashboard/widgets/events_list.php:94
-#: ../../enterprise/dashboard/widgets/groups_status.php:53
-#: ../../enterprise/dashboard/widgets/groups_status.php:59
+#: ../../enterprise/dashboard/widgets/groups_status.php:51
+#: ../../enterprise/dashboard/widgets/groups_status.php:57
 #: ../../enterprise/dashboard/widgets/module_icon.php:116
 #: ../../enterprise/dashboard/widgets/module_icon.php:123
-#: ../../enterprise/dashboard/widgets/module_status.php:111
-#: ../../enterprise/dashboard/widgets/module_status.php:118
+#: ../../enterprise/dashboard/widgets/module_status.php:100
+#: ../../enterprise/dashboard/widgets/module_status.php:107
 #: ../../enterprise/dashboard/widgets/module_table_value.php:102
 #: ../../enterprise/dashboard/widgets/module_table_value.php:110
-#: ../../enterprise/dashboard/widgets/module_value.php:99
-#: ../../enterprise/dashboard/widgets/module_value.php:106
-#: ../../enterprise/dashboard/widgets/single_graph.php:93
-#: ../../enterprise/dashboard/widgets/single_graph.php:100
+#: ../../enterprise/dashboard/widgets/module_value.php:100
+#: ../../enterprise/dashboard/widgets/module_value.php:107
+#: ../../enterprise/dashboard/widgets/single_graph.php:96
+#: ../../enterprise/dashboard/widgets/single_graph.php:102
 #: ../../enterprise/dashboard/widgets/sla_percent.php:96
 #: ../../enterprise/dashboard/widgets/sla_percent.php:103
 msgid "You don't have access"
@@ -27640,7 +29183,7 @@ msgid "Welcome message to Pandora FMS"
 msgstr "Pandora FMS へのウエルカムメッセージ"
 
 #: ../../enterprise/dashboard/widgets/example.php:26
-#: ../../enterprise/extensions/vmware/vmware_view.php:1099
+#: ../../enterprise/extensions/vmware/vmware_view.php:1202
 msgid "Welcome"
 msgstr "ようこそ"
 
@@ -27676,30 +29219,30 @@ msgstr "Pandora FMS のご利用ありがとうございます"
 msgid "Graph Module Histogram"
 msgstr "モジュールヒストグラム"
 
-#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:66
+#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:64
 #: ../../enterprise/dashboard/widgets/sla_percent.php:63
 msgid "2 Hours"
 msgstr "2 時間"
 
-#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:67
+#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:65
 #: ../../enterprise/dashboard/widgets/sla_percent.php:64
 msgid "12 Hours"
 msgstr "12 時間"
 
-#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:68
+#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:66
 #: ../../enterprise/dashboard/widgets/sla_percent.php:65
 msgid "24 Hours"
 msgstr "24 時間"
 
-#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:69
+#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:67
 #: ../../enterprise/dashboard/widgets/sla_percent.php:66
 msgid "48 Hours"
 msgstr "48 時間"
 
-#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:74
+#: ../../enterprise/dashboard/widgets/graph_module_histogram.php:72
 #: ../../enterprise/dashboard/widgets/module_icon.php:89
-#: ../../enterprise/dashboard/widgets/module_status.php:86
-#: ../../enterprise/dashboard/widgets/module_value.php:77
+#: ../../enterprise/dashboard/widgets/module_status.php:75
+#: ../../enterprise/dashboard/widgets/module_value.php:78
 #: ../../enterprise/dashboard/widgets/sla_percent.php:74
 msgid "Text size of label in px"
 msgstr "pxでのラベルのテキストサイズ"
@@ -27708,11 +29251,23 @@ msgstr "pxでのラベルのテキストサイズ"
 msgid "Show the URL content"
 msgstr "URL のコンテンツ表示"
 
-#: ../../enterprise/dashboard/widgets/url.php:26
+#: ../../enterprise/dashboard/widgets/url.php:28
+msgid "Only embebed urls can be shown, be sure that the url is embebed."
+msgstr "埋め込みURLのみ表示できます。URLは埋め込みであることを確認してください。"
+
+#: ../../enterprise/dashboard/widgets/url.php:29
+msgid "For example: "
+msgstr "例: "
+
+#: ../../enterprise/dashboard/widgets/url.php:30
+msgid " must be "
+msgstr ""
+
+#: ../../enterprise/dashboard/widgets/url.php:32
 msgid "My URL"
 msgstr "マイ URL"
 
-#: ../../enterprise/dashboard/widgets/url.php:49
+#: ../../enterprise/dashboard/widgets/url.php:57
 #: ../../enterprise/dashboard/widgets/post.php:36
 #: ../../enterprise/dashboard/widgets/tactical.php:63
 #: ../../enterprise/dashboard/widgets/tactical.php:71
@@ -27727,38 +29282,38 @@ msgstr "グループ状態"
 msgid "General and quick group status report"
 msgstr "一般およびクイックグループ状態レポート"
 
-#: ../../enterprise/dashboard/widgets/groups_status.php:89
-#: ../../enterprise/dashboard/widgets/groups_status.php:161
+#: ../../enterprise/dashboard/widgets/groups_status.php:87
+#: ../../enterprise/dashboard/widgets/groups_status.php:159
 msgid "Total nº:"
-msgstr "合計:"
+msgstr ""
 
-#: ../../enterprise/dashboard/widgets/groups_status.php:219
+#: ../../enterprise/dashboard/widgets/groups_status.php:217
 msgid "Not agents in this group"
 msgstr "このグループにエージェントがありません"
 
-#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:27
-msgid "Map made by user"
-msgstr "ユーザ作成マップ"
+#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:28
+msgid "Vsiual Console"
+msgstr "ビジュアルコンソール"
 
-#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:29
-msgid "Show a map made by user"
-msgstr "ユーザ作成マップの表示"
+#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:30
+msgid "Show a Visual Console"
+msgstr "ビジュアルコンソール表示"
 
-#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:32
+#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:33
 msgid "WARNING: "
 msgstr "警告: "
 
-#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:32
+#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:33
 msgid ""
 "If your visual console is bigger than widget size, it will not fit in the "
 "widget, instead, both vertical and horizonal scroll bars will be drawn. If "
 "you want to \"fit\" a visual console into a widget, create it with the real "
 "size you want to be fitter inside the widget."
 msgstr ""
-"ウィジェットサイズよりビジュアルコンソールの方が大きい場合は、ウィジェットに合わず垂直および水平方向にスクロールバーが表示されます。ビジュアルコンソールを"
-"ウィジェットに合わせたい場合は、ウィジェット内に収まるサイズでビジュアルコンソールを作成してください。"
+"ウィジェットサイズよりもビジュアルコンソールが大きい場合、ウィジェットに合わず、かわりに縦と横のスクロールバーが表示されます。ウィジェットにビジュアルコン"
+"ソールを合わせたい場合は、ウィジェット内に合うサイズで作成してください。"
 
-#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:35
+#: ../../enterprise/dashboard/widgets/maps_made_by_user.php:36
 msgid "Layout"
 msgstr "レイアウト"
 
@@ -27780,13 +29335,13 @@ msgstr "モジュールの値とアイコンを表示"
 
 #: ../../enterprise/dashboard/widgets/module_icon.php:86
 #: ../../enterprise/dashboard/widgets/module_table_value.php:71
-#: ../../enterprise/dashboard/widgets/module_value.php:74
+#: ../../enterprise/dashboard/widgets/module_value.php:75
 #: ../../enterprise/dashboard/widgets/sla_percent.php:71
 msgid "Text size of value in px"
 msgstr "pxでの値のテキストサイズ"
 
 #: ../../enterprise/dashboard/widgets/module_icon.php:92
-#: ../../enterprise/dashboard/widgets/module_status.php:89
+#: ../../enterprise/dashboard/widgets/module_status.php:78
 msgid "Size of icon"
 msgstr "アイコンのサイズ"
 
@@ -27850,35 +29405,30 @@ msgstr "全体の正常性"
 msgid "Show a list of global monitor health"
 msgstr "全体の監視状態一覧の表示"
 
-#: ../../enterprise/dashboard/widgets/network_map.php:30
+#: ../../enterprise/dashboard/widgets/network_map.php:31
 msgid "Show a map of the monitored network"
 msgstr "監視対象ネットワークのマップ表示"
 
-#: ../../enterprise/dashboard/widgets/network_map.php:42
+#: ../../enterprise/dashboard/widgets/network_map.php:43
 msgid "X offset"
 msgstr "X オフセット"
 
-#: ../../enterprise/dashboard/widgets/network_map.php:45
+#: ../../enterprise/dashboard/widgets/network_map.php:46
 msgid "Introduce x-axis data. Right=positive Left=negative"
-msgstr "X軸データを設定します。右=プラス、左=マイナス"
+msgstr "X軸データを入力します。右がプラス、左がマイナスです。"
 
-#: ../../enterprise/dashboard/widgets/network_map.php:47
+#: ../../enterprise/dashboard/widgets/network_map.php:48
 msgid "Y offset"
 msgstr "Y オフセット"
 
-#: ../../enterprise/dashboard/widgets/network_map.php:50
+#: ../../enterprise/dashboard/widgets/network_map.php:51
 msgid "Introduce Y-axis data. Top=positive Bottom=negative"
-msgstr "Y軸データを設定します。上=プラス、下=マイナス"
+msgstr "Y軸データを入力します。上がプラス、下がマイナスです。"
 
-#: ../../enterprise/dashboard/widgets/network_map.php:53
+#: ../../enterprise/dashboard/widgets/network_map.php:54
 msgid "Zoom level"
 msgstr "拡大率"
 
-#: ../../enterprise/dashboard/widgets/network_map.php:56
-msgid ""
-"Introduce zoom level. 1 = Highest resolution. Figures may include decimals"
-msgstr "拡大率を設定します。1=最大解像度。小数点以下を設定できます。"
-
 #: ../../enterprise/dashboard/widgets/post.php:23
 msgid "Panel with a message"
 msgstr "メッセージつきパネル"
@@ -27893,7 +29443,7 @@ msgstr "ユーザ作成レポートの表示"
 
 #: ../../enterprise/dashboard/widgets/service_map.php:22
 #: ../../enterprise/operation/services/services.service.php:92
-#: ../../enterprise/operation/services/services.service_map.php:102
+#: ../../enterprise/operation/services/services.service_map.php:100
 msgid "Service Map"
 msgstr "サービスマップ"
 
@@ -27917,6 +29467,22 @@ msgstr "単一グラフ"
 msgid "Show a graph of an agent module"
 msgstr "エージェントモジュールのグラフ表示"
 
+#: ../../enterprise/dashboard/widgets/single_graph.php:66
+msgid "Show full legend"
+msgstr "全履歴表示"
+
+#: ../../enterprise/dashboard/widgets/single_graph.php:72
+msgid "Graph colour (max)"
+msgstr "グラフの色(最大)"
+
+#: ../../enterprise/dashboard/widgets/single_graph.php:73
+msgid "Graph colour (avg)"
+msgstr "グラフの色(平均)"
+
+#: ../../enterprise/dashboard/widgets/single_graph.php:74
+msgid "Graph colour (min)"
+msgstr "グラフの色(最小)"
+
 #: ../../enterprise/dashboard/widgets/sla_percent.php:29
 #: ../../enterprise/dashboard/widgets/sla_percent.php:31
 msgid "Show SLA percent"
@@ -27950,7 +29516,7 @@ msgid "Regex for to filter modules"
 msgstr "モジュールをフィルタする正規表現"
 
 #: ../../enterprise/dashboard/widgets/top_n.php:320
-#: ../../enterprise/dashboard/widgets/tree_view.php:73
+#: ../../enterprise/dashboard/widgets/tree_view.php:75
 msgid "Filter modules"
 msgstr "モジュールをフィルタ"
 
@@ -27995,46 +29561,78 @@ msgstr "モジュールごとのトップ N イベント"
 msgid "Top N events by module."
 msgstr "モジュールごとのトップ N イベント"
 
-#: ../../enterprise/dashboard/widgets/tree_view.php:22
+#: ../../enterprise/dashboard/widgets/tree_view.php:24
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1212
 #: ../../enterprise/meta/include/ajax/tree_view.ajax.php:1416
 msgid "Tree View"
 msgstr "ツリー表示"
 
-#: ../../enterprise/dashboard/widgets/tree_view.php:24
+#: ../../enterprise/dashboard/widgets/tree_view.php:26
 msgid "Show the tree view"
 msgstr "ツリービューの表示"
 
-#: ../../enterprise/dashboard/widgets/tree_view.php:41
+#: ../../enterprise/dashboard/widgets/tree_view.php:43
 msgid "Tab"
 msgstr "タブ"
 
-#: ../../enterprise/dashboard/widgets/tree_view.php:47
+#: ../../enterprise/dashboard/widgets/tree_view.php:49
 msgid "Open all nodes"
 msgstr "すべてのノードを開く"
 
-#: ../../enterprise/dashboard/widgets/tree_view.php:58
+#: ../../enterprise/dashboard/widgets/tree_view.php:60
 msgid "Agents status"
 msgstr "エージェントの状態"
 
-#: ../../enterprise/dashboard/widgets/tree_view.php:60
+#: ../../enterprise/dashboard/widgets/tree_view.php:62
 msgid "Filter agents"
 msgstr "エージェントフィルタ"
 
-#: ../../enterprise/dashboard/widgets/tree_view.php:71
+#: ../../enterprise/dashboard/widgets/tree_view.php:73
 msgid "Modules status"
 msgstr "モジュールの状態"
 
-#: ../../enterprise/dashboard/widgets/tree_view.php:82
+#: ../../enterprise/dashboard/widgets/tree_view.php:84
 msgid ""
 "The user doesn't have permission to read agents. Please contact with your "
 "pandora administrator."
 msgstr "ユーザにエージェントを参照する権限がありません。pandora管理者に連絡してください。"
 
-#: ../../enterprise/dashboard/widgets/tree_view.php:89
+#: ../../enterprise/dashboard/widgets/tree_view.php:91
 msgid "This widget only working in desktop version."
 msgstr "ウィジェットはデスクトップ版でのみ動作します。"
 
+#: ../../enterprise/dashboard/widgets/ux_transaction.php:27
+#: ../../enterprise/dashboard/widgets/ux_transaction.php:80
+msgid "Ux transaction"
+msgstr "Ux トランザクション"
+
+#: ../../enterprise/dashboard/widgets/ux_transaction.php:31
+msgid "Show an agent ux transaction"
+msgstr "エージェント ux トランザクション表示"
+
+#: ../../enterprise/dashboard/widgets/wux_transaction.php:27
+#: ../../enterprise/dashboard/widgets/wux_transaction.php:80
+#: ../../enterprise/dashboard/widgets/wux_transaction_stats.php:88
+msgid "Wux transaction"
+msgstr "Wux トランザクション"
+
+#: ../../enterprise/dashboard/widgets/wux_transaction.php:31
+msgid "Show agent wux transaction"
+msgstr "エージェント wux トランザクション表示"
+
+#: ../../enterprise/dashboard/widgets/wux_transaction_stats.php:27
+msgid "Wux transaction stats"
+msgstr "Wux トランザクション状態"
+
+#: ../../enterprise/dashboard/widgets/wux_transaction_stats.php:31
+msgid "Show agent wux transaction stats"
+msgstr "エージェント wux トランザクション状態"
+
+#: ../../enterprise/dashboard/widgets/wux_transaction_stats.php:43
+#: ../../enterprise/operation/agentes/wux_console_view.php:396
+msgid "View all stats"
+msgstr "全状態表示"
+
 #: ../../enterprise/extensions/backup/main.php:63
 msgid "Pandora database backup utility"
 msgstr "Pandora データベースバックアップユーティリティ"
@@ -28045,11 +29643,11 @@ msgstr "フィルタバックアップ"
 
 #: ../../enterprise/extensions/backup/main.php:82
 msgid "Path backups"
-msgstr "バックアップパス"
+msgstr "パックアップパス"
 
 #: ../../enterprise/extensions/backup/main.php:102
-#: ../../enterprise/extensions/cron/main.php:268
-#: ../../enterprise/extensions/cron/main.php:282
+#: ../../enterprise/extensions/cron/main.php:361
+#: ../../enterprise/extensions/cron/main.php:387
 msgid "Path"
 msgstr "パス"
 
@@ -28067,7 +29665,7 @@ msgstr "バックアップの作成"
 
 #: ../../enterprise/extensions/backup/main.php:217
 msgid "Path to save backup"
-msgstr "バックアップ保存先パス"
+msgstr "バックアップ保存パス"
 
 #: ../../enterprise/extensions/backup.php:63
 msgid "Backup"
@@ -28075,10 +29673,10 @@ msgstr "バックアップ"
 
 #: ../../enterprise/extensions/cron/functions.php:17
 #: ../../enterprise/extensions/cron/functions.php:52
-#: ../../enterprise/extensions/cron/functions.php:73
-#: ../../enterprise/extensions/cron/functions.php:104
-#: ../../enterprise/extensions/cron/functions.php:134
-#: ../../enterprise/extensions/cron/functions.php:175
+#: ../../enterprise/extensions/cron/functions.php:77
+#: ../../enterprise/extensions/cron/functions.php:112
+#: ../../enterprise/extensions/cron/functions.php:142
+#: ../../enterprise/extensions/cron/functions.php:183
 msgid "Report to build"
 msgstr "生成するレポート"
 
@@ -28088,186 +29686,243 @@ msgid "Send to emails (separated by comma)"
 msgstr "メール送信 (カンマ区切り)"
 
 #: ../../enterprise/extensions/cron/functions.php:27
-#: ../../enterprise/extensions/cron/functions.php:119
+#: ../../enterprise/extensions/cron/functions.php:127
 msgid "Template to build"
 msgstr "作成するテンプレート"
 
 #: ../../enterprise/extensions/cron/functions.php:46
-#: ../../enterprise/extensions/cron/main.php:249
+#: ../../enterprise/extensions/cron/main.php:318
 msgid "Report per agent"
 msgstr "エージェントごとのレポート"
 
-#: ../../enterprise/extensions/cron/functions.php:58
-#: ../../enterprise/extensions/cron/functions.php:63
-#: ../../enterprise/extensions/cron/functions.php:79
-#: ../../enterprise/extensions/cron/functions.php:135
-#: ../../enterprise/extensions/cron/functions.php:176
+#: ../../enterprise/extensions/cron/functions.php:59
+#: ../../enterprise/extensions/cron/functions.php:67
+#: ../../enterprise/extensions/cron/functions.php:84
+#: ../../enterprise/extensions/cron/functions.php:143
+#: ../../enterprise/extensions/cron/functions.php:184
 msgid "Save to disk into path"
 msgstr "保存先パス"
 
-#: ../../enterprise/extensions/cron/functions.php:105
-#: ../../enterprise/extensions/cron/functions.php:120
+#: ../../enterprise/extensions/cron/functions.php:60
+#: ../../enterprise/extensions/cron/functions.php:85
+msgid "The apache user should have read-write access on this folder. Ex: "
+msgstr "apache ユーザはこのフォルダに読み書き権限が必要です。: "
+
+#: ../../enterprise/extensions/cron/functions.php:113
+#: ../../enterprise/extensions/cron/functions.php:128
 msgid "Send to email"
 msgstr "送信先メールアドレス"
 
-#: ../../enterprise/extensions/cron/functions.php:106
+#: ../../enterprise/extensions/cron/functions.php:114
 msgid "Send custom report by email"
 msgstr "カスタムレポートをメールで送信"
 
-#: ../../enterprise/extensions/cron/functions.php:121
+#: ../../enterprise/extensions/cron/functions.php:129
 msgid "Send custom report (from template) by email"
 msgstr "(テンプレートから) email でカスタムレポートを送信"
 
-#: ../../enterprise/extensions/cron/functions.php:136
-#: ../../enterprise/extensions/cron/functions.php:177
+#: ../../enterprise/extensions/cron/functions.php:144
+#: ../../enterprise/extensions/cron/functions.php:185
 msgid "Save custom report to disk"
 msgstr "カスタムレポートをディスクに保存"
 
-#: ../../enterprise/extensions/cron/functions.php:149
-#: ../../enterprise/extensions/cron/functions.php:162
+#: ../../enterprise/extensions/cron/functions.php:157
 msgid "Backup Pandora database"
 msgstr "Pandora データベースバックアップ"
 
-#: ../../enterprise/extensions/cron/functions.php:192
+#: ../../enterprise/extensions/cron/functions.php:170
+msgid "Execute custom script"
+msgstr "カスタムスクリプト実行"
+
+#: ../../enterprise/extensions/cron/functions.php:186
+msgid "Save custom xml report to disk"
+msgstr "カスタム XML レポートをディスクへ保存"
+
+#: ../../enterprise/extensions/cron/functions.php:201
 msgid "Not scheduled"
 msgstr "スケジュールされていません"
 
-#: ../../enterprise/extensions/cron/functions.php:193
+#: ../../enterprise/extensions/cron/functions.php:202
 #: ../../enterprise/extensions/vmware/functions.php:25
 msgid "Hourly"
 msgstr "毎時"
 
-#: ../../enterprise/extensions/cron/functions.php:197
+#: ../../enterprise/extensions/cron/functions.php:206
 #: ../../enterprise/extensions/vmware/functions.php:29
 msgid "Yearly"
 msgstr "年次"
 
-#: ../../enterprise/extensions/cron/functions.php:446
-#: ../../enterprise/extensions/cron/functions.php:544
-msgid "This is the automatic generated report"
-msgstr "これは自動生成レポートです"
+#: ../../enterprise/extensions/cron/functions.php:489
+#: ../../enterprise/extensions/cron/functions.php:595
+msgid "Greetings"
+msgstr "挨拶"
 
-#: ../../enterprise/extensions/cron/functions.php:449
-#: ../../enterprise/extensions/cron/functions.php:547
-msgid "Open the attached file to view it"
-msgstr "添付ファイルを開く"
+#: ../../enterprise/extensions/cron/functions.php:491
+#: ../../enterprise/extensions/cron/functions.php:597
+msgid "Attached to this email there's a PDF file of the"
+msgstr ""
 
-#: ../../enterprise/extensions/cron/functions.php:455
-#: ../../enterprise/extensions/cron/functions.php:553
-msgid "Please do not answer or reply to this email"
-msgstr "このメールには返信しないでください"
+#: ../../enterprise/extensions/cron/functions.php:491
+#: ../../enterprise/extensions/cron/functions.php:597
+msgid "report"
+msgstr "レポート"
 
-#: ../../enterprise/extensions/cron/main.php:39
-#: ../../enterprise/extensions/cron.php:117
-#: ../../enterprise/extensions/cron.php:123
+#: ../../enterprise/extensions/cron/functions.php:495
+#: ../../enterprise/extensions/cron/functions.php:601
+msgid "Thanks for your time."
+msgstr "お時間いただきありがとうございます。"
+
+#: ../../enterprise/extensions/cron/functions.php:497
+#: ../../enterprise/extensions/cron/functions.php:603
+msgid "Best regards, Pandora FMS"
+msgstr ""
+
+#: ../../enterprise/extensions/cron/functions.php:499
+#: ../../enterprise/extensions/cron/functions.php:605
+msgid ""
+"This is an automatically generated email from Pandora FMS, please do not "
+"reply."
+msgstr "これは、Pandora FMS から自動生成されたメールです。返信しないでください。"
+
+#: ../../enterprise/extensions/cron/main.php:46
+#: ../../enterprise/extensions/cron.php:118
+#: ../../enterprise/extensions/cron.php:121
+#: ../../enterprise/extensions/cron.php:128
 msgid "Cron jobs"
 msgstr "Cron ジョブ"
 
-#: ../../enterprise/extensions/cron/main.php:45
+#: ../../enterprise/extensions/cron/main.php:52
 msgid "Add new job"
 msgstr "新規ジョブ追加"
 
-#: ../../enterprise/extensions/cron/main.php:83
-#: ../../enterprise/extensions/cron/main.php:142
+#: ../../enterprise/extensions/cron/main.php:91
+#: ../../enterprise/extensions/cron/main.php:123
+#: ../../enterprise/extensions/cron/main.php:183
 msgid "Path doesn't exists or is not writable"
 msgstr "パスが存在しないか書き込みできません"
 
-#: ../../enterprise/extensions/cron/main.php:117
-#: ../../enterprise/extensions/cron/main.php:135
+#: ../../enterprise/extensions/cron/main.php:102
+msgid "Only administrator users can create this type of functions"
+msgstr "管理者ユーザのみがこの機能を作成できます。"
+
+#: ../../enterprise/extensions/cron/main.php:158
+#: ../../enterprise/extensions/cron/main.php:176
 msgid "Edit job"
 msgstr "ジョブ編集"
 
-#: ../../enterprise/extensions/cron/main.php:161
-msgid "Cron extension is not running"
-msgstr "Cron 実行が稼動していません"
-
-#: ../../enterprise/extensions/cron/main.php:162
+#: ../../enterprise/extensions/cron/main.php:202
 msgid "Cron extension has never run or it's not configured well"
 msgstr "Cron 拡張は、正しく設定しないと動作しません"
 
-#: ../../enterprise/extensions/cron/main.php:164
+#: ../../enterprise/extensions/cron/main.php:205
 msgid ""
 "This extension relies on a proper setup of cron, the time-based scheduling "
 "service"
 msgstr "この拡張は、時間で実行する cron の設定に依存します。"
 
-#: ../../enterprise/extensions/cron/main.php:166
+#: ../../enterprise/extensions/cron/main.php:206
 msgid "Please, add the following line to your crontab file"
 msgstr "次の行を crontab に追加してください"
 
-#: ../../enterprise/extensions/cron/main.php:172
+#: ../../enterprise/extensions/cron/main.php:211
 msgid "Last execution"
 msgstr "最後の実行"
 
-#: ../../enterprise/extensions/cron/main.php:179
+#: ../../enterprise/extensions/cron/main.php:217
 msgid "Cron extension is running"
 msgstr "Cron 実行が動作中です"
 
-#: ../../enterprise/extensions/cron/main.php:188
+#: ../../enterprise/extensions/cron/main.php:238
 msgid "Scheduled jobs"
 msgstr "スケジュールされたジョブ"
 
-#: ../../enterprise/extensions/cron/main.php:197
-#: ../../enterprise/extensions/cron/main.php:317
+#: ../../enterprise/extensions/cron/main.php:247
+#: ../../enterprise/extensions/cron/main.php:458
 msgid "Task"
 msgstr "タスク"
 
-#: ../../enterprise/extensions/cron/main.php:198
-#: ../../enterprise/extensions/cron/main.php:326
-#: ../../enterprise/extensions/vmware/main.php:275
+#: ../../enterprise/extensions/cron/main.php:248
+#: ../../enterprise/extensions/cron/main.php:472
+#: ../../enterprise/extensions/vmware/vmware_admin.php:409
+#: ../../enterprise/extensions/vmware/vmware_admin.php:487
 msgid "Scheduled"
 msgstr "スケジュール"
 
-#: ../../enterprise/extensions/cron/main.php:199
-#: ../../enterprise/extensions/cron/main.php:329
+#: ../../enterprise/extensions/cron/main.php:249
+#: ../../enterprise/extensions/cron/main.php:475
 msgid "Next execution"
 msgstr "次回の実行"
 
-#: ../../enterprise/extensions/cron/main.php:200
+#: ../../enterprise/extensions/cron/main.php:250
 msgid "Last run"
 msgstr "最後の実行"
 
-#: ../../enterprise/extensions/cron/main.php:209
+#: ../../enterprise/extensions/cron/main.php:263
+#: ../../enterprise/extensions/cron/main.php:288
+#: ../../enterprise/extensions/cron/main.php:326
+#: ../../enterprise/extensions/cron/main.php:342
+#: ../../enterprise/extensions/cron/main.php:368
+#: ../../enterprise/extensions/cron/main.php:393
 msgid "Force run"
 msgstr "強制実行"
 
-#: ../../enterprise/extensions/csv_import/main.php:40
+#: ../../enterprise/extensions/csv_import/main.php:39
+msgid "No data or wrong separator in line "
+msgstr "s "
+
+#: ../../enterprise/extensions/csv_import/main.php:42
+msgid "Agent "
+msgstr "エージェント "
+
+#: ../../enterprise/extensions/csv_import/main.php:42
+msgid " duplicated"
+msgstr " 複製しました"
+
+#: ../../enterprise/extensions/csv_import/main.php:45
+msgid "Id group "
+msgstr "グループID "
+
+#: ../../enterprise/extensions/csv_import/main.php:45
+msgid " in line "
+msgstr ""
+
+#: ../../enterprise/extensions/csv_import/main.php:52
 #, php-format
 msgid "Created agent %s"
 msgstr "エージェント %s を作成しました"
 
-#: ../../enterprise/extensions/csv_import/main.php:41
+#: ../../enterprise/extensions/csv_import/main.php:53
 #: ../../enterprise/meta/include/functions_wizard_meta.php:2036
 #, php-format
 msgid "Could not create agent %s"
 msgstr "エージェント %s を作成できませんでした"
 
-#: ../../enterprise/extensions/csv_import/main.php:46
+#: ../../enterprise/extensions/csv_import/main.php:60
 #: ../../enterprise/extensions/csv_import_group/main.php:46
 msgid "File processed"
 msgstr "ファイルを処理しました"
 
-#: ../../enterprise/extensions/csv_import/main.php:56
+#: ../../enterprise/extensions/csv_import/main.php:76
 #: ../../enterprise/extensions/csv_import_group/main.php:56
 msgid "CSV format"
 msgstr "CSV フォーマット"
 
-#: ../../enterprise/extensions/csv_import/main.php:57
+#: ../../enterprise/extensions/csv_import/main.php:77
 #: ../../enterprise/extensions/csv_import_group/main.php:57
 msgid "The CSV file must have the fields in the following order"
 msgstr "CSV ファイルのフィールドは、次の順番でなければいけません"
 
-#: ../../enterprise/extensions/csv_import/main.php:72
+#: ../../enterprise/extensions/csv_import/main.php:92
 #: ../../enterprise/extensions/csv_import_group/main.php:72
 msgid "Upload file"
 msgstr "ファイルのアップロード"
 
-#: ../../enterprise/extensions/csv_import/main.php:79
+#: ../../enterprise/extensions/csv_import/main.php:99
 #: ../../enterprise/extensions/csv_import_group/main.php:75
 msgid "Separator"
 msgstr "セパレータ"
 
-#: ../../enterprise/extensions/csv_import/main.php:83
+#: ../../enterprise/extensions/csv_import/main.php:103
 #: ../../enterprise/extensions/csv_import_group/main.php:79
 msgid "Upload CSV file"
 msgstr "CSV ファイルのアップロード"
@@ -28353,7 +30008,7 @@ msgid "Manage this IP now"
 msgstr "この IP を管理対象にする"
 
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:157
-#: ../../enterprise/extensions/ipam/ipam_excel.php:116
+#: ../../enterprise/extensions/ipam/ipam_excel.php:121
 #: ../../enterprise/extensions/ipam/ipam_network.php:274
 #: ../../enterprise/extensions/ipam/ipam_network.php:275
 #: ../../enterprise/extensions/ipam/ipam_network.php:536
@@ -28373,6 +30028,7 @@ msgid "Generate events"
 msgstr "イベント生成"
 
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:191
+#: ../../enterprise/extensions/ipam/ipam_excel.php:126
 #: ../../enterprise/extensions/ipam/ipam_massive.php:77
 #: ../../enterprise/extensions/ipam/ipam_network.php:231
 #: ../../enterprise/extensions/ipam/ipam_network.php:540
@@ -28380,6 +30036,7 @@ msgid "Managed"
 msgstr "管理対象"
 
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:201
+#: ../../enterprise/extensions/ipam/ipam_excel.php:127
 #: ../../enterprise/extensions/ipam/ipam_massive.php:78
 #: ../../enterprise/extensions/ipam/ipam_network.php:237
 #: ../../enterprise/extensions/ipam/ipam_network.php:306
@@ -28387,6 +30044,10 @@ msgstr "管理対象"
 msgid "Reserved"
 msgstr "予約済み"
 
+#: ../../enterprise/extensions/ipam/ipam_ajax.php:216
+msgid "Created"
+msgstr "作成"
+
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:226
 msgid "Edited"
 msgstr "編集"
@@ -28513,12 +30174,28 @@ msgid ""
 "can manage networks and edit the networks."
 msgstr "IPAM でネットワークを管理できるユーザ一覧。admin ユーザのみネットワーク管理とネットワークの編集ができます。"
 
-#: ../../enterprise/extensions/ipam/ipam_excel.php:116
+#: ../../enterprise/extensions/ipam/ipam_excel.php:122
 #: ../../enterprise/extensions/ipam/ipam_network.php:225
 #: ../../enterprise/extensions/ipam/ipam_network.php:550
 msgid "Alive"
 msgstr "稼働"
 
+#: ../../enterprise/extensions/ipam/ipam_excel.php:125
+msgid "OS Name"
+msgstr "OS 名"
+
+#: ../../enterprise/extensions/ipam/ipam_excel.php:128
+msgid "Created at"
+msgstr "作成日時"
+
+#: ../../enterprise/extensions/ipam/ipam_excel.php:129
+msgid "Last updated"
+msgstr "最終更新"
+
+#: ../../enterprise/extensions/ipam/ipam_excel.php:130
+msgid "Last modified"
+msgstr "最終修正"
+
 #: ../../enterprise/extensions/ipam/ipam_list.php:133
 msgid "No networks found"
 msgstr "ネットワークが見つかりません"
@@ -28682,6 +30359,10 @@ msgstr "手動エージェントを設定するには、自動オプションを
 msgid "Subnetworks calculator"
 msgstr "サブネット計算"
 
+#: ../../enterprise/extensions/ipam.php:197
+msgid "Massive operations"
+msgstr "一括操作"
+
 #: ../../enterprise/extensions/ipam.php:240
 #: ../../enterprise/extensions/ipam.php:308
 #: ../../enterprise/extensions/ipam.php:330
@@ -28691,7 +30372,7 @@ msgstr "IPAM"
 
 #: ../../enterprise/extensions/resource_exportation/functions.php:19
 msgid "Export agents"
-msgstr "エージェントのエクスポート"
+msgstr ""
 
 #: ../../enterprise/extensions/resource_registration/functions.php:37
 #, php-format
@@ -28721,7 +30402,7 @@ msgstr "'%s' ポリシー作成エラー"
 #: ../../enterprise/extensions/resource_registration/functions.php:104
 #, php-format
 msgid "Error add '%s' agent. The agent does not exist in pandora"
-msgstr "エージェント '%s' の追加エラー。pandora にエージェントが存在しません。"
+msgstr "エージェント '%s' 追加エラー。エージェントが pandora に存在しません。"
 
 #: ../../enterprise/extensions/resource_registration/functions.php:108
 #, php-format
@@ -28761,253 +30442,336 @@ msgstr "エージェントプラグイン '%s' の追加エラー。"
 msgid "Error add the module, haven't type."
 msgstr "モジュール追加エラー。タイプがありません。"
 
-#: ../../enterprise/extensions/resource_registration/functions.php:235
-#: ../../enterprise/extensions/resource_registration/functions.php:265
-#: ../../enterprise/extensions/resource_registration/functions.php:322
-#: ../../enterprise/extensions/resource_registration/functions.php:368
+#: ../../enterprise/extensions/resource_registration/functions.php:269
+#: ../../enterprise/extensions/resource_registration/functions.php:299
+#: ../../enterprise/extensions/resource_registration/functions.php:356
+#: ../../enterprise/extensions/resource_registration/functions.php:402
 msgid "Error add the module, error in tag component."
 msgstr "モジュール追加エラー。タグコンポーネント内にエラーがあります。"
 
-#: ../../enterprise/extensions/resource_registration/functions.php:409
+#: ../../enterprise/extensions/resource_registration/functions.php:443
 msgid "Error add the module plugin importation, plugin is not registered"
 msgstr "モジュールプラグイン追加エラー。プラグインは登録されていません。"
 
-#: ../../enterprise/extensions/resource_registration/functions.php:420
+#: ../../enterprise/extensions/resource_registration/functions.php:454
 #, php-format
 msgid "Success add '%s' module."
 msgstr "'%s' モジュールを追加しました。"
 
-#: ../../enterprise/extensions/resource_registration/functions.php:421
+#: ../../enterprise/extensions/resource_registration/functions.php:455
 #, php-format
 msgid "Error add '%s' module."
 msgstr "'%s' モジュール追加エラー"
 
-#: ../../enterprise/extensions/resource_registration/functions.php:431
+#: ../../enterprise/extensions/resource_registration/functions.php:465
 #, php-format
 msgid "Error add the alert, the template '%s' don't exist."
 msgstr "アラート追加エラー。テンプレート '%s' は存在しません。"
 
-#: ../../enterprise/extensions/resource_registration/functions.php:439
+#: ../../enterprise/extensions/resource_registration/functions.php:473
 #, php-format
 msgid "Error add the alert, the module '%s' don't exist."
 msgstr "アラート追加エラー。モジュール '%s' は存在しません。"
 
-#: ../../enterprise/extensions/resource_registration/functions.php:452
+#: ../../enterprise/extensions/resource_registration/functions.php:486
 #, php-format
 msgid "Success add '%s' alert."
 msgstr "'%s' アラートを追加しました。"
 
-#: ../../enterprise/extensions/resource_registration/functions.php:453
+#: ../../enterprise/extensions/resource_registration/functions.php:487
 #, php-format
 msgid "Error add '%s' alert."
 msgstr "'%s' アラート追加エラー"
 
-#: ../../enterprise/extensions/resource_registration/functions.php:469
+#: ../../enterprise/extensions/resource_registration/functions.php:503
 #, php-format
 msgid "Error add the alert, the action '%s' don't exist."
 msgstr "アラートの追加エラー。アクション '%s' は存在しません。"
 
-#: ../../enterprise/extensions/resource_registration/functions.php:481
+#: ../../enterprise/extensions/resource_registration/functions.php:515
 #, php-format
 msgid "Success add '%s' action."
 msgstr "'%s' アクションを追加しました"
 
 #: ../../enterprise/extensions/translate_string.php:165
-#: ../../enterprise/extensions/translate_string.php:326
+#: ../../enterprise/extensions/translate_string.php:323
 msgid "Translate string"
 msgstr "翻訳文字列"
 
-#: ../../enterprise/extensions/translate_string.php:271
-#: ../../enterprise/meta/advanced/metasetup.translate_string.php:151
-msgid "Please search for anything text."
-msgstr "任意のテキストで検索してください。"
-
-#: ../../enterprise/extensions/translate_string.php:280
-#: ../../enterprise/meta/advanced/metasetup.translate_string.php:161
+#: ../../enterprise/extensions/translate_string.php:277
+#: ../../enterprise/meta/advanced/metasetup.translate_string.php:160
 msgid "Original string"
 msgstr "オリジナルの文字列"
 
-#: ../../enterprise/extensions/translate_string.php:281
-#: ../../enterprise/meta/advanced/metasetup.translate_string.php:162
+#: ../../enterprise/extensions/translate_string.php:278
+#: ../../enterprise/meta/advanced/metasetup.translate_string.php:161
 msgid "Translation in selected language"
 msgstr "選択した言語での翻訳"
 
-#: ../../enterprise/extensions/translate_string.php:282
-#: ../../enterprise/meta/advanced/metasetup.translate_string.php:163
+#: ../../enterprise/extensions/translate_string.php:279
+#: ../../enterprise/meta/advanced/metasetup.translate_string.php:162
 msgid "Customize translation"
 msgstr "翻訳カスタマイズ"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:638
-#: ../../enterprise/extensions/vmware/vmware_view.php:1040
-msgid "Top 5 VMs CPU Usage"
-msgstr "CPU利用率上位 5位内のVM"
+#: ../../enterprise/extensions/vmware/ajax.php:87
+#: ../../enterprise/include/ajax/clustermap.php:42
+msgid "No IP"
+msgstr "IPなし"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:645
-#: ../../enterprise/extensions/vmware/vmware_view.php:1047
-msgid "Top 5 VMs Memory Usage"
-msgstr "メモリ使用率上位 5位内のVM"
+#: ../../enterprise/extensions/vmware/functions.php:52
+msgid "This configuration has no file associated."
+msgstr "この設定にはファイルが関連付けられていません。"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:654
-#: ../../enterprise/extensions/vmware/vmware_view.php:1056
-msgid "Top 5 VMs Disk Usage"
-msgstr "ディスク使用率上位 5位内のVM"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:661
-#: ../../enterprise/extensions/vmware/vmware_view.php:1063
-msgid "Top 5 VMs Network Usage"
-msgstr "ネットワーク使用率上位 5位内のVM"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:718
-msgid "Host ESX"
-msgstr "ホスト ESX"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:953
-msgid "CPU Usage"
-msgstr "CPU 使用率"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:963
-msgid "Memory Usage"
-msgstr "メモリ使用率"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:973
-msgid "Disk I/O Rate"
-msgstr "ディスク I/O 速度"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:983
-msgid "Network Usage"
-msgstr "ネットワーク使用率"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:1115
-msgid "ESX Detail"
-msgstr "ESX 詳細"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:1132
-msgid "ESX details"
-msgstr "ESX 詳細"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:1143
-msgid "VMware View"
-msgstr "VMware 表示"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:1231
+#: ../../enterprise/extensions/vmware/functions.php:61
 msgid ""
-"Some ESX Hosts are not up to date, please check vmware plugin configuration."
-msgstr "いくつかの ESX ホストは更新されません。vmware プラグインの設定を確認してください。"
+"Task scheduled with this configuration does not match with the ID stored. "
+"Please delete it "
+msgstr "この設定の計画タスクは保存されたIDにマッチしません。削除してください "
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:1234
-msgid "VMWare plugin is working."
-msgstr "VMWare プラグインが動作中です。"
+#: ../../enterprise/extensions/vmware/functions.php:115
+msgid "Please reinstall Cron extension."
+msgstr "Cron 拡張を再インストールしてください。"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:1243
-msgid "View VMWare map"
-msgstr "VMWare マップ表示"
+#: ../../enterprise/extensions/vmware/functions.php:132
+msgid "Please check configuration definition."
+msgstr "設定の定義を確認してください。"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:1244
-msgid "View VMWare dashboard"
-msgstr "VMWare ダッシュボード表示"
+#: ../../enterprise/extensions/vmware/functions.php:241
+msgid "The file does not exists"
+msgstr "ファイルが存在しません"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:1245
-msgid "View ESX Host statistics from"
-msgstr "ESX ホスト統計表示"
+#: ../../enterprise/extensions/vmware/functions.php:245
+msgid "The file is not readable by HTTP Server"
+msgstr "HTTP サーバからファイルを読めません"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:1253
-msgid "this link"
-msgstr "このリンク"
+#: ../../enterprise/extensions/vmware/functions.php:246
+#: ../../enterprise/extensions/vmware/functions.php:251
+msgid "Please check that the web server has write rights on the file"
+msgstr "ウェブサーバがファイルに対して書き込み権限があるか確認してください。"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:1253
-msgid "administration page"
-msgstr "管理ページ"
+#: ../../enterprise/extensions/vmware/functions.php:250
+msgid "The file is not writable by HTTP Server"
+msgstr "HTTP サーバからファイルに書き込めません"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:1323
-msgid "Show Datastores"
-msgstr "データストア表示"
+#: ../../enterprise/extensions/vmware/functions.php:268
+msgid "The file does not exist."
+msgstr "ファイルがありません。"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:1326
-msgid "Show ESX"
-msgstr "ESX 表示"
+#: ../../enterprise/extensions/vmware/functions.php:271
+msgid "The file is not executable."
+msgstr "ファイルが実行できません。"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:1329
-msgid "Show VM"
-msgstr "VM 表示"
+#: ../../enterprise/extensions/vmware/functions.php:396
+msgid "Configuration file path"
+msgstr "設定ファイルパス"
 
-#: ../../enterprise/extensions/vmware/vmware_view.php:1347
-msgid "Zoom"
-msgstr "ズーム"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:1357
-msgid "View options"
-msgstr "オプションの表示"
-
-#: ../../enterprise/extensions/vmware/vmware_view.php:1404
-msgid "VMware map"
-msgstr "VMware マップ"
-
-#: ../../enterprise/extensions/vmware/main.php:30
-msgid "WMware Plugin Settings"
-msgstr "VMware プラグイン設定"
-
-#: ../../enterprise/extensions/vmware/main.php:79
-msgid "VMWare configuration updated."
-msgstr "VMWare 設定を更新しました。"
-
-#: ../../enterprise/extensions/vmware/main.php:142
-msgid "VMWare scheduled execution disabled."
-msgstr "VMWare 計画実行を無効化しました。"
-
-#: ../../enterprise/extensions/vmware/main.php:165
-msgid "There was an error updating the execution data of the plugin"
-msgstr "プラグインの実行データ更新エラーです"
-
-#: ../../enterprise/extensions/vmware/main.php:168
-#: ../../enterprise/extensions/vmware/main.php:178
-msgid "VMWare scheduled execution updated."
-msgstr "VMWare 計画実行を更新しました。"
-
-#: ../../enterprise/extensions/vmware/main.php:174
-msgid "There was an error activating the execution of the plugin"
-msgstr "プラグインの実行有効化エラーです"
-
-#: ../../enterprise/extensions/vmware/main.php:194
-msgid "Config Path"
-msgstr "設定パス"
-
-#: ../../enterprise/extensions/vmware/main.php:201
-msgid "Plugin Path"
-msgstr "プラグインパス"
-
-#: ../../enterprise/extensions/vmware/main.php:226
-msgid "Config parameters"
-msgstr "設定パラメータ"
-
-#: ../../enterprise/extensions/vmware/main.php:233
+#: ../../enterprise/extensions/vmware/functions.php:401
 msgid "V-Center IP"
 msgstr "V-Center IP"
 
-#: ../../enterprise/extensions/vmware/main.php:238
+#: ../../enterprise/extensions/vmware/functions.php:406
 msgid "Datacenter Name"
 msgstr "データセンター名"
 
-#: ../../enterprise/extensions/vmware/main.php:265
-msgid "Plugin execution"
-msgstr "プラグイン実行"
+#: ../../enterprise/extensions/vmware/functions.php:411
+msgid "Datacenter user"
+msgstr "データセンターユーザ"
 
-#: ../../enterprise/extensions/vmware/main.php:266
-msgid ""
-"To enable the plugin execution, this extension needs the Cron jobs extension "
-"installed.\n"
-"\tKeep in mind that the Cron jobs execution period will be the less real "
-"execution period, so if you want to run the plugin every\n"
-"\t5 minutes, for example, the Cron jobs script should be configured in the "
-"cron to run every 5 minutes or less"
+#: ../../enterprise/extensions/vmware/functions.php:434
+msgid "Temporal directory"
+msgstr "テンポラリディレクトリ"
+
+#: ../../enterprise/extensions/vmware/functions.php:439
+msgid "Target log file"
+msgstr "対象ログファイル"
+
+#: ../../enterprise/extensions/vmware/functions.php:444
+msgid "Entities list file"
+msgstr "エンティティ一覧ファイル"
+
+#: ../../enterprise/extensions/vmware/functions.php:449
+msgid "Event pointer file"
+msgstr "イベントポインターファイル"
+
+#: ../../enterprise/extensions/vmware/functions.php:478
+msgid "API user"
+msgstr "API ユーザ"
+
+#: ../../enterprise/extensions/vmware/functions.php:483
+msgid "API user's password"
+msgstr "API ユーザパスワード"
+
+#: ../../enterprise/extensions/vmware/functions.php:502
+#: ../../enterprise/godmode/servers/manage_export.php:131
+#: ../../enterprise/godmode/servers/manage_export_form.php:88
+msgid "Transfer mode"
+msgstr "転送モード"
+
+#: ../../enterprise/extensions/vmware/functions.php:508
+msgid "Tentacle server IP"
+msgstr "Tentacle サーバ IP"
+
+#: ../../enterprise/extensions/vmware/functions.php:513
+msgid "Tentacle server port"
+msgstr "Tentacle サーバポート"
+
+#: ../../enterprise/extensions/vmware/functions.php:518
+msgid "Tentacle extra options"
+msgstr "Tentacle 拡張オプション"
+
+#: ../../enterprise/extensions/vmware/functions.php:523
+msgid "Local folder"
+msgstr "ローカルフォルダ"
+
+#: ../../enterprise/extensions/vmware/functions.php:528
+msgid "Tentacle client path"
+msgstr "Tentacle クライアントパス"
+
+#: ../../enterprise/extensions/vmware/functions.php:546
+msgid "Agents group"
+msgstr "エージェントグループ"
+
+#: ../../enterprise/extensions/vmware/functions.php:551
+msgid "Verbosity"
 msgstr ""
-"プラグインの実行を有効化するために、この拡張では Cron ジョブ拡張がインストールされている必要があります。\n"
-"\tCron ジョブ実行間隔は、実際の実行間隔よりも短くすることに注意してください。たとえば、プラグインを 5分間隔で\n"
-"\t実行したい場合は、Cron ジョブスクリプトは 5分またはそれ未満の間隔で実行するよう cron を設定する必要があります。"
 
-#: ../../enterprise/extensions/vmware/main.php:298
-#: ../../enterprise/godmode/agentes/collections.php:269
-msgid "Apply changes"
-msgstr "変更を適用"
+#: ../../enterprise/extensions/vmware/functions.php:556
+msgid "Max. threads"
+msgstr "最大スレッド"
+
+#: ../../enterprise/extensions/vmware/functions.php:561
+msgid "Retry send"
+msgstr "再送"
+
+#: ../../enterprise/extensions/vmware/functions.php:566
+msgid "Event mode"
+msgstr "イベントモード"
+
+#: ../../enterprise/extensions/vmware/functions.php:576
+msgid "Extra settings"
+msgstr "拡張設定"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:37
+msgid "WMware Plugin Settings"
+msgstr "VMware プラグイン設定"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:91
+msgid ""
+"Pandora FMS Cron extension is required to automate VMware plugin from this "
+"form."
+msgstr "このフォームから VMware プラグイン有効化するには Pandora FMS Cron 拡張が必要です。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:152
+msgid "Failed to update plugin path."
+msgstr "プラグインパスの更新に失敗しました。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:155
+msgid "VMWare plugin path succesfully updated."
+msgstr "VMWare プラグインパスを更新しました。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:170
+#: ../../enterprise/extensions/vmware/vmware_admin.php:275
+msgid "Configuration name is required."
+msgstr "設定名が必要です。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:174
+msgid "Configuration name already in use."
+msgstr "設定名は既に使われています。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:185
+msgid "Failed while creating configuration file."
+msgstr "設定ファイル作成に失敗しました。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:198
+msgid "Failed while creating cron task."
+msgstr "cron タスク作成に失敗しました。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:208
+#: ../../enterprise/extensions/vmware/vmware_admin.php:253
+#: ../../enterprise/extensions/vmware/vmware_admin.php:316
+msgid "Failed while updating configuration references."
+msgstr "設定リファレンスの更新に失敗しました。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:214
+msgid " succesfully created."
+msgstr " 作成成功"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:226
+msgid "Unknown configuration file."
+msgstr "不明な設定ファイル。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:234
+msgid "Failed while deleting associated cron task."
+msgstr "関連 cron タスクの削除エラー。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:242
+msgid "Failed while deleting associated conf file."
+msgstr "関連 conf ファイルの削除エラー。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:260
+msgid " succesfully deleted."
+msgstr " 削除しました。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:283
+msgid "Failed while deleting previous cron task. Disable and re-enable it"
+msgstr "以前の cron タスクの削除に失敗しました。無効化した後に再度有効化してください。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:287
+msgid "Failed while deleting associated conf file. Please remove "
+msgstr "関連 conf ファイルの削除に失敗しました。削除してください "
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:287
+msgid " manually"
+msgstr ""
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:295
+msgid "Failed while updating configuration file."
+msgstr "設定ファイルの更新に失敗しました。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:303
+msgid "Failed while updating cron task."
+msgstr "cron タスクの更新に失敗しました。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:322
+msgid " succesfully updated."
+msgstr " 更新しました。"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:352
+msgid "Plugin Path"
+msgstr "プラグインパス"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:369
+msgid "Configuration files"
+msgstr "設定ファイル"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:392
+#: ../../enterprise/extensions/vmware/vmware_admin.php:426
+msgid "Configuration name"
+msgstr "設定名"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:432
+msgid "File path"
+msgstr "ファイルパス"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:439
+msgid "Load"
+msgstr "処理実行率"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:444
+msgid "Create new file"
+msgstr "ファイルの新規作成"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:446
+msgid "Load vmware conf file"
+msgstr "vmware 設定ファイルの読み込み"
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:456
+msgid " is invalid"
+msgstr ""
+
+#: ../../enterprise/extensions/vmware/vmware_admin.php:500
+msgid "Delete this configuration: "
+msgstr "この設定を削除: "
 
 #: ../../enterprise/extensions/vmware/vmware_manager.php:160
 msgid "Power Status: "
@@ -29017,25 +30781,185 @@ msgstr "電源状態: "
 msgid "Change Status"
 msgstr "状態の変更"
 
-#: ../../enterprise/extensions/vmware/functions.php:161
-#: ../../enterprise/extensions/vmware/functions.php:189
-msgid "The file does not exists"
-msgstr "ファイルが存在しません"
+#: ../../enterprise/extensions/vmware/vmware_view.php:241
+msgid "Top 5 VMs CPU Usage"
+msgstr "CPU利用率上位 5位内のVM"
 
-#: ../../enterprise/extensions/vmware/functions.php:165
-msgid "The file is not readable by HTTP Server"
-msgstr "HTTP サーバからファイルを読めません"
+#: ../../enterprise/extensions/vmware/vmware_view.php:250
+msgid "Top 5 VMs Memory Usage"
+msgstr "メモリ使用率上位 5位内のVM"
 
-#: ../../enterprise/extensions/vmware/functions.php:166
-#: ../../enterprise/extensions/vmware/functions.php:171
-msgid "Please check that the web server has write rights on the file"
-msgstr "ウェブサーバがファイルに対して書き込み権限があるか確認してください。"
+#: ../../enterprise/extensions/vmware/vmware_view.php:261
+msgid "Top 5 VMs Provisioning Usage"
+msgstr ""
 
-#: ../../enterprise/extensions/vmware/functions.php:170
-msgid "The file is not writable by HTTP Server"
-msgstr "HTTP サーバからファイルに書き込めません"
+#: ../../enterprise/extensions/vmware/vmware_view.php:270
+msgid "Top 5 VMs Network Usage"
+msgstr "ネットワーク使用率上位 5位内のVM"
 
-#: ../../enterprise/extensions/vmware.php:46
+#: ../../enterprise/extensions/vmware/vmware_view.php:710
+msgid "Host ESX"
+msgstr "ホスト ESX"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:967
+msgid "CPU Usage"
+msgstr "CPU 使用率"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:977
+msgid "Memory Usage"
+msgstr "メモリ使用率"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:987
+msgid "Disk I/O Rate"
+msgstr "ディスク I/O 速度"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:997
+msgid "Network Usage"
+msgstr "ネットワーク使用率"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1096
+msgid "Settings updated "
+msgstr ""
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1099
+msgid "No changes in settings "
+msgstr "次の設定に変更はありません: "
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1107
+msgid "CPU usage graphs"
+msgstr "CPU 使用率グラフ"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1108
+#: ../../enterprise/extensions/vmware/vmware_view.php:1114
+#: ../../enterprise/extensions/vmware/vmware_view.php:1120
+#: ../../enterprise/extensions/vmware/vmware_view.php:1126
+msgid "Force minimum value"
+msgstr ""
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1110
+#: ../../enterprise/extensions/vmware/vmware_view.php:1116
+#: ../../enterprise/extensions/vmware/vmware_view.php:1122
+#: ../../enterprise/extensions/vmware/vmware_view.php:1128
+msgid "Force maximum value"
+msgstr ""
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1113
+msgid "Memory usage graphs"
+msgstr "メモリ使用率グラフ"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1119
+msgid "Provisioning Usage graphs"
+msgstr ""
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1125
+msgid "Network usage graphs"
+msgstr "ネットワーク使用率グラフ"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1137
+msgid "Map items"
+msgstr "マップ要素"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1138
+msgid "Show datastores"
+msgstr "データストアの表示"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1140
+msgid "Show ESXis"
+msgstr "ESXi 表示"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1142
+msgid "Show VMs"
+msgstr "VM 表示"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1144
+msgid "Font size (px)"
+msgstr "フォントサイズ (px)"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1146
+msgid "Node radius (px)"
+msgstr ""
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1152
+msgid "Looking for plugin configuration? Is placed at "
+msgstr "プラグイン設定を探していますか? それは次の場所にあります: "
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1152
+#: ../../enterprise/extensions/vmware/vmware_view.php:1360
+msgid "this link"
+msgstr "このリンク"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1152
+#: ../../enterprise/extensions/vmware/vmware_view.php:1360
+msgid "administration page"
+msgstr "管理ページ"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1159
+msgid "Graph settings"
+msgstr "グラフ設定"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1164
+msgid "Map settings"
+msgstr "マップ設定"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1218
+msgid "ESX Detail"
+msgstr "ESX 詳細"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1240
+msgid "ESX details"
+msgstr "ESX 詳細"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1244
+msgid "VMware view options"
+msgstr "VMware 表示オプション"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1255
+#: ../../enterprise/extensions/vmware/vmware_view.php:1518
+msgid "VMware View"
+msgstr "VMware 表示"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1338
+msgid ""
+"Some ESX Hosts are not up to date, please check vmware plugin configuration."
+msgstr "いくつかの ESX ホストが更新されていません。vmware プラグイン設定を確認してください。"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1341
+msgid "VMWare plugin is working."
+msgstr ""
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1350
+msgid "View VMWare map"
+msgstr "VMware マップ表示"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1351
+msgid "View VMWare dashboard"
+msgstr "VMware ダッシュボード表示"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1352
+msgid "View ESX Host statistics from"
+msgstr ""
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1410
+msgid "Show Datastores"
+msgstr "データストア表示"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1413
+msgid "Show ESX"
+msgstr "ESX 表示"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1416
+msgid "Show VM"
+msgstr "VM 表示"
+
+#: ../../enterprise/extensions/vmware/vmware_view.php:1434
+msgid "View options"
+msgstr "オプションの表示"
+
+#: ../../enterprise/extensions/vmware.php:26
+msgid "Failed to initialize VMware extension."
+msgstr "VMware 拡張の初期化に失敗。"
+
+#: ../../enterprise/extensions/vmware.php:65
 msgid "VMware"
 msgstr "VMware"
 
@@ -29045,9 +30969,9 @@ msgstr "拡張情報表示"
 
 #: ../../enterprise/godmode/admin_access_logs.php:61
 msgid ""
-"Maybe delete the extended data or the audit data is previous to table "
-"tsession_extended."
-msgstr "拡張データが削除されているか、監査データが tsession_extended テーブルにありません。"
+"The security check cannot be performed. There are no data in "
+"tsession_extended to check the hash."
+msgstr "セキュリティチェックを実行できません。ハッシュをチェックするための tsession_extended  内のデータがありません。"
 
 #: ../../enterprise/godmode/admin_access_logs.php:71
 msgid "Security check is ok."
@@ -29057,10 +30981,14 @@ msgstr "セキュリティチェックは正常です。"
 msgid "Security check is fail."
 msgstr "セキュリティチェックに失敗しました。"
 
-#: ../../enterprise/godmode/admin_access_logs.php:115
+#: ../../enterprise/godmode/admin_access_logs.php:187
 msgid "Extended info:"
 msgstr "拡張情報:"
 
+#: ../../enterprise/godmode/admin_access_logs.php:187
+msgid "Changes:"
+msgstr "変更:"
+
 #: ../../enterprise/godmode/agentes/agent_disk_conf_editor.php:107
 msgid "Error: The conf file of agent is not readble."
 msgstr "エラー: エージェント設定ファイルを読めません。"
@@ -29154,7 +31082,7 @@ msgstr "エージェント表示 &gt;"
 
 #: ../../enterprise/godmode/agentes/collections.agents.php:113
 msgid "This collection has not been added to any agents"
-msgstr "このコレクションはいずれのエージェントへも追加されません。"
+msgstr "このコレクションは、いずれのエージェントにも追加されていません"
 
 #: ../../enterprise/godmode/agentes/collections.data.php:47
 #: ../../enterprise/godmode/agentes/collections.data.php:125
@@ -29170,7 +31098,7 @@ msgstr "設定管理 &gt; 新規"
 #: ../../enterprise/godmode/agentes/collections.data.php:269
 #: ../../enterprise/godmode/agentes/collections.data.php:283
 #: ../../enterprise/godmode/agentes/collections.data.php:289
-#: ../../enterprise/godmode/agentes/collections.editor.php:55
+#: ../../enterprise/godmode/agentes/collections.editor.php:54
 msgid "Manager configuration &gt; Edit "
 msgstr "設定管理 &gt; 編集 "
 
@@ -29237,24 +31165,24 @@ msgstr "短い名前は、アルファベットと、- および _ のみ利用
 msgid "Empty for default short name fc_X where X is the collection id."
 msgstr "指定しない場合のデフォルトの短い名前は fc_X で、X はコレクション ID です。"
 
-#: ../../enterprise/godmode/agentes/collections.editor.php:63
+#: ../../enterprise/godmode/agentes/collections.editor.php:62
 msgid "Files in "
 msgstr "次の中に存在するファイル: "
 
-#: ../../enterprise/godmode/agentes/collections.editor.php:112
-#: ../../enterprise/godmode/agentes/collections.editor.php:173
+#: ../../enterprise/godmode/agentes/collections.editor.php:106
+#: ../../enterprise/godmode/agentes/collections.editor.php:167
 msgid "Back to file explorer"
 msgstr "ファイルエクスプローラへ戻る"
 
-#: ../../enterprise/godmode/agentes/collections.editor.php:236
+#: ../../enterprise/godmode/agentes/collections.editor.php:230
 msgid "Correct update file."
 msgstr "ファイルを更新しました。"
 
-#: ../../enterprise/godmode/agentes/collections.editor.php:237
+#: ../../enterprise/godmode/agentes/collections.editor.php:231
 msgid "Incorrect update file."
 msgstr "ファイルの更新に失敗しました。"
 
-#: ../../enterprise/godmode/agentes/collections.editor.php:376
+#: ../../enterprise/godmode/agentes/collections.editor.php:370
 msgid "Please, first save a new collection before to upload files."
 msgstr "ファイルをアップロードする前に新規コレクションを保存してください。"
 
@@ -29300,6 +31228,10 @@ msgstr "変更の再適用"
 msgid "Are you sure to apply?"
 msgstr "適用しますか?"
 
+#: ../../enterprise/godmode/agentes/collections.php:269
+msgid "Apply changes"
+msgstr "変更を適用"
+
 #: ../../enterprise/godmode/agentes/inventory_manager.php:57
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:81
 msgid "Successfully added inventory module"
@@ -29347,7 +31279,7 @@ msgstr "インベントリモジュールエラー"
 
 #: ../../enterprise/godmode/agentes/inventory_manager.php:172
 #: ../../enterprise/godmode/agentes/inventory_manager.php:235
-#: ../../enterprise/meta/advanced/synchronizing.user.php:532
+#: ../../enterprise/meta/advanced/synchronizing.user.php:543
 msgid "Target"
 msgstr "対象"
 
@@ -29416,112 +31348,116 @@ msgstr "適用先エージェント:"
 msgid "Replicate configuration"
 msgstr "設定の複製"
 
-#: ../../enterprise/godmode/agentes/module_manager.php:16
+#: ../../enterprise/godmode/agentes/module_manager.php:21
 msgid "Create a new web Server module"
 msgstr "ウェブサーバモジュールの新規作成"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:42
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:43
+#: ../../enterprise/godmode/agentes/module_manager.php:29
+msgid "Create a new web analysis module"
+msgstr "web 分析モジュール新規作成"
+
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:49
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:50
 msgid "The changes on this field are linked with the configuration data."
 msgstr "このフィールド上の変更は、設定データにリンクされます。"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:48
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:55
 msgid "Using local component"
 msgstr "ローカルコンポーネントの利用"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:121
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:122
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:128
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:129
 msgid "Show configuration data"
 msgstr "設定データを表示する"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:132
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:139
 msgid "Hide configuration data"
 msgstr "設定データを隠す"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:140
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:147
 msgid "Data configuration"
 msgstr "データ設定"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:146
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:82
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:153
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:101
 #: ../../enterprise/godmode/modules/configure_local_component.php:315
 #: ../../enterprise/meta/include/functions_wizard_meta.php:552
 msgid "Load basic"
 msgstr "基本設定読み込み"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:146
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:153
 #: ../../enterprise/godmode/modules/configure_local_component.php:317
 msgid "Load a basic structure on data configuration"
 msgstr "データ設定に基本構造をロードします"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:151
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:86
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:158
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:105
 #: ../../enterprise/godmode/modules/configure_local_component.php:323
-#: ../../enterprise/include/functions_metaconsole.php:1330
-#: ../../enterprise/include/functions_metaconsole.php:1353
-#: ../../enterprise/include/functions_metaconsole.php:1376
-#: ../../enterprise/include/functions_metaconsole.php:1399
-#: ../../enterprise/include/functions_metaconsole.php:1422
-#: ../../enterprise/include/functions_metaconsole.php:1445
+#: ../../enterprise/include/functions_metaconsole.php:992
+#: ../../enterprise/include/functions_metaconsole.php:1015
+#: ../../enterprise/include/functions_metaconsole.php:1038
+#: ../../enterprise/include/functions_metaconsole.php:1061
+#: ../../enterprise/include/functions_metaconsole.php:1084
+#: ../../enterprise/include/functions_metaconsole.php:1107
 #: ../../enterprise/meta/include/functions_wizard_meta.php:175
 #: ../../enterprise/meta/include/functions_wizard_meta.php:556
 msgid "Check"
 msgstr "チェック"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:151
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:158
 #: ../../enterprise/godmode/modules/configure_local_component.php:324
 msgid "Check the correct structure of the data configuration"
 msgstr "データ設定の正常性を確認"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:162
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:169
 #: ../../enterprise/godmode/modules/configure_local_component.php:327
 msgid "First line must be \"module_begin\""
 msgstr "最初の行は、\"module_begin\" でなければいけません"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:163
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:170
 #: ../../enterprise/godmode/modules/configure_local_component.php:328
 msgid "Data configuration is empty"
 msgstr "データ設定が空です"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:164
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:168
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:171
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:175
 #: ../../enterprise/godmode/modules/configure_local_component.php:329
 #: ../../enterprise/godmode/modules/configure_local_component.php:333
 msgid "Last line must be \"module_end\""
 msgstr "最後の行は \"module_end\" でなければいけません"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:165
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:172
 #: ../../enterprise/godmode/modules/configure_local_component.php:330
 msgid ""
 "Name is missed. Please add a line with \"module_name yourmodulename\" to "
 "data configuration"
 msgstr "名前がありません。データ設定に \"module_name モジュール名\" という行を追加してください。"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:166
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:173
 #: ../../enterprise/godmode/modules/configure_local_component.php:331
 msgid ""
 "Type is missed. Please add a line with \"module_type yourmoduletype\" to "
 "data configuration"
 msgstr "タイプがありません。データ設定に \"module_type モジュールタイプ\" という行を追加してください。"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:167
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:174
 #: ../../enterprise/godmode/modules/configure_local_component.php:332
 msgid "Type is wrong. Please set a correct type"
 msgstr "タイプが不正です。正しいタイプを選択してください。"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:169
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:136
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:176
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:172
 #: ../../enterprise/godmode/modules/configure_local_component.php:334
 #: ../../enterprise/meta/include/functions_wizard_meta.php:569
 msgid "There is a line with a unknown token 'token_fail'."
 msgstr "不明なトークン 'token_fail' を含む行があります。"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:170
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:177
 #: ../../enterprise/godmode/modules/configure_local_component.php:335
 msgid "Error in the syntax, please check the data configuration."
 msgstr "書式エラーです。データ設定を確認してください。"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:171
+#: ../../enterprise/godmode/agentes/module_manager_editor_data.php:178
 #: ../../enterprise/godmode/modules/configure_local_component.php:336
 msgid "Data configuration are built correctly"
 msgstr "データ設定が正しく作られました"
@@ -29586,79 +31522,118 @@ msgstr "Netflow フィルタ"
 msgid "Select filter"
 msgstr "フィルタ選択"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:60
-#: ../../enterprise/include/functions_enterprise.php:295
-#: ../../enterprise/meta/include/functions_wizard_meta.php:493
-#: ../../enterprise/meta/include/functions_wizard_meta.php:544
-msgid "Web checks"
-msgstr "ウェブチェック"
-
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:84
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:103
 #: ../../enterprise/meta/include/functions_wizard_meta.php:554
 msgid "Load a basic structure on Web Checks"
 msgstr "ウェブチェックに基本構造を読み込む"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:88
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:107
 #: ../../enterprise/meta/include/functions_wizard_meta.php:558
 msgid "Check the correct structure of the WebCheck"
 msgstr "ウェブチェックの構造確認"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:94
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:115
+#: ../../enterprise/meta/include/functions_wizard_meta.php:476
+msgid "Check type"
+msgstr "チェックタイプ"
+
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:121
 msgid "Requests"
 msgstr "リクエスト"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:97
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:124
 msgid "Agent browser id"
 msgstr "エージェントブラウザID"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:104
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:130
+msgid "HTTP auth (login)"
+msgstr "HTTP 認証 (ログイン)"
+
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:133
+msgid "HTTP auth (password)"
+msgstr "HTTP 認証(パスワード)"
+
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:140
 #: ../../enterprise/meta/include/functions_wizard_meta.php:950
 #: ../../enterprise/meta/include/functions_wizard_meta.php:1455
 msgid "Proxy URL"
 msgstr "プロキシURL"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:111
-msgid "HTTP auth (login)"
-msgstr "HTTP 認証 (ログイン)"
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:147
+msgid "Proxy auth (login)"
+msgstr "プロキシ認証(ログイン)"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:115
-msgid "HTTP auth (pass)"
-msgstr "HTTP 認証 (パスワード)"
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:151
+msgid "Proxy auth (pass)"
+msgstr "プロキシ認証(パスワード)"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:122
-msgid "HTTP auth (server)"
-msgstr "HTTP 認証 (サーバ)"
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:158
+msgid "Proxy auth (server)"
+msgstr "プロキシ認証(サーバ)"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:126
-msgid "HTTP auth (realm)"
-msgstr "HTTP 認証(realm)"
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:162
+msgid "Proxy auth (realm)"
+msgstr "プロキシ認証(レルム)"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:132
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:168
 #: ../../enterprise/meta/include/functions_wizard_meta.php:565
 msgid "First line must be \"task_begin\""
 msgstr "最初の行は、\"task_begin\" でなければいけません。"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:133
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:169
 #: ../../enterprise/meta/include/functions_wizard_meta.php:566
 msgid "Webchecks configuration is empty"
 msgstr "ウェブチェック設定が空です"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:134
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:135
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:170
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:171
 #: ../../enterprise/meta/include/functions_wizard_meta.php:567
 #: ../../enterprise/meta/include/functions_wizard_meta.php:568
 msgid "Last line must be \"task_end\""
 msgstr "最後の行は、\"task_end\" でなければいけません。"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:137
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:173
 msgid "There isn't get or post"
 msgstr "get または post がありません"
 
-#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:138
+#: ../../enterprise/godmode/agentes/module_manager_editor_web.php:174
 #: ../../enterprise/meta/include/functions_wizard_meta.php:570
 msgid "Web checks are built correctly"
 msgstr "ウェブチェックを設定しました"
 
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:89
+msgid "Run performance tests"
+msgstr "パフォーマンステストの実行"
+
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:94
+msgid "Target web site"
+msgstr "対象webサイト"
+
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:94
+msgid ""
+"The url specified in this field is mandatory to retrieve performance stats."
+msgstr "パフォーマンス統計には、このフィールドの URL 指定は必須です。"
+
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:99
+msgid "target web site (http://...)"
+msgstr "対象 web サイト(http://...)"
+
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:104
+msgid "Execute tests from"
+msgstr ""
+
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:127
+msgid "Paste your selenium test, exported as HTML, here"
+msgstr "HTML としてエクスポートした Selenium のテストケースをここにペーストしてください"
+
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:131
+msgid "Add file"
+msgstr "ファイル追加"
+
+#: ../../enterprise/godmode/agentes/module_manager_editor_webux.php:134
+msgid "Upload your selenium test in html format"
+msgstr ""
+
 #: ../../enterprise/godmode/agentes/plugins_manager.php:67
 msgid "Plug-in updated succesfully"
 msgstr "プラグインを更新しました"
@@ -29780,11 +31755,13 @@ msgstr "Val."
 
 #: ../../enterprise/godmode/alerts/alert_events_list.php:486
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:440
+#: ../../enterprise/meta/include/functions_autoprovision.php:703
 msgid "Move up"
 msgstr "上へ"
 
 #: ../../enterprise/godmode/alerts/alert_events_list.php:498
 #: ../../enterprise/godmode/alerts/alert_events_rules.php:447
+#: ../../enterprise/meta/include/functions_autoprovision.php:712
 msgid "Move down"
 msgstr "下へ"
 
@@ -29881,6 +31858,26 @@ msgstr "失敗: このモジュールのアラート作成、確認してくだ
 msgid "Modules agents in policy"
 msgstr "ポリシー内のモジュールエージェント"
 
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:51
+msgid "Successfully copied "
+msgstr ""
+
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:58
+msgid " cannot be copied to "
+msgstr ""
+
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:58
+msgid " policy"
+msgstr " ポリシー"
+
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:177
+msgid "To policies"
+msgstr "ポリシーへ"
+
+#: ../../enterprise/godmode/massive/massive_add_modules_policy.php:330
+msgid "No destiny policies to copy"
+msgstr ""
+
 #: ../../enterprise/godmode/massive/massive_delete_alerts_policy.php:67
 msgid "Success: remove the alerts."
 msgstr "成功: アラート削除"
@@ -29901,11 +31898,11 @@ msgid "SNMP Alerts to be deleted"
 msgstr "削除するSNMPアラート"
 
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:212
-#: ../../enterprise/godmode/policies/policy_agents.php:268
-#: ../../enterprise/godmode/policies/policy_agents.php:276
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:162
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:444
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:361
+#: ../../enterprise/godmode/policies/policy_agents.php:403
+#: ../../enterprise/godmode/policies/policy_agents.php:411
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:165
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:445
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:362
 msgid "Filter agent"
 msgstr "エージェントのフィルタ"
 
@@ -29922,7 +31919,8 @@ msgid "Agent configuration files updated"
 msgstr "エージェント設定ファイルを更新しました"
 
 #: ../../enterprise/godmode/massive/massive_edit_modules_satellite.php:354
-#: ../../enterprise/godmode/policies/policy_queue.php:378
+#: ../../enterprise/godmode/policies/policy_queue.php:398
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:407
 #: ../../enterprise/meta/advanced/policymanager.queue.php:260
 msgid "Finished"
 msgstr "完了"
@@ -29990,15 +31988,19 @@ msgstr "一括タグモジュールポリシー編集"
 msgid "Bulk modules policy tags edit"
 msgstr "一括モジュールポリシータグ編集"
 
-#: ../../enterprise/godmode/massive/massive_operations.php:89
+#: ../../enterprise/godmode/massive/massive_operations.php:82
+msgid "Bulk modules policy add from agent"
+msgstr ""
+
+#: ../../enterprise/godmode/massive/massive_operations.php:90
 msgid "Bulk alert SNMP delete"
 msgstr "一括SNMPアラート削除"
 
-#: ../../enterprise/godmode/massive/massive_operations.php:90
+#: ../../enterprise/godmode/massive/massive_operations.php:91
 msgid "Bulk alert SNMP edit"
 msgstr "一括SNMPアラート編集"
 
-#: ../../enterprise/godmode/massive/massive_operations.php:98
+#: ../../enterprise/godmode/massive/massive_operations.php:99
 msgid "Bulk Satellite modules edit"
 msgstr "一括サテライトモジュール編集"
 
@@ -30014,7 +32016,7 @@ msgstr "使用中モジュール"
 msgid "Manage Satellite Server"
 msgstr "サテライトサーバ管理"
 
-#: ../../enterprise/godmode/menu.php:58 ../../enterprise/godmode/menu.php:149
+#: ../../enterprise/godmode/menu.php:58 ../../enterprise/godmode/menu.php:152
 msgid "Duplicate config"
 msgstr "設定の複製"
 
@@ -30023,7 +32025,7 @@ msgstr "設定の複製"
 #: ../../enterprise/godmode/modules/manage_inventory_modules_form.php:28
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:47
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:225
-#: ../../enterprise/include/functions_policies.php:3251
+#: ../../enterprise/include/functions_policies.php:3430
 msgid "Inventory modules"
 msgstr "インベントリモジュール"
 
@@ -30051,11 +32053,11 @@ msgstr "スキン"
 msgid "Export targets"
 msgstr "エクスポートターゲット"
 
-#: ../../enterprise/godmode/menu.php:143
+#: ../../enterprise/godmode/menu.php:145
 msgid "Log Collector"
 msgstr "ログ収集"
 
-#: ../../enterprise/godmode/menu.php:156
+#: ../../enterprise/godmode/menu.php:159
 msgid "Password policy"
 msgstr "パスワードポリシー"
 
@@ -30164,7 +32166,7 @@ msgstr "ポリシー更新待ち"
 
 #: ../../enterprise/godmode/policies/policies.php:381
 #: ../../enterprise/godmode/policies/policy_linking.php:122
-#: ../../enterprise/include/functions_policies.php:3280
+#: ../../enterprise/include/functions_policies.php:3459
 msgid "Linking"
 msgstr "リンク"
 
@@ -30174,13 +32176,13 @@ msgstr "エージェントウィザード"
 
 #: ../../enterprise/godmode/policies/policies.php:401
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:37
-#: ../../enterprise/include/functions_policies.php:3270
+#: ../../enterprise/include/functions_policies.php:3449
 msgid "External alerts"
 msgstr "外部アラート"
 
 #: ../../enterprise/godmode/policies/policies.php:405
 #: ../../enterprise/godmode/policies/policy.php:46
-#: ../../enterprise/include/functions_policies.php:3298
+#: ../../enterprise/include/functions_policies.php:3477
 msgid "Queue"
 msgstr "キュー"
 
@@ -30221,124 +32223,166 @@ msgstr "操作をキューに追加できません"
 msgid "Duplicated or incompatible operation in the queue"
 msgstr "重複もしくは完了できない操作がキューにあります"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:90
+#: ../../enterprise/godmode/policies/policy_agents.php:95
 msgid ""
 "Successfully added to delete pending agents. Will be deleted in the next "
 "policy application."
 msgstr "削除待ちエージェントに追加しました。次回のポリシー適用時に削除されます。"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:95
+#: ../../enterprise/godmode/policies/policy_agents.php:100
+#: ../../enterprise/godmode/policies/policy_agents.php:122
 #: ../../enterprise/godmode/policies/policy_alerts.php:169
 #: ../../enterprise/godmode/policies/policy_collections.php:73
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:100
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:100
-#: ../../enterprise/godmode/policies/policy_modules.php:1101
+#: ../../enterprise/godmode/policies/policy_modules.php:1132
 #: ../../enterprise/godmode/policies/policy_plugins.php:42
 msgid "Successfully reverted deletion"
 msgstr "削除を取り消しました"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:96
+#: ../../enterprise/godmode/policies/policy_agents.php:101
+#: ../../enterprise/godmode/policies/policy_agents.php:123
 #: ../../enterprise/godmode/policies/policy_alerts.php:170
 #: ../../enterprise/godmode/policies/policy_collections.php:74
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:101
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:103
-#: ../../enterprise/godmode/policies/policy_modules.php:1102
+#: ../../enterprise/godmode/policies/policy_modules.php:1133
 #: ../../enterprise/godmode/policies/policy_plugins.php:43
 msgid "Could not be reverted"
 msgstr "取り消しできませんでした"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:121
+#: ../../enterprise/godmode/policies/policy_agents.php:117
+msgid ""
+"Successfully added to delete pending groups. Will be deleted in the next "
+"policy application."
+msgstr "削除予約グループへ追加しました。次回のポリシー適用で削除されます。"
+
+#: ../../enterprise/godmode/policies/policy_agents.php:159
+#: ../../enterprise/godmode/policies/policy_agents.php:282
 msgid "Successfully added to delete queue"
 msgstr "削除キューに追加しました"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:122
+#: ../../enterprise/godmode/policies/policy_agents.php:160
+#: ../../enterprise/godmode/policies/policy_agents.php:283
 msgid "Could not be added to delete queue"
 msgstr "削除キューに追加できませんでした"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:157
+#: ../../enterprise/godmode/policies/policy_agents.php:195
 msgid "Successfully deleted from delete pending agents"
 msgstr "削除待ちエージェントから削除しました"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:158
+#: ../../enterprise/godmode/policies/policy_agents.php:196
 msgid "Could not be deleted from delete pending agents"
 msgstr "削除待ちエージェントから削除できませんでした"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:285
+#: ../../enterprise/godmode/policies/policy_agents.php:353
+msgid "Apply to"
+msgstr ""
+
+#: ../../enterprise/godmode/policies/policy_agents.php:420
 msgid "Agents in Policy"
 msgstr "ポリシー内エージェント"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:322
+#: ../../enterprise/godmode/policies/policy_agents.php:437
+msgid "Groups in Policy"
+msgstr "ポリシー内のグループ"
+
+#: ../../enterprise/godmode/policies/policy_agents.php:517
 msgid "Add agents to policy"
 msgstr "ポリシーへのエージェント追加"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:328
+#: ../../enterprise/godmode/policies/policy_agents.php:523
 msgid "Delete agents from policy"
 msgstr "ポリシーからエージェント削除"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:368
+#: ../../enterprise/godmode/policies/policy_agents.php:563
 msgid "Applied"
 msgstr "適用済"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:369
+#: ../../enterprise/godmode/policies/policy_agents.php:564
 msgid "Not applied"
 msgstr "未適用"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:378
+#: ../../enterprise/godmode/policies/policy_agents.php:573
 #: ../../enterprise/operation/agentes/policy_view.php:304
 msgid "R."
 msgstr "R."
 
-#: ../../enterprise/godmode/policies/policy_agents.php:380
+#: ../../enterprise/godmode/policies/policy_agents.php:575
 msgid "Unlinked modules"
 msgstr "未リンクモジュール"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:380
+#: ../../enterprise/godmode/policies/policy_agents.php:575
 msgid "U."
 msgstr "U."
 
-#: ../../enterprise/godmode/policies/policy_agents.php:382
+#: ../../enterprise/godmode/policies/policy_agents.php:578
+#: ../../enterprise/godmode/policies/policy_agents.php:822
 #: ../../enterprise/operation/agentes/policy_view.php:50
 msgid "Last application"
 msgstr "最後の適用"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:383
+#: ../../enterprise/godmode/policies/policy_agents.php:579
+#: ../../enterprise/godmode/policies/policy_agents.php:823
 msgid "Add to delete queue"
 msgstr "削除キューへの追加"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:433
+#: ../../enterprise/godmode/policies/policy_agents.php:631
 msgid "This agent can not be remotely configured"
 msgstr "このエージェントはリモート設定できません"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:457
-#: ../../enterprise/godmode/policies/policy_queue.php:176
+#: ../../enterprise/godmode/policies/policy_agents.php:656
+#: ../../enterprise/godmode/policies/policy_agents.php:893
+#: ../../enterprise/godmode/policies/policy_queue.php:180
 msgid "Add to apply queue"
 msgstr "適用キューへ追加"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:474
+#: ../../enterprise/godmode/policies/policy_agents.php:684
+#: ../../enterprise/godmode/policies/policy_agents.php:925
 #: ../../enterprise/godmode/policies/policy_alerts.php:417
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:252
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:264
-#: ../../enterprise/godmode/policies/policy_modules.php:1264
+#: ../../enterprise/godmode/policies/policy_modules.php:1295
 msgid "Undo deletion"
 msgstr "削除取り消し"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:488
+#: ../../enterprise/godmode/policies/policy_agents.php:698
+#: ../../enterprise/godmode/policies/policy_agents.php:864
 #: ../../enterprise/operation/agentes/policy_view.php:62
 msgid "Policy applied"
 msgstr "適用済ポリシー"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:492
+#: ../../enterprise/godmode/policies/policy_agents.php:702
+#: ../../enterprise/godmode/policies/policy_agents.php:868
 msgid "Need apply"
 msgstr "要適用"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:500
+#: ../../enterprise/godmode/policies/policy_agents.php:710
+#: ../../enterprise/godmode/policies/policy_agents.php:875
 msgid "Applying policy"
 msgstr "ポリシー適用中"
 
-#: ../../enterprise/godmode/policies/policy_agents.php:506
+#: ../../enterprise/godmode/policies/policy_agents.php:716
+#: ../../enterprise/godmode/policies/policy_agents.php:879
 msgid "Deleting from policy"
 msgstr "ポリシーから削除中"
 
+#: ../../enterprise/godmode/policies/policy_agents.php:795
+msgid "Add groups to policy"
+msgstr "ポリシーへグループ追加"
+
+#: ../../enterprise/godmode/policies/policy_agents.php:801
+msgid "Delete groups from policy"
+msgstr "ポリシーからグループ削除"
+
+#: ../../enterprise/godmode/policies/policy_agents.php:821
+msgid "Total agents in policy group"
+msgstr "ポリシーグループ内の全エージェント"
+
+#: ../../enterprise/godmode/policies/policy_agents.php:821
+msgid "T."
+msgstr ""
+
 #: ../../enterprise/godmode/policies/policy_alerts.php:148
 #: ../../enterprise/godmode/policies/policy_external_alerts.php:73
 msgid "Created successfuly"
@@ -30396,8 +32440,8 @@ msgid "Module is not selected"
 msgstr "モジュールが選択されていません"
 
 #: ../../enterprise/godmode/policies/policy_inventory_modules.php:93
-#: ../../enterprise/godmode/policies/policy_modules.php:1082
-#: ../../enterprise/godmode/policies/policy_modules.php:1096
+#: ../../enterprise/godmode/policies/policy_modules.php:1113
+#: ../../enterprise/godmode/policies/policy_modules.php:1127
 msgid ""
 "Successfully added to delete pending modules. Will be deleted in the next "
 "policy application."
@@ -30482,41 +32526,41 @@ msgstr "モジュールを追加しました。"
 msgid "Could not be added module."
 msgstr "モジュールを追加できませんでした。"
 
-#: ../../enterprise/godmode/policies/policy_modules.php:1052
+#: ../../enterprise/godmode/policies/policy_modules.php:1083
 msgid ""
 "The module type in Data configuration is empty, take from combo box of form."
 msgstr "データ設定内のモジュールタイプが空です。フォームから選択してください。"
 
-#: ../../enterprise/godmode/policies/policy_modules.php:1055
+#: ../../enterprise/godmode/policies/policy_modules.php:1086
 msgid ""
 "The module name in Data configuration is empty, take from text field of form."
 msgstr "データ設定内のモジュール名が空です。テキストフィールドに入力してください。"
 
-#: ../../enterprise/godmode/policies/policy_modules.php:1086
+#: ../../enterprise/godmode/policies/policy_modules.php:1117
 msgid "Could not be added to deleted all modules."
 msgstr "削除済の全モジュールへの追加ができませんでした。"
 
-#: ../../enterprise/godmode/policies/policy_modules.php:1172
+#: ../../enterprise/godmode/policies/policy_modules.php:1203
 msgid "Successfully duplicate the module."
 msgstr "モジュールを複製しました。"
 
-#: ../../enterprise/godmode/policies/policy_modules.php:1232
+#: ../../enterprise/godmode/policies/policy_modules.php:1263
 msgid "Local component"
 msgstr "ローカルコンポーネント"
 
-#: ../../enterprise/godmode/policies/policy_modules.php:1298
+#: ../../enterprise/godmode/policies/policy_modules.php:1329
 msgid "There are no defined modules"
 msgstr "定義済のモジュールがありません"
 
-#: ../../enterprise/godmode/policies/policy_modules.php:1316
+#: ../../enterprise/godmode/policies/policy_modules.php:1347
 msgid "Copy selected modules to policy: "
 msgstr "選択したモジュールをポリシーへコピー: "
 
-#: ../../enterprise/godmode/policies/policy_modules.php:1494
+#: ../../enterprise/godmode/policies/policy_modules.php:1525
 msgid "Are you sure to copy modules into policy?\\n"
 msgstr "モジュールをポリシーにコピーしますか?\\n"
 
-#: ../../enterprise/godmode/policies/policy_modules.php:1514
+#: ../../enterprise/godmode/policies/policy_modules.php:1545
 msgid "Please select any module to copy"
 msgstr "コピーするモジュールを選択してください"
 
@@ -30552,128 +32596,137 @@ msgstr "キューから操作を削除しました"
 msgid "Operations cannot be deleted from the queue"
 msgstr "キューから操作を削除できません"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:160
+#: ../../enterprise/godmode/policies/policy_queue.php:164
 msgid "Update pending"
 msgstr "更新待ち"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:162
+#: ../../enterprise/godmode/policies/policy_queue.php:166
 msgid "Update pending agents"
 msgstr "更新待ちエージェント"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:180
+#: ../../enterprise/godmode/policies/policy_queue.php:184
 msgid "Add to apply queue only for database"
 msgstr "データベースにのみ適用キューを追加"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:186
+#: ../../enterprise/godmode/policies/policy_queue.php:190
+msgid "Update pending groups"
+msgstr "ペンディンググループの更新"
+
+#: ../../enterprise/godmode/policies/policy_queue.php:198
 msgid "Link pending modules"
 msgstr "リンク待ちモジュール"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:192
+#: ../../enterprise/godmode/policies/policy_queue.php:204
 msgid "Will be linked in the next policy application"
 msgstr "次回のポリシー適用でリンクされます"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:195
+#: ../../enterprise/godmode/policies/policy_queue.php:207
 msgid "Unlink pending modules"
 msgstr "リンク解除待ちモジュール"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:201
+#: ../../enterprise/godmode/policies/policy_queue.php:213
 msgid "Will be unlinked in the next policy application"
 msgstr "次回のポリシー適用でリンクが解除されます"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:206
+#: ../../enterprise/godmode/policies/policy_queue.php:218
 msgid "Delete pending"
 msgstr "削除待ち"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:208
+#: ../../enterprise/godmode/policies/policy_queue.php:220
 msgid "Delete pending agents"
 msgstr "削除待ちエージェント"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:214
-#: ../../enterprise/godmode/policies/policy_queue.php:223
-#: ../../enterprise/godmode/policies/policy_queue.php:232
-#: ../../enterprise/godmode/policies/policy_queue.php:241
-#: ../../enterprise/godmode/policies/policy_queue.php:250
-#: ../../enterprise/godmode/policies/policy_queue.php:259
-#: ../../enterprise/godmode/policies/policy_queue.php:268
+#: ../../enterprise/godmode/policies/policy_queue.php:226
+#: ../../enterprise/godmode/policies/policy_queue.php:234
+#: ../../enterprise/godmode/policies/policy_queue.php:243
+#: ../../enterprise/godmode/policies/policy_queue.php:252
+#: ../../enterprise/godmode/policies/policy_queue.php:261
+#: ../../enterprise/godmode/policies/policy_queue.php:270
+#: ../../enterprise/godmode/policies/policy_queue.php:279
+#: ../../enterprise/godmode/policies/policy_queue.php:288
 msgid "Will be deleted in the next policy application"
 msgstr "次回のポリシー適用で削除されます"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:217
+#: ../../enterprise/godmode/policies/policy_queue.php:229
+msgid "Delete pending groups"
+msgstr "ペンディンググループの削除"
+
+#: ../../enterprise/godmode/policies/policy_queue.php:237
 msgid "Delete pending modules"
 msgstr "削除待ちモジュール"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:226
+#: ../../enterprise/godmode/policies/policy_queue.php:246
 msgid "Delete pending inventory modules"
 msgstr "削除待ちインベントリモジュール"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:235
+#: ../../enterprise/godmode/policies/policy_queue.php:255
 msgid "Delete pending alerts"
 msgstr "削除待ちアラート"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:244
+#: ../../enterprise/godmode/policies/policy_queue.php:264
 msgid "Delete pending external alerts"
 msgstr "削除待ち外部アラート"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:253
+#: ../../enterprise/godmode/policies/policy_queue.php:273
 msgid "Delete pending file collections"
 msgstr "削除待ちファイルコレクション"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:262
+#: ../../enterprise/godmode/policies/policy_queue.php:282
 msgid "Delete pending plugins"
 msgstr "削除待ちプラグイン"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:274
+#: ../../enterprise/godmode/policies/policy_queue.php:294
 msgid "Advices"
 msgstr "アドバイス"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:277
+#: ../../enterprise/godmode/policies/policy_queue.php:297
 msgid "Queue summary"
 msgstr "キューサマリ"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:344
+#: ../../enterprise/godmode/policies/policy_queue.php:364
 #: ../../enterprise/meta/advanced/policymanager.queue.php:218
 msgid "Apply (database and files)"
 msgstr "適用 (データベースおよびファイル)"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:344
-#: ../../enterprise/godmode/policies/policy_queue.php:418
+#: ../../enterprise/godmode/policies/policy_queue.php:364
+#: ../../enterprise/godmode/policies/policy_queue.php:438
 #: ../../enterprise/meta/advanced/policymanager.queue.php:218
 #: ../../enterprise/meta/advanced/policymanager.queue.php:309
 msgid "Apply (only database)"
 msgstr "適用 (データベースのみ)"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:350
+#: ../../enterprise/godmode/policies/policy_queue.php:370
 #: ../../enterprise/meta/advanced/policymanager.queue.php:224
 msgid "Complete"
 msgstr "完了"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:350
+#: ../../enterprise/godmode/policies/policy_queue.php:370
 #: ../../enterprise/meta/advanced/policymanager.queue.php:224
 msgid "Incomplete"
 msgstr "未完了"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:364
+#: ../../enterprise/godmode/policies/policy_queue.php:384
 msgid "Queue filter"
 msgstr "キューフィルタ"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:446
+#: ../../enterprise/godmode/policies/policy_queue.php:466
 #: ../../enterprise/meta/advanced/policymanager.queue.php:334
 msgid "Delete from queue"
 msgstr "キューから削除"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:459
+#: ../../enterprise/godmode/policies/policy_queue.php:479
 msgid "Empty queue"
 msgstr "キューが空です"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:476
+#: ../../enterprise/godmode/policies/policy_queue.php:496
 msgid "This operation could take a long time"
 msgstr "この操作は時間がかかります"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:487
+#: ../../enterprise/godmode/policies/policy_queue.php:507
 msgid "Apply all"
 msgstr "すべて適用"
 
-#: ../../enterprise/godmode/policies/policy_queue.php:493
+#: ../../enterprise/godmode/policies/policy_queue.php:513
 msgid "Delete all"
 msgstr "すべて削除"
 
@@ -30700,12 +32753,13 @@ msgstr "4日"
 
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:149
 #: ../../enterprise/godmode/reporting/graph_template_item_editor.php:207
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1948
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2012
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2105
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2179
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2450
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2548
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2133
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2197
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2290
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2364
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2649
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2748
+#: ../../enterprise/operation/log/log_viewer.php:181
 msgid "Exact match"
 msgstr "完全一致"
 
@@ -30717,15 +32771,15 @@ msgstr "ウエイトを減らす"
 msgid "Increase Weight"
 msgstr "ウエイトを増やす"
 
-#: ../../enterprise/godmode/reporting/graph_template_list.php:70
+#: ../../enterprise/godmode/reporting/graph_template_list.php:73
 msgid "Graph template management"
 msgstr "グラフテンプレート管理"
 
-#: ../../enterprise/godmode/reporting/graph_template_list.php:163
+#: ../../enterprise/godmode/reporting/graph_template_list.php:166
 msgid "There are no defined graph templates"
 msgstr "定義済のグラフテンプレートがありません"
 
-#: ../../enterprise/godmode/reporting/graph_template_list.php:168
+#: ../../enterprise/godmode/reporting/graph_template_list.php:171
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:118
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:389
 msgid "Create template"
@@ -30741,60 +32795,66 @@ msgstr "整理しました"
 msgid "Cleanup error"
 msgstr "整理エラー"
 
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:97
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:100
 msgid "Wizard template"
 msgstr "ウィザードテンプレート"
 
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:142
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:256
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:145
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:257
 msgid "Clean up template"
 msgstr "整理テンプレート"
 
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:173
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:462
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:381
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:176
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:463
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:382
 msgid "Agents available"
 msgstr "存在するエージェント"
 
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:173
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:179
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:463
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:466
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:380
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:386
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:176
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:182
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:464
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:467
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:381
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:387
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:323
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:331
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:402
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:410
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:555
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:563
 msgid "Select all"
 msgstr "全てを選択"
 
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:179
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:465
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:387
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:182
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:466
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:388
 msgid "Agents to apply"
 msgstr "適用するエージェント"
 
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:204
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:408
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:207
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:409
 msgid "Add agents to template"
 msgstr "テンプレートにエージェントを追加"
 
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:208
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:412
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:211
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:413
 msgid "Undo agents to template"
 msgstr "エージェントをテンプレートから外します"
 
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:227
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:430
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:230
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:431
 msgid "Apply template"
 msgstr "テンプレート適用"
 
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:389
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:421
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:755
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:786
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:392
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:424
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:756
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:787
 msgid "Please set template distinct than "
 msgstr "次より明確なテンプレートを指定してください: "
 
-#: ../../enterprise/godmode/reporting/graph_template_wizard.php:416
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:781
+#: ../../enterprise/godmode/reporting/graph_template_wizard.php:419
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:782
 msgid ""
 "This will be delete all reports created in previous template applications. "
 "Do you want to continue?"
@@ -30829,33 +32889,30 @@ msgstr "操作を完了できませんでした"
 msgid "Advance Reporting"
 msgstr "拡張レポート"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:73
-#: ../../enterprise/include/functions_reporting.php:38
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:74
+#: ../../enterprise/include/functions_reporting.php:39
 msgid "Global"
 msgstr "全体"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:101
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:143
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:102
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:162
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:207
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:169
 msgid "Elements to apply"
 msgstr "適用する要素"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:189
-msgid "Sum"
-msgstr "合計"
-
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:284
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1620
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:298
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1726
 msgid ">="
 msgstr ">="
 
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:286
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1622
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:300
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1728
 msgid "<"
 msgstr "<"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.global.php:304
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1653
+#: ../../enterprise/godmode/reporting/reporting_builder.global.php:318
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1759
 msgid ""
 "Show a resume table with max, min, average of total modules on the report "
 "bottom"
@@ -30864,7 +32921,7 @@ msgstr "レポートの下に、全モジュールの最大、最小、平均と
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:81
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:90
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:134
-#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:100
+#: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:101
 msgid "Edit template"
 msgstr "テンプレートの編集"
 
@@ -30900,20 +32957,21 @@ msgstr "テンプレートが作成されていません。"
 msgid "Generate a dynamic report\""
 msgstr "ダイナミックレポートの生成"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:474
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:475
 msgid "Add agents"
 msgstr "エージェント追加"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:477
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:478
 msgid "Undo agents"
 msgstr "エージェント追加取り消し"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:485
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:486
 msgid "Generate"
 msgstr "生成"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template.php:768
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:759
+#: ../../enterprise/godmode/reporting/reporting_builder.template.php:769
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:760
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:1015
 msgid "Please set agent distinct than "
 msgstr "エージェントを次のもの以外で明確にしてください: "
 
@@ -30921,7 +32979,17 @@ msgstr "エージェントを次のもの以外で明確にしてください: "
 msgid "Advance Options"
 msgstr "拡張オプション"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1464
+#: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:121
+#: ../../enterprise/meta/advanced/metasetup.visual.php:294
+msgid ""
+"The dir of custom logos is in your www Pandora Console in "
+"\"images/custom_logo\". You can upload more files (ONLY JPEG) in upload tool "
+"in console."
+msgstr ""
+"カスタムロゴのディレクトリは、Pandora コンソールの \"images/custom_logo\" "
+"です。コンソールのアップロードツールを使って、ファイル(JPEG)をアップロードできます。"
+
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1534
 msgid ""
 "Case insensitive regular expression for agent name. For example: Network.* "
 "will match with the following agent names: network_agent1, NetworK CHECKS"
@@ -30929,9 +32997,9 @@ msgstr ""
 "エージェント名に対して大文字小文字を区別しない正規表現です。例: Network.* は、network_agent1, NetworKCHECKS "
 "というエージェント名にマッチします。"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1478
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2058
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2229
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1548
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2243
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2414
 msgid ""
 "Case insensitive regular expression or string for module name. For example: "
 "if you use this field with \"Module exact match\" enabled then this field "
@@ -30943,54 +33011,62 @@ msgstr ""
 "を有効にしてこのフィールドを使った場合は、モジュール名の文字列そのままの指定です。そうでない場合は正規表現です。例えば .*usage.* "
 "は、cpu_usage、vram usage in machine 1 にマッチします。"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1489
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1559
 msgid "Module exact match"
 msgstr "モジュール完全一致"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1489
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1995
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2060
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2158
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2233
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1559
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2180
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2245
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2343
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2418
 msgid "Check it if you want to match module name literally"
 msgstr "モジュール名の文字列通りにマッチさせたい場合にチェックします"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1529
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1568
+msgid "Hide items without data"
+msgstr "データの無い要素を隠す"
+
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1568
+msgid "Check it if you want not show items without data"
+msgstr "データの無い要素を表示したくない場合はチェックします"
+
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1608
 msgid "Query SQL"
 msgstr "SQL クエリ"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1544
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1632
 msgid "SQL preview"
 msgstr "SQL プレビュー"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1606
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:267
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1712
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:385
 msgid ""
 "If this option was checked, only adding in elements that type of modules "
 "support this option."
 msgstr "このオプションをチェックすると、このオプションをサポートするモジュールタイプの要素のみ追加できます。"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1772
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1893
 msgid "Modules to match"
 msgstr "マッチするモジュール"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1774
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1895
 msgid "Select the modules to match when create a report for agents"
 msgstr "エージェントのレポートを作成する時にマッチするモジュールを選択します"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1855
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1973
 msgid "Modules to match (Free text)"
 msgstr "マッチするモジュール (任意のテキスト)"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1857
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1975
 msgid "Free text to filter the modules of agents when apply this template."
 msgstr "このテンプレートを適用する時のエージェントのモジュールフィルタテキスト"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1871
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1989
 msgid "Create a graph for each agent"
 msgstr "それぞれのエージェントのグラフ作成"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1873
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1991
 msgid ""
 "If it is checked, the regexp or name of modules match only each to each to "
 "agent, instead create a big graph with all modules from all agents."
@@ -30998,19 +33074,19 @@ msgstr ""
 "チェックした場合、それぞれのエージェントでモジュール名または正規表現でマッチします。そうでなければ、全エージェントの全モジュールの大きなグラフを生成します"
 "。"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1960
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2145
 msgid "Please save the SLA template for start to add items in this list."
 msgstr "この一覧へのアイテム追加を開始するには、SLA テンプレートを保存してください。"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2009
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2176
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2453
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2551
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2194
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2361
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2652
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2751
 msgid "Not literally"
 msgstr "存在しません"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2053
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2223
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2238
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2408
 msgid ""
 "Case insensitive regular expression for agent name. For example: Network* "
 "will match with the following agent names: network_agent1, NetworK CHECKS"
@@ -31018,72 +33094,72 @@ msgstr ""
 "エージェント名に対して大文字小文字を区別しない正規表現です。例: Network* は、network_agent1、NetworKCHECKS "
 "というエージェント名にマッチします。"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2120
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2305
 msgid "Please save the template to start adding items into the list."
 msgstr "一覧へのアイテム追加を開始するには、テンプレートを保存してください。"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2472
+#: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:2671
 msgid "Name and SLA limit should not be empty"
 msgstr "名前と SLA 制限は空にできません"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:194
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:195
 msgid "Sucessfully applied"
 msgstr "適用しました"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:194
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:195
 msgid "reports"
 msgstr "レポート"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:194
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:195
 msgid "items"
 msgstr "アイテム"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:196
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:197
 msgid "Could not be applied"
 msgstr "適用できません"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:216
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:217
 msgid "Create template report wizard"
 msgstr "レポートウィザードテンプレート作成"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:263
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:264
 msgid "Create report per agent"
 msgstr "エージェントごとのレポート作成"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:272
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:273
 msgid ""
 "Left in blank if you want to use default name: Template name - agents (num "
 "agents) - Date"
 msgstr "デフォルトの名前「テンプレート名 - エージェント (エージェント数) - 日付」 を利用したい場合は、空白にしてください。"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:278
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:279
 msgid "Target group"
 msgstr "対象グループ"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:305
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:306
 msgid "Filter by"
 msgstr "フィルタ"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:368
+#: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:369
 msgid "Filter tag"
 msgstr "タグフィルタ"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:183
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:245
 msgid "Order:"
 msgstr "並び順:"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:203
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:265
 msgid ""
 "Show a resume table with max, min, average of total modules on the report "
 "bottom:"
 msgstr "レポートの下に全モジュールの最大、最小、平均を含む復旧表を表示:"
 
-#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:218
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard.php:280
 msgid "Show address instead module name"
 msgstr "モジュール名の代わりにアドレスを表示"
 
 #: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:89
-#: ../../enterprise/include/functions_reporting.php:35
+#: ../../enterprise/include/functions_reporting.php:36
 msgid "Wizard SLA"
 msgstr "SLAウィザード"
 
@@ -31119,6 +33195,18 @@ msgstr "SLA 制限 %"
 msgid "SLA Limit Value"
 msgstr "SLA 制限値"
 
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:325
+msgid "SLA min value is needed"
+msgstr "SLA 最小値が必要です"
+
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:329
+msgid "SLA max value is needed"
+msgstr "SLA 最大値が必要です"
+
+#: ../../enterprise/godmode/reporting/reporting_builder.wizard_sla.php:333
+msgid "SLA Limit value is needed"
+msgstr "SLA 制限値が必要です"
+
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:104
 msgid "Available"
 msgstr "利用可能"
@@ -31139,13 +33227,231 @@ msgstr "アイコンプレビュー"
 msgid "The services list is empty"
 msgstr "サービス一覧が空です"
 
+#: ../../enterprise/godmode/reporting/cluster_view.php:29
+#: ../../enterprise/godmode/reporting/cluster_builder.php:40
+msgid "Clusters list"
+msgstr "クラスタ一覧"
+
+#: ../../enterprise/godmode/reporting/cluster_view.php:34
+msgid "Cluster editor"
+msgstr "クラスタ編集"
+
+#: ../../enterprise/godmode/reporting/cluster_view.php:36
+msgid "Cluster detail"
+msgstr "クラスタ詳細"
+
+#: ../../enterprise/godmode/reporting/cluster_view.php:102
+msgid "Node running with"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_view.php:103
+msgid "balanced modules"
+msgstr "バランスモジュール"
+
+#: ../../enterprise/godmode/reporting/cluster_view.php:118
+msgid "Cluster status"
+msgstr "クラスタ状態"
+
+#: ../../enterprise/godmode/reporting/cluster_view.php:172
+msgid "Reload cluster"
+msgstr "クラスタの再読み込み"
+
+#: ../../enterprise/godmode/reporting/cluster_view.php:292
+#: ../../enterprise/godmode/reporting/cluster_name_agents.php:22
+msgid "Balanced modules"
+msgstr "バランスモジュール"
+
+#: ../../enterprise/godmode/reporting/cluster_view.php:369
+#: ../../enterprise/godmode/reporting/cluster_name_agents.php:25
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:480
+msgid "Common modules"
+msgstr "共通モジュール"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.php:46
+msgid "Cluster view"
+msgstr "クラスタ表示"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.php:144
+#: ../../enterprise/godmode/reporting/cluster_builder.php:191
+#: ../../enterprise/godmode/reporting/cluster_builder.php:300
+#: ../../enterprise/godmode/reporting/cluster_builder.php:369
+#: ../../enterprise/godmode/reporting/cluster_builder.php:497
+#: ../../enterprise/godmode/reporting/cluster_builder.php:543
+msgid "Cluster"
+msgstr "クラスタ"
+
+#: ../../enterprise/godmode/reporting/cluster_name_agents.php:199
+msgid "No init"
+msgstr "未初期化"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:46
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:52
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:57
+msgid "Cluster settings"
+msgstr "クラスタ設定"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:76
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:82
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:87
+msgid "Cluster agents"
+msgstr "クラスタエージェント"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:107
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:113
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:118
+msgid "A/A modules"
+msgstr "A/A モジュール"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:140
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:146
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:151
+msgid "A/A modules limits"
+msgstr "Act/Act モジュール制限"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:176
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:182
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:187
+msgid "A/P modules"
+msgstr "Act/Stb モジュール"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:208
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:214
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:219
+msgid "Critical A/P modules"
+msgstr "Act/Stb 障害モジュール"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:240
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:313
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:392
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:545
+#: ../../enterprise/godmode/reporting/cluster_list.php:155
+msgid "Cluster name"
+msgstr "クラスタ名"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:240
+msgid ""
+"An agent with the same name of the cluster will be created, as well a "
+"special service with the same name"
+msgstr "クラスタと同じ名前のエージェントが作成され、同じ名前の特別なサービスが作成されます"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:244
+msgid "Should not be empty"
+msgstr "空にできません"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:253
+msgid "Cluster type"
+msgstr "クラスタタイプ"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:258
+msgid "Ative - Active"
+msgstr "アクティブ - アクティブ"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:259
+msgid "Active - Pasive"
+msgstr "アクティブ - スタンバイ"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:296
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:373
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:515
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:687
+msgid "Update and view cluster"
+msgstr "更新およびクラスタ表示"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:318
+msgid "Adding agents to the cluster"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:332
+msgid "Agents in Cluster"
+msgstr "クラスタ内エージェント"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:355
+msgid "Add agents to cluster"
+msgstr "クラスタにエージェントを追加"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:357
+msgid "Drop agents to cluster"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:370
+msgid "Update and next"
+msgstr "更新して次へ"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:397
+msgid "Adding common modules"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:403
+msgid "Common in agents"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:411
+msgid "Added common modules"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:448
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:601
+msgid "Add modules to cluster"
+msgstr "クラスタへのモジュール追加"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:450
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:603
+msgid "Drop modules to cluster"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:462
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:512
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:615
+msgid "Update and Next"
+msgstr "更新して次へ"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:481
+msgid "Critical if equal or greater than"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:482
+msgid "Warning if equal or greater than"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:550
+msgid "Adding balanced modules"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:564
+msgid "Added balanced modules"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:647
+msgid "Balanced modules settings"
+msgstr "バランスモジュール設定"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:652
+msgid "Balanced module"
+msgstr "バランスモジュール"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:653
+msgid "is critical module"
+msgstr ""
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:684
+msgid "Update and Finish"
+msgstr "更新して終了"
+
+#: ../../enterprise/godmode/reporting/cluster_builder.main.php:1011
+msgid "Select at least two agents "
+msgstr "少なくとも 2つのエージェントを選択 "
+
+#: ../../enterprise/godmode/reporting/cluster_list.php:270
+msgid "Create cluster"
+msgstr "クラスタ作成"
+
 #: ../../enterprise/godmode/servers/credential_boxes_satellite.php:30
 msgid "Credential Boxes List"
-msgstr "権限ボックス一覧"
+msgstr ""
 
 #: ../../enterprise/godmode/servers/credential_boxes_satellite.php:33
 msgid "Credential Boxes"
-msgstr "権限ボックス"
+msgstr ""
 
 #: ../../enterprise/godmode/servers/credential_boxes_satellite.php:374
 #: ../../enterprise/godmode/servers/list_satellite.php:69
@@ -31158,7 +33464,7 @@ msgstr "サテライトサーバ"
 
 #: ../../enterprise/godmode/servers/manage_credential_boxes.php:20
 msgid "Add Credential Box"
-msgstr "権限ボックス追加"
+msgstr ""
 
 #: ../../enterprise/godmode/servers/manage_export.php:61
 msgid "Error updating export target"
@@ -31191,11 +33497,6 @@ msgstr "定義済のエクスポートターゲットがありません"
 msgid "Preffix"
 msgstr "プレフィックス"
 
-#: ../../enterprise/godmode/servers/manage_export.php:131
-#: ../../enterprise/godmode/servers/manage_export_form.php:88
-msgid "Transfer mode"
-msgstr "転送モード"
-
 #: ../../enterprise/godmode/servers/manage_export_form.php:109
 msgid "Target directory"
 msgstr "対象ディレクトリ"
@@ -31223,7 +33524,7 @@ msgid ""
 msgstr "コンフィグファイルを削除すると、ローカルの設定ファイルをコンソールに再送します"
 
 #: ../../enterprise/godmode/services/services.elements.php:70
-#: ../../enterprise/godmode/services/services.service.php:266
+#: ../../enterprise/godmode/services/services.service.php:306
 msgid ""
 "This values are by default because the service is auto calculate mode."
 msgstr "サービスが自動計算モードのため、デフォルト値です。"
@@ -31233,7 +33534,7 @@ msgid "Invalid service"
 msgstr "不正なサービスです"
 
 #: ../../enterprise/godmode/services/services.elements.php:96
-#: ../../enterprise/godmode/services/services.service.php:171
+#: ../../enterprise/godmode/services/services.service.php:215
 #: ../../enterprise/operation/services/services.service.php:55
 #: ../../enterprise/operation/services/services.service_map.php:63
 #: ../../enterprise/operation/services/services.table_services.php:39
@@ -31241,42 +33542,42 @@ msgid "Services list"
 msgstr "サービス一覧"
 
 #: ../../enterprise/godmode/services/services.elements.php:102
-#: ../../enterprise/godmode/services/services.service.php:177
+#: ../../enterprise/godmode/services/services.service.php:221
 #: ../../enterprise/operation/services/services.service.php:61
 #: ../../enterprise/operation/services/services.service_map.php:69
 msgid "Services table view"
-msgstr "サービス一覧表示"
+msgstr ""
 
 #: ../../enterprise/godmode/services/services.elements.php:109
-#: ../../enterprise/godmode/services/services.service.php:182
+#: ../../enterprise/godmode/services/services.service.php:226
 #: ../../enterprise/operation/services/services.service.php:66
 #: ../../enterprise/operation/services/services.service_map.php:75
 msgid "Config Service"
 msgstr "サービス設定"
 
 #: ../../enterprise/godmode/services/services.elements.php:115
-#: ../../enterprise/godmode/services/services.service.php:187
+#: ../../enterprise/godmode/services/services.service.php:231
 #: ../../enterprise/operation/services/services.service.php:71
 #: ../../enterprise/operation/services/services.service_map.php:81
 msgid "Config Elements"
 msgstr "要素編集"
 
 #: ../../enterprise/godmode/services/services.elements.php:123
-#: ../../enterprise/godmode/services/services.service.php:194
+#: ../../enterprise/godmode/services/services.service.php:236
 #: ../../enterprise/operation/services/services.service.php:79
-#: ../../enterprise/operation/services/services.service_map.php:89
+#: ../../enterprise/operation/services/services.service_map.php:87
 msgid "View Service"
 msgstr "サービス参照"
 
 #: ../../enterprise/godmode/services/services.elements.php:130
-#: ../../enterprise/godmode/services/services.service.php:200
+#: ../../enterprise/godmode/services/services.service.php:241
 #: ../../enterprise/operation/services/services.service.php:85
-#: ../../enterprise/operation/services/services.service_map.php:95
+#: ../../enterprise/operation/services/services.service_map.php:93
 msgid "Service map"
 msgstr "サービスマップ"
 
 #: ../../enterprise/godmode/services/services.elements.php:142
-#: ../../enterprise/include/functions_services.php:1647
+#: ../../enterprise/include/functions_services.php:1736
 msgid "Edit service elements"
 msgstr "サービス要素編集"
 
@@ -31316,15 +33617,15 @@ msgstr "サービス要素を削除しました"
 msgid "Error deleting service element"
 msgstr "サービス要素の削除エラー"
 
-#: ../../enterprise/godmode/services/services.elements.php:318
+#: ../../enterprise/godmode/services/services.elements.php:324
 msgid "Edit element service"
 msgstr "サービス要素編集"
 
-#: ../../enterprise/godmode/services/services.elements.php:321
+#: ../../enterprise/godmode/services/services.elements.php:327
 msgid "Create element service"
 msgstr "サービス要素作成"
 
-#: ../../enterprise/godmode/services/services.elements.php:371
+#: ../../enterprise/godmode/services/services.elements.php:377
 msgid "First select an agent"
 msgstr "最初にエージェントを選択"
 
@@ -31332,19 +33633,19 @@ msgstr "最初にエージェントを選択"
 msgid "Critical weight"
 msgstr "障害ウエイト"
 
-#: ../../enterprise/godmode/services/services.elements.php:394
+#: ../../enterprise/godmode/services/services.elements.php:393
 msgid "Warning weight"
 msgstr "警告ウエイト"
 
-#: ../../enterprise/godmode/services/services.elements.php:399
+#: ../../enterprise/godmode/services/services.elements.php:397
 msgid "Unknown weight"
 msgstr "不明ウエイト"
 
-#: ../../enterprise/godmode/services/services.elements.php:404
+#: ../../enterprise/godmode/services/services.elements.php:401
 msgid "Ok weight"
 msgstr "正常ウエイト"
 
-#: ../../enterprise/godmode/services/services.elements.php:412
+#: ../../enterprise/godmode/services/services.elements.php:408
 msgid ""
 "Only the critical elements are relevant to calculate the service status"
 msgstr "障害状態のもののみがサービス状態の計算に使われます"
@@ -31355,90 +33656,97 @@ msgstr "障害状態のもののみがサービス状態の計算に使われま
 msgid "Create Service"
 msgstr "サービスの作成"
 
-#: ../../enterprise/godmode/services/services.service.php:62
-msgid "Service created successfully"
-msgstr "サービスを作成しました"
-
-#: ../../enterprise/godmode/services/services.service.php:63
-msgid "Error creating service"
-msgstr "サービス作成エラー"
-
-#: ../../enterprise/godmode/services/services.service.php:85
+#: ../../enterprise/godmode/services/services.service.php:65
+#: ../../enterprise/godmode/services/services.service.php:112
 msgid "No name and description specified for the service"
 msgstr "サービスに名前と説明がありません"
 
-#: ../../enterprise/godmode/services/services.service.php:90
+#: ../../enterprise/godmode/services/services.service.php:70
+#: ../../enterprise/godmode/services/services.service.php:117
 msgid "No name specified for the service"
 msgstr "サービスに名前がありません"
 
-#: ../../enterprise/godmode/services/services.service.php:95
+#: ../../enterprise/godmode/services/services.service.php:75
+#: ../../enterprise/godmode/services/services.service.php:122
 msgid "No description specified for the service"
 msgstr "サービスに説明がありません"
 
-#: ../../enterprise/godmode/services/services.service.php:109
+#: ../../enterprise/godmode/services/services.service.php:82
+msgid "Error creating service"
+msgstr "サービス作成エラー"
+
+#: ../../enterprise/godmode/services/services.service.php:86
+msgid "Service created successfully"
+msgstr "サービスを作成しました"
+
+#: ../../enterprise/godmode/services/services.service.php:153
 msgid "Error updating service"
 msgstr "サービスの更新エラー"
 
-#: ../../enterprise/godmode/services/services.service.php:113
+#: ../../enterprise/godmode/services/services.service.php:157
 msgid "Service updated successfully"
 msgstr "サービスを更新しました"
 
-#: ../../enterprise/godmode/services/services.service.php:126
-#: ../../enterprise/godmode/services/services.service.php:153
+#: ../../enterprise/godmode/services/services.service.php:170
+#: ../../enterprise/godmode/services/services.service.php:197
 #: ../../enterprise/operation/services/services.service.php:37
 #: ../../enterprise/operation/services/services.service_map.php:44
 msgid "Not found"
 msgstr "見つかりません"
 
-#: ../../enterprise/godmode/services/services.service.php:130
+#: ../../enterprise/godmode/services/services.service.php:174
 msgid "New Service"
 msgstr "新規サービス"
 
-#: ../../enterprise/godmode/services/services.service.php:229
+#: ../../enterprise/godmode/services/services.service.php:269
 msgid "No Services or concrete action"
 msgstr "サービスまたは具体的なアクションがありません"
 
-#: ../../enterprise/godmode/services/services.service.php:240
+#: ../../enterprise/godmode/services/services.service.php:280
 msgid "General Data"
 msgstr "一般データ"
 
-#: ../../enterprise/godmode/services/services.service.php:256
+#: ../../enterprise/godmode/services/services.service.php:296
 msgid "You should set the weights manually"
 msgstr "手動でウエイトを設定する必要があります"
 
-#: ../../enterprise/godmode/services/services.service.php:259
+#: ../../enterprise/godmode/services/services.service.php:299
 msgid "The weights have default values"
 msgstr "ウエイトはデフォルト値です"
 
-#: ../../enterprise/godmode/services/services.service.php:261
+#: ../../enterprise/godmode/services/services.service.php:301
 #: ../../enterprise/operation/services/services.list.php:191
 #: ../../enterprise/operation/services/services.table_services.php:160
 msgid "Simple"
 msgstr "シンプル"
 
-#: ../../enterprise/godmode/services/services.service.php:262
+#: ../../enterprise/godmode/services/services.service.php:302
 msgid ""
 "Only the elements configured as 'critical element' are used to calculate the "
 "service status"
 msgstr "'障害' として設定されているもののみサービスの状態計算に利用されます。"
 
-#: ../../enterprise/godmode/services/services.service.php:282
+#: ../../enterprise/godmode/services/services.service.php:322
 msgid "Agent to store data"
 msgstr "データを保存するエージェント"
 
-#: ../../enterprise/godmode/services/services.service.php:305
+#: ../../enterprise/godmode/services/services.service.php:345
 msgid "S.L.A. interval"
 msgstr "SLA 間隔"
 
-#: ../../enterprise/godmode/services/services.service.php:310
+#: ../../enterprise/godmode/services/services.service.php:350
 msgid "S.L.A. limit"
 msgstr "SLA 制限"
 
-#: ../../enterprise/godmode/services/services.service.php:312
+#: ../../enterprise/godmode/services/services.service.php:352
 msgid "Please set limit between 0 to 100."
 msgstr "制限は、0 と 100 の間で設定してください。"
 
-#: ../../enterprise/godmode/services/services.service.php:320
+#: ../../enterprise/godmode/services/services.service.php:358
+msgid "Update service"
+msgstr "サービス更新"
+
+#: ../../enterprise/godmode/services/services.service.php:365
 msgid ""
 "Here are described the alert templates, which will use their default "
 "actions.\n"
@@ -31448,18 +33756,22 @@ msgstr ""
 "アラートテンプレートの説明です。デフォルトのアクションで利用されます。\n"
 "\t\tデータが存在しサービスとSLAの状態に関するアラートの定義があるエージェントでアラートを編集することによりデフォルトの動作を変更できます。"
 
-#: ../../enterprise/godmode/services/services.service.php:334
+#: ../../enterprise/godmode/services/services.service.php:379
 msgid "Warning Service alert"
 msgstr "警告サービスアラート"
 
-#: ../../enterprise/godmode/services/services.service.php:345
+#: ../../enterprise/godmode/services/services.service.php:390
 msgid "Critical Service alert"
 msgstr "障害サービスアラート"
 
-#: ../../enterprise/godmode/services/services.service.php:363
+#: ../../enterprise/godmode/services/services.service.php:408
 msgid "SLA critical service alert"
 msgstr "SLA 障害サービスアラート"
 
+#: ../../enterprise/godmode/services/services.service.php:422
+msgid "Update alerts"
+msgstr "アラート更新"
+
 #: ../../enterprise/godmode/setup/edit_skin.php:42
 #: ../../enterprise/godmode/setup/setup_skins.php:36
 msgid "Skins configuration"
@@ -31587,41 +33899,46 @@ msgstr "選択したモジュールをブラックリストから削除"
 msgid "Enterprise options"
 msgstr "Enterprise オプション"
 
-#: ../../enterprise/godmode/setup/setup.php:249
+#: ../../enterprise/godmode/setup/setup.php:236
+#: ../../enterprise/meta/advanced/metasetup.mail.php:79
+msgid "Mail configuration"
+msgstr "メール設定"
+
+#: ../../enterprise/godmode/setup/setup.php:293
 #: ../../enterprise/meta/advanced/metasetup.password.php:85
 msgid " Caracters"
 msgstr " 文字"
 
-#: ../../enterprise/godmode/setup/setup.php:262
+#: ../../enterprise/godmode/setup/setup.php:306
 #: ../../enterprise/meta/advanced/metasetup.password.php:101
 msgid "Set 0 if never expire."
 msgstr "0 に設定すると期限切れは発生しません"
 
-#: ../../enterprise/godmode/setup/setup.php:263
+#: ../../enterprise/godmode/setup/setup.php:307
 #: ../../enterprise/meta/advanced/metasetup.password.php:102
 msgid " Days"
 msgstr " 日"
 
-#: ../../enterprise/godmode/setup/setup.php:272
+#: ../../enterprise/godmode/setup/setup.php:316
 #: ../../enterprise/meta/advanced/metasetup.password.php:113
 msgid " Minutes"
 msgstr " 分"
 
-#: ../../enterprise/godmode/setup/setup.php:276
+#: ../../enterprise/godmode/setup/setup.php:320
 #: ../../enterprise/meta/advanced/metasetup.password.php:117
 msgid "Two attempts minimum"
 msgstr "最小は 2回です"
 
-#: ../../enterprise/godmode/setup/setup.php:277
+#: ../../enterprise/godmode/setup/setup.php:321
 #: ../../enterprise/meta/advanced/metasetup.password.php:118
 msgid " Attempts"
 msgstr " 回"
 
-#: ../../enterprise/godmode/setup/setup.php:309
+#: ../../enterprise/godmode/setup/setup.php:361
 msgid "Enterprise password policy"
 msgstr "Enterprise パスワードポリシー"
 
-#: ../../enterprise/godmode/setup/setup.php:310
+#: ../../enterprise/godmode/setup/setup.php:362
 msgid ""
 "Rules applied to the management of passwords. This policy applies to all "
 "users except the administrator."
@@ -31631,40 +33948,44 @@ msgstr "パスワード管理に適用するルールです。このポリシー
 msgid "Enterprise ACL setup"
 msgstr "Enterprise ACL 設定"
 
-#: ../../enterprise/godmode/setup/setup_acl.php:147
-#: ../../enterprise/godmode/setup/setup_acl.php:179
+#: ../../enterprise/godmode/setup/setup_acl.php:309
+msgid "This record already exists in the database"
+msgstr "このレコードはすでにデータベースにあります"
+
+#: ../../enterprise/godmode/setup/setup_acl.php:356
+#: ../../enterprise/godmode/setup/setup_acl.php:388
 msgid "Add new ACL element to profile"
 msgstr "プロファイルへの新ACL要素の追加"
 
-#: ../../enterprise/godmode/setup/setup_acl.php:152
-#: ../../enterprise/godmode/setup/setup_acl.php:224
+#: ../../enterprise/godmode/setup/setup_acl.php:361
+#: ../../enterprise/godmode/setup/setup_acl.php:433
 msgid "Section"
 msgstr "セクション"
 
-#: ../../enterprise/godmode/setup/setup_acl.php:157
-#: ../../enterprise/godmode/setup/setup_acl.php:313
+#: ../../enterprise/godmode/setup/setup_acl.php:366
+#: ../../enterprise/godmode/setup/setup_acl.php:522
 msgid "Mobile"
 msgstr "モバイル"
 
-#: ../../enterprise/godmode/setup/setup_acl.php:161
-#: ../../enterprise/godmode/setup/setup_acl.php:225
+#: ../../enterprise/godmode/setup/setup_acl.php:370
+#: ../../enterprise/godmode/setup/setup_acl.php:434
 msgid "Section 2"
 msgstr "セクション 2"
 
-#: ../../enterprise/godmode/setup/setup_acl.php:166
-#: ../../enterprise/godmode/setup/setup_acl.php:226
+#: ../../enterprise/godmode/setup/setup_acl.php:375
+#: ../../enterprise/godmode/setup/setup_acl.php:435
 msgid "Section 3"
 msgstr "セクション 3"
 
-#: ../../enterprise/godmode/setup/setup_acl.php:178
+#: ../../enterprise/godmode/setup/setup_acl.php:387
 msgid "Hidden"
 msgstr "隠す"
 
-#: ../../enterprise/godmode/setup/setup_acl.php:184
+#: ../../enterprise/godmode/setup/setup_acl.php:393
 msgid "Page"
 msgstr "ページ"
 
-#: ../../enterprise/godmode/setup/setup_acl.php:203
+#: ../../enterprise/godmode/setup/setup_acl.php:412
 msgid "Filter by profile"
 msgstr "プロファイルによるフィルタ"
 
@@ -31677,59 +33998,87 @@ msgid "Remote Pandora FMS"
 msgstr "リモートの Pandora FMS"
 
 #: ../../enterprise/godmode/setup/setup_auth.php:33
-msgid "Remote Babel Enterprise"
-msgstr "リモートの Babel Enterprise"
-
-#: ../../enterprise/godmode/setup/setup_auth.php:34
 msgid "Remote Integria"
 msgstr "リモートの Integria"
 
-#: ../../enterprise/godmode/setup/setup_auth.php:35
+#: ../../enterprise/godmode/setup/setup_auth.php:34
 msgid "SAML"
 msgstr "SAML"
 
-#: ../../enterprise/godmode/setup/setup_auth.php:154
+#: ../../enterprise/godmode/setup/setup_auth.php:78
+msgid ""
+"by activating this option, the LDAP password will be stored in the database"
+msgstr "このオプションを有効化することにより、LDAP パスワードがデータベースに保存されます"
+
+#: ../../enterprise/godmode/setup/setup_auth.php:87
+msgid "Local command"
+msgstr "ローカルコマンド"
+
+#: ../../enterprise/godmode/setup/setup_auth.php:90
+msgid "PHP function"
+msgstr "PHP 機能"
+
+#: ../../enterprise/godmode/setup/setup_auth.php:102
+msgid ""
+"Enable this option to assign profiles, groups and tags to users from "
+"specific LDAP Attributes (updated at the next login)"
+msgstr ""
+"特定の LDAP "
+"アトリビュートから、プロファイル、グループ、タグをユーザに割り当てるには、このオプションを有効化します。(次回のログイン時に更新されます)"
+
+#: ../../enterprise/godmode/setup/setup_auth.php:138
+#: ../../enterprise/godmode/setup/setup_auth.php:182
+msgid "LDAP Attributes"
+msgstr "LDAP アトリビュート"
+
+#: ../../enterprise/godmode/setup/setup_auth.php:185
+#: ../../enterprise/godmode/setup/setup_auth.php:780
+msgid "Select profile"
+msgstr "プロファイルを選択"
+
+#: ../../enterprise/godmode/setup/setup_auth.php:195
+#: ../../enterprise/godmode/setup/setup_auth.php:789
+msgid "Add new permissions"
+msgstr "新規の権限を追加"
+
+#: ../../enterprise/godmode/setup/setup_auth.php:235
+#: ../../enterprise/godmode/setup/setup_auth.php:699
+#: ../../enterprise/meta/include/functions_meta.php:774
+#: ../../enterprise/meta/include/functions_meta.php:784
+msgid "Auto enable node access"
+msgstr ""
+
+#: ../../enterprise/godmode/setup/setup_auth.php:236
+#: ../../enterprise/godmode/setup/setup_auth.php:700
+msgid "New users will be able to log in to the nodes."
+msgstr "新規ユーザはノードへログインできます。"
+
+#: ../../enterprise/godmode/setup/setup_auth.php:342
+#: ../../enterprise/godmode/setup/setup_auth.php:443
 msgid "You must select a profile from the list of profiles."
 msgstr "プロファイル一覧からぷらファイルを選択する必要があります。"
 
-#: ../../enterprise/godmode/setup/setup_auth.php:346
+#: ../../enterprise/godmode/setup/setup_auth.php:656
 msgid "SimpleSAML path"
 msgstr "SimpleSAML パス"
 
-#: ../../enterprise/godmode/setup/setup_auth.php:346
+#: ../../enterprise/godmode/setup/setup_auth.php:656
 msgid ""
 "Select the path where SimpleSAML has been installed (by default '/opt/')"
 msgstr "SimpleSAML がインストールされているパスを選択 (デフォルトは '/opt/')"
 
-#: ../../enterprise/godmode/setup/setup_auth.php:355
+#: ../../enterprise/godmode/setup/setup_auth.php:665
 msgid ""
 "Enable this option to assign profiles, groups and tags to users from "
 "specific AD groups (updated at the next login)"
 msgstr ""
-"特定の AD グループからユーザにプロファイル、グループ、タグを割り当てるには、このオプションを有効化します。(次回のログインから有効になります)"
+"特定の AD グループから、プロファイル、グループ、タグをユーザに割り当てるには、このオプションを有効化します。(次回のログイン時に更新されます)"
 
-#: ../../enterprise/godmode/setup/setup_auth.php:389
-#: ../../enterprise/meta/include/functions_meta.php:754
-msgid "Auto enable node access"
-msgstr "自動ノードアクセスの有効化"
-
-#: ../../enterprise/godmode/setup/setup_auth.php:390
-msgid "New users will be able to log in to the nodes."
-msgstr "新規ユーザがノードにログインできます。"
-
-#: ../../enterprise/godmode/setup/setup_auth.php:427
-#: ../../enterprise/godmode/setup/setup_auth.php:468
+#: ../../enterprise/godmode/setup/setup_auth.php:737
+#: ../../enterprise/godmode/setup/setup_auth.php:778
 msgid "AD Groups"
 msgstr "ADグループ"
 
-#: ../../enterprise/godmode/setup/setup_auth.php:470
-msgid "Select profile"
-msgstr "プロファイルを選択"
-
-#: ../../enterprise/godmode/setup/setup_auth.php:479
-msgid "Add new permissions"
-msgstr "新規の権限を追加"
-
 #: ../../enterprise/godmode/setup/setup_history.php:49
 msgid "Enable event history"
 msgstr "イベントヒストリの有効化"
@@ -31762,16 +34111,20 @@ msgid "Number of days before events is transfered to history database."
 msgstr "イベントをヒストリデータベースへ転送するまでの日数です。"
 
 #: ../../enterprise/godmode/setup/setup_log_collector.php:44
-msgid "Log storage directory"
-msgstr "ログ保存ディレクトリ"
+msgid "ElasticSearch IP"
+msgstr "ElasticSearch IP"
 
 #: ../../enterprise/godmode/setup/setup_log_collector.php:45
-msgid "Directory where log data will be stored."
-msgstr "ログデータを保存するディレクトリ"
+msgid "IP of ElasticSearch server"
+msgstr "ElasticSearch サーバの IP"
+
+#: ../../enterprise/godmode/setup/setup_log_collector.php:47
+msgid "ElasticSearch Port"
+msgstr "ElasticSearch ポート"
 
 #: ../../enterprise/godmode/setup/setup_log_collector.php:48
-msgid "Sets the maximum lifetime for log data in days."
-msgstr "最大ログ保存日数を設定します。"
+msgid "Port of ElasticSearch server"
+msgstr "ElasticSearch サーバのポート"
 
 #: ../../enterprise/godmode/setup/setup_metaconsole.php:29
 msgid "Metaconsole setup"
@@ -31950,7 +34303,7 @@ msgstr "MIBをアップロード"
 msgid "Custom OID"
 msgstr "カスタム OID"
 
-#: ../../enterprise/include/ajax/dashboard.ajax.php:297
+#: ../../enterprise/include/ajax/dashboard.ajax.php:311
 msgid "Only one service map widget is supported at this moment"
 msgstr "（現時点でサポートされるサービスマップウィジェットは一つだけです"
 
@@ -32010,13 +34363,49 @@ msgstr "エージェントキャッシュが無効"
 #: ../../enterprise/include/ajax/transactional.ajax.php:178
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:151
 msgid "The phase does not have a defined script"
-msgstr "フェースに定義済スクリプトがありません"
+msgstr "フェーズは決まったスクリプトを持っていません"
 
 #: ../../enterprise/include/ajax/transactional.ajax.php:217
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:201
 msgid "Edit Data"
 msgstr "データ編集"
 
+#: ../../enterprise/include/ajax/url_route_analyzer.ajax.php:34
+msgid "Global time: "
+msgstr ""
+
+#: ../../enterprise/include/ajax/clustermap.php:254
+msgid "Common modules list"
+msgstr "共通モジュール一覧"
+
+#: ../../enterprise/include/ajax/clustermap.php:465
+msgid "Balanced modules list"
+msgstr "バランスモジュール一覧"
+
+#: ../../enterprise/include/process_reset_pass.php:106
+#: ../../enterprise/meta/include/process_reset_pass.php:83
+msgid "Repeat password"
+msgstr ""
+
+#: ../../enterprise/include/process_reset_pass.php:109
+#: ../../enterprise/meta/include/process_reset_pass.php:86
+msgid "Change password"
+msgstr "パスワード変更"
+
+#: ../../enterprise/include/process_reset_pass.php:112
+#: ../../enterprise/meta/include/process_reset_pass.php:89
+#: ../../enterprise/meta/index.php:500 ../../index.php:620
+msgid "Passwords must be the same"
+msgstr "パスワードは同じでなければいけません"
+
+#: ../../enterprise/include/process_reset_pass.php:120
+#: ../../enterprise/include/reset_pass.php:110
+#: ../../enterprise/meta/general/noaccess.php:17
+#: ../../enterprise/meta/include/process_reset_pass.php:97
+#: ../../enterprise/meta/include/reset_pass.php:86
+msgid "Back to login"
+msgstr "ログインに戻る"
+
 #: ../../enterprise/include/functions_alert_event.php:925
 msgid "Module alert"
 msgstr "モジュールアラート"
@@ -32124,23 +34513,34 @@ msgstr "コレクションにファイルがありません"
 msgid "File of collection is bigger than the limit ("
 msgstr "ファイルコレクションが制限を越えています ("
 
-#: ../../enterprise/include/functions_dashboard.php:360
+#: ../../enterprise/include/functions_dashboard.php:408
 #, php-format
 msgid "Copy of %s"
 msgstr "%s のコピー"
 
+#: ../../enterprise/include/functions_dashboard.php:822
+msgid "Change every"
+msgstr "変更周期"
+
+#: ../../enterprise/include/functions_dashboard.php:838
+#: ../../enterprise/operation/agentes/transactional_map.php:307
+msgid "Stop"
+msgstr "停止"
+
+#: ../../enterprise/include/functions_dashboard.php:845
+msgid "Pause"
+msgstr "一時停止"
+
 #: ../../enterprise/include/functions_enterprise.php:298
 msgid "Tree view by tags"
 msgstr "タグごとのツリー表示"
 
 #: ../../enterprise/include/functions_enterprise.php:321
 msgid ""
-"If event purge is less than events days pass to history db, you will have a "
-"problems and you lost data. Recommended that event days purge will more "
-"taller than event days to history DB"
+"If the interval of days until events data purge is shorter than the events "
+"data history storage interval, data will be lost. It is recommended that the "
+"storage frequency is higher than the purge frequency."
 msgstr ""
-"イベントの削除タイミングを、ヒストリデータベースへイベントを移す日よりも短く設定していると、問題が発生しデータを失ってしまいます。イベントの削除は、ヒスト"
-"リデータベースへイベントを移す日よりも後に設定してください。"
 
 #: ../../enterprise/include/functions_enterprise.php:323
 msgid ""
@@ -32160,34 +34560,65 @@ msgstr ""
 msgid "Problems with days purge and days that pass data to history DB"
 msgstr "データの削除日とヒストリデータベースへ渡す日数の設定に問題があります。"
 
+#: ../../enterprise/include/functions_visual_map.php:182
+#: ../../enterprise/include/functions_visual_map.php:235
+msgid "Crit:"
+msgstr "障害:"
+
+#: ../../enterprise/include/functions_visual_map.php:184
+#: ../../enterprise/include/functions_visual_map.php:237
+msgid "Warn:"
+msgstr "警告:"
+
+#: ../../enterprise/include/functions_visual_map.php:186
+#: ../../enterprise/include/functions_visual_map.php:239
+msgid "Ok:"
+msgstr "正常:"
+
+#: ../../enterprise/include/functions_visual_map.php:188
+#: ../../enterprise/include/functions_visual_map.php:241
+#: ../../enterprise/meta/include/functions_autoprovision.php:653
+msgid "Value:"
+msgstr "値:"
+
+#: ../../enterprise/include/functions_visual_map.php:615
+msgid "None of the services was added"
+msgstr "サービスが追加されませんでした"
+
+#: ../../enterprise/include/functions_visual_map.php:618
+#, php-format
+msgid "%d services couldn't be added"
+msgstr "%d サービスを追加できませんでした"
+
+#: ../../enterprise/include/functions_visual_map.php:626
+msgid "There was an error retrieving the visual map information"
+msgstr "ビジュアルマップ情報の取得エラー"
+
+#: ../../enterprise/include/functions_visual_map.php:630
+msgid "No services selected"
+msgstr "サービスが選択されていません"
+
 #: ../../enterprise/include/functions_events.php:164
-#: ../../enterprise/include/functions_reporting_csv.php:1449
+#: ../../enterprise/include/functions_reporting_csv.php:1561
 msgid "Hours"
 msgstr "時間"
 
 #: ../../enterprise/include/functions_events.php:177
 #: ../../enterprise/include/functions_events.php:194
 msgid "More than 5 tags"
-msgstr "5個以上のタグ"
-
-#: ../../enterprise/include/functions_events.php:212
-msgid "Active filter"
-msgstr "アクティブフィルタ"
-
-#: ../../enterprise/include/functions_events.php:213
-msgid "Active filters"
-msgstr "有効なフィルタ"
+msgstr ""
 
 #: ../../enterprise/include/functions_groups.php:47
 msgid "Metaconsole"
 msgstr "メタコンソール"
 
 #: ../../enterprise/include/functions_inventory.php:54
-#: ../../enterprise/include/functions_inventory.php:494
+#: ../../enterprise/include/functions_inventory.php:639
 msgid "No changes found"
 msgstr "変更がありません"
 
 #: ../../enterprise/include/functions_inventory.php:64
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:352
 msgid "Agent alias"
 msgstr "エージェントの別名"
 
@@ -32211,160 +34642,144 @@ msgstr "設定が空です"
 msgid "Empty OS"
 msgstr "OS が空です"
 
-#: ../../enterprise/include/functions_log.php:346
+#: ../../enterprise/include/functions_log.php:369
 msgid "Lines"
 msgstr "行"
 
-#: ../../enterprise/include/functions_login.php:22
+#: ../../enterprise/include/functions_login.php:21
 msgid "You must change password:"
 msgstr "パスワードを変更する必要があります:"
 
-#: ../../enterprise/include/functions_login.php:38
+#: ../../enterprise/include/functions_login.php:37
 msgid "Password must be different from the 3 previous changes."
-msgstr "パスワードは過去 3回のものと異なる必要があります。"
+msgstr "パスワードは 3つ前までと異なる必要があります。"
 
-#: ../../enterprise/include/functions_login.php:48
+#: ../../enterprise/include/functions_login.php:47
 msgid "Old pass: "
 msgstr "旧パスワード: "
 
-#: ../../enterprise/include/functions_login.php:51
+#: ../../enterprise/include/functions_login.php:50
 msgid "New pass: "
 msgstr "新パスワード: "
 
-#: ../../enterprise/include/functions_login.php:55
+#: ../../enterprise/include/functions_login.php:54
 msgid "Confirm: "
 msgstr "確認: "
 
-#: ../../enterprise/include/functions_login.php:61
+#: ../../enterprise/include/functions_login.php:60
 msgid "Change"
 msgstr "変更"
 
-#: ../../enterprise/include/functions_login.php:92
+#: ../../enterprise/include/functions_login.php:91
 msgid "Login blocked"
-msgstr "ログインがブロックされました"
+msgstr ""
 
-#: ../../enterprise/include/functions_login.php:100
+#: ../../enterprise/include/functions_login.php:99
 msgid "User has been blocked. Try again in "
 msgstr "ユーザがブロックされました。次の時間経過後に再度試してください: "
 
-#: ../../enterprise/include/functions_login.php:100
+#: ../../enterprise/include/functions_login.php:99
 msgid " minutes"
 msgstr " 分"
 
-#: ../../enterprise/include/functions_login.php:129
+#: ../../enterprise/include/functions_login.php:128
 msgid "Login successfully"
-msgstr "正常にログインしました"
+msgstr ""
+
+#: ../../enterprise/include/functions_login.php:135
+msgid "Successfully"
+msgstr ""
 
 #: ../../enterprise/include/functions_login.php:136
-msgid "Successfully"
-msgstr "正常終了"
-
-#: ../../enterprise/include/functions_login.php:137
 msgid "User pass successfully updated"
 msgstr "パスワードを更新しました"
 
-#: ../../enterprise/include/functions_login.php:238
+#: ../../enterprise/include/functions_login.php:237
 msgid "Password must be different from the "
 msgstr "パスワードは、次と異なっている必要があります: "
 
-#: ../../enterprise/include/functions_login.php:238
+#: ../../enterprise/include/functions_login.php:237
 msgid " previous changes."
 msgstr " 回前までの変更"
 
-#: ../../enterprise/include/functions_login.php:252
+#: ../../enterprise/include/functions_login.php:251
 msgid "Password must be different"
 msgstr "パスワードは違うものでなければいけません"
 
-#: ../../enterprise/include/functions_login.php:262
+#: ../../enterprise/include/functions_login.php:261
 msgid "Password too short"
 msgstr "パスワードが短すぎます"
 
-#: ../../enterprise/include/functions_login.php:273
+#: ../../enterprise/include/functions_login.php:272
 msgid "Password must contain numbers"
 msgstr "パスワードには数字を含めなければいけません"
 
-#: ../../enterprise/include/functions_login.php:285
+#: ../../enterprise/include/functions_login.php:284
 msgid "Password must contain symbols"
 msgstr "パスワードには記号を含めなければいけません"
 
-#: ../../enterprise/include/functions_login.php:305
+#: ../../enterprise/include/functions_login.php:304
 msgid "Invalid old password"
 msgstr "旧パスワードが不正です"
 
-#: ../../enterprise/include/functions_login.php:340
+#: ../../enterprise/include/functions_login.php:339
 msgid "Password confirm does not match"
 msgstr "パスワード確認が一致しません"
 
-#: ../../enterprise/include/functions_login.php:348
+#: ../../enterprise/include/functions_login.php:347
 msgid "Password empty"
 msgstr "パスワードが空です"
 
-#: ../../enterprise/include/functions_metaconsole.php:842
-msgid "Group does not exist. Agent "
-msgstr "グループが存在しません。エージェント "
-
-#: ../../enterprise/include/functions_metaconsole.php:848
-msgid "Created group in destination DB"
-msgstr "移行先 DB にグループを作成しました"
-
-#: ../../enterprise/include/functions_metaconsole.php:852
-msgid "Error creating group. Agent "
-msgstr "グループ作成エラー。エージェント "
-
-#: ../../enterprise/include/functions_metaconsole.php:858
-msgid "Group already exists in destination DB"
-msgstr "移行先 DB にすでにグループがあります"
-
 #: ../../enterprise/include/functions_netflow_pdf.php:45
 #: ../../enterprise/include/functions_reporting_pdf.php:51
 msgid "Automated Pandora FMS report for user defined report"
 msgstr "ユーザ定義レポートの Pandora FMS による自動生成"
 
 #: ../../enterprise/include/functions_netflow_pdf.php:56
-#: ../../enterprise/include/functions_reporting_pdf.php:2190
+#: ../../enterprise/include/functions_reporting_pdf.php:2271
 msgid "Contents"
 msgstr "目次"
 
 #: ../../enterprise/include/functions_netflow_pdf.php:160
-#: ../../enterprise/operation/log/log_viewer.php:215
+#: ../../enterprise/operation/log/log_viewer.php:231
 msgid "Start date"
 msgstr "開始日時"
 
-#: ../../enterprise/include/functions_policies.php:3035
+#: ../../enterprise/include/functions_policies.php:3214
 msgid "Policy linkation"
 msgstr "ポリシーリンク"
 
-#: ../../enterprise/include/functions_policies.php:3040
+#: ../../enterprise/include/functions_policies.php:3219
 msgid "Module linked"
 msgstr "リンク済モジュール"
 
-#: ../../enterprise/include/functions_policies.php:3042
-#: ../../enterprise/include/functions_policies.php:3052
+#: ../../enterprise/include/functions_policies.php:3221
+#: ../../enterprise/include/functions_policies.php:3231
 msgid "Unlink from policy"
 msgstr "ポリシーからリンクを外す"
 
-#: ../../enterprise/include/functions_policies.php:3045
+#: ../../enterprise/include/functions_policies.php:3224
 msgid "Module unlinked"
 msgstr "未リンクモジュール"
 
-#: ../../enterprise/include/functions_policies.php:3047
-#: ../../enterprise/include/functions_policies.php:3057
+#: ../../enterprise/include/functions_policies.php:3226
+#: ../../enterprise/include/functions_policies.php:3236
 msgid "Relink to policy"
 msgstr "ポリシーへの再リンク"
 
-#: ../../enterprise/include/functions_policies.php:3050
+#: ../../enterprise/include/functions_policies.php:3229
 msgid "Module pending to link"
 msgstr "リンク待ちモジュール"
 
-#: ../../enterprise/include/functions_policies.php:3055
+#: ../../enterprise/include/functions_policies.php:3234
 msgid "Module pending to unlink"
 msgstr "リンク解除待ちモジュール"
 
-#: ../../enterprise/include/functions_policies.php:3781
+#: ../../enterprise/include/functions_policies.php:3960
 msgid "Create a new policy map"
 msgstr "新規ポリシーマップ作成"
 
-#: ../../enterprise/include/functions_policies.php:4100
+#: ../../enterprise/include/functions_policies.php:4279
 #, php-format
 msgid ""
 "This extension makes registration of policies enterprise. <br>You can get "
@@ -32373,733 +34788,774 @@ msgstr ""
 "この拡張は、Enterprise ポリシーを登録します。<br>追加のポリシーは我々の<a "
 "href='%s'>リソースライブラリ</a>から入手できます。"
 
-#: ../../enterprise/include/functions_reporting.php:41
+#: ../../enterprise/include/functions_reporting.php:42
 msgid "Advance options"
 msgstr "拡張オプション"
 
-#: ../../enterprise/include/functions_reporting.php:59
+#: ../../enterprise/include/functions_reporting.php:60
 msgid "Templates list"
 msgstr "テンプレート一覧"
 
-#: ../../enterprise/include/functions_reporting.php:65
+#: ../../enterprise/include/functions_reporting.php:66
 #: ../../enterprise/meta/general/main_header.php:165
 msgid "Templates wizard"
 msgstr "テンプレートウィザード"
 
-#: ../../enterprise/include/functions_reporting.php:85
+#: ../../enterprise/include/functions_reporting.php:86
 msgid "Templates Wizard"
 msgstr "テンプレートウィザード"
 
-#: ../../enterprise/include/functions_reporting.php:633
+#: ../../enterprise/include/functions_reporting.php:1019
 msgid "Availability item created from wizard."
 msgstr "ウィザードから作成された可用性アイテム"
 
-#: ../../enterprise/include/functions_reporting.php:1300
-#: ../../enterprise/include/functions_reporting.php:2092
-#: ../../enterprise/include/functions_reporting.php:2869
-#: ../../enterprise/include/functions_reporting_pdf.php:1653
+#: ../../enterprise/include/functions_reporting.php:1686
+#: ../../enterprise/include/functions_reporting.php:2494
+#: ../../enterprise/include/functions_reporting.php:3271
+#: ../../enterprise/include/functions_reporting_pdf.php:1734
 msgid "Planned Downtimes"
 msgstr "計画停止"
 
-#: ../../enterprise/include/functions_reporting.php:1306
-#: ../../enterprise/include/functions_reporting.php:2098
-#: ../../enterprise/include/functions_reporting.php:2875
-#: ../../enterprise/include/functions_reporting_pdf.php:1659
+#: ../../enterprise/include/functions_reporting.php:1692
+#: ../../enterprise/include/functions_reporting.php:2500
+#: ../../enterprise/include/functions_reporting.php:3277
+#: ../../enterprise/include/functions_reporting_pdf.php:1740
 msgid "Ignore Time"
 msgstr "除外時間"
 
-#: ../../enterprise/include/functions_reporting.php:1326
-#: ../../enterprise/include/functions_reporting_pdf.php:1674
+#: ../../enterprise/include/functions_reporting.php:1712
+#: ../../enterprise/include/functions_reporting_pdf.php:1755
 msgid "SLA Compliance per days"
 msgstr "日ごとの SLA 準拠"
 
-#: ../../enterprise/include/functions_reporting.php:1393
-#: ../../enterprise/include/functions_reporting_pdf.php:1753
+#: ../../enterprise/include/functions_reporting.php:1779
+#: ../../enterprise/include/functions_reporting_pdf.php:1834
 msgid "Summary of SLA Failures"
 msgstr "条件を満たさない SLA の概要"
 
-#: ../../enterprise/include/functions_reporting.php:1395
-#: ../../enterprise/include/functions_reporting_csv.php:1085
-#: ../../enterprise/include/functions_reporting_pdf.php:1757
+#: ../../enterprise/include/functions_reporting.php:1781
+#: ../../enterprise/include/functions_reporting_csv.php:1197
+#: ../../enterprise/include/functions_reporting_pdf.php:1838
 msgid "Day"
 msgstr "日"
 
-#: ../../enterprise/include/functions_reporting.php:2135
+#: ../../enterprise/include/functions_reporting.php:2537
 msgid "T. Total"
 msgstr "合計時間"
 
-#: ../../enterprise/include/functions_reporting.php:2136
-#: ../../enterprise/include/functions_reporting.php:2899
+#: ../../enterprise/include/functions_reporting.php:2538
+#: ../../enterprise/include/functions_reporting.php:3301
 msgid "T. OK"
 msgstr "正常時間"
 
-#: ../../enterprise/include/functions_reporting.php:2137
-#: ../../enterprise/include/functions_reporting.php:2900
+#: ../../enterprise/include/functions_reporting.php:2539
+#: ../../enterprise/include/functions_reporting.php:3302
 msgid "T. Error"
 msgstr "障害時間"
 
-#: ../../enterprise/include/functions_reporting.php:2138
-#: ../../enterprise/include/functions_reporting.php:2901
+#: ../../enterprise/include/functions_reporting.php:2540
+#: ../../enterprise/include/functions_reporting.php:3303
 msgid "T. Unknown"
 msgstr "不明時間"
 
-#: ../../enterprise/include/functions_reporting.php:2139
-#: ../../enterprise/include/functions_reporting.php:2902
+#: ../../enterprise/include/functions_reporting.php:2541
+#: ../../enterprise/include/functions_reporting.php:3304
 msgid "T. Not_init"
 msgstr "未初期化時間"
 
-#: ../../enterprise/include/functions_reporting.php:2140
-#: ../../enterprise/include/functions_reporting.php:2903
+#: ../../enterprise/include/functions_reporting.php:2542
+#: ../../enterprise/include/functions_reporting.php:3305
 msgid "T. Downtime"
 msgstr "計画停止時間"
 
-#: ../../enterprise/include/functions_reporting.php:2141
-#: ../../enterprise/include/functions_reporting.php:2904
+#: ../../enterprise/include/functions_reporting.php:2543
+#: ../../enterprise/include/functions_reporting.php:3306
 msgid "SLA %"
 msgstr "SLA %"
 
-#: ../../enterprise/include/functions_reporting.php:3528
+#: ../../enterprise/include/functions_reporting.php:3930
 msgid "Module Histogram Graph"
-msgstr "モジュールヒストグラムグラフ"
+msgstr "モジュールヒストグラム"
 
-#: ../../enterprise/include/functions_reporting.php:4038
+#: ../../enterprise/include/functions_reporting.php:4456
 msgid "There are no SLAs defined."
 msgstr "定義済のSLAがありません。"
 
-#: ../../enterprise/include/functions_reporting.php:4152
-#: ../../enterprise/include/functions_reporting.php:4771
-#: ../../enterprise/include/functions_services.php:1216
-#: ../../enterprise/include/functions_services.php:1218
-#: ../../enterprise/include/functions_services.php:1239
-#: ../../enterprise/include/functions_services.php:1240
-#: ../../enterprise/include/functions_services.php:1242
-#: ../../enterprise/include/functions_services.php:1276
-#: ../../enterprise/include/functions_services.php:1278
+#: ../../enterprise/include/functions_reporting.php:4570
+#: ../../enterprise/include/functions_reporting.php:5189
+#: ../../enterprise/include/functions_services.php:1305
+#: ../../enterprise/include/functions_services.php:1307
+#: ../../enterprise/include/functions_services.php:1328
+#: ../../enterprise/include/functions_services.php:1329
+#: ../../enterprise/include/functions_services.php:1331
+#: ../../enterprise/include/functions_services.php:1365
+#: ../../enterprise/include/functions_services.php:1367
 msgid "Nonexistent"
 msgstr "なし"
 
-#: ../../enterprise/include/functions_reporting.php:5308
-#: ../../enterprise/include/functions_reporting.php:5787
+#: ../../enterprise/include/functions_reporting.php:5726
+#: ../../enterprise/include/functions_reporting.php:6258
 #, php-format
 msgid "Graph agents(%s) - %s"
 msgstr "エージェントグラフ(%s) - %s"
 
-#: ../../enterprise/include/functions_reporting.php:5735
+#: ../../enterprise/include/functions_reporting.php:6179
 #, php-format
 msgid "Graph agent(%s) - %s"
 msgstr "エージェントグラフ(%s) - %s"
 
-#: ../../enterprise/include/functions_reporting.php:6188
-#: ../../enterprise/include/functions_reporting.php:6238
+#: ../../enterprise/include/functions_reporting.php:6598
+msgid "There is not data for the selected conditions"
+msgstr "選択した条件のデータがありません"
+
+#: ../../enterprise/include/functions_reporting.php:6749
+#: ../../enterprise/include/functions_reporting.php:6799
 msgid "Template editor"
 msgstr "テンプレート編集"
 
-#: ../../enterprise/include/functions_reporting.php:6252
+#: ../../enterprise/include/functions_reporting.php:6813
 msgid "Get PDF file"
 msgstr "PDF ファイル取得"
 
-#: ../../enterprise/include/functions_reporting_csv.php:363
+#: ../../enterprise/include/functions_reporting_csv.php:376
 msgid "Serialized data "
 msgstr "連続データ "
 
-#: ../../enterprise/include/functions_reporting_csv.php:455
-#: ../../enterprise/include/functions_reporting_csv.php:523
-#: ../../enterprise/include/functions_reporting_csv.php:558
-#: ../../enterprise/include/functions_reporting_csv.php:594
-#: ../../enterprise/include/functions_reporting_csv.php:631
-#: ../../enterprise/include/functions_reporting_csv.php:699
-#: ../../enterprise/include/functions_reporting_csv.php:735
-#: ../../enterprise/include/functions_reporting_csv.php:771
-#: ../../enterprise/include/functions_reporting_csv.php:807
-#: ../../enterprise/include/functions_reporting_csv.php:843
+#: ../../enterprise/include/functions_reporting_csv.php:468
+#: ../../enterprise/include/functions_reporting_csv.php:567
+#: ../../enterprise/include/functions_reporting_csv.php:603
+#: ../../enterprise/include/functions_reporting_csv.php:640
+#: ../../enterprise/include/functions_reporting_csv.php:678
+#: ../../enterprise/include/functions_reporting_csv.php:747
+#: ../../enterprise/include/functions_reporting_csv.php:784
+#: ../../enterprise/include/functions_reporting_csv.php:821
+#: ../../enterprise/include/functions_reporting_csv.php:857
+#: ../../enterprise/include/functions_reporting_csv.php:916
+#: ../../enterprise/include/functions_reporting_csv.php:953
 msgid "Report type"
 msgstr "レポートタイプ"
 
-#: ../../enterprise/include/functions_reporting_csv.php:457
+#: ../../enterprise/include/functions_reporting_csv.php:470
 msgid "Uknown agents"
 msgstr "不明エージェント"
 
-#: ../../enterprise/include/functions_reporting_csv.php:466
+#: ../../enterprise/include/functions_reporting_csv.php:479
 msgid "Last 8 hours events"
 msgstr "直近 8時間のイベント"
 
-#: ../../enterprise/include/functions_reporting_csv.php:668
+#: ../../enterprise/include/functions_reporting_csv.php:715
 msgid "Illegal query or any other error"
 msgstr "不正なクエリまたはその他エラー"
 
-#: ../../enterprise/include/functions_reporting_csv.php:843
+#: ../../enterprise/include/functions_reporting_csv.php:953
 msgid "% OK"
 msgstr "正常%"
 
-#: ../../enterprise/include/functions_reporting_csv.php:843
+#: ../../enterprise/include/functions_reporting_csv.php:953
 msgid "% Wrong"
 msgstr "異常%"
 
-#: ../../enterprise/include/functions_reporting_csv.php:867
+#: ../../enterprise/include/functions_reporting_csv.php:978
 msgid "Simple Graph"
 msgstr "単一グラフ"
 
-#: ../../enterprise/include/functions_reporting_csv.php:929
-#: ../../enterprise/include/functions_reporting_csv.php:976
-#: ../../enterprise/include/functions_reporting_csv.php:1048
-#: ../../enterprise/include/functions_reporting_csv.php:1164
-#: ../../enterprise/include/functions_reporting_csv.php:1376
+#: ../../enterprise/include/functions_reporting_csv.php:1041
+#: ../../enterprise/include/functions_reporting_csv.php:1088
+#: ../../enterprise/include/functions_reporting_csv.php:1160
+#: ../../enterprise/include/functions_reporting_csv.php:1276
+#: ../../enterprise/include/functions_reporting_csv.php:1488
 msgid "SLA Max"
 msgstr "最大 SLA"
 
-#: ../../enterprise/include/functions_reporting_csv.php:930
-#: ../../enterprise/include/functions_reporting_csv.php:977
-#: ../../enterprise/include/functions_reporting_csv.php:1049
-#: ../../enterprise/include/functions_reporting_csv.php:1165
-#: ../../enterprise/include/functions_reporting_csv.php:1377
+#: ../../enterprise/include/functions_reporting_csv.php:1042
+#: ../../enterprise/include/functions_reporting_csv.php:1089
+#: ../../enterprise/include/functions_reporting_csv.php:1161
+#: ../../enterprise/include/functions_reporting_csv.php:1277
+#: ../../enterprise/include/functions_reporting_csv.php:1489
 msgid "SLA Min"
 msgstr "最小 SLA"
 
-#: ../../enterprise/include/functions_reporting_csv.php:932
-#: ../../enterprise/include/functions_reporting_csv.php:979
+#: ../../enterprise/include/functions_reporting_csv.php:1044
+#: ../../enterprise/include/functions_reporting_csv.php:1091
 msgid "Time Total "
 msgstr "合計時間 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:933
-#: ../../enterprise/include/functions_reporting_csv.php:980
+#: ../../enterprise/include/functions_reporting_csv.php:1045
+#: ../../enterprise/include/functions_reporting_csv.php:1092
 msgid "Time OK "
 msgstr "正常時間 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:934
-#: ../../enterprise/include/functions_reporting_csv.php:981
+#: ../../enterprise/include/functions_reporting_csv.php:1046
+#: ../../enterprise/include/functions_reporting_csv.php:1093
 msgid "Time Error "
 msgstr "障害時間 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:935
-#: ../../enterprise/include/functions_reporting_csv.php:982
+#: ../../enterprise/include/functions_reporting_csv.php:1047
+#: ../../enterprise/include/functions_reporting_csv.php:1094
 msgid "Time Unknown "
 msgstr "不明時間 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:936
-#: ../../enterprise/include/functions_reporting_csv.php:983
+#: ../../enterprise/include/functions_reporting_csv.php:1048
+#: ../../enterprise/include/functions_reporting_csv.php:1095
 msgid "Time Not Init "
 msgstr "未初期化時間 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:937
-#: ../../enterprise/include/functions_reporting_csv.php:984
+#: ../../enterprise/include/functions_reporting_csv.php:1049
+#: ../../enterprise/include/functions_reporting_csv.php:1096
 msgid "Time Downtime "
 msgstr "計画停止時間 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:938
-#: ../../enterprise/include/functions_reporting_csv.php:985
+#: ../../enterprise/include/functions_reporting_csv.php:1050
+#: ../../enterprise/include/functions_reporting_csv.php:1097
 msgid "Checks Total "
 msgstr "合計確認数 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:939
-#: ../../enterprise/include/functions_reporting_csv.php:986
+#: ../../enterprise/include/functions_reporting_csv.php:1051
+#: ../../enterprise/include/functions_reporting_csv.php:1098
 msgid "Checks OK "
 msgstr "正常確認数 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:940
-#: ../../enterprise/include/functions_reporting_csv.php:987
+#: ../../enterprise/include/functions_reporting_csv.php:1052
+#: ../../enterprise/include/functions_reporting_csv.php:1099
 msgid "Checks Error "
 msgstr "障害確認数 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:941
-#: ../../enterprise/include/functions_reporting_csv.php:988
+#: ../../enterprise/include/functions_reporting_csv.php:1053
+#: ../../enterprise/include/functions_reporting_csv.php:1100
 msgid "Checks Unknown "
 msgstr "不明確認数 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:942
-#: ../../enterprise/include/functions_reporting_csv.php:989
+#: ../../enterprise/include/functions_reporting_csv.php:1054
+#: ../../enterprise/include/functions_reporting_csv.php:1101
 msgid "Checks Not Init "
 msgstr "未初期化確認数 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:943
-#: ../../enterprise/include/functions_reporting_csv.php:990
+#: ../../enterprise/include/functions_reporting_csv.php:1055
+#: ../../enterprise/include/functions_reporting_csv.php:1102
 msgid "SLA "
 msgstr "SLA "
 
-#: ../../enterprise/include/functions_reporting_csv.php:944
-#: ../../enterprise/include/functions_reporting_csv.php:991
+#: ../../enterprise/include/functions_reporting_csv.php:1056
+#: ../../enterprise/include/functions_reporting_csv.php:1103
 msgid "Status "
 msgstr "状態 "
 
-#: ../../enterprise/include/functions_reporting_csv.php:1036
-#: ../../enterprise/include/functions_reporting_csv.php:1149
-#: ../../enterprise/include/functions_reporting_csv.php:1296
-#: ../../enterprise/include/functions_reporting_csv.php:1361
+#: ../../enterprise/include/functions_reporting_csv.php:1148
+#: ../../enterprise/include/functions_reporting_csv.php:1261
+#: ../../enterprise/include/functions_reporting_csv.php:1408
+#: ../../enterprise/include/functions_reporting_csv.php:1473
 msgid "Subtitle"
 msgstr "サブタイトル"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1051
-#: ../../enterprise/include/functions_reporting_csv.php:1180
-#: ../../enterprise/include/functions_reporting_csv.php:1392
+#: ../../enterprise/include/functions_reporting_csv.php:1163
+#: ../../enterprise/include/functions_reporting_csv.php:1292
+#: ../../enterprise/include/functions_reporting_csv.php:1504
 msgid "Time Total Month"
 msgstr "月間合計時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1052
-#: ../../enterprise/include/functions_reporting_csv.php:1181
-#: ../../enterprise/include/functions_reporting_csv.php:1393
+#: ../../enterprise/include/functions_reporting_csv.php:1164
+#: ../../enterprise/include/functions_reporting_csv.php:1293
+#: ../../enterprise/include/functions_reporting_csv.php:1505
 msgid "Time OK Month"
 msgstr "月間正常時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1053
-#: ../../enterprise/include/functions_reporting_csv.php:1182
-#: ../../enterprise/include/functions_reporting_csv.php:1394
+#: ../../enterprise/include/functions_reporting_csv.php:1165
+#: ../../enterprise/include/functions_reporting_csv.php:1294
+#: ../../enterprise/include/functions_reporting_csv.php:1506
 msgid "Time Error Month"
 msgstr "月間障害時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1054
-#: ../../enterprise/include/functions_reporting_csv.php:1183
-#: ../../enterprise/include/functions_reporting_csv.php:1395
+#: ../../enterprise/include/functions_reporting_csv.php:1166
+#: ../../enterprise/include/functions_reporting_csv.php:1295
+#: ../../enterprise/include/functions_reporting_csv.php:1507
 msgid "Time Unknown Month"
 msgstr "月間不明時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1055
-#: ../../enterprise/include/functions_reporting_csv.php:1184
-#: ../../enterprise/include/functions_reporting_csv.php:1396
+#: ../../enterprise/include/functions_reporting_csv.php:1167
+#: ../../enterprise/include/functions_reporting_csv.php:1296
+#: ../../enterprise/include/functions_reporting_csv.php:1508
 msgid "Time Downtime Month"
 msgstr "月間計画停止時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1056
-#: ../../enterprise/include/functions_reporting_csv.php:1185
-#: ../../enterprise/include/functions_reporting_csv.php:1397
+#: ../../enterprise/include/functions_reporting_csv.php:1168
+#: ../../enterprise/include/functions_reporting_csv.php:1297
+#: ../../enterprise/include/functions_reporting_csv.php:1509
 msgid "Time Not Init Month"
 msgstr "月間未初期化時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1057
-#: ../../enterprise/include/functions_reporting_csv.php:1186
-#: ../../enterprise/include/functions_reporting_csv.php:1398
+#: ../../enterprise/include/functions_reporting_csv.php:1169
+#: ../../enterprise/include/functions_reporting_csv.php:1298
+#: ../../enterprise/include/functions_reporting_csv.php:1510
 msgid "Checks Total Month"
 msgstr "月間合計確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1058
-#: ../../enterprise/include/functions_reporting_csv.php:1187
-#: ../../enterprise/include/functions_reporting_csv.php:1399
+#: ../../enterprise/include/functions_reporting_csv.php:1170
+#: ../../enterprise/include/functions_reporting_csv.php:1299
+#: ../../enterprise/include/functions_reporting_csv.php:1511
 msgid "Checks OK Month"
 msgstr "月間正常確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1059
-#: ../../enterprise/include/functions_reporting_csv.php:1188
-#: ../../enterprise/include/functions_reporting_csv.php:1400
+#: ../../enterprise/include/functions_reporting_csv.php:1171
+#: ../../enterprise/include/functions_reporting_csv.php:1300
+#: ../../enterprise/include/functions_reporting_csv.php:1512
 msgid "Checks Error Month"
 msgstr "月間障害確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1060
-#: ../../enterprise/include/functions_reporting_csv.php:1189
-#: ../../enterprise/include/functions_reporting_csv.php:1401
+#: ../../enterprise/include/functions_reporting_csv.php:1172
+#: ../../enterprise/include/functions_reporting_csv.php:1301
+#: ../../enterprise/include/functions_reporting_csv.php:1513
 msgid "Checks Unknown Month"
 msgstr "月間不明確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1061
-#: ../../enterprise/include/functions_reporting_csv.php:1190
-#: ../../enterprise/include/functions_reporting_csv.php:1402
+#: ../../enterprise/include/functions_reporting_csv.php:1173
+#: ../../enterprise/include/functions_reporting_csv.php:1302
+#: ../../enterprise/include/functions_reporting_csv.php:1514
 msgid "Checks Not Init Month"
 msgstr "月間未初期化確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1062
-#: ../../enterprise/include/functions_reporting_csv.php:1191
-#: ../../enterprise/include/functions_reporting_csv.php:1403
+#: ../../enterprise/include/functions_reporting_csv.php:1174
+#: ../../enterprise/include/functions_reporting_csv.php:1303
+#: ../../enterprise/include/functions_reporting_csv.php:1515
 msgid "SLA Month"
 msgstr "月間 SLA"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1063
-#: ../../enterprise/include/functions_reporting_csv.php:1192
-#: ../../enterprise/include/functions_reporting_csv.php:1404
+#: ../../enterprise/include/functions_reporting_csv.php:1175
+#: ../../enterprise/include/functions_reporting_csv.php:1304
+#: ../../enterprise/include/functions_reporting_csv.php:1516
 msgid "Status Month"
 msgstr "月間状態"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1086
-#: ../../enterprise/include/functions_reporting_csv.php:1238
+#: ../../enterprise/include/functions_reporting_csv.php:1198
+#: ../../enterprise/include/functions_reporting_csv.php:1350
 msgid "Time Total Day"
 msgstr "日ごとの合計時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1087
-#: ../../enterprise/include/functions_reporting_csv.php:1239
+#: ../../enterprise/include/functions_reporting_csv.php:1199
+#: ../../enterprise/include/functions_reporting_csv.php:1351
 msgid "Time OK Day"
 msgstr "日ごとの正常時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1088
-#: ../../enterprise/include/functions_reporting_csv.php:1240
+#: ../../enterprise/include/functions_reporting_csv.php:1200
+#: ../../enterprise/include/functions_reporting_csv.php:1352
 msgid "Time Error Day"
 msgstr "日ごとの障害時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1089
-#: ../../enterprise/include/functions_reporting_csv.php:1241
+#: ../../enterprise/include/functions_reporting_csv.php:1201
+#: ../../enterprise/include/functions_reporting_csv.php:1353
 msgid "Time Unknown Day"
 msgstr "日ごとの不明時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1090
-#: ../../enterprise/include/functions_reporting_csv.php:1242
+#: ../../enterprise/include/functions_reporting_csv.php:1202
+#: ../../enterprise/include/functions_reporting_csv.php:1354
 msgid "Time Not Init Day"
 msgstr "日ごとの未初期化時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1091
-#: ../../enterprise/include/functions_reporting_csv.php:1243
+#: ../../enterprise/include/functions_reporting_csv.php:1203
+#: ../../enterprise/include/functions_reporting_csv.php:1355
 msgid "Time Downtime Day"
 msgstr "日ごとの計画停止時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1092
-#: ../../enterprise/include/functions_reporting_csv.php:1244
+#: ../../enterprise/include/functions_reporting_csv.php:1204
+#: ../../enterprise/include/functions_reporting_csv.php:1356
 msgid "Time Out Day"
 msgstr "日ごとの停止時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1093
-#: ../../enterprise/include/functions_reporting_csv.php:1245
+#: ../../enterprise/include/functions_reporting_csv.php:1205
+#: ../../enterprise/include/functions_reporting_csv.php:1357
 msgid "Checks Total Day"
 msgstr "日ごとの合計確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1094
-#: ../../enterprise/include/functions_reporting_csv.php:1246
+#: ../../enterprise/include/functions_reporting_csv.php:1206
+#: ../../enterprise/include/functions_reporting_csv.php:1358
 msgid "Checks OK Day"
 msgstr "日ごとの正常確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1095
-#: ../../enterprise/include/functions_reporting_csv.php:1247
+#: ../../enterprise/include/functions_reporting_csv.php:1207
+#: ../../enterprise/include/functions_reporting_csv.php:1359
 msgid "Checks Error Day"
 msgstr "日ごとの障害確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1096
-#: ../../enterprise/include/functions_reporting_csv.php:1248
+#: ../../enterprise/include/functions_reporting_csv.php:1208
+#: ../../enterprise/include/functions_reporting_csv.php:1360
 msgid "Checks Unknown Day"
 msgstr "日ごとの不明確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1097
-#: ../../enterprise/include/functions_reporting_csv.php:1249
+#: ../../enterprise/include/functions_reporting_csv.php:1209
+#: ../../enterprise/include/functions_reporting_csv.php:1361
 msgid "Checks Not Init Day"
 msgstr "日ごとの不明確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1098
-#: ../../enterprise/include/functions_reporting_csv.php:1250
+#: ../../enterprise/include/functions_reporting_csv.php:1210
+#: ../../enterprise/include/functions_reporting_csv.php:1362
 msgid "SLA Day"
 msgstr "日ごとの SLAd"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1099
-#: ../../enterprise/include/functions_reporting_csv.php:1251
+#: ../../enterprise/include/functions_reporting_csv.php:1211
+#: ../../enterprise/include/functions_reporting_csv.php:1363
 msgid "SLA Fixed Day"
 msgstr "日ごとの修正 SLA"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1100
-#: ../../enterprise/include/functions_reporting_csv.php:1252
+#: ../../enterprise/include/functions_reporting_csv.php:1212
+#: ../../enterprise/include/functions_reporting_csv.php:1364
 msgid "Date From Day"
 msgstr "開始日"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1101
-#: ../../enterprise/include/functions_reporting_csv.php:1253
+#: ../../enterprise/include/functions_reporting_csv.php:1213
+#: ../../enterprise/include/functions_reporting_csv.php:1365
 msgid "Date To Day"
 msgstr "終了日"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1102
-#: ../../enterprise/include/functions_reporting_csv.php:1254
+#: ../../enterprise/include/functions_reporting_csv.php:1214
+#: ../../enterprise/include/functions_reporting_csv.php:1366
 msgid "Status Day"
 msgstr "日ごとの状態"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1160
-#: ../../enterprise/include/functions_reporting_csv.php:1372
+#: ../../enterprise/include/functions_reporting_csv.php:1272
+#: ../../enterprise/include/functions_reporting_csv.php:1484
 msgid "Month Number"
 msgstr "月の数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1161
-#: ../../enterprise/include/functions_reporting_csv.php:1373
+#: ../../enterprise/include/functions_reporting_csv.php:1273
+#: ../../enterprise/include/functions_reporting_csv.php:1485
 msgid "Year"
 msgstr "年"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1211
+#: ../../enterprise/include/functions_reporting_csv.php:1323
 msgid "Time Total week"
 msgstr "週間合計時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1212
+#: ../../enterprise/include/functions_reporting_csv.php:1324
 msgid "Time OK week"
 msgstr "週間正常時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1213
+#: ../../enterprise/include/functions_reporting_csv.php:1325
 msgid "Time Error week"
 msgstr "週間障害時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1214
+#: ../../enterprise/include/functions_reporting_csv.php:1326
 msgid "Time Unknown week"
 msgstr "週間不明時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1215
+#: ../../enterprise/include/functions_reporting_csv.php:1327
 msgid "Time Downtime week"
 msgstr "週間計画停止時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1216
+#: ../../enterprise/include/functions_reporting_csv.php:1328
 msgid "Time Not Init week"
 msgstr "週間未初期化時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1217
+#: ../../enterprise/include/functions_reporting_csv.php:1329
 msgid "Checks Total week"
 msgstr "週間合計確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1218
+#: ../../enterprise/include/functions_reporting_csv.php:1330
 msgid "Checks OK week"
 msgstr "週間正常確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1219
+#: ../../enterprise/include/functions_reporting_csv.php:1331
 msgid "Checks Error week"
 msgstr "週間障害確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1220
+#: ../../enterprise/include/functions_reporting_csv.php:1332
 msgid "Checks Unknown week"
 msgstr "週間不明確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1221
+#: ../../enterprise/include/functions_reporting_csv.php:1333
 msgid "Status week"
 msgstr "週間状態"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1237
+#: ../../enterprise/include/functions_reporting_csv.php:1349
 msgid "Day Week"
 msgstr "週"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1306
+#: ../../enterprise/include/functions_reporting_csv.php:1418
 msgid "SLA max"
 msgstr "最大 SLA"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1307
+#: ../../enterprise/include/functions_reporting_csv.php:1419
 msgid "SLA min"
 msgstr "最小 SLA"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1308
+#: ../../enterprise/include/functions_reporting_csv.php:1420
 msgid "SLA limit"
 msgstr "SLA 制限"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1311
+#: ../../enterprise/include/functions_reporting_csv.php:1423
 msgid "Time Error"
 msgstr "障害時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1317
+#: ../../enterprise/include/functions_reporting_csv.php:1429
 msgid "Checks Error"
 msgstr "エラー数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1319
+#: ../../enterprise/include/functions_reporting_csv.php:1431
 msgid "Checks Not Init"
 msgstr "未初期化数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1321
+#: ../../enterprise/include/functions_reporting_csv.php:1433
 msgid "SLA Fixed"
 msgstr "修正 SLA"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1423
+#: ../../enterprise/include/functions_reporting_csv.php:1535
 msgid "Time Total day"
 msgstr "日ごとの合計時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1424
+#: ../../enterprise/include/functions_reporting_csv.php:1536
 msgid "Time OK day"
 msgstr "日ごとの正常時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1425
+#: ../../enterprise/include/functions_reporting_csv.php:1537
 msgid "Time Error day"
 msgstr "日ごとの障害時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1426
+#: ../../enterprise/include/functions_reporting_csv.php:1538
 msgid "Time Unknown day"
 msgstr "日ごとの不明時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1427
+#: ../../enterprise/include/functions_reporting_csv.php:1539
 msgid "Time Downtime day"
 msgstr "日ごとの計画停止時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1428
+#: ../../enterprise/include/functions_reporting_csv.php:1540
 msgid "Time Not Init day"
 msgstr "日ごとの未初期化時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1429
+#: ../../enterprise/include/functions_reporting_csv.php:1541
 msgid "Checks Total day"
 msgstr "日ごとの合計確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1430
+#: ../../enterprise/include/functions_reporting_csv.php:1542
 msgid "Checks OK day"
 msgstr "日ごとの正常確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1431
+#: ../../enterprise/include/functions_reporting_csv.php:1543
 msgid "Checks Error day"
 msgstr "日ごとのエラー確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1432
+#: ../../enterprise/include/functions_reporting_csv.php:1544
 msgid "Checks Unknown day"
 msgstr "日ごとの不明確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1433
+#: ../../enterprise/include/functions_reporting_csv.php:1545
 msgid "Status day"
 msgstr "日ごとの状態"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1450
+#: ../../enterprise/include/functions_reporting_csv.php:1562
 msgid "Time Total hours"
 msgstr "1時間ごとの合計時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1451
+#: ../../enterprise/include/functions_reporting_csv.php:1563
 msgid "Time OK hours"
 msgstr "1時間ごとの正常時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1452
+#: ../../enterprise/include/functions_reporting_csv.php:1564
 msgid "Time Error hours"
 msgstr "1時間ごとの障害時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1453
+#: ../../enterprise/include/functions_reporting_csv.php:1565
 msgid "Time Unknown hours"
 msgstr "1時間ごとの不明時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1454
+#: ../../enterprise/include/functions_reporting_csv.php:1566
 msgid "Time Not Init hours"
 msgstr "1時間ごとの未初期化時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1455
+#: ../../enterprise/include/functions_reporting_csv.php:1567
 msgid "Time Downtime hours"
 msgstr "1時間ごとの計画停止時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1456
+#: ../../enterprise/include/functions_reporting_csv.php:1568
 msgid "Time Out hours"
 msgstr "1時間ごとの停止時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1457
+#: ../../enterprise/include/functions_reporting_csv.php:1569
 msgid "Checks Total hours"
 msgstr "1時間ごとの確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1458
+#: ../../enterprise/include/functions_reporting_csv.php:1570
 msgid "Checks OK hours"
 msgstr "1時間ごとの正常確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1459
+#: ../../enterprise/include/functions_reporting_csv.php:1571
 msgid "Checks Error hours"
 msgstr "1時間ごとの障害確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1460
+#: ../../enterprise/include/functions_reporting_csv.php:1572
 msgid "Checks Unknown hours"
 msgstr "1時間ごとの不明確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1461
+#: ../../enterprise/include/functions_reporting_csv.php:1573
 msgid "Checks Not Init hours"
 msgstr "1時間ごとの未初期化確認数"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1462
+#: ../../enterprise/include/functions_reporting_csv.php:1574
 msgid "SLA hours"
 msgstr "1時間ごとの SLA"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1463
+#: ../../enterprise/include/functions_reporting_csv.php:1575
 msgid "SLA Fixed hours"
 msgstr "1時間ごとの修正 SLA"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1464
+#: ../../enterprise/include/functions_reporting_csv.php:1576
 msgid "Date From hours"
 msgstr "開始時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1465
+#: ../../enterprise/include/functions_reporting_csv.php:1577
 msgid "Date To hours"
 msgstr "終了時間"
 
-#: ../../enterprise/include/functions_reporting_csv.php:1466
+#: ../../enterprise/include/functions_reporting_csv.php:1578
 msgid "Status hours"
 msgstr "1時間ごとの状態"
 
-#: ../../enterprise/include/functions_reporting_pdf.php:1498
+#: ../../enterprise/include/functions_reporting_pdf.php:1579
 msgid "Legend Graph"
 msgstr "グラフの凡例"
 
-#: ../../enterprise/include/functions_reporting_pdf.php:1849
+#: ../../enterprise/include/functions_reporting_pdf.php:1930
 msgid "Total Time"
 msgstr "合計時間"
 
-#: ../../enterprise/include/functions_reporting_pdf.php:1853
+#: ../../enterprise/include/functions_reporting_pdf.php:1934
 msgid "Time Not init"
 msgstr "未初期化時間"
 
-#: ../../enterprise/include/functions_reporting_pdf.php:1854
+#: ../../enterprise/include/functions_reporting_pdf.php:1935
 msgid "Time Downtimes"
 msgstr "計画停止時間"
 
-#: ../../enterprise/include/functions_reporting_pdf.php:1869
+#: ../../enterprise/include/functions_reporting_pdf.php:1950
 msgid "Total Checks"
 msgstr "合計確認数"
 
-#: ../../enterprise/include/functions_reporting_pdf.php:1991
+#: ../../enterprise/include/functions_reporting_pdf.php:2072
 msgid "Agent min"
 msgstr "最小エージェント"
 
-#: ../../enterprise/include/functions_reporting_pdf.php:1992
+#: ../../enterprise/include/functions_reporting_pdf.php:2073
 msgid "Agent min Value"
 msgstr "エージェント最小値"
 
-#: ../../enterprise/include/functions_reporting_pdf.php:2316
+#: ../../enterprise/include/functions_reporting_pdf.php:2397
 msgid "SO"
 msgstr "OS"
 
-#: ../../enterprise/include/functions_reporting_pdf.php:2357
+#: ../../enterprise/include/functions_reporting_pdf.php:2438
 msgid "There are no modules."
 msgstr "モジュールがありません。"
 
-#: ../../enterprise/include/functions_services.php:23
+#: ../../enterprise/include/functions_services.php:22
+msgid "There is no information about"
+msgstr "次に関する情報がありません:"
+
+#: ../../enterprise/include/functions_services.php:26
 msgid "Service does not exist."
 msgstr "サービスがありません。"
 
-#: ../../enterprise/include/functions_services.php:30
-msgid "Module store the service does not exist."
-msgstr "サービスを保存するモジュールがありません。"
+#: ../../enterprise/include/functions_services.php:34
+msgid ", module that stores the service"
+msgstr ""
 
-#: ../../enterprise/include/functions_services.php:35
-msgid "Module store SLA service does not exist."
-msgstr "SLAサービスを保存するモジュールがありません。"
+#: ../../enterprise/include/functions_services.php:37
+msgid "module that stores the service"
+msgstr ""
 
-#: ../../enterprise/include/functions_services.php:41
-msgid "Agent store the service does not exist."
-msgstr "サービスを保存するエージェントがありません。"
+#: ../../enterprise/include/functions_services.php:45
+msgid ", module that stores SLA service"
+msgstr ""
 
-#: ../../enterprise/include/functions_services.php:47
-msgid "Agent store SLA service does not exist."
-msgstr "SLAサービスを保存するエージェントがありません。"
+#: ../../enterprise/include/functions_services.php:48
+msgid "module that stores SLA service"
+msgstr ""
 
-#: ../../enterprise/include/functions_services.php:57
-msgid "Alert critical SLA service does not exist."
-msgstr "障害アラートSLAサービスがありません。"
+#: ../../enterprise/include/functions_services.php:58
+msgid ", agent that stores the service"
+msgstr ""
 
-#: ../../enterprise/include/functions_services.php:68
-msgid "Alert warning service does not exist."
-msgstr "警告アラートサービスがありません。"
+#: ../../enterprise/include/functions_services.php:61
+msgid "agent that stores the service"
+msgstr ""
 
-#: ../../enterprise/include/functions_services.php:79
-msgid "Alert critical service does not exist."
-msgstr "障害アラートサービスがありません。"
+#: ../../enterprise/include/functions_services.php:70
+msgid ", agent that stores SLA service"
+msgstr ""
 
-#: ../../enterprise/include/functions_services.php:90
-msgid "Alert unknown service does not exist."
-msgstr "不明アラートサービスがありません。"
+#: ../../enterprise/include/functions_services.php:73
+msgid "agent that stores SLA service"
+msgstr ""
 
-#: ../../enterprise/include/functions_services.php:328
+#: ../../enterprise/include/functions_services.php:86
+msgid ", alert critical SLA service"
+msgstr ""
+
+#: ../../enterprise/include/functions_services.php:89
+msgid "alert critical SLA service"
+msgstr ""
+
+#: ../../enterprise/include/functions_services.php:103
+msgid ", alert warning service"
+msgstr ""
+
+#: ../../enterprise/include/functions_services.php:106
+msgid "alert warning service"
+msgstr ""
+
+#: ../../enterprise/include/functions_services.php:120
+msgid ", alert critical service"
+msgstr ""
+
+#: ../../enterprise/include/functions_services.php:123
+msgid "alert critical service"
+msgstr ""
+
+#: ../../enterprise/include/functions_services.php:137
+msgid ", alert unknown service"
+msgstr ""
+
+#: ../../enterprise/include/functions_services.php:140
+msgid "alert unknown service"
+msgstr ""
+
+#: ../../enterprise/include/functions_services.php:379
 #, php-format
 msgid "Module automatic create for the service %s"
 msgstr "サービス %s のモジュール自動生成"
 
-#: ../../enterprise/include/functions_services.php:1261
+#: ../../enterprise/include/functions_services.php:1350
 msgid "Critical (Alert)"
 msgstr "障害 (アラート)"
 
-#: ../../enterprise/include/functions_services.php:1391
+#: ../../enterprise/include/functions_services.php:1480
 msgid "There are no service elements defined"
 msgstr "サービス要素が定義されていません"
 
-#: ../../enterprise/include/functions_services.php:1417
+#: ../../enterprise/include/functions_services.php:1506
 msgid "Weight Critical"
 msgstr "障害ウエイト"
 
-#: ../../enterprise/include/functions_services.php:1418
+#: ../../enterprise/include/functions_services.php:1507
 msgid "Weight Warning"
 msgstr "警告ウエイト"
 
-#: ../../enterprise/include/functions_services.php:1419
+#: ../../enterprise/include/functions_services.php:1508
 msgid "Weight Unknown"
 msgstr "不明ウエイト"
 
-#: ../../enterprise/include/functions_services.php:1420
+#: ../../enterprise/include/functions_services.php:1509
 msgid "Weight Ok"
 msgstr "正常ウエイト"
 
-#: ../../enterprise/include/functions_services.php:1446
-#: ../../enterprise/include/functions_services.php:1461
-#: ../../enterprise/include/functions_services.php:1496
+#: ../../enterprise/include/functions_services.php:1535
+#: ../../enterprise/include/functions_services.php:1550
+#: ../../enterprise/include/functions_services.php:1585
 msgid "Nonexistent. This element should be deleted"
 msgstr "存在しません。要素が削除されています。"
 
-#: ../../enterprise/include/functions_services.php:1661
+#: ../../enterprise/include/functions_services.php:1750
 msgid "Delete service element"
 msgstr "サービス要素削除"
 
-#: ../../enterprise/include/functions_services.php:1703
+#: ../../enterprise/include/functions_services.php:1792
 msgid "FAIL"
 msgstr "失敗"
 
@@ -33110,32 +35566,32 @@ msgstr "ログ収集"
 
 #: ../../enterprise/include/functions_setup.php:80
 msgid "Auto provisioning into Metaconsole"
-msgstr "メタコンソールへの自動プロビジョニング"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:90
 msgid "URL Metaconsole Api"
-msgstr "メタコンソール API URL"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:95
 msgid "Api pass"
-msgstr "API パスワード"
+msgstr "APIパスワード"
 
 #: ../../enterprise/include/functions_setup.php:99
 msgid "Meta user"
-msgstr "メタコンソールユーザ"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:103
 msgid "Meta pass"
-msgstr "メタコンソールパスワード"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:107
 msgid "Metaconsole APi Online"
-msgstr "メタコンソールオンライン API"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:109
 #: ../../enterprise/include/functions_setup.php:139
 msgid "Please click in the dot to re-check"
-msgstr "再確認のためには、ドットをクリックしてください"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:115
 msgid "Pandora user"
@@ -33143,42 +35599,42 @@ msgstr "Pandora ユーザ"
 
 #: ../../enterprise/include/functions_setup.php:116
 msgid "Normally the admin user"
-msgstr "通常は admin ユーザです"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:120
 msgid "Pandora pass"
-msgstr "Pandora パスワード"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:124
 msgid "Public url console"
-msgstr "コンソール公開 URL"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:125
 msgid "Without the index.php such as http://domain/pandora_url"
-msgstr "http://domain/pandora_url のように index.php なし"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:131
 msgid "Register your node in metaconsole"
-msgstr "メタコンソールにノードを登録"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:133
 msgid "Register the node"
-msgstr "ノードを登録"
+msgstr ""
 
 #: ../../enterprise/include/functions_setup.php:138
 msgid "Status your node in metaconsole"
-msgstr "メタコンソール内のノードの状態"
+msgstr ""
 
 #: ../../enterprise/include/functions_transactional.php:496
 msgid "Error in dependencies field"
-msgstr "依存関係フィールドでエラー"
+msgstr ""
 
 #: ../../enterprise/include/functions_transactional.php:505
 msgid "Error in enables field"
-msgstr "有効化フィールドでエラー"
+msgstr ""
 
 #: ../../enterprise/include/functions_update_manager.php:147
-#: ../../enterprise/include/functions_update_manager.php:320
+#: ../../enterprise/include/functions_update_manager.php:327
 #, php-format
 msgid "There is a error: %s"
 msgstr "エラーがあります: %s"
@@ -33196,92 +35652,78 @@ msgstr "バージョン番号:"
 msgid "Show details"
 msgstr "詳細表示"
 
-#: ../../enterprise/include/functions_update_manager.php:190
-msgid ""
-"There are new database changes available to apply. Do you want to start the "
-"DB update process?"
-msgstr "適用する新たなデータベースの変更があります。DB のアップデート処理を開始しますか。"
-
-#: ../../enterprise/include/functions_update_manager.php:191
-msgid "We recommend launching "
-msgstr "起動することをお勧めします "
-
-#: ../../enterprise/include/functions_update_manager.php:207
+#: ../../enterprise/include/functions_update_manager.php:214
 msgid "Update to the next version"
 msgstr "次のバージョンへアップデート"
 
-#: ../../enterprise/include/functions_visual_map.php:182
-#: ../../enterprise/include/functions_visual_map.php:235
-msgid "Crit:"
-msgstr "障害:"
+#: ../../enterprise/include/functions_ux_console.php:422
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:404
+#: ../../enterprise/operation/agentes/transactional_map.php:260
+#: ../../enterprise/operation/agentes/ux_console_view.php:218
+#: ../../enterprise/operation/agentes/ux_console_view.php:338
+#: ../../enterprise/operation/agentes/wux_console_view.php:348
+msgid "Failed"
+msgstr "失敗"
 
-#: ../../enterprise/include/functions_visual_map.php:184
-#: ../../enterprise/include/functions_visual_map.php:237
-msgid "Warn:"
-msgstr "警告:"
+#: ../../enterprise/include/reset_pass.php:100
+#: ../../enterprise/meta/include/reset_pass.php:76
+msgid "User to reset password"
+msgstr ""
 
-#: ../../enterprise/include/functions_visual_map.php:186
-#: ../../enterprise/include/functions_visual_map.php:239
-msgid "Ok:"
-msgstr "正常:"
+#: ../../enterprise/include/reset_pass.php:103
+#: ../../enterprise/meta/include/reset_pass.php:79
+#: ../../enterprise/meta/index.php:581 ../../index.php:702
+msgid "Reset password"
+msgstr "パスワードをリセット"
 
-#: ../../enterprise/include/functions_visual_map.php:188
-#: ../../enterprise/include/functions_visual_map.php:241
-msgid "Value:"
-msgstr "値:"
+#: ../../enterprise/include/reset_pass.php:164
+#: ../../enterprise/include/reset_pass.php:167
+#: ../../enterprise/meta/include/reset_pass.php:122
+#: ../../enterprise/meta/include/reset_pass.php:125
+msgid "Reset password failed"
+msgstr "パスワードのリセットに失敗"
 
-#: ../../enterprise/include/functions_visual_map.php:615
-msgid "None of the services was added"
-msgstr "サービスが追加されませんでした"
-
-#: ../../enterprise/include/functions_visual_map.php:618
-#, php-format
-msgid "%d services couldn't be added"
-msgstr "%d サービスを追加できませんでした"
-
-#: ../../enterprise/include/functions_visual_map.php:626
-msgid "There was an error retrieving the visual map information"
-msgstr "ビジュアルマップ情報の取得エラー"
-
-#: ../../enterprise/include/functions_visual_map.php:630
-msgid "No services selected"
-msgstr "サービスが選択されていません"
-
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:336
+#: ../../enterprise/load_enterprise.php:400
 msgid "Invalid licence."
 msgstr "不正なライセンス。"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:337
+msgid "Please contact your system administrator."
+msgstr "システム管理者に連絡してください。"
+
+#: ../../enterprise/load_enterprise.php:401
 msgid "Please contact Artica at info@artica.es for a valid licence."
 msgstr "ライセンスについては、Artica(info@artica.es) までご連絡ください。"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:403
 msgid "Or disable Pandora FMS enterprise"
 msgstr "または、Pandora FMS Enterprise を無効化します"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:497
+#: ../../enterprise/load_enterprise.php:742
 msgid "Request new licence"
 msgstr "新規ライセンスの要求"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:580
 msgid ""
 "<strong style=\"font-size: 11pt\">Metaconsole unreached</strong> <br><br> "
 "This node has a metaconsole license and cannot contact with the metaconsole."
 msgstr ""
-"<strong style=\"font-size: 11pt\">メタコンソール接続ができません</strong> <br><br> "
-"このノードはメタコンソールライセンスを持っていますが、メタコンソールからの接続ができません。"
+"<strong style=\"font-size: 11pt\">Metaconsole unreached</strong> <br><br> "
+"このノードはメタコンソールライセンスを持っていますが、メタコンソールに接続できません。"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:584
 #, php-format
 msgid ""
 "<strong style=\"font-size: 11pt\">License out of limits</strong> <br><br> "
 "This node has a metaconsole license and it allows %d agents and you have %d "
 "agents cached."
 msgstr ""
-"<strong style=\"font-size: 11pt\">ライセンス制限を超えました</strong> <br><br> "
-"このノードはメタコンソールライセンスを持っており、%d エージェント利用可能ですが %d エージェントあります。a"
+"<strong style=\"font-size: 11pt\">ライセンス制限超過</strong> <br><br> "
+"このノードはメタコンソールライセンスを持っており、%d エージェントまで利用できますが、%d エージェントが存在します。"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:592
 #, php-format
 msgid ""
 "<strong style=\"font-size: 11pt\">License out of limits</strong> <br><br> "
@@ -33290,7 +35732,7 @@ msgstr ""
 "<strong style=\"font-size: 11pt\">ライセンスの上限を超えています</strong> <br><br> このライセンスは "
 "%d エージェントまでですが、%d エージェントが設定されています。"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:597
 #, php-format
 msgid ""
 "<strong style=\"font-size: 11pt\">License out of limits</strong> <br><br> "
@@ -33299,7 +35741,7 @@ msgstr ""
 "<strong style=\"font-size: 11pt\">ライセンスの制限を超過しました</strong> <br><br>このライセンスは "
 "%d モジュールですが、%d モジュールが設定されています。"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:604
 msgid ""
 "<strong style=\"font-size: 11pt\">This license has expired.</strong> "
 "<br><br>You can not get updates until you renew the license."
@@ -33307,7 +35749,7 @@ msgstr ""
 "<strong style=\"font-size: 11pt\">このライセンスは期限切れです。</strong> "
 "<br><br>ライセンスを更新するまでアップデートの入手はできません。"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:615
 msgid ""
 "To continue using Pandora FMS, please disable enterprise by renaming the "
 "Enterprise directory in the console.<br><br>Or contact Artica at "
@@ -33316,23 +35758,23 @@ msgstr ""
 "Pandora FMS の利用を継続するには、コンソールの enterprise ディレクトリをリネームして Enterprise "
 "版を無効化するか、<br><br>Artica (info@artica.es) までライセンスに関してお問い合わせください:"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:619
 msgid "Please contact Artica at info@artica.es to renew the license."
 msgstr "ライセンスの更新は、Artica (info@artica.es) までお問い合わせください。"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:739
 msgid "Renew"
 msgstr "更新"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:825
 msgid "Activate license"
 msgstr "ライセンスの有効化"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:826
 msgid "Your <b>request key</b> is:"
 msgstr "<b>リクエストキー</b>:"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:828
 #, php-format
 msgid ""
 "You can activate it manually <a href=\"%s\" target=\"_blank\">here</a> or "
@@ -33340,110 +35782,222 @@ msgid ""
 msgstr ""
 "<a href=\"%s\" target=\"_blank\">ここ</a>から手動で有効化するか、以下のフォームから自動入力できます:"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:833
 msgid "Auth Key:"
 msgstr "認証キー:"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:840
+#: ../../enterprise/load_enterprise.php:856
 msgid "Online validation"
 msgstr "オンライン認証"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:849
 msgid "ERROR:"
 msgstr "エラー:"
 
-#: ../../enterprise/load_enterprise.php:1
+#: ../../enterprise/load_enterprise.php:849
 msgid "When connecting to Artica server."
 msgstr "Artica サーバへの接続時"
 
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:83
-msgid "redirected ip server in conf into source DB"
-msgstr "設定内のリダイレクトサーバをソース DB に入れました"
-
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:85
-msgid "created agent in destination DB"
-msgstr "対象 DB にエージェントを作成しました"
-
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:86
-msgid "created agent modules in destination DB"
-msgstr "対象 DB にエージェントモジュールを作成しました"
-
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:87
-msgid "created agent alerts in destination DB"
-msgstr "対象 DB にエージェントアラートを作成しました"
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:88
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:91
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:94
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:97
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:100
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:103
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:106
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:109
+msgid "Agent: "
+msgstr "エージェント: "
 
 #: ../../enterprise/meta/advanced/agents_setup.move_agents.php:88
-msgid "created alerts actions in destination DB"
-msgstr "対象 DB にアラートアクションを作成しました"
-
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:89
-msgid "disabled agent in source DB"
-msgstr "ソース DB のエージェントを無効化しました"
-
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:90
-msgid ""
-"Not set metaconsole IP in the \"IP list with API access\" guess Pandora "
-"Console."
+msgid " already exists in target node"
 msgstr ""
-"Pandora コンソールで \"APIアクセスを許可するIPアドレスリスト\" にメタコンソールの IP が設定されていない可能性があります。"
 
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:98
-msgid "Successfully moved"
-msgstr "移動しました"
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:91
+msgid " group does not exist in target node"
+msgstr ""
 
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:98
-msgid "Could not be moved"
-msgstr "移動できませんでした"
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:94
+msgid ""
+" policies definitions does not match  with defined ones in target node"
+msgstr " ポリシー定義が対象ノードの定義済のものとマッチしません。"
 
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:124
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:97
+msgid " plugins does not exist in target node"
+msgstr " 対象ノードにプラグインが存在しません"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:100
+msgid " collections does not exist in target node"
+msgstr " 対象ノードにコレクションが存在しません"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:103
+msgid " inventory does not exist in target node"
+msgstr " 対象ノードにインベントリが存在しません"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:106
+msgid " alerts template does not exist in target node"
+msgstr " 対象ノードにアラートテンプレートが存在しません"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:109
+msgid " alerts action does not exist in target node"
+msgstr " 対象ノードにアラートアクションが存在しません"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:112
+msgid "Exists agent conf for agent: "
+msgstr ""
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:112
+msgid " please remove configuration file from target node."
+msgstr " 対象ノードから設定を削除してください。"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:115
+msgid "There are differences between MR versions"
+msgstr "MR バージョンに違いがあります"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:118
+msgid "Target server ip address is set"
+msgstr "対象サーバ IP アドレス設定"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:204
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:207
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:211
+msgid "The agent: "
+msgstr "エージェント: "
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:204
+msgid " has been successfully added to the migration queue "
+msgstr " : マイグレーションキューに追加しました "
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:207
+msgid " has not been added due to problems in the insertion"
+msgstr " : 追加処理の問題により追加できませんでした"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:211
+msgid " has already been added to the migration queue"
+msgstr " : マイグレーションキューにすでに追加されています"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:230
+msgid "Problems delete queue"
+msgstr "キュー削除で問題発生"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:246
 msgid "Move Agents"
 msgstr "エージェント移動"
 
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:140
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:262
 msgid "Source Server"
 msgstr "ソースサーバ"
 
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:142
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:264
 msgid "Destination Server"
 msgstr "対象サーバ"
 
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:150
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:152
-msgid "Group filter"
-msgstr "グループフィルタ"
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:280
+msgid "Agents to move"
+msgstr "移動エージェント"
 
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:152
-msgid ""
-"Destination group is the same than in the original server, if there is not "
-"any group with that name, will be created if check box is selected. "
-"Destination group filter is just used to check agents in that group"
-msgstr ""
-"移行先のグループは移行元サーバと同じになります。同じ名前のグループが無い場合、チェックボックスがチェックされていると作成されます。移行先のグループフィルタ"
-"は、エージェントがグループにあるかどうかのみのチェックに利用されます。"
-
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:158
-msgid "Create group if doesn’t exist in destination"
-msgstr "移動先にグループが無ければ作成する"
-
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:158
-msgid "Based on name"
-msgstr "名前ベース"
-
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:167
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:292
 msgid "Add agents to destination server"
 msgstr "対象サーバにエージェントを追加"
 
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:169
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:300
 msgid "Remove agents to doesn't move to destination server"
 msgstr "送り先サーバへ移動させないエージェントを削除"
 
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:179
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:311
+msgid "Active DB only"
+msgstr "アクティブ DB のみ"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:318
+msgid "Agents do not exist in target server."
+msgstr "対象サーバにエージェントがありません。"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:319
+msgid "Check group is synchronized with target server."
+msgstr ""
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:320
+msgid "All policies needed are synchronized with target server."
+msgstr ""
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:321
+msgid "All remote plugins needed are synchronized with target server."
+msgstr ""
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:322
+msgid "All collections needed are syncronized with target server."
+msgstr ""
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:323
+msgid ""
+"All remote inventory definitions needed are syncronized with target server."
+msgstr ""
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:324
+msgid ""
+"All alert templates definitions needed are syncronized with target server."
+msgstr ""
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:325
+msgid "All alert actions needed are syncronized with target server."
+msgstr ""
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:326
+msgid "Agents conf does not exists in target server."
+msgstr "対象サーバにエージェント設定がありません。"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:327
+msgid "Both Pandora servers must be in the same version"
+msgstr "双方の Pandora サーバは同じバージョンでなければいけません"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:328
+msgid "Check target server ip address is set"
+msgstr "対象サーバ IP アドレス設定確認"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:338
 msgid "Move"
 msgstr "移動"
 
-#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:282
-msgid "Please choose other server."
-msgstr "他のサーバを選択してください。"
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:353
+msgid "Source node"
+msgstr "ソースノード"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:354
+msgid "Target node"
+msgstr "対象ノード"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:358
+msgid "Active db only"
+msgstr "アクティブ DB のみ"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:388
+msgid "Creating modules in target node"
+msgstr "対象ノードでのモジュール作成"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:391
+msgid "Disabling agent in source node and enabling in target one"
+msgstr "ソースノードでのエージェント無効化と対象ノードでの有効化"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:394
+msgid "Transferring data"
+msgstr "データ転送中"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:398
+msgid "Creating agent in target node"
+msgstr "対象ノードでのエージェント作成"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:408
+msgid "Completed"
+msgstr "完了"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:412
+msgid "Queued"
+msgstr "キュー済み"
+
+#: ../../enterprise/meta/advanced/agents_setup.move_agents.php:478
+msgid "checking migration requirements"
+msgstr "マイグレーション要求のチェック"
 
 #: ../../enterprise/meta/advanced/agents_setup.php:37
 msgid "Propagation"
@@ -33457,22 +36011,13 @@ msgstr "モジュールグループ管理"
 msgid "OS Management"
 msgstr "OS 管理"
 
-#: ../../enterprise/meta/advanced/license_meta.php:40
-msgid "Metaconsole and all nodes license updated"
-msgstr "メタコンソールとすべてのノードのライセンスを更新しました"
-
-#: ../../enterprise/meta/advanced/license_meta.php:43
-#, php-format
-msgid "Metaconsole license updated but %d of %d node synchronization failed"
-msgstr "メタコンソールのライセンスを更新しましたが、%d ノード(%dノード中)の同期に失敗しました。"
-
 #: ../../enterprise/meta/advanced/license_meta.php:72
 msgid "Licence"
 msgstr "ライセンス"
 
 #: ../../enterprise/meta/advanced/license_meta.php:113
 msgid "Validate and sync"
-msgstr "承諾と同期"
+msgstr "承諾および同期"
 
 #: ../../enterprise/meta/advanced/metasetup.auth.php:47
 #: ../../enterprise/meta/advanced/metasetup.password.php:47
@@ -33491,16 +36036,15 @@ msgstr "作成できませんでした。同じサーバ名があります。"
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:128
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:206
 msgid "Node synchronization process failed"
-msgstr "ノード同期処理に失敗しました"
+msgstr "ノードの同期処理に失敗"
 
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:227
 msgid "Could not be delete"
 msgstr "削除できませんでした"
 
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:316
-msgid ""
-"Complete path to Pandora console without last \"/\" character. Example "
-msgstr "最後の \"/\" を除いた Pandora コンソールの完全パス。例 "
+msgid "Full path to Pandora console (without index.php). Example "
+msgstr "Pandora コンソールのフルパス(index.php は含まない)。例: "
 
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:333
 msgid "DB port"
@@ -33511,14 +36055,14 @@ msgid "Agent cache"
 msgstr "エージェントキャッシュ"
 
 #: ../../enterprise/meta/advanced/metasetup.consoles.php:386
-#: ../../enterprise/meta/advanced/policymanager.sync.php:315
+#: ../../enterprise/meta/advanced/policymanager.sync.php:311
 #: ../../enterprise/meta/advanced/synchronizing.alert.php:351
 #: ../../enterprise/meta/advanced/synchronizing.component.php:327
-#: ../../enterprise/meta/advanced/synchronizing.group.php:164
-#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:108
-#: ../../enterprise/meta/advanced/synchronizing.os.php:108
+#: ../../enterprise/meta/advanced/synchronizing.group.php:201
+#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:92
+#: ../../enterprise/meta/advanced/synchronizing.os.php:92
 #: ../../enterprise/meta/advanced/synchronizing.tag.php:108
-#: ../../enterprise/meta/advanced/synchronizing.user.php:587
+#: ../../enterprise/meta/advanced/synchronizing.user.php:604
 msgid "Sync"
 msgstr "同期"
 
@@ -33530,79 +36074,88 @@ msgstr "メタコンソールに追加されたサーバがありません"
 msgid "Passwords"
 msgstr "パスワード"
 
-#: ../../enterprise/meta/advanced/metasetup.performance.php:82
-#: ../../enterprise/meta/include/functions_meta.php:1291
+#: ../../enterprise/meta/advanced/metasetup.performance.php:81
+#: ../../enterprise/meta/include/functions_meta.php:1436
 msgid "Active events history"
 msgstr "アクティブイベント履歴"
 
+#: ../../enterprise/meta/advanced/metasetup.performance.php:91
+msgid "Migration block size"
+msgstr "マイグレーションブロックサイズ"
+
 #: ../../enterprise/meta/advanced/metasetup.php:55
 msgid "Consoles Setup"
 msgstr "コンソール設定"
 
 #: ../../enterprise/meta/advanced/metasetup.php:60
-#: ../../enterprise/meta/advanced/metasetup.php:116
+#: ../../enterprise/meta/advanced/metasetup.php:121
 msgid "General setup"
 msgstr "一般設定"
 
 #: ../../enterprise/meta/advanced/metasetup.php:65
-#: ../../enterprise/meta/advanced/metasetup.php:119
+#: ../../enterprise/meta/advanced/metasetup.php:124
 msgid "Passwords setup"
 msgstr "パスワード設定"
 
 #: ../../enterprise/meta/advanced/metasetup.php:75
-#: ../../enterprise/meta/advanced/metasetup.php:125
+#: ../../enterprise/meta/advanced/metasetup.php:130
 msgid "Visual setup"
 msgstr "表示設定"
 
 #: ../../enterprise/meta/advanced/metasetup.php:80
-#: ../../enterprise/meta/advanced/metasetup.php:128
+#: ../../enterprise/meta/advanced/metasetup.php:133
 msgid "Performance setup"
 msgstr "パフォーマンス設定"
 
 #: ../../enterprise/meta/advanced/metasetup.php:90
-#: ../../enterprise/meta/advanced/metasetup.php:134
+#: ../../enterprise/meta/advanced/metasetup.php:139
 msgid "Strings translation"
 msgstr "文字列翻訳"
 
 #: ../../enterprise/meta/advanced/metasetup.php:95
+#: ../../enterprise/meta/advanced/metasetup.php:142
+msgid "Mail"
+msgstr "メール"
+
+#: ../../enterprise/meta/advanced/metasetup.php:100
 msgid "Options Update Manager"
 msgstr "アップデートマネージャオプション"
 
-#: ../../enterprise/meta/advanced/metasetup.php:100
-#: ../../enterprise/meta/advanced/metasetup.php:139
+#: ../../enterprise/meta/advanced/metasetup.php:105
+#: ../../enterprise/meta/advanced/metasetup.php:148
 msgid "Offline Update Manager"
 msgstr "オフラインアップデートマネージャ"
 
-#: ../../enterprise/meta/advanced/metasetup.php:105
-#: ../../enterprise/meta/advanced/metasetup.php:142
+#: ../../enterprise/meta/advanced/metasetup.php:110
+#: ../../enterprise/meta/advanced/metasetup.php:151
 msgid "Online Update Manager"
 msgstr "オンラインアップデートマネージャ"
 
-#: ../../enterprise/meta/advanced/metasetup.php:112
+#: ../../enterprise/meta/advanced/metasetup.php:117
 msgid "Consoles setup"
 msgstr "コンソール設定"
 
-#: ../../enterprise/meta/advanced/metasetup.php:137
+#: ../../enterprise/meta/advanced/metasetup.php:145
 msgid "Online Update Options"
 msgstr "オンラインアップデートオプション"
 
-#: ../../enterprise/meta/advanced/metasetup.setup.php:192
+#: ../../enterprise/meta/advanced/metasetup.setup.php:197
 msgid "Customize sections"
 msgstr "セクションのカスタマイズ"
 
-#: ../../enterprise/meta/advanced/metasetup.setup.php:214
+#: ../../enterprise/meta/advanced/metasetup.setup.php:219
 msgid "Disabled sections"
 msgstr "無効化セクション"
 
-#: ../../enterprise/meta/advanced/metasetup.setup.php:216
+#: ../../enterprise/meta/advanced/metasetup.setup.php:221
 msgid "Enabled sections"
 msgstr "有効化セクション"
 
-#: ../../enterprise/meta/advanced/metasetup.setup.php:222
+#: ../../enterprise/meta/advanced/metasetup.setup.php:227
 msgid "Push selected sections to enable it"
 msgstr "選択したセクションを有効にする"
 
-#: ../../enterprise/meta/advanced/metasetup.setup.php:226
+#: ../../enterprise/meta/advanced/metasetup.setup.php:231
 msgid "Pop selected sections to disable it"
 msgstr "選択したセクションを無効にする"
 
@@ -33610,16 +36163,24 @@ msgstr "選択したセクションを無効にする"
 msgid "Visual"
 msgstr "表示"
 
+#: ../../enterprise/meta/advanced/metasetup.visual.php:108
+msgid "Data precision for reports and visual consoles"
+msgstr "レポートおよびビジュアルコンソールのデータ精度"
+
 #: ../../enterprise/meta/advanced/metasetup.visual.php:108
 msgid "Precision must be a integer number between 0 and 5"
 msgstr "精度は 0 と 5 の間の整数でなければいけません"
 
-#: ../../enterprise/meta/advanced/metasetup.visual.php:136
-#: ../../enterprise/meta/include/functions_meta.php:1111
+#: ../../enterprise/meta/advanced/metasetup.visual.php:137
+msgid "Graph TIP view"
+msgstr "グラフ詳細表示"
+
+#: ../../enterprise/meta/advanced/metasetup.visual.php:158
+#: ../../enterprise/meta/include/functions_meta.php:1225
 msgid "Metaconsole elements"
 msgstr "メタコンソール要素"
 
-#: ../../enterprise/meta/advanced/metasetup.visual.php:136
+#: ../../enterprise/meta/advanced/metasetup.visual.php:158
 msgid "The number of elements retrieved for each instance in some views."
 msgstr "一部のビュー内での各インスタンスの要素数"
 
@@ -33653,77 +36214,77 @@ msgstr "ポリシー適用"
 msgid "Empty queue."
 msgstr "キューが空です"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:238
+#: ../../enterprise/meta/advanced/policymanager.sync.php:235
 #: ../../enterprise/meta/advanced/synchronizing.alert.php:286
 #: ../../enterprise/meta/advanced/synchronizing.component.php:289
-#: ../../enterprise/meta/advanced/synchronizing.user.php:498
-#: ../../enterprise/meta/advanced/synchronizing.user.php:578
-#: ../../enterprise/meta/include/functions_groups_meta.php:130
+#: ../../enterprise/meta/advanced/synchronizing.user.php:509
+#: ../../enterprise/meta/advanced/synchronizing.user.php:595
+#: ../../enterprise/meta/include/functions_groups_meta.php:174
 #: ../../enterprise/meta/include/functions_meta.php:99
-#: ../../enterprise/meta/include/functions_meta.php:201
-#: ../../enterprise/meta/include/functions_meta.php:303
+#: ../../enterprise/meta/include/functions_meta.php:195
+#: ../../enterprise/meta/include/functions_meta.php:285
 #, php-format
 msgid "Error connecting to %s"
 msgstr "%s への接続エラー"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:248
+#: ../../enterprise/meta/advanced/policymanager.sync.php:244
 #, php-format
 msgid "Error creating %s policies"
 msgstr "%s ポリシー作成エラー"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:251
+#: ../../enterprise/meta/advanced/policymanager.sync.php:247
 #, php-format
 msgid "Created %s policies"
 msgstr "%s ポリシーを作成しました"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:256
+#: ../../enterprise/meta/advanced/policymanager.sync.php:252
 #, php-format
 msgid "Error creating/updating %s/%s policy modules"
 msgstr "ポリシーモジュールの作成(%s)/更新(%s)エラー"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:259
+#: ../../enterprise/meta/advanced/policymanager.sync.php:255
 #, php-format
 msgid "Created/Updated %s/%s policy modules"
 msgstr "ポリシーモジュールを作成(%s)/更新(%s)しました"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:264
+#: ../../enterprise/meta/advanced/policymanager.sync.php:260
 #, php-format
 msgid "Error deleting %s policy modules"
 msgstr "%s ポリシーモジュールの削除エラー"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:267
+#: ../../enterprise/meta/advanced/policymanager.sync.php:263
 #, php-format
 msgid "Deleted %s policy modules"
 msgstr "%s ポリシーモジュールを削除しました"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:272
+#: ../../enterprise/meta/advanced/policymanager.sync.php:268
 #, php-format
 msgid "Error creating %s policy alerts"
 msgstr "%s ポリシーアラートの作成エラー"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:275
+#: ../../enterprise/meta/advanced/policymanager.sync.php:271
 #, php-format
 msgid "Created %s policy alerts"
 msgstr "%s ポリシーアラートを作成しました"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:280
+#: ../../enterprise/meta/advanced/policymanager.sync.php:276
 #, php-format
 msgid "Error deleting %s policy alerts"
 msgstr "%s ポリシーアラートの削除エラー"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:283
+#: ../../enterprise/meta/advanced/policymanager.sync.php:279
 #, php-format
 msgid "Deleted %s policy alerts"
 msgstr "%s ポリシーアラートを削除しました"
 
-#: ../../enterprise/meta/advanced/policymanager.sync.php:296
+#: ../../enterprise/meta/advanced/policymanager.sync.php:292
 #: ../../enterprise/meta/advanced/synchronizing.alert.php:333
 #: ../../enterprise/meta/advanced/synchronizing.component.php:311
-#: ../../enterprise/meta/advanced/synchronizing.group.php:148
-#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:92
-#: ../../enterprise/meta/advanced/synchronizing.os.php:92
+#: ../../enterprise/meta/advanced/synchronizing.group.php:153
+#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:76
+#: ../../enterprise/meta/advanced/synchronizing.os.php:76
 #: ../../enterprise/meta/advanced/synchronizing.tag.php:92
-#: ../../enterprise/meta/advanced/synchronizing.user.php:518
+#: ../../enterprise/meta/advanced/synchronizing.user.php:529
 msgid "This metaconsole"
 msgstr "このメタコンソール"
 
@@ -33795,76 +36356,76 @@ msgstr "ネットワークコンポーネントを作成(%s)/更新(%s)しまし
 msgid "Synchronizing Components"
 msgstr "コンポーネントの同期中"
 
-#: ../../enterprise/meta/advanced/synchronizing.group.php:74
-#: ../../enterprise/meta/advanced/synchronizing.group.php:75
-#: ../../enterprise/meta/advanced/synchronizing.group.php:87
-#: ../../enterprise/meta/advanced/synchronizing.group.php:88
+#: ../../enterprise/meta/advanced/synchronizing.group.php:79
+#: ../../enterprise/meta/advanced/synchronizing.group.php:80
+#: ../../enterprise/meta/advanced/synchronizing.group.php:92
+#: ../../enterprise/meta/advanced/synchronizing.group.php:93
 msgid "Open for more details"
 msgstr "詳細を開く"
 
-#: ../../enterprise/meta/advanced/synchronizing.group.php:78
+#: ../../enterprise/meta/advanced/synchronizing.group.php:83
 #, php-format
 msgid "Error creating %s groups"
 msgstr "%s グループ作成エラー"
 
-#: ../../enterprise/meta/advanced/synchronizing.group.php:91
+#: ../../enterprise/meta/advanced/synchronizing.group.php:96
 #, php-format
 msgid "Error updating %s groups"
 msgstr "%s グループ更新エラー"
 
-#: ../../enterprise/meta/advanced/synchronizing.group.php:100
-#: ../../enterprise/meta/advanced/synchronizing.group.php:101
+#: ../../enterprise/meta/advanced/synchronizing.group.php:105
+#: ../../enterprise/meta/advanced/synchronizing.group.php:106
 msgid "Open for more details in creation"
 msgstr "作成の詳細を開く"
 
-#: ../../enterprise/meta/advanced/synchronizing.group.php:106
-#: ../../enterprise/meta/advanced/synchronizing.group.php:107
+#: ../../enterprise/meta/advanced/synchronizing.group.php:111
+#: ../../enterprise/meta/advanced/synchronizing.group.php:112
 msgid "Open for more details in update"
 msgstr "更新の詳細を開く"
 
-#: ../../enterprise/meta/advanced/synchronizing.group.php:110
+#: ../../enterprise/meta/advanced/synchronizing.group.php:115
 #, php-format
 msgid "Error creating/updating %s/%s groups"
 msgstr "グループの作成(%s)/更新(%s)エラー"
 
-#: ../../enterprise/meta/advanced/synchronizing.group.php:122
+#: ../../enterprise/meta/advanced/synchronizing.group.php:127
 #, php-format
-msgid "Created/Updated %s/%s groups"
-msgstr "グループを作成(%s)/更新(%s)しました"
+msgid "Created %s / Updated %s groups ("
+msgstr "作成 %s / 更新 %s グループ ("
 
-#: ../../enterprise/meta/advanced/synchronizing.group.php:129
+#: ../../enterprise/meta/advanced/synchronizing.group.php:134
 msgid "None update or create group"
 msgstr "更新または作成したグループがありません"
 
-#: ../../enterprise/meta/advanced/synchronizing.group.php:140
+#: ../../enterprise/meta/advanced/synchronizing.group.php:145
 msgid "Synchronizing Groups"
 msgstr "グループの同期中"
 
-#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:69
+#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:53
 #, php-format
 msgid "Error creating/updating %s/%s module groups"
 msgstr "モジュールグループの作成(%s)/更新(%s)エラー"
 
-#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:72
+#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:56
 #, php-format
 msgid "Created/Updated %s/%s module groups"
 msgstr "モジュールグループを作成(%s)/更新(%s)しました"
 
-#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:84
+#: ../../enterprise/meta/advanced/synchronizing.module_groups.php:68
 msgid "Synchronizing Module Groups"
 msgstr "モジュールグループの同期中"
 
-#: ../../enterprise/meta/advanced/synchronizing.os.php:69
+#: ../../enterprise/meta/advanced/synchronizing.os.php:53
 #, php-format
 msgid "Error creating/updating %s/%s OS"
 msgstr "OS 作成(%s)/更新(%s)エラー"
 
-#: ../../enterprise/meta/advanced/synchronizing.os.php:72
+#: ../../enterprise/meta/advanced/synchronizing.os.php:56
 #, php-format
 msgid "Created/Updated %s/%s OS"
 msgstr "OS を作成(%s)/更新(%s)しました"
 
-#: ../../enterprise/meta/advanced/synchronizing.os.php:84
+#: ../../enterprise/meta/advanced/synchronizing.os.php:68
 msgid "Synchronizing OS"
 msgstr "OSの同期中"
 
@@ -33922,75 +36483,136 @@ msgstr "タグを作成(%s)/更新(%s)しました"
 msgid "Synchronizing Tags"
 msgstr "タグの同期中"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:273
+#: ../../enterprise/meta/advanced/synchronizing.user.php:274
 #, php-format
 msgid "Error updating user %s"
 msgstr "ユーザ %s の更新エラー"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:277
+#: ../../enterprise/meta/advanced/synchronizing.user.php:278
 #, php-format
 msgid "Updated user %s"
 msgstr "ユーザ %s を更新しました"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:288
+#: ../../enterprise/meta/advanced/synchronizing.user.php:289
 #, php-format
 msgid "Error creating user %s"
 msgstr "ユーザ %s の作成エラー"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:292
+#: ../../enterprise/meta/advanced/synchronizing.user.php:293
 #, php-format
 msgid "Created user %s"
 msgstr "ユーザ %s を作成しました"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:487
+#: ../../enterprise/meta/advanced/synchronizing.user.php:492
+#, php-format
+msgid ""
+"There are groups that not exist in node. The followings elements "
+"groups/profiles/user profiles were created/updated sucessfully (%d/%d/%d)"
+msgstr "ノードに存在しないグループがあります。次のグループ/プロファイル/ユーザの要素を作成/更新しました。(%d/%d/%d)"
+
+#: ../../enterprise/meta/advanced/synchronizing.user.php:497
 #, php-format
 msgid ""
 "Error creating/updating the followings elements groups/profiles/user "
 "profiles (%d/%d/%d)"
 msgstr "グループ/プロファイル/ユーザの要素の作成・更新エラー (%d/%d/%d)"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:492
+#: ../../enterprise/meta/advanced/synchronizing.user.php:503
 #, php-format
 msgid ""
 "The followings elements groups/profiles/user profiles were created/updated "
 "sucessfully (%d/%d/%d)"
 msgstr "グループ/プロファイル/ユーザの要素を作成・更新しました (%d/%d/%d)"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:510
+#: ../../enterprise/meta/advanced/synchronizing.user.php:521
 msgid "Synchronizing Users"
 msgstr "ユーザの同期中"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:542
+#: ../../enterprise/meta/advanced/synchronizing.user.php:553
 msgid "Profile mode"
 msgstr "プロファイルモード"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:542
+#: ../../enterprise/meta/advanced/synchronizing.user.php:553
 msgid "Profile synchronization mode."
 msgstr "プロファイル同期モード"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:543
+#: ../../enterprise/meta/advanced/synchronizing.user.php:554
 msgid "New profile"
 msgstr "新規プロファイル"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:545
+#: ../../enterprise/meta/advanced/synchronizing.user.php:556
 msgid ""
 "The selected user profile will be added to the selected users into the target"
 msgstr "選択されたユーザプロファイルは、対象の選択ユーザに追加されます"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:546
+#: ../../enterprise/meta/advanced/synchronizing.user.php:557
 msgid "Copy profile"
 msgstr "プロファイルのコピー"
 
-#: ../../enterprise/meta/advanced/synchronizing.user.php:548
+#: ../../enterprise/meta/advanced/synchronizing.user.php:559
 msgid ""
 "The target user profiles will be replaced with the source user profiles"
 msgstr "対象のユーザプロファイルは、元ユーザのプロファイルで置き換えられます"
 
-#: ../../enterprise/meta/agentsearch.php:80
+#: ../../enterprise/meta/advanced/synchronizing.user.php:561
+#: ../../enterprise/meta/advanced/synchronizing.user.php:581
+msgid "Create groups if not exist"
+msgstr "グループが存在しない場合作成する"
+
+#: ../../enterprise/meta/advanced/synchronizing.user.php:561
+#: ../../enterprise/meta/advanced/synchronizing.user.php:581
+msgid "Create groups assigned to user profile if not exist in node"
+msgstr "ユーザプロファイルに割り当てられたグループが存在しない場合にそれを作成する"
+
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision.php:65
+#, php-format
+msgid "Provisioning custom data <b>%s</b> successfully deleted."
+msgstr ""
+
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision.php:70
+#, php-format
+msgid "Cannot delete custom data <b>%s</b>."
+msgstr "カスタムデータを削除できません <b>%s</b>"
+
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision.php:80
+msgid "There was an error when moving the custom provisioning data."
+msgstr "カスタムプロビジョニングデータの移動エラーです。"
+
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision_rules.php:68
+msgid "Cannot create an unnamed rule."
+msgstr "名前の無いルールは作成できません。"
+
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision_rules.php:76
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision_rules.php:97
+msgid "Error creating provisioning rule."
+msgstr "プロビジョニングルールの作成エラー。"
+
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision_rules.php:87
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision_rules.php:106
+msgid "Error updating provisioning rule."
+msgstr "プロビジョニングルールの更新エラー。"
+
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision_rules.php:111
+msgid "Error deleting provisioning rule."
+msgstr "プロビジョニングルールの削除エラー。"
+
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision_rules.php:119
+msgid "There was an error rule when moving the provisioning."
+msgstr "プロビジョニングの移動でルールにエラーがあります。"
+
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision_rules.php:184
+msgid "Create rule"
+msgstr "ルールの作成"
+
+#: ../../enterprise/meta/advanced/agents_setup.autoprovision_rules.php:185
+msgid "Edit rule"
+msgstr "ルールの編集"
+
+#: ../../enterprise/meta/agentsearch.php:89
 msgid "Search results for"
 msgstr "検索結果:"
 
-#: ../../enterprise/meta/agentsearch.php:205
+#: ../../enterprise/meta/agentsearch.php:260
 msgid "There are no agents included in this group"
 msgstr "このグループに属しているエージェントが存在しません"
 
@@ -34010,11 +36632,18 @@ msgstr "更新に失敗しました"
 msgid "Fields"
 msgstr "フィールド"
 
-#: ../../enterprise/meta/general/login_page.php:43
-msgid "Go to pandorafms.com"
-msgstr "pandorafms.com へ行く"
+#: ../../enterprise/meta/general/login_page.php:61
+msgid "Go to Pandora FMS Support"
+msgstr "Pandora FMS サポートへ行く"
 
-#: ../../enterprise/meta/general/login_page.php:48
+#: ../../enterprise/meta/general/login_page.php:64
+#: ../../enterprise/meta/general/login_page.php:75
+msgid "Go to "
+msgstr "次へ行く: "
+
+#: ../../enterprise/meta/general/login_page.php:72
+#: ../../enterprise/meta/include/process_reset_pass.php:46
+#: ../../enterprise/meta/include/reset_pass.php:46
 msgid "Go to Pandora FMS Wiki"
 msgstr "Pandora FMS wiki へ行く"
 
@@ -34082,10 +36711,6 @@ msgid ""
 "system administrator if you need assistance. <br>"
 msgstr "メタコンソールは、通常のコンソールから事前に有効化する必要があります。手助けが必要であればシステム管理者へ問い合わせてください。<br>"
 
-#: ../../enterprise/meta/general/noaccess.php:17
-msgid "Back to login"
-msgstr "ログインに戻る"
-
 #: ../../enterprise/meta/general/noaccess.php:33
 msgid ""
 "Access to this page is restricted to authorized users only, please contact "
@@ -34137,15 +36762,24 @@ msgid "There was a problem loading tag"
 msgstr "タグのロードで問題が発生しました"
 
 #: ../../enterprise/meta/include/functions_agents_meta.php:1204
-#: ../../enterprise/meta/include/functions_agents_meta.php:1215
+#: ../../enterprise/meta/include/functions_agents_meta.php:1218
 msgid "Agents movement"
 msgstr "エージェント移動"
 
 #: ../../enterprise/meta/include/functions_agents_meta.php:1209
-#: ../../enterprise/meta/include/functions_agents_meta.php:1218
+#: ../../enterprise/meta/include/functions_agents_meta.php:1226
+msgid "Provisioning management"
+msgstr "プロビジョニング管理"
+
+#: ../../enterprise/meta/include/functions_agents_meta.php:1214
+#: ../../enterprise/meta/include/functions_agents_meta.php:1222
 msgid "Group management"
 msgstr "グループ管理"
 
+#: ../../enterprise/meta/include/functions_agents_meta.php:1230
+msgid "Provisioning rules management"
+msgstr "プロビジョニングルール管理"
+
 #: ../../enterprise/meta/include/functions_components_meta.php:60
 #: ../../enterprise/meta/include/functions_components_meta.php:75
 msgid "Plugin management"
@@ -34159,24 +36793,24 @@ msgstr "プラグイン作成"
 msgid "Edit plugin"
 msgstr "プラグイン編集"
 
-#: ../../enterprise/meta/include/functions_groups_meta.php:77
+#: ../../enterprise/meta/include/functions_groups_meta.php:120
 #, php-format
 msgid "(Error Duplicate ID (%d) ) "
 msgstr "(重複 ID (%d) エラー) "
 
-#: ../../enterprise/meta/include/functions_groups_meta.php:99
+#: ../../enterprise/meta/include/functions_groups_meta.php:143
 msgid "Different parent"
 msgstr "異なる親"
 
-#: ../../enterprise/meta/include/functions_groups_meta.php:104
+#: ../../enterprise/meta/include/functions_groups_meta.php:148
 msgid "Different name"
 msgstr "異なる名前"
 
-#: ../../enterprise/meta/include/functions_meta.php:332
+#: ../../enterprise/meta/include/functions_meta.php:311
 msgid "No admin user"
 msgstr "管理者ではありません"
 
-#: ../../enterprise/meta/include/functions_meta.php:428
+#: ../../enterprise/meta/include/functions_meta.php:407
 msgid "Netflow disable custom live view filters"
 msgstr "Netflow は、カスタムライブビューフィルタを無効にします"
 
@@ -34184,17 +36818,25 @@ msgstr "Netflow は、カスタムライブビューフィルタを無効にし
 msgid "Customizable section"
 msgstr "カスタマイズ可能なセクション"
 
-#: ../../enterprise/meta/include/functions_meta.php:829
+#: ../../enterprise/meta/include/functions_meta.php:913
 msgid "Pandora FMS host"
 msgstr "Pandora FMS ホスト"
 
-#: ../../enterprise/meta/include/functions_meta.php:1101
+#: ../../enterprise/meta/include/functions_meta.php:966
+msgid "Babel Enterprise host"
+msgstr "Babel Enterprise ホスト"
+
+#: ../../enterprise/meta/include/functions_meta.php:1215
 msgid "Type of charts"
 msgstr "チャートのタイプ"
 
-#: ../../enterprise/meta/include/functions_meta.php:1181
+#: ../../enterprise/meta/include/functions_meta.php:1315
 msgid "Custom background login"
-msgstr "カスタムバックグラウンドログイン"
+msgstr "カスタムログイン背景"
+
+#: ../../enterprise/meta/include/functions_meta.php:1476
+msgid "Default block size migration agents"
+msgstr "デフォルトのエージェントマイグレーションブロックサイズ"
 
 #: ../../enterprise/meta/include/functions_users_meta.php:184
 msgid "User synchronization"
@@ -34224,10 +36866,6 @@ msgstr "待ち時間"
 msgid "Response"
 msgstr "応答"
 
-#: ../../enterprise/meta/include/functions_wizard_meta.php:476
-msgid "Check type"
-msgstr "チェックタイプ"
-
 #: ../../enterprise/meta/include/functions_wizard_meta.php:525
 msgid "String to check"
 msgstr "チェック文字列"
@@ -34246,12 +36884,6 @@ msgstr "チェックを削除"
 msgid "Various"
 msgstr "いろいろ"
 
-#: ../../enterprise/meta/include/functions_wizard_meta.php:858
-#: ../../enterprise/meta/include/functions_wizard_meta.php:944
-#: ../../enterprise/meta/include/functions_wizard_meta.php:1161
-msgid "Thresholds"
-msgstr "しきい値"
-
 #: ../../enterprise/meta/include/functions_wizard_meta.php:955
 msgid "Web configuration"
 msgstr "ウェブ設定"
@@ -34361,21 +36993,122 @@ msgstr "モジュールを更新しました。"
 msgid "Manage agent modules"
 msgstr "エージェントモジュール管理"
 
-#: ../../enterprise/meta/index.php:250 ../../index.php:267
+#: ../../enterprise/meta/include/process_reset_pass.php:41
+#: ../../enterprise/meta/include/reset_pass.php:41
+msgid "Go to pandorafms.com"
+msgstr "pandorafms.com へ行く"
+
+#: ../../enterprise/meta/include/functions_autoprovision.php:304
+msgid "Round Robin"
+msgstr "ラウンドロビン"
+
+#: ../../enterprise/meta/include/functions_autoprovision.php:309
+msgid "Less loaded"
+msgstr "より少ない負荷"
+
+#: ../../enterprise/meta/include/functions_autoprovision.php:435
+msgid ""
+"There is no custom entries defined. Click on \"Create custom entry\" to add "
+"the first."
+msgstr "カスタムエントリが定義されていません。最初に \"カスタムエントリの作成\" をクリックしてください。"
+
+#: ../../enterprise/meta/include/functions_autoprovision.php:440
+msgid "Create custom entry"
+msgstr "カスタムエントリの作成"
+
+#: ../../enterprise/meta/include/functions_autoprovision.php:465
+msgid "Provisioning configuration"
+msgstr "プロビジョニング設定"
+
+#: ../../enterprise/meta/include/functions_autoprovision.php:476
+msgid "Configuration:"
+msgstr "設定:"
+
+#: ../../enterprise/meta/include/functions_autoprovision.php:511
+msgid ""
+"There is no rules configured for this custom entry. Click on Add button to "
+"create the first."
+msgstr "このカスタムエントリに設定されたルールがありません。最初に追加ボタンをクリックしてください。"
+
+#: ../../enterprise/meta/include/functions_autoprovision.php:540
+msgid "Method"
+msgstr "方法"
+
+#: ../../enterprise/meta/include/functions_autoprovision.php:617
+msgid "There was an error when editing the rule."
+msgstr "ルール編集エラー。"
+
+#: ../../enterprise/meta/include/functions_autoprovision.php:631
+msgid "Operation:"
+msgstr "操作："
+
+#: ../../enterprise/meta/include/functions_autoprovision.php:642
+msgid "Method:"
+msgstr "方法:"
+
+#: ../../enterprise/meta/index.php:228 ../../index.php:284
 msgid "The code shouldn't be empty"
 msgstr "コードは空にできません"
 
-#: ../../enterprise/meta/index.php:262 ../../index.php:279
+#: ../../enterprise/meta/index.php:240 ../../index.php:296
 msgid "Expired login"
 msgstr "ログイン期限切れ"
 
-#: ../../enterprise/meta/index.php:270 ../../enterprise/meta/index.php:276
-#: ../../index.php:287 ../../index.php:293
+#: ../../enterprise/meta/index.php:248 ../../enterprise/meta/index.php:254
+#: ../../index.php:304 ../../index.php:310
 msgid "Login error"
 msgstr "ログインエラー"
 
-#: ../../enterprise/meta/index.php:523 ../../enterprise/meta/index.php:534
-#: ../../index.php:809
+#: ../../enterprise/meta/index.php:489 ../../index.php:607
+msgid "Password changed successfully"
+msgstr "パスワードを変更しました"
+
+#: ../../enterprise/meta/index.php:496 ../../index.php:614
+msgid "Failed to change password"
+msgstr "パスワード変更に失敗しました"
+
+#: ../../enterprise/meta/index.php:516 ../../index.php:636
+msgid "Too much time since password change request"
+msgstr "パスワード変更要求から長時間経過しました"
+
+#: ../../enterprise/meta/index.php:527 ../../index.php:647
+msgid "This user has not requested a password change"
+msgstr "このユーザはパスワード変更を要求していません"
+
+#: ../../enterprise/meta/index.php:545 ../../index.php:665
+msgid "Id user cannot be empty"
+msgstr "ユーザIDは空にできません"
+
+#: ../../enterprise/meta/index.php:554 ../../index.php:674
+msgid "Error in reset password request"
+msgstr "パスワードリセット要求エラー"
+
+#: ../../enterprise/meta/index.php:563 ../../index.php:683
+msgid "This user doesn't have a valid email address"
+msgstr "このユーザは正しいメールアドレスがありません"
+
+#: ../../enterprise/meta/index.php:582 ../../index.php:703
+msgid "This is an automatically sent message for user "
+msgstr "これは、次のユーザへの自動送信メッセージです: "
+
+#: ../../enterprise/meta/index.php:585 ../../index.php:706
+msgid "Please click the link below to reset your password"
+msgstr "パスワードをリセットするには、以下のリンクをクリックしてください"
+
+#: ../../enterprise/meta/index.php:587 ../../index.php:708
+msgid "Reset your password"
+msgstr "パスワードリセット"
+
+#: ../../enterprise/meta/index.php:591 ../../index.php:712
+msgid "Please do not reply to this email."
+msgstr "このメールには返信しないでください。"
+
+#: ../../enterprise/meta/index.php:597 ../../index.php:718
+msgid "Error at sending the email"
+msgstr "メール送信エラー"
+
+#: ../../enterprise/meta/index.php:725 ../../enterprise/meta/index.php:796
+#: ../../index.php:1021
 msgid "Sorry! I can't find the page!"
 msgstr "ページが見つかりません"
 
@@ -34445,7 +37178,7 @@ msgstr "イベントレポート"
 msgid "Info of state in events"
 msgstr "イベントの状態"
 
-#: ../../enterprise/meta/monitoring/tactical.php:341
+#: ../../enterprise/meta/monitoring/tactical.php:342
 msgid "More events"
 msgstr "イベント追加"
 
@@ -34646,7 +37379,7 @@ msgstr "トランザクションがありません"
 
 #: ../../enterprise/operation/agentes/manage_transmap.php:110
 msgid "Master lock file not found (No data to show)"
-msgstr "マスターロックファイルがありません (表示するデータがありません)"
+msgstr "マスターロックファイルがありません(表示するデータがありません)"
 
 #: ../../enterprise/operation/agentes/manage_transmap.php:114
 msgid "Transaction is stopped"
@@ -34654,7 +37387,7 @@ msgstr "トランザクションが停止しました"
 
 #: ../../enterprise/operation/agentes/manage_transmap.php:118
 msgid "Error, please check the transaction phases"
-msgstr "エラー。トランザクションフェーズを確認してください。"
+msgstr "エラー、トランザクションフェーズを確認してください"
 
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:36
 msgid "Please, reset the transaction"
@@ -34666,7 +37399,7 @@ msgstr "データを更新しました"
 
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:72
 msgid "Could not be data updated"
-msgstr "データの更新に失敗しました"
+msgstr "データの更新ができませんでした"
 
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:107
 msgid "Transactional Map - Create Phase - "
@@ -34686,11 +37419,11 @@ msgstr "有効化"
 
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:181
 msgid "Not valid dependencies field"
-msgstr "不正な依存関係フィールド"
+msgstr "依存関係フィールドが不正です"
 
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:187
 msgid "Not valid enables field"
-msgstr "不正な有効化フィールド"
+msgstr "有効化フィールドが不正です"
 
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:260
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:345
@@ -34700,11 +37433,11 @@ msgstr "トランザクションマップ - トランザクション作成"
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:272
 #: ../../enterprise/operation/agentes/manage_transmap_creation.php:361
 msgid "Loop interval"
-msgstr "繰り返し間隔"
+msgstr "ループ間隔"
 
 #: ../../enterprise/operation/agentes/manage_transmap_creation_phases_data.php:45
 msgid "Go back to phases list"
-msgstr "フェーズ一覧に戻る"
+msgstr "フェーズ一覧へ戻る"
 
 #: ../../enterprise/operation/agentes/manage_transmap_creation_phases_data.php:49
 msgid "Transactional Map - Phase - "
@@ -34712,7 +37445,7 @@ msgstr "トランザクションマップ - フェーズ - "
 
 #: ../../enterprise/operation/agentes/manage_transmap_creation_phases_data.php:62
 msgid "Launch script"
-msgstr "スクリプト実行"
+msgstr "起動スクリプト"
 
 #: ../../enterprise/operation/agentes/policy_view.php:37
 msgid "This agent has no policy assigned"
@@ -34759,19 +37492,24 @@ msgstr "モジュール表示"
 
 #: ../../enterprise/operation/agentes/policy_view.php:333
 msgid "(Un-adopted)"
-msgstr "(未採用)"
+msgstr "(未適用)"
 
 #: ../../enterprise/operation/agentes/policy_view.php:337
 msgid "(Adopted)"
-msgstr "(採用)"
+msgstr "(適用)"
 
 #: ../../enterprise/operation/agentes/policy_view.php:343
 msgid "(Un-adopted) (Unlinked)"
-msgstr "(未採用) (未リンク)"
+msgstr "(未適用) (未リンク)"
 
 #: ../../enterprise/operation/agentes/policy_view.php:347
 msgid "(Adopted) (Unlinked)"
-msgstr "(採用) (未リンク)"
+msgstr "(適用) (未リンク)"
+
+#: ../../enterprise/operation/agentes/tag_view.php:22
+#: ../../enterprise/operation/menu.php:152
+msgid "Tag view"
+msgstr "タグ表示"
 
 #: ../../enterprise/operation/agentes/transactional_map.php:31
 msgid "Transactions list"
@@ -34795,7 +37533,7 @@ msgstr "経過時間"
 
 #: ../../enterprise/operation/agentes/transactional_map.php:183
 msgid "Stopped"
-msgstr "停止"
+msgstr "停止済み"
 
 #: ../../enterprise/operation/agentes/transactional_map.php:189
 msgid "Starting"
@@ -34805,62 +37543,133 @@ msgstr "開始中"
 msgid "Stopping"
 msgstr "停止中"
 
-#: ../../enterprise/operation/agentes/transactional_map.php:260
-#: ../../enterprise/operation/agentes/ux_console_view.php:118
-#: ../../enterprise/operation/agentes/ux_console_view.php:237
-msgid "Failed"
-msgstr "失敗"
-
 #: ../../enterprise/operation/agentes/transactional_map.php:314
 msgid "Edit phases"
 msgstr "フェーズ編集"
 
 #: ../../enterprise/operation/agentes/transactional_map.php:323
 msgid "Error in phases section"
-msgstr "フェーズセクションでエラー"
+msgstr "フェーズ選択エラー"
 
 #: ../../enterprise/operation/agentes/transactional_map.php:342
 msgid "Create Transaction"
 msgstr "トランザクション作成"
 
-#: ../../enterprise/operation/agentes/ux_console_view.php:38
-msgid "No ux transactions found."
-msgstr "UX トランザクションがありません"
+#: ../../enterprise/operation/agentes/url_route_analyzer.php:38
+msgid "No agent selected"
+msgstr "エージェント選択なし"
 
-#: ../../enterprise/operation/agentes/ux_console_view.php:48
+#: ../../enterprise/operation/agentes/url_route_analyzer.php:42
+msgid "Route not found"
+msgstr "ルートが見つかりません"
+
+#: ../../enterprise/operation/agentes/ux_console_view.php:59
+msgid "No ux transaction selected."
+msgstr "UX トランザクションが選択されていません。"
+
+#: ../../enterprise/operation/agentes/ux_console_view.php:138
+msgid "No ux transactions found."
+msgstr "UX トランザクションが見つかりません。"
+
+#: ../../enterprise/operation/agentes/ux_console_view.php:148
+#: ../../enterprise/operation/agentes/wux_console_view.php:178
 msgid "Transaction"
 msgstr "トランザクション"
 
-#: ../../enterprise/operation/agentes/ux_console_view.php:57
+#: ../../enterprise/operation/agentes/ux_console_view.php:157
+#: ../../enterprise/operation/agentes/wux_console_view.php:187
 msgid "Show transaction"
 msgstr "トランザクション表示"
 
-#: ../../enterprise/operation/agentes/ux_console_view.php:83
+#: ../../enterprise/operation/agentes/ux_console_view.php:183
+#: ../../enterprise/operation/agentes/wux_console_view.php:313
 msgid "Execution results for transaction "
 msgstr "トランザクションの実行結果 "
 
-#: ../../enterprise/operation/agentes/ux_console_view.php:157
+#: ../../enterprise/operation/agentes/ux_console_view.php:257
+#: ../../enterprise/operation/agentes/wux_console_view.php:235
 msgid "Global results"
 msgstr "全体の結果"
 
-#: ../../enterprise/operation/agentes/ux_console_view.php:217
+#: ../../enterprise/operation/agentes/ux_console_view.php:318
+#: ../../enterprise/operation/agentes/wux_console_view.php:418
 msgid "Transaction history"
 msgstr "トランザクション履歴"
 
 #: ../../enterprise/operation/agentes/ver_agente.php:225
+msgid "URL Route Analyzer"
+msgstr "URL ルート分析"
+
+#: ../../enterprise/operation/agentes/ver_agente.php:242
 msgid "UX Console"
 msgstr "UX コンソール"
 
-#: ../../enterprise/operation/inventory/inventory.php:266
+#: ../../enterprise/operation/agentes/ver_agente.php:259
+msgid "WUX Console"
+msgstr "WUX コンソール"
+
+#: ../../enterprise/operation/agentes/wux_console_view.php:64
+msgid "No wux transaction selected."
+msgstr "WUX トランザクションが選択されていません。"
+
+#: ../../enterprise/operation/agentes/wux_console_view.php:120
+msgid "Phase modules not found"
+msgstr "フェーズモジュールがありません"
+
+#: ../../enterprise/operation/agentes/wux_console_view.php:160
+msgid "Selected transaction has no stats"
+msgstr "選択したトランザクションに状態がありません"
+
+#: ../../enterprise/operation/agentes/wux_console_view.php:168
+msgid "No WUX transactions found."
+msgstr "WUX トランザクションがありません。"
+
+#: ../../enterprise/operation/agentes/wux_console_view.php:251
+msgid "Failed: "
+msgstr "失敗: "
+
+#: ../../enterprise/operation/agentes/wux_console_view.php:286
+msgid "Success: "
+msgstr "成功: "
+
+#: ../../enterprise/operation/agentes/wux_console_view.php:296
+msgid "Total transaction time: "
+msgstr "全トランザクション時間: "
+
+#: ../../enterprise/operation/agentes/wux_console_view.php:455
+msgid "Invalid transaction."
+msgstr "不正なトランザクション。"
+
+#: ../../enterprise/operation/inventory/inventory.php:231
+msgid "Order by agent"
+msgstr "エージェントで並べ替え"
+
+#: ../../enterprise/operation/inventory/inventory.php:272
 msgid "Export this list to CSV"
 msgstr "この一覧を CSV へエクスポートする"
 
-#: ../../enterprise/operation/log/log_viewer.php:150
-#: ../../enterprise/operation/menu.php:128
+#: ../../enterprise/operation/log/log_viewer.php:162
+#: ../../enterprise/operation/menu.php:144
 msgid "Log viewer"
 msgstr "ログ・ビューワ"
 
-#: ../../enterprise/operation/log/log_viewer.php:350
+#: ../../enterprise/operation/log/log_viewer.php:181
+msgid "All words"
+msgstr "全単語"
+
+#: ../../enterprise/operation/log/log_viewer.php:181
+msgid "Any word"
+msgstr "任意の単語"
+
+#: ../../enterprise/operation/log/log_viewer.php:183
+msgid "Search mode"
+msgstr "検索モード"
+
+#: ../../enterprise/operation/log/log_viewer.php:191
+msgid "Full context"
+msgstr "全内容"
+
+#: ../../enterprise/operation/log/log_viewer.php:369
 msgid "The start date cannot be greater than the end date"
 msgstr "開始日は終了日より後にできません"
 
@@ -34892,43 +37701,47 @@ msgstr "削除アイテム一覧"
 
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:108
 msgid "Successfully restore the item"
-msgstr "アイテムを復元しました"
+msgstr "アイテムのリストアをしました"
 
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:109
 msgid "Could not be restore the item"
-msgstr "アイテムを復元できません"
+msgstr "アイテムのリストアができません"
 
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:130
 msgid "Successfully restore the items"
-msgstr "アイテムを復元しました"
+msgstr "アイテムのリストアをしました"
 
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:132
 msgid "Could not be restore the "
-msgstr "復元できませんでした: "
+msgstr "リストアができません: "
 
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:136
 msgid "Not found networkmap"
-msgstr "ネットワークマップが見つかりません"
+msgstr "ネットワークマップがありません"
 
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:140
 msgid "The items restored will be appear in the holding area."
-msgstr "復元アイテムは、保持エリアに表示されます。"
+msgstr ""
 
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:160
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:227
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:256
 msgid "Restore"
-msgstr "復元"
+msgstr ""
 
 #: ../../enterprise/operation/maps/networkmap_list_deleted.php:170
 msgid "There are not nodes in the networkmap."
-msgstr "ネットワークマップにノードがありません。"
+msgstr ""
 
-#: ../../enterprise/operation/menu.php:100
+#: ../../enterprise/operation/menu.php:30
+msgid "Cluster View"
+msgstr ""
+
+#: ../../enterprise/operation/menu.php:113
 msgid "Transactional map"
-msgstr "トランザクションマップ"
+msgstr ""
 
-#: ../../enterprise/operation/menu.php:111
+#: ../../enterprise/operation/menu.php:127
 msgid "Custom SQL"
 msgstr "カスタム SQL"
 
@@ -34991,23 +37804,32 @@ msgstr "サービスがありません"
 msgid "List of elements"
 msgstr "要素一覧"
 
-#: ../../index.php:563
+#: ../../index.php:769
 msgid "User doesn\\'t exist."
 msgstr "ユーザが存在しません。"
 
-#: ../../index.php:579
+#: ../../index.php:785
 msgid "User only can use the API."
 msgstr "ユーザは API のみ利用可能"
 
 #~ msgid "Welcome to Pandora FMS Web Console"
 #~ msgstr "Pandora FMS の Web コンソールへようこそ"
 
+#~ msgid "Item"
+#~ msgstr "項目"
+
+#~ msgid "Data value"
+#~ msgstr "値"
+
 #~ msgid "Updated at realtime"
 #~ msgstr "リアルタイム更新"
 
 #~ msgid "Criticity"
 #~ msgstr "危険度"
 
+#~ msgid "Zoom"
+#~ msgstr "ズーム"
+
 #~ msgid "This user doesn't have any assigned profile/group"
 #~ msgstr "このユーザには、プロファイル・グループが割り当てられていません。"
 
@@ -35194,6 +38016,24 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Deleted data above %d"
 #~ msgstr "%d 以上のデータを削除しました。"
 
+#~ msgid "DB maintenance"
+#~ msgstr "DBメンテナンス"
+
+#~ msgid "DB information"
+#~ msgstr "DBステータス"
+
+#~ msgid "Database purge"
+#~ msgstr "収集データ"
+
+#~ msgid "Database audit"
+#~ msgstr "監査DB"
+
+#~ msgid "Database event"
+#~ msgstr "イベントDB"
+
+#~ msgid "Agents cannot be updated"
+#~ msgstr "エージェントの更新ができませんでした。"
+
 #~ msgid "No action selected"
 #~ msgstr "アクションが選択されていません。"
 
@@ -35242,6 +38082,208 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Massive modules copy"
 #~ msgstr "複数モジュールコピー"
 
+#~ msgid "Database maintenance"
+#~ msgstr "データベースメンテナンス"
+
+#~ msgid "Get data from agent"
+#~ msgstr "エージェントから収集したデータ"
+
+#~ msgid ""
+#~ "Please be patient. This operation can take a long time depending on the "
+#~ "amount of modules."
+#~ msgstr "しばらくお待ちください。この操作は、モジュール数によりしばらく時間がかかることがあります。"
+
+#~ msgid "Deleting records for all agents"
+#~ msgstr "全エージェントのレコードの削除中"
+
+#~ msgid "Choose agent"
+#~ msgstr "エージェントの選択"
+
+#~ msgid "Select the agent you want information about"
+#~ msgstr "情報を見たいエージェントを選択してください。"
+
+#~ msgid "Get data"
+#~ msgstr "データ取得"
+
+#~ msgid "Click here to get the data from the agent specified in the select box"
+#~ msgstr "選択したエージェントからデータを取得するためには、ここをクリックしてください。"
+
+#, php-format
+#~ msgid "Information on agent %s in the database"
+#~ msgstr "エージェント %s に関するデータベース内の情報"
+
+#~ msgid "Information on all agents in the database"
+#~ msgstr "データベース内の全エージェントの情報"
+
+#~ msgid "Packets less than three months old"
+#~ msgstr "過去3ヵ月のパケット数"
+
+#~ msgid "Packets less than one month old"
+#~ msgstr "過去1ヵ月のパケット数"
+
+#~ msgid "Packets less than two weeks old"
+#~ msgstr "過去2週間のパケット数"
+
+#~ msgid "Packets less than one week old"
+#~ msgstr "過去1週間のパケット数"
+
+#~ msgid "Packets less than three days old"
+#~ msgstr "過去3日間のパケット数"
+
+#~ msgid "Packets less than one day old"
+#~ msgstr "過去1日間のパケット数"
+
+#~ msgid "Total number of packets"
+#~ msgstr "全パケット数"
+
+#~ msgid "Purge data"
+#~ msgstr "データ削除"
+
+#~ msgid "Purge data over 3 months"
+#~ msgstr "3ヵ月より古いデータの削除"
+
+#~ msgid "Purge data over 1 month"
+#~ msgstr "1ヵ月より古いデータの削除"
+
+#~ msgid "Purge data over 2 weeks"
+#~ msgstr "2週間より古いデータの削除"
+
+#~ msgid "Purge data over 1 week"
+#~ msgstr "1週間より古いデータの削除"
+
+#~ msgid "Purge data over 3 days"
+#~ msgstr "3日より古いデータの削除"
+
+#~ msgid "Purge data over 1 day"
+#~ msgstr "1日より古いデータの削除"
+
+#~ msgid "All data until now"
+#~ msgstr "現在より古いデータ全ての削除"
+
+#~ msgid "Purge"
+#~ msgstr "削除"
+
+#~ msgid "Event database cleanup"
+#~ msgstr "イベントDB削除"
+
+#~ msgid "Successfully deleted old events"
+#~ msgstr "古いイベントを削除しました。"
+
+#~ msgid "Error deleting old events"
+#~ msgstr "古いイベントの削除に失敗しました。"
+
+#~ msgid "Records"
+#~ msgstr "レコード"
+
+#~ msgid "First date"
+#~ msgstr "開始日時"
+
+#~ msgid "Latest data"
+#~ msgstr "最新日時"
+
+#~ msgid "Purge event data over 90 days"
+#~ msgstr "90日より古いイベントデータ削除"
+
+#~ msgid "Purge event data over 30 days"
+#~ msgstr "30日より古いイベントデータ削除"
+
+#~ msgid "Purge event data over 14 days"
+#~ msgstr "14日より古いイベントデータ削除"
+
+#~ msgid "Purge event data over 7 days"
+#~ msgstr "7日より古いイベントデータ削除"
+
+#~ msgid "Purge event data over 3 days"
+#~ msgstr "3日より古いイベントデータ削除"
+
+#~ msgid "Purge event data over 1 day"
+#~ msgstr "1日より古いイベントデータ削除"
+
+#~ msgid "Purge all event data"
+#~ msgstr "すべてのイベントデータ削除"
+
+#~ msgid "Do it!"
+#~ msgstr "実行"
+
+#~ msgid "Maximum is equal to minimum"
+#~ msgstr "最大値と最小値が同じです。"
+
+#~ msgid "Filtering data module"
+#~ msgstr "データモジュールのフィルタ中"
+
+#~ msgid "Filtering completed"
+#~ msgstr "フィルタリングが完了しました。"
+
+#~ msgid "Get Info"
+#~ msgstr "情報取得"
+
+#~ msgid "Purge data out of these limits"
+#~ msgstr "以下の範囲外のデータ削除"
+
+#~ msgid "Database information"
+#~ msgstr "データベース情報"
+
+#~ msgid "Database audit purge"
+#~ msgstr "監査DB削除"
+
+#~ msgid "Latest date"
+#~ msgstr "最新日時"
+
+#~ msgid "Purge audit data over 90 days"
+#~ msgstr "90日より古い監査データ削除"
+
+#~ msgid "Purge audit data over 30 days"
+#~ msgstr "30日より古い監査データ削除"
+
+#~ msgid "Purge audit data over 14 days"
+#~ msgstr "14日より古い監査データ削除"
+
+#~ msgid "Purge audit data over 7 days"
+#~ msgstr "7日より古い監査データ削除"
+
+#~ msgid "Purge audit data over 3 days"
+#~ msgstr "3日より古い監査データ削除"
+
+#~ msgid "Purge audit data over 1 day"
+#~ msgstr "1日より古い監査データ削除"
+
+#~ msgid "Purge all audit data"
+#~ msgstr "すべての監査データ削除"
+
+#~ msgid "Cannot read file"
+#~ msgstr "ファイルを読み込めません"
+
+#~ msgid "System Info"
+#~ msgstr "システム情報"
+
+#~ msgid ""
+#~ "This extension can run as PHP script in a shell for extract more "
+#~ "information, but it must be run as root or across sudo. For example: <i>sudo "
+#~ "php /var/www/pandora_console/extensions/system_info.php -d -s -c</i>"
+#~ msgstr ""
+#~ "この拡張は、シェル上で情報を表示するための PHP スクリプトとしても実行できます。ただし、root 権限が必要です。<br>例: <i>sudo "
+#~ "php /var/www/pandora_console/extensions/system_info.php -d -s -c</i>"
+
+#~ msgid ""
+#~ "This tool is used just to view your Pandora FMS system logfiles directly "
+#~ "from console"
+#~ msgstr "このツールは、コンソールから Pandora FMS のシステムログファイルを直接参照するのに利用します。"
+
+#~ msgid "Pandora Diagnostic info"
+#~ msgstr "Pandora 診断情報"
+
+#~ msgid "Log Info"
+#~ msgstr "ログ情報"
+
+#~ msgid "Number lines of log"
+#~ msgstr "ログの行数"
+
+#~ msgid "Generate file"
+#~ msgstr "ファイル生成"
+
+#~ msgid "VNC view"
+#~ msgstr "VNCビュー"
+
 #, php-format
 #~ msgid ""
 #~ "This extension makes registration of server plugins more easy. Here you can "
@@ -35258,6 +38300,9 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Ping to "
 #~ msgstr "以下へのping "
 
+#~ msgid "File is too large (> 500KB)"
+#~ msgstr "ファイルが大きすぎます。(> 500KB)"
+
 #~ msgid "Inside limits"
 #~ msgstr "限度内"
 
@@ -35273,6 +38318,15 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "License Info"
 #~ msgstr "ライセンス情報"
 
+#~ msgid "Connect"
+#~ msgstr "接続"
+
+#~ msgid "You need to specify a user and a host address"
+#~ msgstr "ユーザとホストのアドレスを指定する必要があります"
+
+#~ msgid "Connect mode"
+#~ msgstr "接続モード"
+
 #~ msgid "Error in creation plugin module. Agent name doesn't exists."
 #~ msgstr "プラグインモジュール作成エラー。エージェント名が存在しません。"
 
@@ -35401,6 +38455,12 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Error creating module from network component. Agent doesn't exists."
 #~ msgstr "ネットワークコンポーネントからのモジュール作成エラー。エージェントが存在しません。"
 
+#~ msgid "Error deleting data"
+#~ msgstr "データ削除エラー"
+
+#~ msgid "Success data deleted"
+#~ msgstr "データを削除しました"
+
 #, php-format
 #~ msgid "projection for %s"
 #~ msgstr "%s の予想"
@@ -35452,21 +38512,60 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Events by criticity"
 #~ msgstr "重要度で分類したイベント"
 
+#~ msgid "Port (use 0 for default)"
+#~ msgstr "ポート (デフォルトは 0)"
+
+#~ msgid "VNC Display (:0 by default)"
+#~ msgstr "VNC ディスプレイ (デフォルトは :0)"
+
+#~ msgid "Send"
+#~ msgstr "送信"
+
 #~ msgid "Quiet: Disable modules that we indicate below."
 #~ msgstr "静観: 以下に示すモジュールを無効化します。"
 
 #~ msgid "Cron"
 #~ msgstr "Cron"
 
+#~ msgid ""
+#~ "If cron is set the module interval is ignored and the module runs on the "
+#~ "specified date and time"
+#~ msgstr "cron が設定されている場合、モジュールの実行間隔は無視され、モジュールは指定された日時に実行されます。"
+
+#, php-format
+#~ msgid "Purge task launched for agent %s :: Data older than %s"
+#~ msgstr "エージェント %s の削除タスクを起動しました。%s より古いデータが対象です。"
+
+#, php-format
+#~ msgid "Deleting records for module %s"
+#~ msgstr "モジュール %s のレコードを削除しています"
+
+#, php-format
+#~ msgid "Total errors: %s"
+#~ msgstr "全エラー数: %s"
+
+#, php-format
+#~ msgid "Total records deleted: %s"
+#~ msgstr "全削除レコード数: %s"
+
 #~ msgid "There are no defined graphs"
 #~ msgstr "定義済のグラフがありません"
 
+#~ msgid "Load default event fields"
+#~ msgstr "デフォルトイベントフィールドの読み込み"
+
+#~ msgid "Default event fields will be loaded. Do you want to continue?"
+#~ msgstr "デフォルトのイベントフィールドを読み込みます。続けますか?"
+
 #~ msgid "No special days configured"
 #~ msgstr "特別日が設定されていません"
 
 #~ msgid "Paginate module view"
 #~ msgstr "モジュール表示をページ分割"
 
+#~ msgid "The data number of the module graphs will be rounded and shortened"
+#~ msgstr "モジュールグラフのデータ数が四捨五入して短くなります"
+
 #, php-format
 #~ msgid "The last version of package installed is: %d"
 #~ msgstr "インストール済の最新パッケージ: %d"
@@ -35479,6 +38578,10 @@ msgstr "ユーザは API のみ利用可能"
 #~ "アップデートマネージャは、匿名で Pandora FMS の利用状況 (動作中のエージェントおよびモジュール数) "
 #~ "を送信します。これを無効にするには、アップデートマネージャプラグインの設定で、リモートサーバアドレスを削除します。"
 
+#~ msgid ""
+#~ "If there are any database change, it will be applied on the next login."
+#~ msgstr "データベース変更がある場合は、次回のログイン時に適用されます。"
+
 #~ msgid "Package not updated."
 #~ msgstr "パッケージは更新されませんでした。"
 
@@ -35491,6 +38594,23 @@ msgstr "ユーザは API のみ利用可能"
 #~ "マニュアルモードではウエイトを手動で設定する必要があります。自動モードではウエイトはデフォルトの値があります。\n"
 #~ "\t\tシンプルモードでは、\"障害要素\"として設定したもののみがサービスの状態計算に利用されます。"
 
+#~ msgid ""
+#~ "Maybe delete the extended data or the audit data is previous to table "
+#~ "tsession_extended."
+#~ msgstr "拡張データが削除されているか、監査データが tsession_extended テーブルにありません。"
+
+#~ msgid "Group filter"
+#~ msgstr "グループフィルタ"
+
+#~ msgid "HTTP auth (pass)"
+#~ msgstr "HTTP 認証 (パスワード)"
+
+#~ msgid "HTTP auth (server)"
+#~ msgstr "HTTP 認証 (サーバ)"
+
+#~ msgid "HTTP auth (realm)"
+#~ msgstr "HTTP 認証(realm)"
+
 #~ msgid ": Edit: "
 #~ msgstr ": 編集: "
 
@@ -35522,6 +38642,27 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Fail uploaded %s/%s traps"
 #~ msgstr "%s/%s トラップのアップロードに失敗しました"
 
+#~ msgid "Log storage directory"
+#~ msgstr "ログ保存ディレクトリ"
+
+#~ msgid "Directory where log data will be stored."
+#~ msgstr "ログデータを保存するディレクトリ"
+
+#~ msgid "Log max lifetime"
+#~ msgstr "ログ最大保存期間"
+
+#~ msgid "Sets the maximum lifetime for log data in days."
+#~ msgstr "最大ログ保存日数を設定します。"
+
+#~ msgid "Remote Babel Enterprise"
+#~ msgstr "リモートの Babel Enterprise"
+
+#~ msgid "Map made by user"
+#~ msgstr "ユーザ作成マップ"
+
+#~ msgid "Show a map made by user"
+#~ msgstr "ユーザ作成マップの表示"
+
 #~ msgid "Successful added modules"
 #~ msgstr "モジュールを追加しました"
 
@@ -35615,15 +38756,64 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Add new dashboard view"
 #~ msgstr "新規ダッシュボード表示追加"
 
-#~ msgid "Visualmap"
-#~ msgstr "ビジュアルマップ"
-
 #~ msgid "Please, set a valid IP address"
 #~ msgstr "正しい IP アドレスを設定してください"
 
 #~ msgid "Check this to copy user original profiles"
 #~ msgstr "ユーザのオリジナルプロファイルをコピーするには、これをチェックします"
 
+#~ msgid ""
+#~ "Complete path to Pandora console without last \"/\" character. Example "
+#~ msgstr "最後の \"/\" を除いた Pandora コンソールの完全パス。例 "
+
+#~ msgid "Please search for anything text."
+#~ msgstr "任意のテキストで検索してください。"
+
+#, php-format
+#~ msgid "Created/Updated %s/%s groups"
+#~ msgstr "グループを作成(%s)/更新(%s)しました"
+
+#~ msgid "redirected ip server in conf into source DB"
+#~ msgstr "設定内のリダイレクトサーバをソース DB に入れました"
+
+#~ msgid "created agent in destination DB"
+#~ msgstr "対象 DB にエージェントを作成しました"
+
+#~ msgid "created agent modules in destination DB"
+#~ msgstr "対象 DB にエージェントモジュールを作成しました"
+
+#~ msgid "created agent alerts in destination DB"
+#~ msgstr "対象 DB にエージェントアラートを作成しました"
+
+#~ msgid "created alerts actions in destination DB"
+#~ msgstr "対象 DB にアラートアクションを作成しました"
+
+#~ msgid "disabled agent in source DB"
+#~ msgstr "ソース DB のエージェントを無効化しました"
+
+#~ msgid ""
+#~ "Not set metaconsole IP in the \"IP list with API access\" guess Pandora "
+#~ "Console."
+#~ msgstr ""
+#~ "Pandora コンソールで \"APIアクセスを許可するIPアドレスリスト\" にメタコンソールの IP が設定されていない可能性があります。"
+
+#~ msgid "Successfully moved"
+#~ msgstr "移動しました"
+
+#~ msgid "Could not be moved"
+#~ msgstr "移動できませんでした"
+
+#~ msgid ""
+#~ "Destination group is the same than in the original server, if there is not "
+#~ "any group with that name, will be created if check box is selected. "
+#~ "Destination group filter is just used to check agents in that group"
+#~ msgstr ""
+#~ "移行先のグループは移行元サーバと同じになります。同じ名前のグループが無い場合、チェックボックスがチェックされていると作成されます。移行先のグループフィルタ"
+#~ "は、エージェントがグループにあるかどうかのみのチェックに利用されます。"
+
+#~ msgid "Based on name"
+#~ msgstr "名前ベース"
+
 #~ msgid ""
 #~ "In order to have the best user experience with Pandora FMS, we <b>strongly "
 #~ "recommend</b> to use"
@@ -35716,6 +38906,18 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Details of node:"
 #~ msgstr "ノードの詳細:"
 
+#~ msgid "This is the automatic generated report"
+#~ msgstr "これは自動生成レポートです"
+
+#~ msgid "Open the attached file to view it"
+#~ msgstr "添付ファイルを開く"
+
+#~ msgid "Please do not answer or reply to this email"
+#~ msgstr "このメールには返信しないでください"
+
+#~ msgid "Cron extension is not running"
+#~ msgstr "Cron 実行が稼動していません"
+
 #~ msgid "First_execution"
 #~ msgstr "初回実行"
 
@@ -35742,6 +38944,18 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Show modules:"
 #~ msgstr "モジュール表示:"
 
+#~ msgid "Group does not exist. Agent "
+#~ msgstr "グループが存在しません。エージェント "
+
+#~ msgid "Created group in destination DB"
+#~ msgstr "移行先 DB にグループを作成しました"
+
+#~ msgid "Error creating group. Agent "
+#~ msgstr "グループ作成エラー。エージェント "
+
+#~ msgid "Group already exists in destination DB"
+#~ msgstr "移行先 DB にすでにグループがあります"
+
 #~ msgid "Generated: "
 #~ msgstr "生成日: "
 
@@ -35754,6 +38968,30 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "CONTENTS"
 #~ msgstr "目次"
 
+#~ msgid "Module store the service does not exist."
+#~ msgstr "サービスを保存するモジュールがありません。"
+
+#~ msgid "Module store SLA service does not exist."
+#~ msgstr "SLAサービスを保存するモジュールがありません。"
+
+#~ msgid "Agent store the service does not exist."
+#~ msgstr "サービスを保存するエージェントがありません。"
+
+#~ msgid "Agent store SLA service does not exist."
+#~ msgstr "SLAサービスを保存するエージェントがありません。"
+
+#~ msgid "Alert critical SLA service does not exist."
+#~ msgstr "障害アラートSLAサービスがありません。"
+
+#~ msgid "Alert warning service does not exist."
+#~ msgstr "警告アラートサービスがありません。"
+
+#~ msgid "Alert critical service does not exist."
+#~ msgstr "障害アラートサービスがありません。"
+
+#~ msgid "Alert unknown service does not exist."
+#~ msgstr "不明アラートサービスがありません。"
+
 #~ msgid "You must change password"
 #~ msgstr "パスワードを変更する必要があります"
 
@@ -35799,6 +39037,9 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Create new message"
 #~ msgstr "新規メッセージの作成"
 
+#~ msgid "one combined graph"
+#~ msgstr "一つの組み合わせグラフ"
+
 #~ msgid "Combined graph"
 #~ msgstr "組み合わせグラフ"
 
@@ -35817,6 +39058,12 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Alerts found"
 #~ msgstr "アラートが見つかりました"
 
+#~ msgid "Show events graph"
+#~ msgstr "イベントグラフ表示"
+
+#~ msgid "Events generated -by agent-"
+#~ msgstr "エージェントごとに生成されたイベント"
+
 #~ msgid "Shortcut bar"
 #~ msgstr "ショートカットバー"
 
@@ -35836,6 +39083,25 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Closed tickets"
 #~ msgstr "クローズしたチケット"
 
+#~ msgid "No options selected"
+#~ msgstr "オプションが選択されていません"
+
+#~ msgid "There was an error with the zip file"
+#~ msgstr "zipファイルにエラーがあります。"
+
+#~ msgid "At least one option must be selected"
+#~ msgstr "少なくとも一つのオプションを選択する必要があります"
+
+#, php-format
+#~ msgid "For security reasons the following characters are not allowed: %s"
+#~ msgstr "セキュリティ上の理由により、次の文字は利用できません: %s"
+
+#~ msgid "Agent address"
+#~ msgstr "エージェントアドレス"
+
+#~ msgid "Agent id"
+#~ msgstr "エージェント ID"
+
 #~ msgid "Minimal"
 #~ msgstr "最小"
 
@@ -35846,6 +39112,9 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Agent '%s'"
 #~ msgstr "エージェント '%s'"
 
+#~ msgid "The configuration of email for the task email is in the file:"
+#~ msgstr "メール送信タスクのメール設定はこのファイルにあります:"
+
 #~ msgid "Error updating special day. Id doesn't exists."
 #~ msgstr "特別日更新エラー。IDが存在しません。"
 
@@ -35888,6 +39157,12 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Events info (1hr)"
 #~ msgstr "イベント情報 (1時間)"
 
+#~ msgid "Module data received"
+#~ msgstr "データ受信モジュール"
+
+#~ msgid "Unsuccessfull multiple delete."
+#~ msgstr "複数削除に失敗しました。"
+
 #~ msgid "Poling time"
 #~ msgstr "ポーリング時間"
 
@@ -35900,6 +39175,9 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "E-mail:"
 #~ msgstr "メールアドレス:"
 
+#~ msgid "Please choose other server."
+#~ msgstr "他のサーバを選択してください。"
+
 #~ msgid "# Failed"
 #~ msgstr "失敗数"
 
@@ -35921,9 +39199,24 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "OLD PASS: "
 #~ msgstr "旧パスワード: "
 
+#, php-format
+#~ msgid ""
+#~ "Your PHP environment is setted with %d max_input_vars. Maybe you must not "
+#~ "set this value with upper values."
+#~ msgstr "PHP の max_input_vars が %d に設定されています。この値は大きく設定してはいけません。"
+
 #~ msgid "This is defined in minutes"
 #~ msgstr "分単位で設定します"
 
+#~ msgid "Strict ACL"
+#~ msgstr "厳重な ACL"
+
+#~ msgid ""
+#~ "With this option enabled, the user will can access to accurate information. "
+#~ "It is not recommended for admin users because performance could be affected"
+#~ msgstr ""
+#~ "このオプションを有効にすると、ユーザは指定の範囲の情報にのみアクセスすることができます。パフォーマンスに影響するため、管理者ユーザではお勧めしません。"
+
 #~ msgid "The session may be expired"
 #~ msgstr "セッションの有効期限が切れました"
 
@@ -35933,9 +39226,59 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "There was an error loading the network map"
 #~ msgstr "ネットワークマップの読み込みでエラーが発生しました"
 
+#~ msgid "DB Status"
+#~ msgstr "DB の状態"
+
+#~ msgid "Unsuccessful installed enterprise tables into the testing DB"
+#~ msgstr "テスト DB への enterprise テーブル設定に失敗しました"
+
+#, php-format
+#~ msgid ""
+#~ "Unsuccessful the DB Pandora has not all tables. The tables lost are (%s)"
+#~ msgstr "DB Pandora にはすべてのテーブルが揃っていません。不足テーブルは (%s) です。"
+
+#, php-format
+#~ msgid ""
+#~ "Unsuccessful the field %s in the table %s must be setted the type with %s."
+#~ msgstr "フィールド %s (テーブル %s 内)は、%s のタイプに設定されている必要があります。"
+
+#, php-format
+#~ msgid ""
+#~ "Unsuccessful the field %s in the table %s must be setted the null values "
+#~ "with %s."
+#~ msgstr "フィールド %s (テーブル %s 内)は、%s の null 値に設定されている必要があります。"
+
+#, php-format
+#~ msgid ""
+#~ "Unsuccessful the field %s in the table %s must be setted the key as defined "
+#~ "in the SQL file."
+#~ msgstr "フィールド %s (テーブル %s 内)は、SQL ファイル内で定義されている通りのキーが設定されている必要があります。"
+
+#~ msgid "Please check the SQL file for to know the kind of key needed."
+#~ msgstr "必要なキーを特定するには、SQL ファイルを確認してください。"
+
+#, php-format
+#~ msgid ""
+#~ "Unsuccessful the field %s in the table %s must be setted the default value "
+#~ "as %s."
+#~ msgstr "フィールド %s (テーブル %s 内)は、デフォルト値が %s に設定されている必要があります。"
+
+#~ msgid ""
+#~ "Please check the SQL file for to know the kind of default value needed."
+#~ msgstr "必要なデフォルト値を特定するには、SQL ファイルを確認してください。"
+
+#, php-format
+#~ msgid ""
+#~ "Unsuccessful the field %s in the table %s must be setted as defined in the "
+#~ "SQL file."
+#~ msgstr "フィールド %s (テーブル %s 内)は、SQL ファイルに定義されている通りに設定されている必要があります。"
+
 #~ msgid "Store group"
 #~ msgstr "保存グループ"
 
+#~ msgid "Limit parameters massive"
+#~ msgstr "一括操作制限"
+
 #~ msgid "List of visual console"
 #~ msgstr "ビジュアルコンソール一覧"
 
@@ -35944,6 +39287,21 @@ msgstr "ユーザは API のみ利用可能"
 #~ "downtimes section to solve this."
 #~ msgstr "この要素は不正な計画停止の景況を受けます。計画停止の設定画面で調整してくだいさい。"
 
+#~ msgid ""
+#~ "Illegal query: Due security restrictions, there are some tokens or words you "
+#~ "cannot use: *, delete, drop, alter, modify, union, password, pass, insert or "
+#~ "update."
+#~ msgstr ""
+#~ "不正なクエリ。セキュリティ上の制約により次のトークンやワードは利用でません: *, delete, drop, alter, modify, "
+#~ "union, password, pass, insert または update"
+
+#~ msgid ""
+#~ "Please check the SQL file for to know the kind of extra config needed."
+#~ msgstr "必要な追加設定を知るには、SQL ファイルを確認してください。"
+
+#~ msgid "Module Agent address"
+#~ msgstr "モジュールエージェントアドレス"
+
 #~ msgid "No colections for this agent"
 #~ msgstr "このエージェントにはコレクションがありません"
 
@@ -35963,6 +39321,9 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "List of Services"
 #~ msgstr "サービス一覧"
 
+#~ msgid "Create group if doesn’t exist in destination"
+#~ msgstr "移動先にグループが無ければ作成する"
+
 #~ msgid "Networkmap list"
 #~ msgstr "ネットワークマップ一覧"
 
@@ -36059,6 +39420,9 @@ msgstr "ユーザは API のみ利用可能"
 #~ "when he/she will login."
 #~ msgstr "このオプションを有効化すると、新規ユーザがログインしたときにグループとタグが同期されます。"
 
+#~ msgid "e.g., switch.ehorus.com"
+#~ msgstr "例: switch.ehorus.com"
+
 #~ msgid ""
 #~ "If you check this option, the lateral menus display with left click. "
 #~ "Otherwise it will show by placing the mouse over"
@@ -36067,20 +39431,73 @@ msgstr "ユーザは API のみ利用可能"
 #~ msgid "Display lateral menus with click"
 #~ msgstr "クリックで横のメニューを表示"
 
-#~ msgid "This OID is preexistent."
-#~ msgstr "この OID は元から存在します。"
-
-#~ msgid "New networkmap"
-#~ msgstr "新規ネットワークマップ"
-
-#~ msgid "Disable Pandora FMS on graphs"
-#~ msgstr "グラフで Pandora FMS 表示を無効化"
-
 #~ msgid "Custom logo in login"
 #~ msgstr "ログイン時のカスタムロゴ"
 
+#~ msgid "The last version of package installed is:"
+#~ msgstr "インストールされている最新バージョンのパッケージ:"
+
+#~ msgid "Unsuccessfull action<br><br>"
+#~ msgstr "実行に失敗<br><br>"
+
 #~ msgid "Percentil 95"
 #~ msgstr "95パーセント"
 
+#~ msgid ""
+#~ "If event purge is less than events days pass to history db, you will have a "
+#~ "problems and you lost data. Recommended that event days purge will more "
+#~ "taller than event days to history DB"
+#~ msgstr ""
+#~ "イベントの削除タイミングを、ヒストリデータベースへイベントを移す日よりも短く設定していると、問題が発生しデータを失ってしまいます。イベントの削除は、ヒスト"
+#~ "リデータベースへイベントを移す日よりも後に設定してください。"
+
 #~ msgid "Allows only show the average in graphs"
 #~ msgstr "グラフで平均のみの表示をします"
+
+#~ msgid ""
+#~ "This is the online help for Pandora FMS console. This help is -in best cases-"
+#~ " just a brief contextual help, not intented to teach you how to use Pandora "
+#~ "FMS. Official documentation of Pandora FMS is about 900 pages, and you "
+#~ "probably don't need to read it entirely, but sure, you should download it "
+#~ "and take a look.<br><br>\n"
+#~ "\t<a href='https://pandorafms.org/en/docs/monitoring-documentation/' "
+#~ "target='_blanck'>Download the official documentation</a>"
+#~ msgstr ""
+#~ "Pandora FMS コンソールのオンラインヘルプです。これは、その場で最適な手助けをするのもであり、Pandora FMS "
+#~ "の使い方を教えるものではありません。Pandora FMS の公式ドキュメントは約 "
+#~ "900ページあり全体を読む必要はありません。しかしダウンロードして確認すると良いでしょう。<br><br>\n"
+#~ "\t<a href='https://pandorafms.org/ja/docs/monitoring-documentation/' "
+#~ "target='_blanck'>公式ドキュメントをダウンロード</a>"
+
+#~ msgid "Config Path"
+#~ msgstr "設定パス"
+
+#~ msgid "There was an error updating the execution data of the plugin"
+#~ msgstr "プラグインの実行データ更新エラーです"
+
+#~ msgid "There was an error activating the execution of the plugin"
+#~ msgstr "プラグインの実行有効化エラーです"
+
+#~ msgid "Top 5 VMs Disk Usage"
+#~ msgstr "ディスク使用率上位 5位内のVM"
+
+#~ msgid "Plugin execution"
+#~ msgstr "プラグイン実行"
+
+#~ msgid "Config parameters"
+#~ msgstr "設定パラメータ"
+
+#~ msgid "VMware map"
+#~ msgstr "VMware マップ"
+
+#~ msgid ""
+#~ "To enable the plugin execution, this extension needs the Cron jobs extension "
+#~ "installed.\n"
+#~ "\tKeep in mind that the Cron jobs execution period will be the less real "
+#~ "execution period, so if you want to run the plugin every\n"
+#~ "\t5 minutes, for example, the Cron jobs script should be configured in the "
+#~ "cron to run every 5 minutes or less"
+#~ msgstr ""
+#~ "プラグインの実行を有効化するために、この拡張では Cron ジョブ拡張がインストールされている必要があります。\n"
+#~ "\tCron ジョブ実行間隔は、実際の実行間隔よりも短くすることに注意してください。たとえば、プラグインを 5分間隔で\n"
+#~ "\t実行したい場合は、Cron ジョブスクリプトは 5分またはそれ未満の間隔で実行するよう cron を設定する必要があります。"

From adf9e4d1fe9000d864cef2918bd9a736973fef00 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 11 Jun 2018 13:53:10 +0200
Subject: [PATCH 145/146] fixed minor errors

---
 pandora_console/include/functions.php         |  8 +--
 pandora_console/include/functions_graph.php   | 53 +++++++++++-----
 .../include/graphs/flot/pandora.flot.js       | 62 +++++++++++++------
 3 files changed, 85 insertions(+), 38 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index efa5e49263..9c328336e6 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2913,7 +2913,7 @@ function color_graph_array(){
 	//XXX Colores fijos para eventos, alertas, desconocidos, percentil, overlapped, summatory, average, projection
 	$color_series['event'] = array(
 		'border' => '#ff0000',
-		'color' => '#ff66cc',
+		'color' => '#FF5733',
 		'alpha' => CHART_DEFAULT_ALPHA
 	);
 
@@ -3041,11 +3041,11 @@ function series_type_graph_array($data, $show_elements_graph){
 				}
 				else{
 					if(strpos($key, 'baseline') !== false){
-						$data_return['legend'][$key] = $value['agent_name']  . ' / ' .
+						$data_return['legend'][$key] = $value['agent_alias']  . ' / ' .
 													$value['module_name'] . ' Baseline ';
 					}
 					else{
-						$data_return['legend'][$key] = $value['agent_name']  . ' / ' .
+						$data_return['legend'][$key] = $value['agent_alias']  . ' / ' .
 													$value['module_name'] . ': ';
 					}
 				}
@@ -3114,7 +3114,7 @@ function series_type_graph_array($data, $show_elements_graph){
 						$data_return['legend'][$key] .= $show_elements_graph['labels'][$value['agent_module_id']] . ' ' ;
 					}
 					else{
-						$data_return['legend'][$key] .= $value['agent_name']  . ' / ' .
+						$data_return['legend'][$key] .= $value['agent_alias']  . ' / ' .
 												$value['module_name'] . ': ' . ' Value: ';
 					}
 					$data_return['legend'][$key] .= remove_right_zeros(
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 0c1a45caad..efa479df62 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -262,16 +262,33 @@ function grafico_modulo_sparse_data_chart (
 		);
 	}
 	else{
-		$data = db_get_all_rows_filter (
-			'tagente_datos',
-			array ('id_agente_modulo' => (int)$agent_module_id,
-					"utimestamp > '". $date_array['start_date']. "'",
-					"utimestamp < '". $date_array['final_date'] . "'",
-					'order' => 'utimestamp ASC'),
-			array ('datos', 'utimestamp'),
-			'AND',
-			$data_module_graph['history_db']
-		);
+		/*
+		if(true){
+			$data = db_get_all_rows_filter (
+				'tagente_datos',
+				array ('id_agente_modulo' => (int)$agent_module_id,
+						"utimestamp > '". $date_array['start_date']. "'",
+						"utimestamp < '". $date_array['final_date'] . "'",
+						'group' => "ROUND(utimestamp / 86400)",
+						'order' => 'utimestamp ASC'),
+				array ('max(datos) as datos', 'min(utimestamp) as utimestamp'),
+				'AND',
+				$data_module_graph['history_db']
+			);
+		}
+		else{
+			*/
+			$data = db_get_all_rows_filter (
+				'tagente_datos',
+				array ('id_agente_modulo' => (int)$agent_module_id,
+						"utimestamp > '". $date_array['start_date']. "'",
+						"utimestamp < '". $date_array['final_date'] . "'",
+						'order' => 'utimestamp ASC'),
+				array ('datos', 'utimestamp'),
+				'AND',
+				$data_module_graph['history_db']
+			);
+		//}
 	}
 
 	if($data === false){
@@ -362,6 +379,7 @@ function grafico_modulo_sparse_data_chart (
 	$array_data["sum" . $series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
 	$array_data["sum" . $series_suffix]['agent_name']     = $data_module_graph['agent_name'];
 	$array_data["sum" . $series_suffix]['module_name']    = $data_module_graph['module_name'];
+	$array_data["sum" . $series_suffix]['agent_alias']    = $data_module_graph['agent_alias'];
 
 	if (!is_null($params['percentil']) &&
 		$params['percentil'] &&
@@ -402,6 +420,7 @@ function grafico_modulo_sparse_data(
 		$array_data["sum" . $series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
 		$array_data["sum" . $series_suffix]['agent_name']     = $data_module_graph['agent_name'];
 		$array_data["sum" . $series_suffix]['module_name']    = $data_module_graph['module_name'];
+		$array_data["sum" . $series_suffix]['agent_alias']    = $data_module_graph['agent_alias'];
 	}
 	else{
 		$array_data = grafico_modulo_sparse_data_chart (
@@ -880,12 +899,13 @@ function grafico_modulo_sparse ($params) {
 
 		$data_module_graph = array();
 		$data_module_graph['history_db']     = db_search_in_history_db($date_array["start_date"]);
-		$data_module_graph['agent_name']     = modules_get_agentmodule_agent_name ($agent_module_id);
+		$data_module_graph['agent_name']     = modules_get_agentmodule_agent_name($agent_module_id);
+		$data_module_graph['agent_alias']    = modules_get_agentmodule_agent_alias($agent_module_id);
 		$data_module_graph['agent_id']       = $module_data['id_agente'];
 		$data_module_graph['module_name']    = $module_data['nombre'];
 		$data_module_graph['id_module_type'] = $module_data['id_tipo_modulo'];
-		$data_module_graph['module_type']    = modules_get_moduletype_name ($data_module_graph['id_module_type']);
-		$data_module_graph['uncompressed']   = is_module_uncompressed ($data_module_graph['module_type']);
+		$data_module_graph['module_type']    = modules_get_moduletype_name($data_module_graph['id_module_type']);
+		$data_module_graph['uncompressed']   = is_module_uncompressed($data_module_graph['module_type']);
 		$data_module_graph['w_min']    		 = $module_data['min_warning'];
 		$data_module_graph['w_max']   		 = $module_data['max_warning'];
 		$data_module_graph['w_inv']    		 = $module_data['warning_inverse'];
@@ -1453,12 +1473,13 @@ function graphic_combined_module (
 
 				$data_module_graph = array();
 				$data_module_graph['history_db']     = db_search_in_history_db($date_array["start_date"]);
-				$data_module_graph['agent_name']     = modules_get_agentmodule_agent_name ($agent_module_id);
+				$data_module_graph['agent_name']     = modules_get_agentmodule_agent_name($agent_module_id);
+				$data_module_graph['agent_alias']    = modules_get_agentmodule_agent_alias($agent_module_id);
 				$data_module_graph['agent_id']       = $module_data['id_agente'];
 				$data_module_graph['module_name']    = $module_data['nombre'];
 				$data_module_graph['id_module_type'] = $module_data['id_tipo_modulo'];
-				$data_module_graph['module_type']    = modules_get_moduletype_name ($data_module_graph['id_module_type']);
-				$data_module_graph['uncompressed']   = is_module_uncompressed ($data_module_graph['module_type']);
+				$data_module_graph['module_type']    = modules_get_moduletype_name($data_module_graph['id_module_type']);
+				$data_module_graph['uncompressed']   = is_module_uncompressed($data_module_graph['module_type']);
 				$data_module_graph['w_min']    		 = $module_data['min_warning'];
 				$data_module_graph['w_max']   		 = $module_data['max_warning'];
 				$data_module_graph['w_inv']    		 = $module_data['warning_inverse'];
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 62fa929de7..40d1f6cf6f 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -165,9 +165,9 @@ function pandoraFlotPieCustom(graph_id, values, labels, width,
 				color: ''
 			}
 		};
-		
+
 	}
-	
+
 	var conf_pie = {
 			series: {
 				pie: {
@@ -1505,7 +1505,6 @@ function pandoraFlotArea(
 
 	i=0;
 	$.each(values, function (index, value) {
-		
 		if (typeof value.data !== "undefined") {
 			if(index.search("alert") >= 0){
 				fill_color = '#ff7f00';
@@ -1582,12 +1581,12 @@ function pandoraFlotArea(
 	});
 
 	// The first execution, the graph data is the base data
-	datas = data_base;
-	font_size = 8;
+	datas     = data_base;
+
 	// minTickSize
 	var count_data = datas[0].data.length;
-	var min_tick = datas[0].data[0][0];
-	var max_tick = datas[0].data[count_data - 1][0];
+	var min_tick   = datas[0].data[0][0];
+	var max_tick   = datas[0].data[count_data - 1][0];
 
 	var number_ticks = 8;
 	if(vconsole){
@@ -1623,8 +1622,15 @@ function pandoraFlotArea(
 				color: legend_color,
 				autoHighlight: true
 			},
+			xaxis: {
+				min: date_array.start_date * 1000,
+				max: date_array.final_date * 1000
+			},
 			xaxes: [{
+				axisLabelUseCanvas: true,
 				axisLabelFontSizePixels: font_size,
+				axisLabelFontFamily: font+'Font',
+				axisLabelPadding: 0,
 				mode: "time",
 				//tickFormatter: xFormatter,
 				tickSize: [maxticks, 'hour']
@@ -1669,7 +1675,7 @@ function pandoraFlotArea(
 		}
 	}
 
-/*	
+/*//XXXXXXX
 if (vconsole) {
 		var myCanvas = plot.getCanvas();
 		plot.setupGrid(); // redraw plot to new size
@@ -1714,13 +1720,21 @@ if (vconsole) {
 				borderWidth:1,
 				borderColor: '#C1C1C1',
 				tickColor: background_color,
-				color: legend_color
+				color: legend_color,
+				autoHighlight: true
+			},
+			xaxis: {
+				min: date_array.start_date * 1000,
+				max: date_array.final_date * 1000
 			},
 			xaxes: [{
+				axisLabelUseCanvas: true,
 				axisLabelFontSizePixels: font_size,
+				axisLabelFontFamily: font+'Font',
+				axisLabelPadding: 0,
 				mode: "time",
 				//tickFormatter: xFormatter,
-				tickSize: [maxticks, 'hour'],
+				tickSize: [maxticks, 'hour']
 			}],
 			yaxes: [{
 				tickFormatter: yFormatter,
@@ -1729,7 +1743,7 @@ if (vconsole) {
 				labelWidth: 30,
 				position: 'left',
 				font: font,
-				reserveSpace: true,
+				reserveSpace: true
 			}],
 			legend: {
 				position: 'se',
@@ -1738,8 +1752,13 @@ if (vconsole) {
 			}
 		});
 	}
-	// Connection between plot and miniplot
 
+	// Adjust overview when main chart is resized
+	$('#overview_'+graph_id).resize(function(){
+		update_left_width_canvas(graph_id);
+	});
+
+	// Connection between plot and miniplot
 	$('#' + graph_id).bind('plotselected', function (event, ranges) {
 		// do the zooming if exist menu to undo it
 		if (menu == 0) {
@@ -1748,9 +1767,9 @@ if (vconsole) {
 
 		dataInSelection = ranges.xaxis.to - ranges.xaxis.from;
 
-		var maxticks_zoom = dataInSelection / 3600000 / 6;
+		var maxticks_zoom = dataInSelection / 3600000 / number_ticks;
 		if(maxticks_zoom < 0.001){
-			maxticks_zoom = dataInSelection / 60000 / 6;
+			maxticks_zoom = dataInSelection / 60000 / number_ticks;
 			if(maxticks_zoom < 0.001){
 				maxticks_zoom = 0;
 			}
@@ -1780,6 +1799,10 @@ if (vconsole) {
 						max: ranges.xaxis.to
 					},
 					xaxes: [{
+						axisLabelUseCanvas: true,
+						axisLabelFontSizePixels: font_size,
+						axisLabelFontFamily: font+'Font',
+						axisLabelPadding: 0,
 						mode: "time",
 						//tickFormatter: xFormatter,
 						tickSize: [maxticks_zoom, 'hour']
@@ -1815,6 +1838,10 @@ if (vconsole) {
 						max: ranges.xaxis.to
 					},
 					xaxes: [{
+						axisLabelUseCanvas: true,
+						axisLabelFontSizePixels: font_size,
+						axisLabelFontFamily: font+'Font',
+						axisLabelPadding: 0,
 						mode: "time",
 						//tickFormatter: xFormatter,
 						tickSize: [maxticks_zoom, 'hour']
@@ -1840,7 +1867,6 @@ if (vconsole) {
 
 		$('#menu_cancelzoom_' + graph_id).attr('src', homeurl + '/images/zoom_cross_grey.png');
 
-	//	currentRanges = ranges;
 		// don't fire event on the overview to prevent eternal loop
 		overview.setSelection(ranges, true);
 	});
@@ -1971,7 +1997,7 @@ if (vconsole) {
 
 	// Events
 	$('#overview_' + graph_id).bind('plothover',  function (event, pos, item) {
-		plot.setCrosshair({ x: pos.x, y: 0 });
+		plot.setCrosshair({ x: pos.x, y: pos.y });
 		currentPlot = plot;
 		latestPosition = pos;
 		if (!updateLegendTimeout) {
@@ -1980,7 +2006,7 @@ if (vconsole) {
 	});
 
 	$('#' + graph_id).bind('plothover',  function (event, pos, item) {
-		overview.setCrosshair({ x: pos.x, y: 0 });
+		overview.setCrosshair({ x: pos.x, y: pos.y });
 		currentPlot = plot;
 		latestPosition = pos;
 		if (!updateLegendTimeout) {
@@ -2074,7 +2100,7 @@ if (vconsole) {
 	});
 
 	$('#'+graph_id).bind('mouseout',resetInteractivity(vconsole));
-	
+
 	if(!vconsole){
 		$('#overview_'+graph_id).bind('mouseout',resetInteractivity);
 	}

From abad4f4f4bdedcc94b68b6e0c3ca583505974b3c Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 11 Jun 2018 15:35:04 +0200
Subject: [PATCH 146/146] fixed minor errorstime graphs

---
 pandora_console/include/functions.php               | 2 +-
 pandora_console/include/functions_graph.php         | 2 +-
 pandora_console/include/graphs/flot/pandora.flot.js | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 9c328336e6..3918da045e 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3072,7 +3072,7 @@ function series_type_graph_array($data, $show_elements_graph){
 						) . ' ' . $str;
 				}
 
-				if($show_elements_graph['compare'] == 'overlapped'){
+				if($show_elements_graph['compare'] == 'overlapped' && $key == 'sum2'){
 					$data_return['color'][$key] = $color_series['overlapped'];
 				}
 				else{
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index efa479df62..c32d1c90c8 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1044,7 +1044,7 @@ function grafico_modulo_sparse ($params) {
 				$legend,
 				$series_type,
 				$color,
-				$date_array,
+				$date_array_prev,
 				$data_module_graph,
 				$params,
 				$water_mark,
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 40d1f6cf6f..21624165f4 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1632,6 +1632,8 @@ function pandoraFlotArea(
 				axisLabelFontFamily: font+'Font',
 				axisLabelPadding: 0,
 				mode: "time",
+				timezone: "browser",
+				localTimezone: true,
 				//tickFormatter: xFormatter,
 				tickSize: [maxticks, 'hour']
 			}],
@@ -1733,6 +1735,8 @@ if (vconsole) {
 				axisLabelFontFamily: font+'Font',
 				axisLabelPadding: 0,
 				mode: "time",
+				timezone: "browser",
+				localTimezone: true,
 				//tickFormatter: xFormatter,
 				tickSize: [maxticks, 'hour']
 			}],
@@ -1804,6 +1808,8 @@ if (vconsole) {
 						axisLabelFontFamily: font+'Font',
 						axisLabelPadding: 0,
 						mode: "time",
+						timezone: "browser",
+						localTimezone: true,
 						//tickFormatter: xFormatter,
 						tickSize: [maxticks_zoom, 'hour']
 					}],
@@ -1843,6 +1849,8 @@ if (vconsole) {
 						axisLabelFontFamily: font+'Font',
 						axisLabelPadding: 0,
 						mode: "time",
+						timezone: "browser",
+						localTimezone: true,
 						//tickFormatter: xFormatter,
 						tickSize: [maxticks_zoom, 'hour']
 					}],