Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos

pandora_agents/pc/AIX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, AIX version
+# Version 7.0NG.728, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/FreeBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, FreeBSD Version
+# Version 7.0NG.728, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/HP-UX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, HP-UX Version
+# Version 7.0NG.728, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/Linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, GNU/Linux
+# Version 7.0NG.728, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/NT4/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, GNU/Linux
+# Version 7.0NG.728, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/SunOS/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, Solaris Version
+# Version 7.0NG.728, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

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.727
+# Version 7.0NG.728
 
 # 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

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.727, AIX version
+# Version 7.0NG.728, AIX version
 
 # General Parameters
 # ==================

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.727
+# Version 7.0NG.728
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena
 

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.727, HPUX Version
+# Version 7.0NG.728, HPUX Version
 
 # General Parameters
 # ==================

pandora_agents/shellscript/linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727
+# Version 7.0NG.728
 # Licensed under GPL license v2,
 # (c) 2003-2010 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net

pandora_agents/shellscript/mac_osx/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727
+# Version 7.0NG.728
 # Licensed under GPL license v2,
 # (c) 2003-2009 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net

pandora_agents/shellscript/openWRT/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727
+# Version 7.0NG.728
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net
 

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.727, Solaris version
+# Version 7.0NG.728, Solaris version
 
 # General Parameters
 # ==================

pandora_agents/unix/AIX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, AIX version
+# Version 7.0NG.728, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-181017
+Version: 7.0NG.728-181023
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

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

pandora_agents/unix/Darwin/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, GNU/Linux
+# Version 7.0NG.728, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/FreeBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, FreeBSD Version
+# Version 7.0NG.728, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/HP-UX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, HP-UX Version
+# Version 7.0NG.728, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/Linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, GNU/Linux
+# Version 7.0NG.728, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/NT4/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, GNU/Linux
+# Version 7.0NG.728, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/NetBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, NetBSD Version
+# Version 7.0NG.728, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/SunOS/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.727, Solaris Version
+# Version 7.0NG.728, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/pandora_agent

@@ -41,8 +41,8 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.727';
+use constant AGENT_VERSION => '7.0NG.728';
-use constant AGENT_BUILD => '181017';
+use constant AGENT_BUILD => '181023';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.727
+%define version     7.0NG.728
-%define release     181017
+%define release     181023
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.727
+%define version     7.0NG.728
-%define release     181017
+%define release     181023
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -9,8 +9,8 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.727"
+PI_VERSION="7.0NG.728"
-PI_BUILD="181017"
+PI_BUILD="181023"
 OS_NAME=`uname -s`
 
 FORCE=0

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.727
+# Version 7.0NG.728
 
 # 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

pandora_agents/win32/installer/pandora.mpi

@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent v7.0NG.727}
+{Pandora FMS Windows Agent v7.0NG.728}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{181017}
+{181023}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.727(Build 181017)")
+#define PANDORA_VERSION ("7.0NG.728(Build 181023)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

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

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-181017
+Version: 7.0NG.728-181023
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

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

pandora_console/extras/mr/21.sql

@@ -4,6 +4,7 @@ ALTER TABLE `tservice` ADD COLUMN `is_favourite` tinyint(1) NOT NULL default 0;
 UPDATE tservice SET `is_favourite` = 1 WHERE `name` REGEXP '^[_|.|\[|\(]';
 
 ALTER TABLE tlayout_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0';
+ALTER TABLE tlayout_template_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0';
 ALTER TABLE tlayout MODIFY `name` varchar(600) NOT NULL;
 
 ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbuser` text;

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

@@ -1778,6 +1778,7 @@ CREATE TABLE IF NOT EXISTS `tlayout_template_data` (
 	FOREIGN KEY (`id_layout_template`) REFERENCES tlayout_template(`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;
 
+ALTER TABLE tlayout_template_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0';
 -- ---------------------------------------------------------------------
 -- Table `tlog_graph_models`
 -- ---------------------------------------------------------------------

pandora_console/godmode/massive/massive_delete_modules.php

