Revert "merge develop"

This reverts commit 823291171347bf74d93e74a99a3c958660a39fe2, reversing
changes made to f5da86ac0aa968789fdcfa3a14dc714886c26cfb.

pandora_agents/pc/AIX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.711, AIX version
+# Version 7.0NG.710, 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.711, FreeBSD Version
+# Version 7.0NG.710, 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.711, HP-UX Version
+# Version 7.0NG.710, 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.711, GNU/Linux
+# Version 7.0NG.710, 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.711, GNU/Linux
+# Version 7.0NG.710, 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.711, Solaris Version
+# Version 7.0NG.710, 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.711
+# Version 7.0NG.710
 
 # 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.711, AIX version
+# Version 7.0NG.710, 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.711
+# Version 7.0NG.710
 # 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.711, HPUX Version
+# Version 7.0NG.710, 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.711
+# Version 7.0NG.710
 # 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.711
+# Version 7.0NG.710
 # 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.711
+# Version 7.0NG.710
 # 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.711, Solaris version
+# Version 7.0NG.710, 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.711, AIX version
+# Version 7.0NG.710, 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.711-170822
+Version: 7.0NG.710-170816
 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.711-170822"
+pandora_version="7.0NG.710-170816"
 
 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.711, GNU/Linux
+# Version 7.0NG.710, 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.711, FreeBSD Version
+# Version 7.0NG.710, 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.711, HP-UX Version
+# Version 7.0NG.710, 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.711, GNU/Linux
+# Version 7.0NG.710, 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.711, GNU/Linux
+# Version 7.0NG.710, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
@@ -41,9 +41,9 @@ udp_server_auth_address 0.0.0.0
 
 # Group assigned for this agent (descriptive, p.e: Servers)
 #group Servers
-
+
-# Group password (if defined).
+# Group password (if defined).
-#group_password
+#group_password
 
 # Autotime: Enforce to server to ignore timestamp coming from this
 # agent, used when agents has no timer or it's inestable. 1 to enable

pandora_agents/unix/NetBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.711, NetBSD Version
+# Version 7.0NG.710, 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.711, Solaris Version
+# Version 7.0NG.710, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/pandora_agent

@@ -40,8 +40,8 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.711';
+use constant AGENT_VERSION => '7.0NG.710';
-use constant AGENT_BUILD => '170822';
+use constant AGENT_BUILD => '170816';
 
 # 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.711
+%define version     7.0NG.710
-%define release     170822
+%define release     170816
 
 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.711
+%define version     7.0NG.710
-%define release     170822
+%define release     170816
 
 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.711"
+PI_VERSION="7.0NG.710"
-PI_BUILD="170822"
+PI_BUILD="170816"
 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-2014 Artica Soluciones Tecnologicas 
-# Version 7.0NG.711
+# Version 7.0NG.710
 
 # 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.711}
+{Pandora FMS Windows Agent v7.0NG.710}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170809}
+{170816}
 
 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.711(Build 170822)")
+#define PANDORA_VERSION ("7.0NG.710(Build 170816)")
 
 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.711(Build 170822))"
+      VALUE "ProductVersion", "(7.0NG.710(Build 170816))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170822
+Version: 7.0NG.710-170816
 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.711-170822"
+pandora_version="7.0NG.710-170816"
 
 package_pear=0
 package_pandora=1

pandora_console/extensions/insert_data.php

@@ -167,7 +167,6 @@ 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);
 	

pandora_console/extras/mr/6.sql

@@ -1,6 +1,6 @@
 START TRANSACTION;
 
-ALTER TABLE tagente MODIFY COLUMN `cascade_protection_module` int(10) unsigned NOT NULL default '0';
+ALTER TABLE tagente MODIFY COLUMN cascade_protection_module int(10) unsigned NOT NULL default '0';
 
 INSERT INTO tmodule VALUES (8, 'Wux module');
 

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

@@ -1327,7 +1327,7 @@ IF @vv1>0 THEN
 END IF;
 END;
 //
-delimiter ;
+delimiter;
 CALL addcol();
 DROP PROCEDURE addcol;
 
@@ -1416,3 +1416,9 @@ ALTER TABLE tgraph_source ADD COLUMN id_server int(11) UNSIGNED NOT NULL default
 -- ---------------------------------------------------------------------
 
 ALTER TABLE tserver_export_data MODIFY `module_name` varchar(600) BINARY NOT NULL default '';
+
+-- ---------------------------------------------------------------------
+-- Table `tmodule`
+-- ---------------------------------------------------------------------
+
+INSERT INTO tmodule VALUES (8, 'Wux module');

pandora_console/general/login_page.php

@@ -170,22 +170,18 @@ echo '<div class="login_page">';
 			}
 			else {
 				echo '<div class="login_nick">';
-					echo '<div style="width:15%;">';
+				echo '<div>';
-						html_print_image ("/images/usuario_login.png", false);
+					html_print_image ("/images/usuario_login.png", false);
-					echo '</div>';
+				echo '</div>';
-					echo '<div style="width:85%;">';
+				html_print_input_text_extended ("nick", '', "nick", '', '', '' , false,
-						html_print_input_text_extended ("nick", '', "nick", '', '', '' , false,
+					'', 'autocomplete="off" placeholder="'.__('User').'"');
-							'', 'autocomplete="off" placeholder="'.__('User').'"');
-					echo '</div>';
 				echo '</div>';
 				echo '<div class="login_pass">';
-					echo '<div style="width:15%;">';
+				echo '<div>';
-						html_print_image ("/images/candado_login.png", false);
+					html_print_image ("/images/candado_login.png", false);
-					echo '</div>';
+				echo '</div>';
-					echo '<div style="width:85%;">';
+				html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false,
-						html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false,
+					'', 'autocomplete="off" placeholder="'.__('Password').'"', false, true);
-							'', 'autocomplete="off" placeholder="'.__('Password').'"', false, true);
-					echo '</div>';
 				echo '</div>';
 				echo '<div class="login_button">';
 				html_print_submit_button(__("Login"), "login_button", false, 'class="sub next_login"');

pandora_console/godmode/agentes/agent_manager.php