@@ -385,6 +385,9 @@ echo '</form>';
 echo '<h3 class="error invisible" id="message"> </h3>';
 
 ui_require_jquery_file ('form');
+//Hack to translate text "none" in PHP to javascript
+echo '<span id ="none_text" style="display: none;">' . __('None') . '</span>';
+echo '<span id ="select_agent_first_text" style="display: none;">' . __('Please, select an agent first') . '</span>';
 ui_require_jquery_file ('pandora.controls');
 
 if ($selection_mode == 'modules') {

pandora_console/godmode/massive/massive_edit_modules.php

@@ -709,6 +709,7 @@ echo '</form>';
 echo '<h3 class="error invisible" id="message"> </h3>';
 //Hack to translate text "none" in PHP to javascript
 echo '<span id ="none_text" style="display: none;">' . __('None') . '</span>';
+echo '<span id ="select_agent_first_text" style="display: none;">' . __('Please, select an agent first') . '</span>';
 ui_require_jquery_file ('pandora.controls');
 
 if ($selection_mode == 'modules') {

pandora_console/godmode/reporting/reporting_builder.item_editor.php

@@ -1087,6 +1087,34 @@ You can of course remove the warnings, that's why we include the source and do n
 						$agents2[$value['id_agente']] = $value['alias'];
 					}
 					
+					if ((empty($agents2)) || $agents2 == -1) $agents = array();
+					
+					$agents_select = array();
+					if (is_array($id_agents) || is_object($id_agents)){
+						foreach ($id_agents as $id) {
+							foreach ($agents2 as $key => $a) {
+								if ($key == (int)$id) {
+									$agents_select[$key] = $key;
+								}
+							}
+						}
+					}
+					html_print_select($agents2, 'id_agents3[]', $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>
+		
+		<tr id="agents_modules_row" style="" class="datos">
+			<td style="font-weight:bold;"><?php echo __('Agents'); ?></td>
+			<td>
+				<?php 
+					
+					$all_agent_log = agents_get_agents(false,array('id_agente','alias'));
+					foreach ($all_agent_log as $key => $value) {
+						$agents2[$value['id_agente']] = $value['alias'];
+					}
+					
 					// $agents = agents_get_group_agents($group);
 					if ((empty($agents2)) || $agents2 == -1) $agents = array();
 					
@@ -1101,7 +1129,6 @@ 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>
@@ -2862,6 +2889,7 @@ function chooseType() {
 	$("#row_percentil").hide();
 	$("#log_help_tip").css("visibility", "hidden");
 	$("#agents_row").hide();
+	$("#agents_modules_row").hide();
 	$("#select_agent_modules").hide();
 	$("#modules_row").hide();
 	$("#row_show_summary_group").hide();
@@ -3328,7 +3356,7 @@ function chooseType() {
 			$("#row_group").show();
 			$("#row_module_group").show();
 			$("#select_agent_modules").show();
-			$("#agents_row").show();
+			$("#agents_modules_row").show();
 			$("#modules_row").show();
 			$("#row_historical_db_check").hide();
 			break;
@@ -3499,7 +3527,7 @@ function set_last_value_period() {
 }
 
 function source_change_agents() {
-	$("#id_agents2").empty();
+	$("#id_agents3").empty();
 	$("#spinner_hack").show();
 	jQuery.post ("ajax.php",
 		{"page" : "operation/agentes/ver_agente",
@@ -3508,7 +3536,7 @@ function source_change_agents() {
 		},
 		function (data, status) {
 			for (var clave in data) {
-				$("#id_agents2").append('<option value="'+clave+'">'+data[clave]+'</option>');
+				$("#id_agents3").append('<option value="'+clave+'">'+data[clave]+'</option>');
 			}
 			$("#spinner_hack").hide();
 		},

pandora_console/godmode/reporting/visual_console_builder.editor.js

@@ -849,8 +849,7 @@ function readFields() {
 	
 	values['enable_link'] = $("input[name=enable_link]").is(':checked') ? 1 : 0;
 	values['id_group'] = $("select[name=group]").val();
-	values['id_custom_graph'] = parseInt(
+	values['id_custom_graph'] = $("#custom_graph option:selected").val();
-		$("#custom_graph option:selected").val());
 	values['width_box'] = parseInt(
 		$("input[name='width_box']").val());
 	values['height_box'] = parseInt(
@@ -1715,7 +1714,12 @@ function loadFieldsFromDB(item) {
 						.prop('checked', true);
 					$("input[name='radio_choice']").trigger('change');
 
+					if (is_metaconsole()){
+						$("#custom_graph option[value='" + data.id_custom_graph + '|' + data.id_metaconsole + "']").prop("selected", true);
+					}
+					else{
 						$("#custom_graph option[value=" + data.id_custom_graph + "]").prop("selected", true);
+					}
 
 				}
 			}
@@ -2316,12 +2320,18 @@ function setModuleGraph(id_data) {
 				dataType: 'json',
 				success: function (data)
 				{
+
+					var url_hack_metaconsole = '';
+					if (is_metaconsole()) {
+						url_hack_metaconsole = '../../';
+					}
+
 					if (data['no_data'] == true) {
 						$('#' + id_data).html(data['url']);
 					}
 					else {
 						if($("#module_row").css('display')!='none'){
-							$("#" + id_data + " img").attr('src', 'images/console/signes/module_graph.png');
+							$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module_graph.png');
 								if($('#text-width_module_graph').val() == 0 || $('#text-height_module_graph').val() == 0){
 									$("#" + id_data + " img").css('width', '300px');
 									$("#" + id_data + " img").css('height', '180px');
@@ -2331,7 +2341,7 @@ function setModuleGraph(id_data) {
 									$("#" + id_data + " img").css('height', $('#text-height_module_graph').val()+'px');
 								}
 						}else{
-							$("#" + id_data + " img").attr('src', 'images/console/signes/custom_graph.png');
+							$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/custom_graph.png');
 								if($('#text-width_module_graph').val() == 0 || $('#text-height_module_graph').val() == 0){
 									$("#" + id_data + " img").css('width', '300px');
 									$("#" + id_data + " img").css('height', '180px');

pandora_console/godmode/reporting/visual_console_builder.elements.php

@@ -431,9 +431,23 @@ foreach ($layoutDatas as $layoutData) {
 				$modules = io_safe_output($modules);
 
 				if ($layoutData['id_agent'] == 0 and $layoutData['id_custom_graph'] != 0) {
+					if(is_metaconsole()){
+						$graphs = array();
+						$graphs = metaconsole_get_custom_graphs(true);
+						$table->data[$i + 2][1] = html_print_select(
+							$graphs, 'custom_graph_' . $idLayoutData,
+							$layoutData['id_custom_graph'] . "|" . $layoutData['id_metaconsole'],
+							'', __('None'), 0, true
+						);
+					}
+					else{
 						$table->data[$i + 2][1] = html_print_select_from_sql(
-							"SELECT id_graph, name FROM tgraph", 'custom_graph_' . $idLayoutData,
+							"SELECT id_graph, name FROM tgraph",
-							$layoutData['id_custom_graph'], '', __('None'), 0, true);
+							'custom_graph_' . $idLayoutData,
+							$layoutData['id_custom_graph'],
+							'', __('None'), 0, true
+						);
+					}
 				} else {
 					$table->data[$i + 2][1] = html_print_select($modules,
 						'module_' . $idLayoutData,
@@ -447,8 +461,6 @@ foreach ($layoutDatas as $layoutData) {
 			break;
 	}
 
-	
-	
 	//Empty
 	$table->data[$i + 2][2] = '';
 

pandora_console/include/ajax/visual_console_builder.ajax.php

@@ -1207,12 +1207,28 @@ switch ($action) {
 			case 'module_graph':
 				$values['type'] = MODULE_GRAPH;
 
+				if(is_metaconsole()){
+					$explode_id = explode("|", $values['id_custom_graph']);
+					$values['id_custom_graph'] = $explode_id[0];
+					$values['id_metaconsole']  = $explode_id[1];
+				}
+
 				if ($values['id_custom_graph'] > 0 ) {
 					$values['height'] = $height_module_graph;
 					$values['width'] = $width_module_graph;
 
+					if(is_metaconsole()){
+						$server_data = metaconsole_get_connection_by_id($values['id_metaconsole']);
+						// Establishes connection
+						if (metaconsole_load_external_db($server_data) !== NOERR) continue;
+					}
+
 					$graph_conf = db_get_row('tgraph', 'id_graph', $values['id_custom_graph']);
 
+					if(is_metaconsole()){
+						metaconsole_restore_db();
+					}
+
 					$graph_stacked = $graph_conf['stacked'];
 					if ( $graph_stacked == CUSTOM_GRAPH_BULLET_CHART) {
 						$values['height'] = 50;

pandora_console/include/class/Tree.class.php

@@ -41,6 +41,8 @@ class Tree {
 	protected $L2conditionInside = '';
 	protected $L2inner = '';
 
+	protected $L3forceTagCondition = false;
+
 	const TV_DEFAULT_AGENT_STATUS = -1;
 
 	public function __construct($type, $rootType = '', $id = -1, $rootID = -1, $serverID = false, $childrenMethod = "on_demand", $access = 'AR') {
@@ -891,7 +893,9 @@ class Tree {
 		$module_status_filter = $this->getModuleStatusFilterFromTestado();
 		$agent_filter = "AND ta.id_agente = " . $this->id;
 		$tag_condition = $this->getTagCondition();
-		$tag_join = empty($tag_condition) ? '' : $this->getTagJoin();
+		$tag_join = empty($tag_condition) && (!$this->L3forceTagCondition)
+			? ''
+			: $this->getTagJoin();
 
 		$condition = $this->L2condition;
 		$inner = $this->L2inner;

pandora_console/include/class/TreeTag.class.php

@@ -37,6 +37,8 @@ class TreeTag extends Tree {
 
 		$this->L2condition = "AND ttm.id_tag = " . $this->rootID;
 		$this->L2inner = $this->L1innerInside;
+
+		$this->L3forceTagCondition = true;
 	}
 
 	protected function getData() {
@@ -52,10 +54,6 @@ class TreeTag extends Tree {
 	protected function getTagJoin () {
 		return '';
 	}
-
-	protected function getTagCondition () {
-		return '';
-	}
 }
 
 ?>

pandora_console/include/config_process.php

@@ -22,8 +22,8 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC181017';
+$build_version = 'PC181023';
-$pandora_version = 'v7.0NG.727';
+$pandora_version = 'v7.0NG.728';
 
 // Do not overwrite default timezone set if defined.
 $script_tz = @date_default_timezone_get();

pandora_console/include/functions_agents.php

@@ -94,7 +94,8 @@ function agents_create_agent ($name, $id_group, $interval, $ip_address, $values
 	
 	if (! is_array ($values))
 		$values = array ();
-	$values['nombre'] = $name;
+	$values['alias'] = $name;
+	$values['nombre'] = hash("sha256",$name . "|" .$ip_address ."|". time() ."|". sprintf("%04d", rand(0,10000)));
 	$values['id_grupo'] = $id_group;
 	$values['intervalo'] = $interval;
 	
@@ -1069,7 +1070,7 @@ function agents_get_group_agents (
  */
 function agents_get_modules ($id_agent = null, $details = false,
 	$filter = false, $indexed = true, $get_not_init_modules = true,
-	$noACLs = false) {
+	$force_tags = false) {
 	
 	global $config;
 	
@@ -1205,7 +1206,7 @@ function agents_get_modules ($id_agent = null, $details = false,
 	}
 
 	$sql_tags_join = "";
-	if (tags_has_user_acl_tags($config['id_user'])){
+	if (tags_has_user_acl_tags($config['id_user']) || $force_tags){
 		$where_tags = tags_get_acl_tags($config['id_user'], $id_groups, 'AR',
 			'module_condition', 'AND', 'tagente_modulo', false, array(),
 			true);

pandora_console/include/functions_visual_map_editor.php

@@ -313,19 +313,17 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				html_print_radio_button('radio_choice', 'custom_graph', '', 'module_graph', true) .
 				'</td>';
 
-			
 			$form_items['custom_graph_row'] = array();
-			$form_items['custom_graph_row']['items'] = array(
+			$form_items['custom_graph_row']['html'] = '<td align="left" style="">' . __('Custom graph') . '</td><td align="left" style="">';
-				'module_graph',
+			if(is_metaconsole()){
-				'datos');
+				$graphs = array();
-			$form_items['custom_graph_row']['html'] =
+				$graphs = metaconsole_get_custom_graphs(true);
-				'<td align="left" style="">' . __('Custom graph') . '</td>
+				$form_items['custom_graph_row']['html'] .= html_print_select($graphs, 'custom_graph', '', '', __('None'), 0, true);
-				<td align="left" style="">' .
+			}
-				html_print_select_from_sql(
+			else{
-					"SELECT id_graph, name FROM tgraph", 'custom_graph',
+				$form_items['custom_graph_row']['html'] .= html_print_select_from_sql("SELECT id_graph, name FROM tgraph", 'custom_graph','', '', __('None'), 0, true);
-					'', '', __('None'), 0, true) .
+			}
-				'</td>';
+			$form_items['custom_graph_row']['html'] .= '</td>';
-			
 
 			$form_items['agent_row'] = array();
 			$form_items['agent_row']['items'] = array('static_graph',

pandora_console/include/graphs/functions_d3.php

@@ -185,7 +185,7 @@ function d3_bullet_chart($chart_data, $width, $height, $color, $legend,
 			.bullet g text { font-size:'.$font_size.'pt;}
 
 		</style>
-		<script src="'. $config['homeurl'] . 'include/graphs/bullet.js"></script>
+		<script src="'. $homeurl . 'include/graphs/bullet.js"></script>
 		<script language="javascript" type="text/javascript">
 		
 		var margin = {top: 5, right: 40, bottom: 20, left: 120};

pandora_console/include/javascript/pandora.js

@@ -189,8 +189,10 @@ function agent_changed_by_multiple_agents (event, id_agent, selected) {
 			$('#module').empty ();
 			
 			if (isEmptyObject(data)) {
-				var noneText = $("#none_text").html(); //Trick for catch the translate text.
+				//Trick for catch the translate text.
-				
+				var noneText = $("#id_agents").val() === null
+					? $("#select_agent_first_text").html()
+					: $("#none_text").html();
 				if (noneText == null) {
 					noneText = 'None';
 				}

pandora_console/install.php

@@ -70,8 +70,8 @@
 	<body>
 		<div style='height: 10px'>
 			<?php
-$version = '7.0NG.727';
+$version = '7.0NG.728';
-$build = '181017';
+$build = '181023';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);

pandora_console/operation/agentes/ver_agente.php

@@ -340,6 +340,11 @@ if (is_ajax ()) {
 				'tmetaconsole_setup', 'id', $id_server);
 		}
 
+		if (empty($idAgents[0])) {
+			echo json_encode(array());
+			return;
+		}
+
 		$filter = '1 = 1';
 
 		$all = (string)get_parameter('all', 'all');
@@ -675,23 +680,24 @@ if (is_ajax ()) {
 		else
 			$search = false;
 
+		$force_tags = !empty($tags);
+		if ($force_tags) {
+			$filter['ttag_module.id_tag IN '] = "(" . implode(",", $tags) . ")";
+		}
 		if (is_metaconsole() && !$force_local_modules) {
 			if (enterprise_include_once ('include/functions_metaconsole.php') !== ENTERPRISE_NOT_HOOK) {
 				$connection = metaconsole_get_connection($server_name);
-				
-				
 				if ($server_id > 0) {
 					$connection = metaconsole_get_connection_by_id($server_id);
 				}
 
-				
 				if (metaconsole_load_external_db($connection) == NOERR) {
 					/* Get all agents if no agent was given */
 					if ($id_agent == 0)
 						$id_agent = array_keys(
 							agents_get_group_agents(
 								array_keys (users_get_groups ()), $search, "none"));
-					$agent_modules = agents_get_modules ($id_agent, $fields, $filter, $indexed, true, false, $tags);
+					$agent_modules = agents_get_modules ($id_agent, $fields, $filter, $indexed, true, $force_tags);
 				}
 				// Restore db connection
 				metaconsole_restore_db();
@@ -703,35 +709,12 @@ if (is_ajax ()) {
 				$id_agent = array_keys(
 					agents_get_group_agents(
 						array_keys(users_get_groups ()), $search, "none"));
-			$agent_modules = agents_get_modules ($id_agent, $fields, $filter, $indexed, true, false, $tags);
+			$agent_modules = agents_get_modules ($id_agent, $fields, $filter, $indexed, true, $force_tags);
 		}
 
 		if (empty($agent_modules))
 			$agent_modules = array();
 
-		if (!empty($tags)) {
-			$implode_tags = implode(",", $tags);
-			$tag_modules = db_get_all_rows_sql("SELECT DISTINCT id_agente_modulo FROM ttag_module WHERE id_tag IN (" . $implode_tags . ")");
-			if ($tag_modules) {
-				$final_modules = array();
-				foreach ($agent_modules as $key => $module) {
-					$in_array = false;
-					foreach ($tag_modules as $t_module) {
-						if ($module['id_agente_modulo'] == $t_module['id_agente_modulo']) {
-							$in_array = true;
-						}
-					}
-					if ($in_array) {
-						$final_modules[] = $module;
-					}
-				}
-				$agent_modules = $final_modules;
-			}
-			else {
-				$agent_modules = array();
-			}
-		}
-		
 		foreach ($agent_modules as $key => $module) {
 			$agent_modules[$key]['nombre'] = io_safe_output($module['nombre']);
 		}

pandora_console/pandora_console.redhat.spec

@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.727
+%define version     7.0NG.728
-%define release     181017
+%define release     181023
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.727
+%define version     7.0NG.728
-%define release     181017
+%define release     181023
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandora_console_install

@@ -9,7 +9,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.727"
+PI_VERSION="7.0NG.728"
 FORCE=0
 DESTDIR=""
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`

pandora_console/pandoradb.sql

@@ -3342,6 +3342,7 @@ CREATE TABLE IF NOT EXISTS `tlayout_template_data` (
 	`clock_animation` varchar(60) NOT NULL default "analogic_1",
 	`time_format` varchar(60) NOT NULL default "time",
 	`timezone` varchar(60) NOT NULL default "Europe/Madrid",
+	`show_last_value` tinyint(1) UNSIGNED NULL default '0',
 	PRIMARY KEY(`id`),
 	FOREIGN KEY (`id_layout_template`) REFERENCES tlayout_template(`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-181017
+Version: 7.0NG.728-181023
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/DEBIAN/make_deb_package.sh

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

pandora_server/conf/pandora_server.conf.new

@@ -1,7 +1,7 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
-# Version 7.0NG.727
+# Version 7.0NG.728
 # Licensed under GPL license v2,
 # (c) 2003-2017 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_server/lib/PandoraFMS/Config.pm

@@ -44,8 +44,8 @@ our @EXPORT = qw(
 	);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.727";
+my $pandora_version = "7.0NG.728";
-my $pandora_build = "181017";
+my $pandora_build = "181023";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -31,8 +31,8 @@ use base 'Exporter';
 our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.727";
+my $pandora_version = "7.0NG.728";
-my $pandora_build = "181017";
+my $pandora_build = "181023";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.727
+%define version     7.0NG.728
-%define release     181017
+%define release     181023
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.727
+%define version     7.0NG.728
-%define release     181017
+%define release     181023
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -8,8 +8,8 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.727"
+PI_VERSION="7.0NG.728"
-PI_BUILD="181017"
+PI_BUILD="181023"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS181017";
+my $version = "7.0NG.728 PS181023";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

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