@@ -580,11 +580,11 @@ ui_require_jquery_file('bgiframe');
 		});
 
 		$("#text-id_parent").on("autocompletechange", function () {
-			agent_id=$("#hidden-id_parent").val();
+			agent_name = $("#text-id_parent").val();
 			
 			var params = {};
 			params["get_agent_modules_json_by_name"] = 1;
-			params["id_agent"] = agent_id;
+			params["agent_name"] = agent_name;
 			params["page"] = "include/ajax/module";
 			
 			jQuery.ajax ({

pandora_console/godmode/agentes/configurar_agente.php

@@ -789,7 +789,7 @@ if ($update_agent) { // if modified some agent paramenter
 				WHERE id_group = ".$group_old);
 		
 		$result = db_process_sql_update ('tagente', $values, array ('id_agente' => $id_agente));
-		if ($result == false) {
+		if ($result === false) {
 			ui_print_error_message(
 				__('There was a problem updating the agent'));
 		}

pandora_console/godmode/agentes/modificar_agente.php

@@ -180,7 +180,8 @@ echo "</tr></table>";
 $order_collation = "";
 switch ($config["dbtype"]) {
 	case "mysql":
-		$order_collation = "COLLATE utf8_general_ci";
+		$order_collation = "";
+		//$order_collation = "COLLATE utf8_general_ci";
 		break;
 	case "postgresql":
 	case "oracle":
@@ -274,7 +275,6 @@ switch ($sortField) {
 }
 
 $search_sql = '';
-
 if ($search != "") {
 	$sql = "SELECT DISTINCT taddress_agent.id_agent FROM taddress
 	INNER JOIN taddress_agent ON

pandora_console/godmode/events/custom_events.php

@@ -149,6 +149,7 @@ $table->data = array();
 
 $fields_available = array();
 
+$fields_available['id_evento'] = __('Event id');
 $fields_available['evento'] = __('Event name');
 $fields_available['id_agente'] = __('Agent name');
 $fields_available['id_usuario'] = __('User');

pandora_console/godmode/massive/massive_edit_agents.php

@@ -558,11 +558,11 @@ $(document).ready (function () {
 	});
 
 	$("#text-id_parent").on("autocompletechange", function () {
-		agent_id = $("#hidden-id_parent").val();
+		agent_name = $("#text-id_parent").val();
 		
 		var params = {};
 		params["get_agent_modules_json_by_name"] = 1;
-		params["id_agent"] = agent_id;
+		params["agent_name"] = agent_name;
 		params["page"] = "include/ajax/module";
 		
 		jQuery.ajax ({

pandora_console/godmode/reporting/reporting_builder.php

@@ -539,7 +539,7 @@ switch ($action) {
 			$table->size[3] = '2%';
 			$table->size[4] = '2%';
 			$table->size[5] = '2%';
-			$table->size[6] = '4%';
+			$table->size[6] = '2%';
 			$table->size['csv'] = '5%';
 			
 			$next = 4;

pandora_console/godmode/users/user_list.php

@@ -127,7 +127,7 @@ else {
 
 $disable_user = get_parameter ("disable_user", false);
 
-if (isset ($_GET["user_del"]) && isset ($_GET["delete_user"])) { //delete user
+if (isset ($_GET["user_del"])) { //delete user
 	$id_user = get_parameter ("delete_user", 0);
 	// Only allow delete user if is not the actual user
 	if ($id_user != $config['id_user']) {
@@ -197,17 +197,16 @@ elseif ($disable_user !== false) { //disable_user
 	else {
 		$result = false;
 	}
-	if($result != null){
+	
-		if ($disable_user == 1) {
+	if ($disable_user == 1) {
-			ui_print_result_message ($result, 
+		ui_print_result_message ($result, 
-				__('Successfully disabled'),
+			__('Successfully disabled'),
-				__('There was a problem disabling user'));
+			__('There was a problem disabling user'));
-		}
+	}
-		else {
+	else {
-			ui_print_result_message ($result, 
+		ui_print_result_message ($result, 
-				__('Successfully enabled'),
+			__('Successfully enabled'),
-				__('There was a problem enabling user'));
+			__('There was a problem enabling user'));
-		}
 	}
 }
 

pandora_console/include/ajax/module.php

@@ -38,7 +38,9 @@ $get_agent_modules_json_by_name = (bool) get_parameter('get_agent_modules_json_b
 
 
 if ($get_agent_modules_json_by_name) {
-	$agent_id = get_parameter('id_agent');
+	$agent_name = get_parameter('agent_name');
+
+	$agent_id = agents_get_agent_id($agent_name);
 
 	$agent_modules = db_get_all_rows_sql("SELECT id_agente_modulo as id_module, nombre as name FROM tagente_modulo
 											WHERE id_agente = " . $agent_id);
@@ -737,7 +739,7 @@ if ($list_modules) {
 	$table->head[5] = __('Status') . ' ' .
 		'<a href="' . $url . '&sort_field=status&amp;sort=up&refr=&filter_monitors=1&status_filter_monitor=' .$status_filter_monitor.' &status_text_monitor='. $status_text_monitor.'&status_module_group= '.$status_module_group.'">' . html_print_image("images/sort_up.png", true, array("style" => $selectStatusUp, "alt" => "up")) . '</a>' .
 		'<a href="' . $url . '&sort_field=status&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor=' .$status_filter_monitor.' &status_text_monitor='. $status_text_monitor.'&status_module_group= '.$status_module_group.'">' . html_print_image("images/sort_down.png", true, array("style" => $selectStatusDown, "alt" => "down")) . '</a>';
-	$table->head[6] = __('Thresholds');
+	$table->head[6] = __('Warn');
 	$table->head[7] = __('Data');
 	$table->head[8] = __('Graph');
 	$table->head[9] = __('Last contact') . ' ' .

pandora_console/include/auth/mysql.php

@@ -645,26 +645,15 @@ function ldap_process_user_login ($login, $password) {
 		}
 	}
 	
-	$ldap_login_attr  = !empty($config["ldap_login_attr"]) ? io_safe_output($config["ldap_login_attr"]) . "=" : '';
+	$ldap_login_attr  = isset($config["ldap_login_attr"]) ? io_safe_output($config["ldap_login_attr"]) . "=" : '';
-	$ldap_base_dn  = !empty($config["ldap_base_dn"]) ? "," . io_safe_output($config["ldap_base_dn"]) : '';
+	$ldap_base_dn  = isset($config["ldap_base_dn"]) ? "," . io_safe_output($config["ldap_base_dn"]) : '';
 	
-	if(!empty($ldap_base_dn)){
+	if (strlen($password) == 0 || 
-		if (strlen($password) == 0 || 
-		!@ldap_bind($ds, $ldap_login_attr.io_safe_output($login).$ldap_base_dn, $password) ) {
-			html_debug("entra1",true);
-			$config["auth_error"] = 'User not found in database or incorrect password';
-			@ldap_close ($ds);
-			
-			return false;
-		}
-	} else {
-		if (strlen($password) == 0 || 
 		!@ldap_bind($ds, io_safe_output($login), $password) ) {
-			$config["auth_error"] = 'User not found in database or incorrect password';
+		$config["auth_error"] = 'User not found in database or incorrect password';
-			@ldap_close ($ds);
+		@ldap_close ($ds);
-			
+		
-			return false;
+		return false;
-		}
 	}
 	
 	@ldap_close ($ds);

pandora_console/include/config_process.php

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

pandora_console/include/functions.php

@@ -1701,7 +1701,7 @@ function check_sql ($sql) {
 	
 	//Check that it not delete_ as "delete_pending" (this is a common field in pandora tables).
 	
-	if (preg_match("/\*|delete[^_]|drop|alter|modify|password|pass|insert|update/i", $sql)) {
+	if (preg_match("/\*|delete[^_]|drop|alter|modify|union|password|pass|insert|update/i", $sql)) {
 		return "";
 	}
 	return $sql;

pandora_console/include/functions_api.php

@@ -9112,9 +9112,8 @@ function api_set_create_event($id, $trash1, $other, $returnType) {
  *   http://127.0.0.1/pandora_console/include/api.php?op=set&op2=add_event_comment&id=event_id&other=string|&other_mode=url_encode_separator_|&apipass=1234&user=admin&pass=pandora
  */
 function api_set_add_event_comment($id, $thrash2, $other, $thrash3) {
-	$meta = false;
 	if (defined ('METACONSOLE')) {
-		$meta = true;
+		return;
 	}
 	
 	if ($other['type'] == 'string') {
@@ -9123,9 +9122,11 @@ function api_set_add_event_comment($id, $thrash2, $other, $thrash3) {
 	}
 	else if ($other['type'] == 'array') {
 		$comment = io_safe_input($other['data'][0]);
+		$meta = $other['data'][1];
 		$history = $other['data'][2];
 		
-		$status = events_comment($id, $comment, 'Added comment', $meta, $history);
+		$status = events_comment($id, $comment, 'Added comment', $meta,
+			$history);
 		if (is_error($status)) {
 			returnError('error_add_event_comment',
 				__('Error adding event comment.'));
@@ -9940,14 +9941,7 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
 		$other['data'][0]
 		:
 		SECONDS_1HOUR; // 1 hour by default
-
+	
-	$graph_threshold =
-		(!empty($other) && isset($other['data'][2]))
-		?
-		$other['data'][2]
-		:
-		0;
-
 	if (is_nan($graph_seconds) || $graph_seconds <= 0) {
 		// returnError('error_module_graph', __(''));
 		return;
@@ -9958,44 +9952,41 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
 		$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'], 
+		true, 'white', null, false, false, $config['type_module_charts']);
-		false, false);
 		
-        $graph_image_file_encoded = false;
+       $graph_image_file_encoded = false;
         if (preg_match("/<img src='(.+)'./", $graph_html, $matches)) {
                 $file_url = $matches[1];
 
-            if (preg_match("/\?(.+)&(.+)&(.+)&(.+)/", $file_url,$parameters)) {
+                if (preg_match("/\?(.+)&(.+)&(.+)&(.+)/", $file_url,$parameters)) {
-                    array_shift ($parameters);
+                        array_shift ($parameters);
-                foreach ($parameters as $parameter){
+                        foreach ($parameters as $parameter){
-                        $value = explode ("=",$parameter);
+                                $value = explode ("=",$parameter);
 
-                    if (strcmp($value[0], "static_graph") == 0){
+                                if (strcmp($value[0], "static_graph") == 0){
-                            $static_graph = $value[1];
+                                        $static_graph = $value[1];
-                    }
+                                }
-                    elseif (strcmp($value[0], "graph_type") == 0){
+                                elseif (strcmp($value[0], "graph_type") == 0){
-                            $graph_type = $value[1];
+                                        $graph_type = $value[1];
-                    }
+                                }
-                    elseif (strcmp($value[0], "ttl") == 0){
+                                elseif (strcmp($value[0], "ttl") == 0){
-                            $ttl = $value[1];
+                                        $ttl = $value[1];
-                    }
+                                }
-                    elseif (strcmp($value[0], "id_graph") == 0){
+                                elseif (strcmp($value[0], "id_graph") == 0){
-                            $id_graph = $value[1];
+                                        $id_graph = $value[1];
-                    }
+                                }
+                        }
                 }
-            }
         }
 
         // Check values are OK
         if ( (isset ($graph_type))
         && (isset ($ttl))
         && (isset ($id_graph))) {
-            $_GET["ttl"]             = $ttl;
+                        $_GET["ttl"] = $ttl;
-            $_GET["id_graph"]        = $id_graph;
+                        $_GET["id_graph"] = $id_graph;
-            $_GET["graph_type"]      = $graph_type;
+                        $_GET["graph_type"] = $graph_type;
-            $_GET["static_graph"]    = $static_graph;
+                        $_GET["static_graph"] = $static_graph;
-            $_GET["graph_threshold"] = $graph_threshold;
-            $_GET["id_module"]       = $id_module;
         }
 
         ob_start();

pandora_console/include/functions_graph.php

@@ -3222,11 +3222,11 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta =
 			}
 			else {
 				if ($meta) {
-					$name = mb_substr (io_safe_output($row['agent_name']), 0, 25)." (".$row["count"].")";
+					$name = mb_substr (io_safe_output($row['agent_name']), 0, 14)." (".$row["count"].")";
 				}
 				else {
 					$alias = agents_get_alias($row["id_agente"]);
-					$name = mb_substr($alias, 0, 25)." #".$row["id_agente"]." (".$row["count"].")";
+					$name = mb_substr($alias, 0, 14)." #".$row["id_agente"]." (".$row["count"].")";
 				}
 				$data[$name] = $row["count"];
 			}

pandora_console/include/functions_modules.php

@@ -2597,4 +2597,4 @@ function recursive_get_dt_from_modules_tree (&$f_modules, $modules, $deep) {
 	}
 }
 
-?>
+?>

pandora_console/include/functions_reporting.php

@@ -3991,7 +3991,7 @@ function reporting_sql($report, $content) {
 	}
 	else {
 		$return['correct'] = 0;
-		$return['error'] = __('Illegal query: Due security restrictions, there are some tokens or words you cannot use: *, delete, drop, alter, modify, password, pass, insert or update.');
+		$return['error'] = __('Illegal query: Due security restrictions, there are some tokens or words you cannot use: *, delete, drop, alter, modify, union, password, pass, insert or update.');
 	}
 	
 	if ($config['metaconsole']) {
@@ -5857,25 +5857,6 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 						'id_agent_module'=>$graph_item['id_agent_module']);
 			}
 			
-			if($type_report == 'automatic_graph'){
-				$label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
-				if (!empty($label)) {
-					if ($config['metaconsole']) {
-						$id_meta = metaconsole_get_id_server($content["server_name"]);
-						$server = metaconsole_get_connection_by_id ($id_meta);
-						metaconsole_connect($server);
-					}
-					$label = reporting_label_macro($content, $label);
-					
-					if ($config['metaconsole']) {
-						metaconsole_restore_db();
-					}
-				}
-			} else {
-				$label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
-				$label = reporting_label_macro($content, $label);
-			}
-			
 			$labels[$graph_item['id_agent_module']] = $label;
 		}
 	}

pandora_console/include/functions_update_manager.php

@@ -624,8 +624,8 @@ function update_manager_extract_package() {
 
 	$extracted = false;
 
-	// Phar and exception working fine in 5.6.0 or higher
+	// Phar and exception working fine in 5.5.0 or higher
-	if (PHP_VERSION_ID >= 50600) {
+	if (PHP_VERSION_ID >= 50505) {
 		$phar = new PharData($path_package);
 		try {
 			$result = $phar->extractTo($config['attachment_store'] . "/downloads/",null, true);

pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js

@@ -34,7 +34,10 @@
 				}
 				if (dataObjects.length > 1) {
 					dataObjects.forEach(function (element) {
-						result = element;
+						if (/^Avg.:/i.test(element.label))
+							result = element;
+						if (/^Percentil/i.test(element.label))
+							result = element;
 					});
 
 					// If the avg set is missing, retrieve the first set

pandora_console/include/graphs/flot/pandora.flot.js

@@ -888,16 +888,11 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 
 	// 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;
-				}
-			}
 			aux.push([i, v]);
 		});
 
@@ -981,9 +976,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		// Prepared to turn series with a checkbox
 		// showed[i] = true;
 	}
-	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;
@@ -1545,7 +1538,6 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 				position: 'left',
 				font: font,
 				reserveSpace: true,
-				min: min_check
 			}],
 			legend: {
 				position: 'se',

pandora_console/include/graphs/functions_pchart.php

@@ -54,11 +54,6 @@ $graph_type = get_parameter('graph_type', '');
 
 $id_graph = get_parameter('id_graph', false);
 
-$graph_threshold = get_parameter('graph_threshold', false);
-
-$id_module = get_parameter('id_module');
-
-
 if (!$id_graph) {
 	exit;
 }
@@ -388,7 +383,7 @@ switch ($graph_type) {
 		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);
+			$backgroundColor, $unit, $series_type);
 		break;
 	case 'threshold':
 		pch_threshold_graph($graph_type, $data_keys, $data_values, $width,
@@ -774,8 +769,7 @@ 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;
 	
@@ -981,7 +975,8 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		($height - $margin_bottom));
 	
 	/*Get minimun value to draw axis properly*/
-	$min_data = min($data['min']);
+	$min_data = min(min($data));
+	
 	$ManualScale = array();
 	$mode = SCALE_MODE_START0;
 	if ($min_data < 0) {
@@ -993,244 +988,32 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		$mode = SCALE_MODE_MANUAL;
 	}
 	
-	if($graph_threshold){
+	/* Draw the scale */
-		$sql_treshold = 'select min_critical, max_critical, min_warning, max_warning, critical_inverse, warning_inverse from tagente_modulo where id_agente_modulo =' . $id_module;
+	$scaleSettings = array(
-		$treshold_position = db_get_all_rows_sql($sql_treshold);
+		"GridR" => 200,
-
+		"GridG" => 200,
-		//min, max and inverse critical and warning
+		"GridB" => 200,
-		$p_min_crit = $treshold_position[0]['min_critical'];
+		"GridAlpha" => 30,
-		$p_max_crit = $treshold_position[0]['max_critical'];
+		"DrawSubTicks" => true,
-		$p_inv_crit = $treshold_position[0]['critical_inverse'];
+		"CycleBackground" => true,
-		$p_min_warn = $treshold_position[0]['min_warning'];
+		"BackgroundAlpha1" => 35,
-		$p_max_warn = $treshold_position[0]['max_warning'];
+		"BackgroundAlpha2" => 35,
-		$p_inv_warn = $treshold_position[0]['warning_inverse'];
+		"Mode" => $mode,
-
+		"ManualScale" => $ManualScale,
-		//interval warning
+		"LabelRotation" => 40, 
-		$print_rectangle_warning = 1;
+		"XMargin" => 0, 
-		if($p_min_warn == "0.00" && $p_max_warn == "0.00" && $p_inv_warn == 0){
+		"MinDivHeight" => 15,
-			$print_rectangle_warning = 0;
+		"TicksFontSize" => $font_size - 1);
-		}
+	
-		if($print_rectangle_warning){
+	$scaleSettings['AxisR'] = '200';
-			if($p_inv_warn){
+	$scaleSettings['AxisG'] = '200';
-				if($p_max_warn == 0){
+	$scaleSettings['AxisB'] = '200';
-					$p_max_warn = $p_min_warn;
+	$scaleSettings['TickR'] = '200';
-					$p_min_warn = "none";
+	$scaleSettings['TickG'] = '200';
-				}
+	$scaleSettings['TickB'] = '200';
-				else{
+	
-					$p_max_warn_inv = $p_min_warn;
+	$myPicture->drawScale($scaleSettings);
-					$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{
-		/* 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));
 	
@@ -1304,6 +1087,7 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		}
 	}
 	
+	
 	/* Render the picture */
 	$myPicture->stroke(); 
 }

pandora_console/include/help/en/help_alert_config.php

@@ -64,7 +64,6 @@ Apart from the defined module macros, the following macros are also available:
 <li>_groupother_ : Other information about the group. Configured when the group is created.</li>
 <li>_email_tag_ : Emails associated to the module tags.</li>
 <li>_modulegraph_nh_: (Only for alerts that use the command eMail) Returns an image of a module graph with a period of n hours (eg. _modulegraph_24h_). A correct setup of the connection between the server and the console's api is required. This setup is done into the server's configuration file.</li>
-<li>_modulegraphth_<i>n</i>h_:Same operation as the previous macro only with the critical and warning thresholds of the module provided they are defined.</li>
 <li>_homeurl_ : It is a link of the public URL this must be configured in the general options of the setup.</li>
 </ul>
 <p>

pandora_console/include/help/en/help_alert_macros.php

@@ -67,7 +67,6 @@ Besides the defined module macros, the following macros are available:
 Returns an image encoded in base64 of a module’s graph with a period of <i>n</i> hours (eg. _modulegraph_24h_).
 A correct setup of the connection between the server and the console's API is required.
 This setup is done on the server's configuration file.</li>
-<li>_modulegraphth_<i>n</i>h_:Same operation as the previous macro only with the critical and warning thresholds of the module provided they are defined.</li>
 </ul>
 
 <p>

pandora_console/include/help/en/help_reports_label_field.php

@@ -8,7 +8,6 @@
 
 The following macros are also available: <br />
 	<ul>
-	Only if you select one graph for each agent.<br />
     <li><b>_agent_ </b>: Name of the agent that you selected in report item.<li />
 	<li><b>_agentdescription_ </b>: Description of the agent that you selected in report item.<li />
     <li><b>_agentgroup_ </b>: Agent group name.<li />

pandora_console/include/help/es/help_alert_config.php

@@ -65,8 +65,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
 <li>_groupcontact_ : Información de contacto del grupo.	Se configura al crear el grupo.</li>
 <li>_groupother_ : Otra información sobre el grupo. Se configura al crear el grupo.</li>
 <li>_email_tag_ : Emails asociados a los tags de módulos.</li>
-<li>_modulegraph_<i>n</i>h_: (Sólo para alertas que usen el comando eMail) Devuelve una imagen codificada en base64 de una gráfica del módulo con un período de n horas (eg. _modulegraph_24h_). Requiere de una configuración correcta de la conexión del servidor a la consola vía api, la cual se realiza en el fichero de configuración del servidor.</li>
+<li>_modulegraph_nh_: (Sólo para alertas que usen el comando eMail) Devuelve una imagen codificada en base64 de una gráfica del módulo con un período de n horas (eg. _modulegraph_24h_). Requiere de una configuración correcta de la conexión del servidor a la consola vía api, la cual se realiza en el fichero de configuración del servidor.</li>
-<li>_modulegraphth_<i>n</i>h_:mismo funcionamiento que la macro anterior solo que con los umbrales critical y warning del modulo siempre que estos esten definidos</li>
 <li>_homeurl_ : Es un link de la URL pública esta debe de estar configurada en las opciones generales del setup.</li>
 </ul>
 <p>

pandora_console/include/help/es/help_alert_macros.php

@@ -67,7 +67,6 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
 Devuelve una imagen codificada en base64 de una gráfica del módulo con un período de <i>n</i> horas (eg. _modulegraph_24h_).
 Requiere de una configuración correcta de la conexión del servidor a la consola vía api,
 la cual se realiza en el fichero de configuración del servidor.</li>
-<li>_modulegraphth_<i>n</i>h_:mismo funcionamiento que la macro anterior solo que con los umbrales critical y warning del modulo siempre que estos esten definidos</li>
 </ul>
 
 <p>

pandora_console/include/help/es/help_reports_label_field.php

@@ -8,7 +8,6 @@
 
 Lista de las macros admitidas en este campo: <br />
 	<ul>
-	Solamente si seleccionas una gráfica por cada agente.<br />
     <li><b>_agent_ </b>: Nombre del agente que ha seleccionado en el elemento del informe.<li />
 	<li><b>_agentdescription_ </b>: Descripción del agente que ha seleccionado en el elemento del informe.<li />
     <li><b>_agentgroup_ </b>: Grupo del agente que ha seleccionado en el elemento del informe<li />

pandora_console/include/javascript/functions_pandora_networkmap.js

@@ -307,12 +307,7 @@ function change_shape(id_db_node) {
 										})
 									.on("click", selected_node)
 									.on("dblclick", function(d) {
-											if (d.type == undefined) {
+											edit_node(d, true);
-												move_to_networkmap(d);
-											}
-											else {
-												edit_node(d, true);
-											}
 										})
 									.on("contextmenu", function(d) { show_menu("node", d);});
 									
@@ -347,12 +342,7 @@ function change_shape(id_db_node) {
 										})
 									.on("click", selected_node)
 									.on("dblclick", function(d) {
-											if (d.type == undefined) {
+											edit_node(d, true);
-												move_to_networkmap(d);
-											}
-											else {
-												edit_node(d, true);
-											}
 										})
 									.on("contextmenu", function(d) { show_menu("node", d);});
 								
@@ -375,12 +365,7 @@ function change_shape(id_db_node) {
 											})
 										.on("click", selected_node)
 										.on("dblclick", function(d) {
-												if (d.type == undefined) {
+												edit_node(d, true);
-													move_to_networkmap(d);
-												}
-												else {
-													edit_node(d, true);
-												}
 											})
 										.on("contextmenu", function(d) { show_menu("node", d);});
 										
@@ -415,12 +400,7 @@ function change_shape(id_db_node) {
 										})
 									.on("click", selected_node)
 									.on("dblclick", function(d) {
-											if (d.type == undefined) {
+											edit_node(d, true);
-												move_to_networkmap(d);
-											}
-											else {
-												edit_node(d, true);
-											}
 										})
 									.on("contextmenu", function(d) { show_menu("node", d);});
 								
@@ -445,12 +425,7 @@ function change_shape(id_db_node) {
 											})
 										.on("click", selected_node)
 										.on("dblclick", function(d) {
-												if (d.type == undefined) {
+												edit_node(d, true);
-													move_to_networkmap(d);
-												}
-												else {
-													edit_node(d, true);
-												}
 											})
 										.on("contextmenu", function(d) { show_menu("node", d);});
 										
@@ -485,12 +460,7 @@ function change_shape(id_db_node) {
 										})
 									.on("click", selected_node)
 									.on("dblclick", function(d) {
-											if (d.type == undefined) {
+											edit_node(d, true);
-												move_to_networkmap(d);
-											}
-											else {
-												edit_node(d, true);
-											}
 										})
 									.on("contextmenu", function(d) { show_menu("node", d);});	
 							}
@@ -3184,12 +3154,7 @@ function draw_elements_graph() {
 				})
 			.on("click", selected_node)
 			.on("dblclick", function(d) {
-					if (d.type == undefined) {
+					edit_node(d, true);
-						move_to_networkmap(d);
-					}
-					else {
-						edit_node(d, true);
-					}
 				})
 			.on("contextmenu", function(d) { show_menu("node", d);});
 	
@@ -3223,12 +3188,7 @@ function draw_elements_graph() {
 			})
 		.on("click", selected_node)
 		.on("dblclick", function(d) {
-				if (d.type == undefined) {
+				edit_node(d, true);
-					move_to_networkmap(d);
-				}
-				else {
-					edit_node(d, true);
-				}
 			})
 		.on("contextmenu", function(d) { show_menu("node", d);});
 	
@@ -3256,12 +3216,7 @@ function draw_elements_graph() {
 				})
 			.on("click", selected_node)
 			.on("dblclick", function(d) {
-					if (d.type == undefined) {
+					edit_node(d, true);
-						move_to_networkmap(d);
-					}
-					else {
-						edit_node(d, true);
-					}
 				})
 			.on("contextmenu", function(d) { show_menu("node", d);});
 			
@@ -3299,12 +3254,7 @@ function draw_elements_graph() {
 			})
 		.on("click", selected_node)
 		.on("dblclick", function(d) {
-				if (d.type == undefined) {
+				edit_node(d, true);
-					move_to_networkmap(d);
-				}
-				else {
-					edit_node(d, true);
-				}
 			})
 		.on("contextmenu", function(d) { show_menu("node", d);});
 	
@@ -3334,12 +3284,7 @@ function draw_elements_graph() {
 				})
 			.on("click", selected_node)
 			.on("dblclick", function(d) {
-					if (d.type == undefined) {
+					edit_node(d, true);
-						move_to_networkmap(d);
-					}
-					else {
-						edit_node(d, true);
-					}
 				})
 			.on("contextmenu", function(d) { show_menu("node", d);});
 			
@@ -3377,12 +3322,7 @@ function draw_elements_graph() {
 			})
 		.on("click", selected_node)
 		.on("dblclick", function(d) {
-				if (d.type == undefined) {
+				edit_node(d, true);
-					move_to_networkmap(d);
-				}
-				else {
-					edit_node(d, true);
-				}
 			})
 		.on("contextmenu", function(d) { show_menu("node", d);});
 	
@@ -3413,29 +3353,6 @@ function draw_elements_graph() {
 	node.exit().remove();
 }
 
-function move_to_networkmap (node) {
-	var params = [];
-	params.push("get_networkmap_from_fictional=1");
-	params.push("id=" + node.id_db);
-	params.push("id_map=" + node.map_id);
-	params.push("page=enterprise/operation/agentes/pandora_networkmap.view");
-
-	jQuery.ajax ({
-		data: params.join ("&"),
-		dataType: 'json',
-		type: 'POST',
-		url: action="ajax.php",
-		success: function (data) {
-			if (data['correct']) {
-				window.location="index.php?sec=network&sec2=operation/agentes/pandora_networkmap&tab=view&id_networkmap=" + data['id_networkmap'];
-			}
-			else {
-				edit_node(node, true);
-			}
-		}
-	});
-}
-
 function choose_group_for_show_agents() {
 	if (enterprise_installed) {
 		group = $("#group_for_show_agents option:selected").val();

pandora_console/include/styles/pandora_black.css

@@ -2837,14 +2837,6 @@ div#agent_wizard_subtabs {
 	text-decoration: underline;
 }
 
-#code_license_dialog a:hover {
-	color:red;
-}
-
-#code_license_dialog *{
-	color: #222222;
-}
-
 /* GRAPHS CSS */
 
 .parent_graph {

pandora_console/install.php

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

pandora_console/mobile/include/user.class.php

@@ -63,9 +63,7 @@ class User {
 			$user = $system->getRequest('user', null);
 			$password = $system->getRequest('password', null);
 			
-			$nick = $system->safeInput($user);
+			$this->login($user, $password);
-			$pass = $system->safeInput($password);
-			$this->login($nick, $pass);
 		}
 		
 		return $this->logged;
@@ -78,7 +76,6 @@ class User {
 			$user = $system->getRequest('user', null);
 			$user = $system->safeInput($user);
 			$password = $system->getRequest('password', null);
-			$password = $system->safeInput($password);
 		}
 		
 		if (!empty($user) && !empty($password)) {

pandora_console/operation/search_modules.php

@@ -73,156 +73,154 @@ else {
 		'nombre', 'web_content_string');
 	
 	foreach ($modules as $module) {
-		if(!$module['disabled']){
+		$module["datos"] =
-			$module["datos"] =
+			modules_get_last_value($module['id_agente_modulo']);
-				modules_get_last_value($module['id_agente_modulo']);
+		$module["module_name"] = $module['nombre'];
-			$module["module_name"] = $module['nombre'];
+		
-			
+		//To search the monitor status
-			//To search the monitor status
+		$status_sql = sprintf('SELECT estado from tagente_estado where id_agente_modulo =' . $module['id_agente_modulo']);
-			$status_sql = sprintf('SELECT estado from tagente_estado where id_agente_modulo =' . $module['id_agente_modulo']);
+		$status_sql = db_process_sql($status_sql);
-			$status_sql = db_process_sql($status_sql);
+		$status_sql = $status_sql[0];
-			$status_sql = $status_sql[0];
+		//To search the monitor utimestamp
-			//To search the monitor utimestamp
+		$utimestamp_sql = sprintf('SELECT utimestamp from tagente_estado where id_agente_modulo =' . $module['id_agente_modulo']);
-			$utimestamp_sql = sprintf('SELECT utimestamp from tagente_estado where id_agente_modulo =' . $module['id_agente_modulo']);
+		$utimestamp_sql = db_process_sql($utimestamp_sql);
-			$utimestamp_sql = db_process_sql($utimestamp_sql);
+		$utimestamp_sql = $utimestamp_sql[0];
-			$utimestamp_sql = $utimestamp_sql[0];
+		
-			
+		
-			
+		$agent = db_get_row ('tagente', 'id_agente', $module['id_agente']);
-			$agent = db_get_row ('tagente', 'id_agente', $module['id_agente']);
+		$agentCell = '<a title='.$module['agent_name'].' href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $module['id_agente'] . '">' .
-			$agentCell = '<a title='.$module['agent_name'].' href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $module['id_agente'] . '">' .
+			$agent['alias'] . '</a>';
-				$agent['alias'] . '</a>';
+		
-			
+		$typeCell = ui_print_moduletype_icon($module["id_tipo_modulo"], true);
-			$typeCell = ui_print_moduletype_icon($module["id_tipo_modulo"], true);
+		
-			
+		$intervalCell = modules_get_interval ($module['id_agente_modulo']);
-			$intervalCell = modules_get_interval ($module['id_agente_modulo']);
+		
-			
+		if ($utimestamp_sql['utimestamp'] == 0 &&
-			if ($utimestamp_sql['utimestamp'] == 0 &&
+			(
-				(
+				($module['id_tipo_modulo'] < 21 || $module['id_tipo_modulo'] > 23) &&
-					($module['id_tipo_modulo'] < 21 || $module['id_tipo_modulo'] > 23) &&
+				$module['id_tipo_modulo'] != 100)
-					$module['id_tipo_modulo'] != 100)
+			) {
-				) {
+			$statusCell = ui_print_status_image(STATUS_MODULE_NO_DATA,
-				$statusCell = ui_print_status_image(STATUS_MODULE_NO_DATA,
+				__('NOT INIT'), true);
-					__('NOT INIT'), true);
-			}
-			elseif ($status_sql['estado'] == 0) {
-				$statusCell = ui_print_status_image(STATUS_MODULE_OK,
-					__('NORMAL') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
-			}
-			elseif ($status_sql['estado'] == 1) {
-				$statusCell = ui_print_status_image(STATUS_MODULE_CRITICAL,
-					__('CRITICAL') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
-			}
-			elseif ($status_sql['estado'] == 2) {
-				$statusCell = ui_print_status_image(STATUS_MODULE_WARNING,
-					__('WARNING') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
-			}
-			else {
-				$last_status = modules_get_agentmodule_last_status($module['id_agente_modulo']);
-				switch($last_status) {
-					case 0:
-						$statusCell = ui_print_status_image(
-							STATUS_MODULE_OK,
-							__('UNKNOWN') . " - " . __('Last status') .
-							" " . __('NORMAL') .": " . modules_get_last_value($module["id_agente_modulo"]),
-							true);
-						break;
-					case 1:
-						$statusCell = ui_print_status_image(
-							STATUS_MODULE_CRITICAL,
-							__('UNKNOWN') . " - " . __('Last status') .
-							" " . __('CRITICAL') . ": " . modules_get_last_value($module["id_agente_modulo"]),
-							true);
-						break;
-					case 2:
-						$statusCell = ui_print_status_image(
-							STATUS_MODULE_WARNING,
-							__('UNKNOWN') . " - " . __('Last status') .
-							" " . __('WARNING') . ": " . modules_get_last_value($module["id_agente_modulo"]),
-							true);
-						break;
-				}
-			}
-			
-			$graphCell = "";
-			if ($module['history_data'] == 1) {
-				
-				$graph_type = return_graphtype ($module["id_tipo_modulo"]);
-				
-				$name_module_type = modules_get_moduletype_name ($module["id_tipo_modulo"]);
-				$handle = "stat" . $name_module_type . "_" . $module["id_agente_modulo"];
-				$url = 'include/procesos.php?agente=' . $module["id_agente_modulo"];
-				$win_handle = dechex(crc32($module["id_agente_modulo"] . $module["module_name"]));
-				
-				$link ="winopeng('" .
-					"operation/agentes/stat_win.php?" .
-					"type=$graph_type&" .
-					"period=" . SECONDS_1DAY . "&" .
-					"id=" . $module["id_agente_modulo"] . "&" .
-					"label=" . rawurlencode(
-						urlencode(
-							base64_encode($module["module_name"]))) . "&" .
-					"refresh=" . SECONDS_10MINUTES . "', " .
-					"'day_" . $win_handle . "')";
-				
-				$graphCell = '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => 0, "alt" => "")) . '</a>';
-				$graphCell .= "&nbsp;" .
-					"<a href='index.php?" .
-					"sec=estado&amp;" .
-					"sec2=operation/agentes/ver_agente&amp;" .
-					"id_agente=" . $module["id_agente"] . "&amp;" .
-					"tab=data_view&" .
-					"period=" . SECONDS_1DAY . "&amp;" .
-					"id=" . $module["id_agente_modulo"] . "'>" .
-					html_print_image('images/binary.png', true,
-						array("border" => "0", "alt" => "")) . "</a>";
-			}
-			
-			if (is_numeric(modules_get_last_value($module["id_agente_modulo"]))) {
-				$dataCell = format_numeric(modules_get_last_value($module["id_agente_modulo"]));
-			}
-			else {
-				$dataCell = ui_print_module_string_value(
-					$module["datos"], $module["id_agente_modulo"],
-					$module["current_interval"]);
-			}
-			
-			if ($module['estado'] == 3) {
-				$option = array ("html_attr" => 'class="redb"');
-			}
-			else {
-				$option = array ();
-			}
-			$timestampCell = ui_print_timestamp ($utimestamp_sql["utimestamp"], true, $option);
-			
-			
-			$group_agent = agents_get_agent_group($module['id_agente']);
-			
-			if (check_acl ($config['id_user'], $group_agent, "AW")) {
-				$edit_module = 'aaa';
-				
-				$url_edit = "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente="
-					. $module['id_agente'] . "&tab=module&id_agent_module=" . 
-					$module["id_agente_modulo"] . "&edit_module=1";
-				
-				$edit_module = '<a href="' . $url_edit . '">' .
-					html_print_image("images/config.png", true) . '</a>';
-			}
-			else {
-				$edit_module = '';
-			}
-			
-			
-			array_push($table->data, array(
-				$module['module_name'],
-				$agentCell,
-				$typeCell,
-				$intervalCell,
-				$statusCell,
-				$graphCell,
-				$dataCell,
-				$timestampCell,
-				$edit_module));
 		}
+		elseif ($status_sql['estado'] == 0) {
+			$statusCell = ui_print_status_image(STATUS_MODULE_OK,
+				__('NORMAL') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
+		}
+		elseif ($status_sql['estado'] == 1) {
+			$statusCell = ui_print_status_image(STATUS_MODULE_CRITICAL,
+				__('CRITICAL') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
+		}
+		elseif ($status_sql['estado'] == 2) {
+			$statusCell = ui_print_status_image(STATUS_MODULE_WARNING,
+				__('WARNING') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
+		}
+		else {
+			$last_status = modules_get_agentmodule_last_status($module['id_agente_modulo']);
+			switch($last_status) {
+				case 0:
+					$statusCell = ui_print_status_image(
+						STATUS_MODULE_OK,
+						__('UNKNOWN') . " - " . __('Last status') .
+						" " . __('NORMAL') .": " . modules_get_last_value($module["id_agente_modulo"]),
+						true);
+					break;
+				case 1:
+					$statusCell = ui_print_status_image(
+						STATUS_MODULE_CRITICAL,
+						__('UNKNOWN') . " - " . __('Last status') .
+						" " . __('CRITICAL') . ": " . modules_get_last_value($module["id_agente_modulo"]),
+						true);
+					break;
+				case 2:
+					$statusCell = ui_print_status_image(
+						STATUS_MODULE_WARNING,
+						__('UNKNOWN') . " - " . __('Last status') .
+						" " . __('WARNING') . ": " . modules_get_last_value($module["id_agente_modulo"]),
+						true);
+					break;
+			}
+		}
+		
+		$graphCell = "";
+		if ($module['history_data'] == 1) {
+			
+			$graph_type = return_graphtype ($module["id_tipo_modulo"]);
+			
+			$name_module_type = modules_get_moduletype_name ($module["id_tipo_modulo"]);
+			$handle = "stat" . $name_module_type . "_" . $module["id_agente_modulo"];
+			$url = 'include/procesos.php?agente=' . $module["id_agente_modulo"];
+			$win_handle = dechex(crc32($module["id_agente_modulo"] . $module["module_name"]));
+			
+			$link ="winopeng('" .
+				"operation/agentes/stat_win.php?" .
+				"type=$graph_type&" .
+				"period=" . SECONDS_1DAY . "&" .
+				"id=" . $module["id_agente_modulo"] . "&" .
+				"label=" . rawurlencode(
+					urlencode(
+						base64_encode($module["module_name"]))) . "&" .
+				"refresh=" . SECONDS_10MINUTES . "', " .
+				"'day_" . $win_handle . "')";
+			
+			$graphCell = '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => 0, "alt" => "")) . '</a>';
+			$graphCell .= "&nbsp;" .
+				"<a href='index.php?" .
+				"sec=estado&amp;" .
+				"sec2=operation/agentes/ver_agente&amp;" .
+				"id_agente=" . $module["id_agente"] . "&amp;" .
+				"tab=data_view&" .
+				"period=" . SECONDS_1DAY . "&amp;" .
+				"id=" . $module["id_agente_modulo"] . "'>" .
+				html_print_image('images/binary.png', true,
+					array("border" => "0", "alt" => "")) . "</a>";
+		}
+		
+		if (is_numeric(modules_get_last_value($module["id_agente_modulo"]))) {
+			$dataCell = format_numeric(modules_get_last_value($module["id_agente_modulo"]));
+		}
+		else {
+			$dataCell = ui_print_module_string_value(
+				$module["datos"], $module["id_agente_modulo"],
+				$module["current_interval"]);
+		}
+		
+		if ($module['estado'] == 3) {
+			$option = array ("html_attr" => 'class="redb"');
+		}
+		else {
+			$option = array ();
+		}
+		$timestampCell = ui_print_timestamp ($utimestamp_sql["utimestamp"], true, $option);
+		
+		
+		$group_agent = agents_get_agent_group($module['id_agente']);
+		
+		if (check_acl ($config['id_user'], $group_agent, "AW")) {
+			$edit_module = 'aaa';
+			
+			$url_edit = "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente="
+				. $module['id_agente'] . "&tab=module&id_agent_module=" . 
+				$module["id_agente_modulo"] . "&edit_module=1";
+			
+			$edit_module = '<a href="' . $url_edit . '">' .
+				html_print_image("images/config.png", true) . '</a>';
+		}
+		else {
+			$edit_module = '';
+		}
+		
+		
+		array_push($table->data, array(
+			$module['module_name'],
+			$agentCell,
+			$typeCell,
+			$intervalCell,
+			$statusCell,
+			$graphCell,
+			$dataCell,
+			$timestampCell,
+			$edit_module));
 	}
 	
 	echo "<br />";

pandora_console/pandora_console.redhat.spec

@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.711
+%define version     7.0NG.710
-%define release     170822
+%define release     170816
 
 # 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.711
+%define version     7.0NG.710
-%define release     170822
+%define release     170816
 %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.711"
+PI_VERSION="7.0NG.710"
 FORCE=0
 DESTDIR=""
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`

pandora_console/pandoradb.sql

@@ -67,7 +67,7 @@ CREATE TABLE IF NOT EXISTS `tagente` (
 	`custom_id` varchar(255) default '',
 	`server_name` varchar(100) default '',
 	`cascade_protection` tinyint(2) NOT NULL default '0',
-	`cascade_protection_module` int(10) unsigned NOT NULL default '0',
+	`cascade_protection_module` tinyint(2) NOT NULL default '0',
 	`timezone_offset` TINYINT(2) NULL DEFAULT '0' COMMENT 'nuber of hours of diference with the server timezone' ,
 	`icon_path` VARCHAR(127) NULL DEFAULT NULL COMMENT 'path in the server to the image of the icon representing the agent' ,
 	`update_gis_data` TINYINT(1) NOT NULL DEFAULT '1' COMMENT 'set it to one to update the position data (altitude, longitude, latitude) when getting information from the agent or to 0 to keep the last value and do not update it' ,

pandora_console/pandoradb_data.sql

@@ -112,7 +112,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('MR', 4),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
-('current_package_enterprise', '711'),
+('current_package_enterprise', '710'),
 ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.0009765625":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}');
 
 UNLOCK TABLES;
@@ -344,6 +344,7 @@ INSERT INTO tmodule VALUES (4,'Plugin module');
 INSERT INTO tmodule VALUES (5,'Prediction module');
 INSERT INTO tmodule VALUES (6,'WMI module');
 INSERT INTO tmodule VALUES (7, 'Web module');
+INSERT INTO tmodule VALUES (8, 'Wux module');
 
 INSERT INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`, `id_plugin`, `plugin_user`, `plugin_pass`, `plugin_parameter`, `max_timeout`, `history_data`, `min_warning`, `max_warning`, `str_warning`, `min_critical`, `max_critical`, `str_critical`, `min_ff_event`, `custom_string_1`, `custom_string_2`, `custom_string_3`, `custom_integer_1`, `custom_integer_2`, `post_process`, `wizard_level`, `critical_instructions`, `warning_instructions`, `unknown_instructions`, `tags`, `disabled_types_event`, `module_macros`) VALUES (1,'OS Total process','Total process in Operating System (UNIX MIB)',13,15,0,0,300,0,'','','public','HOST-RESOURCES-MIB::hrSystemProcesses.0 ',4,2,0,NULL,NULL,NULL,0,1,0.00,0.00,NULL,0.00,0.00,NULL,0,NULL,NULL,NULL,0,0,0.0000000000000,'basic','','','','','','');
 INSERT INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`, `id_plugin`, `plugin_user`, `plugin_pass`, `plugin_parameter`, `max_timeout`, `history_data`, `min_warning`, `max_warning`, `str_warning`, `min_critical`, `max_critical`, `str_critical`, `min_ff_event`, `custom_string_1`, `custom_string_2`, `custom_string_3`, `custom_integer_1`, `custom_integer_2`, `post_process`, `wizard_level`, `critical_instructions`, `warning_instructions`, `unknown_instructions`, `tags`, `disabled_types_event`, `module_macros`) VALUES (2,'OS CPU Load (1 min)','CPU Load in Operating System (UNIX MIB)',13,15,0,0,300,0,'','','public','UCD-SNMP-MIB::laLoad.1',4,2,0,NULL,NULL,NULL,0,1,0.00,0.00,NULL,0.00,0.00,NULL,0,NULL,NULL,NULL,0,0,0.0000000000000,'basic','','','','','','');

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170822
+Version: 7.0NG.710-170816
 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.711-170822"
+pandora_version="7.0NG.710-170816"
 
 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.711
+# Version 7.0NG.710
 # Licensed under GPL license v2,
 # (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
@@ -560,3 +560,12 @@ enc_dir /usr/share/pandora_server/enc/
 # Go to http://wiki.pandorafms.com/ for more information.
 dynamic_updates 5
 
+# Enable (1) or disable (0) the Pandora FMS WUX Server (PANDORA FMS ENTERPRISE ONLY).
+wuxserver 0
+
+# Host of the Selenium Grid Server.
+#wux_host localhost
+
+# Port of the Selenium Grid Server.
+#wux_port 4444
+

pandora_server/lib/PandoraFMS/Config.pm

@@ -42,8 +42,8 @@ our @EXPORT = qw(
 	);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.711";
+my $pandora_version = "7.0NG.710";
-my $pandora_build = "170822";
+my $pandora_build = "170816";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
@@ -445,6 +445,11 @@ sub pandora_load_config {
 	$pa_config->{"warmup_unknown_interval"} = 300; # 6.1
 	$pa_config->{"warmup_unknown_on"} = 1; # 6.1
 
+	$pa_config->{"wuxserver"} = 1; # 7.0
+	$pa_config->{"wux_host"} = undef; # 7.0
+	$pa_config->{"wux_port"} = 4444; # 7.0
+	$pa_config->{"wux_browser"} = "*firefox"; # 7.0
+
 	#$pa_config->{'include_agents'} = 0; #6.1
 	#
 	# External .enc files for XML::Parser.
@@ -1030,6 +1035,18 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^dynamic_constant\s+([0-9]*)/i) {
 			$pa_config->{'dynamic_constant'}= clean_blank($1);
 		}
+		elsif ($parametro =~ m/^wuxserver\s+([0-1]*)/i) {
+			$pa_config->{"wuxserver"} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^wux_host\s+(.*)/i) {
+			$pa_config->{'wux_host'}= clean_blank($1);
+		}
+		elsif ($parametro =~ m/^wux_port\s+([0-9]*)/i) {
+			$pa_config->{'wux_port'}= clean_blank($1);
+		}
+		elsif ($parametro =~ m/^wux_browser\s+(.*)/i) {
+			$pa_config->{'wux_browser'}= clean_blank($1);
+		}
 	} # end of loop for parameter #
 
 	# Set to RDBMS' standard port

pandora_server/lib/PandoraFMS/Core.pm

@@ -1010,8 +1010,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 				_modulestatus_ => undef,
 				_moduletags_ => undef,
 				'_moduledata_\S+_' => undef,
-				_id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '',
+				_id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', 
-				_id_module_ => (defined ($module)) ? $module->{'id_agente_modulo'} : '',
 				_id_group_ => (defined ($group)) ? $group->{'id_grupo'} : '',
 				_id_alert_ => (defined ($alert->{'id_template_module'})) ? $alert->{'id_template_module'} : '',
 				_interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '',
@@ -1095,10 +1094,9 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		# Message
 		$field3 = subst_alert_macros ($field3, \%macros, $pa_config, $dbh, $agent, $module);
 		
-		# Check for _module_graph_Xh_ macros and _module_graphth_Xh_ 
+		# Check for _module_graph_Xh_ macros
 		my $module_graph_list = {};
 		my $macro_regexp = "_modulegraph_(\\d+)h_";
-		my $macro_regexp2 = "_modulegraphth_(\\d+)h_";
 		
 		# API connection
 		my $ua = new LWP::UserAgent;
@@ -1114,14 +1112,8 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		
 		my $subst_func = sub {
 			my $hours = shift;
-			my $threshold = shift;
 			my $period = $hours * 3600; # Hours to seconds
-			if($threshold == 0){
+			$params->{"other"} = $period . '%7C0';
-				$params->{"other"} = $period . '%7C0%7C0';
-			}
-			else{
-				$params->{"other"} = $period . '%7C0%7C1';
-			}
 			$params->{"other_mode"} = 'url_encode_separator_%7C';
 			my $cid = 'module_graph_' . $hours . 'h';
 			
@@ -1143,8 +1135,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		eval {
 			no warnings;
 			local $SIG{__DIE__};
-			$field3 =~ s/$macro_regexp/$subst_func->($1, 0)/ige;
+			$field3 =~ s/$macro_regexp/$subst_func->($1)/ige;
-			$field3 =~ s/$macro_regexp2/$subst_func->($1, 1)/ige;
 		};
 		
 		# Default content type

pandora_server/pandora_server.redhat.spec

@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.711
+%define version     7.0NG.710
-%define release     170822
+%define release     170816
 
 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.711
+%define version     7.0NG.710
-%define release     170822
+%define release     170816
 
 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.711"
+PI_VERSION="7.0NG.710"
-PI_BUILD="170822"
+PI_BUILD="170816"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.711 PS170822";
+my $version = "7.0NG.710 PS170816";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.711 PS170822";
+my $version = "7.0NG.710 PS170816";
 
 # save program name for logging
 my $progname = basename($0);
@@ -129,7 +129,7 @@ sub help_screen{
 	help_screen_line('--create_data_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t  <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <definition_file> <warning_str> <critical_str>\n\t  <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>]", 'Add data server module to agent');
 	help_screen_line('--create_web_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t  <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <definition_file> <warning_str> <critical_str>\n\t  <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>].\n\t The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent');
 	help_screen_line('--create_network_module', "<module_name> <module_type> <agent_name> <module_address> \n\t  [<module_port> <description> <module_group> <min> <max> <post_process> <interval> \n\t  <warning_min> <warning_max> <critical_min> <critical_max> <history_data> <ff_threshold>\n\t  <warning_str> <critical_str> <unknown_events> <each_ff>\n\t  <ff_threshold_normal> <ff_threshold_warning> <ff_threshold_critical> <timeout> <retries>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>\n\t <warning_inverse> <critical_inverse>]", 'Add not snmp network module to agent');
-	help_screen_line('--create_snmp_module', "<module_name> <module_type> <agent_name> <module_address> <module_port>\n\t  <version> [<community> <oid> <description> <module_group> <min> <max> <post_process> <interval>\n\t   <warning_min> <warning_max> <critical_min> <critical_max> <history_data> \n\t  <snmp3_priv_method> <snmp3_priv_pass> <snmp3_sec_level> <snmp3_auth_method> \n\t  <snmp3_auth_user> <snmp3_priv_pass> <ff_threshold> <warning_str> \n\t  <critical_str> <unknown_events> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <timeout> <retries>
+	help_screen_line('--create_snmp_module', "<module_name> <module_type> <agent_name> <module_address> <module_port>\n\t  <version> [<community> <oid> <description> <module_group> <min> <max> <post_process> <interval>\n\t   <warning_min> <warning_max> <critical_min> <critical_max> <history_data> \n\t  <snmp3_priv_method> <snmp3_priv_pass> <snmp3_sec_level> <snmp3_auth_method> \n\t  <snmp3_auth_user> <snmp3_auth_pass> <ff_threshold> <warning_str> \n\t  <critical_str> <unknown_events> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <timeout> <retries>
 	\n\t <critical_instructions> <warning_instructions> <unknown_instructions>\n\t <warning_inverse> <critical_inverse>]", 'Add snmp network module to agent');
 	help_screen_line('--create_plugin_module', "<module_name> <module_type> <agent_name> <module_address> \n\t  <module_port> <plugin_name> <user> <password> <parameters> [<description> \n\t  <module_group> <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> \n\t  <critical_max> <history_data> <ff_threshold> <warning_str> <critical_str>\n\t  <unknown_events> <each_ff> <ff_threshold_normal> <ff_threshold_warning>\n\t  <ff_threshold_critical> <timeout> \n\t <critical_instructions> <warning_instructions> <unknown_instructions>\n\t <warning_inverse> <critical_inverse>]", 'Add plug-in module to agent');
     help_screen_line('--create_module_group', '<module_group_name>');