Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios

Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.724-180625
+Version: 7.0NG.724-180626
 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.724-180625"
+pandora_version="7.0NG.724-180626"
 
 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/pandora_agent

@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.724';
-use constant AGENT_BUILD => '180625';
+use constant AGENT_BUILD => '180626';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.724
-%define release     180625
+%define release     180626
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.724
-%define release     180625
+%define release     180626
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.724"
-PI_BUILD="180625"
+PI_BUILD="180626"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180625}
+{180626}
 
 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.724(Build 180625)")
+#define PANDORA_VERSION ("7.0NG.724(Build 180626)")
 
 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.724(Build 180625))"
+      VALUE "ProductVersion", "(7.0NG.724(Build 180626))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.724-180625
+Version: 7.0NG.724-180626
 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.724-180625"
+pandora_version="7.0NG.724-180626"
 
 package_pear=0
 package_pandora=1

pandora_console/extensions/realtime_graphs.php

@@ -110,8 +110,8 @@ function pandora_realtime_graphs () {
 	$refresh_fields[30000] = human_time_description_raw(30, true, 'large');
 
 	if ($graph == 'snmp_module') {
-		$agent_alias = get_parameter('agent_alias', '');
+		$agent_alias = io_safe_output(get_parameter('agent_alias', '')) ;
-		$module_name = get_parameter('module_name', '');
+		$module_name = io_safe_output(get_parameter('module_name', '')) ;
 		$module_incremental = get_parameter ('incremental', 0);
 		$data['module_info'] = "$agent_alias: <b>$module_name</b>";
 

pandora_console/godmode/agentes/agent_manager.php

@@ -670,6 +670,13 @@ ui_require_jquery_file('bgiframe');
 			return
 		}
 
+		// On agent creation PHP will update the secondary groups table (not via AJAX)
+		if (id_agent == 0) {
+			agent_manager_add_secondary_groups_ui();
+			agent_manager_update_hidden_input_secondary();
+			return;
+		}
+
 		var selected_items = new Array();
 		$("#secondary_groups option:selected").each(function(){
 			selected_items.push($(this).val())
@@ -690,11 +697,7 @@ ui_require_jquery_file('bgiframe');
 			data: data,
 			success: function (data) {
 				if (data == 1) {
-					// Move from one input to the other
+					agent_manager_add_secondary_groups_ui();
-					$("#secondary_groups_selected option[value=0]").remove()
-					$("#secondary_groups option:selected").each(function() {
-						$(this).remove().appendTo("#secondary_groups_selected")
-					})
 				} else {
 					console.error("Error in AJAX call to add secondary groups")
 				}
@@ -708,6 +711,13 @@ ui_require_jquery_file('bgiframe');
 	function agent_manager_remove_secondary_groups (event, id_agent) {
 		event.preventDefault();
 
+		// On agent creation PHP will update the secondary groups table (not via AJAX)
+		if (id_agent == 0) {
+			agent_manager_remove_secondary_groups_ui();
+			agent_manager_update_hidden_input_secondary();
+			return;
+		}
+
 		var selected_items = new Array();
 		$("#secondary_groups_selected option:selected").each(function(){
 			selected_items.push($(this).val())
@@ -728,6 +738,27 @@ ui_require_jquery_file('bgiframe');
 			data: data,
 			success: function (data) {
 				if (data == 1) {
+					agent_manager_remove_secondary_groups_ui();
+				} else {
+					console.error("Error in AJAX call to add secondary groups")
+				}
+			},
+			error: function (data) {
+				console.error("Fatal error in AJAX call to add secondary groups")
+			}
+		});
+	}
+
+	// Move from left input to right input
+	function agent_manager_add_secondary_groups_ui () {
+		$("#secondary_groups_selected option[value=0]").remove()
+		$("#secondary_groups option:selected").each(function() {
+			$(this).remove().appendTo("#secondary_groups_selected")
+		})
+	}
+
+	// Move from right input to left input
+	function agent_manager_remove_secondary_groups_ui () {
 		// Remove the groups selected if success
 		$("#secondary_groups_selected option:selected").each(function(){
 			$(this).remove().appendTo("#secondary_groups")
@@ -740,14 +771,22 @@ ui_require_jquery_file('bgiframe');
 				text: "<?php echo __("None");?>"
 			}))
 		}
-				} else {
-					console.error("Error in AJAX call to add secondary groups")
 	}
-			},
+
-			error: function (data) {
+	function agent_manager_update_hidden_input_secondary () {
-				console.error("Fatal error in AJAX call to add secondary groups")
+		var groups = [];
+		if(!$('form[name="conf_agent"] #secondary_hidden').length) {
+			$('form[name="conf_agent"]').append(
+				'<input name="secondary_hidden" type="hidden" id="secondary_hidden">'
+			);
 		}
-		});
+
+		var groups = new Array();
+		$("#secondary_groups_selected option").each(function() {
+			groups.push($(this).val())
+		})
+
+		$("#secondary_hidden").val(groups.join(','));
 	}
 
 	$(document).ready (function() {

pandora_console/godmode/agentes/configurar_agente.php

@@ -191,6 +191,7 @@ if ($create_agent) {
 	$quiet = (int) get_parameter("quiet", 0);
 	$cps = (int) get_parameter("cps", 0);
 
+	$secondary_groups = (string) get_parameter("secondary_hidden", "");
 	$fields = db_get_all_fields_in_table('tagent_custom_fields');
 
 	if ($fields === false) $fields = array();
@@ -293,6 +294,11 @@ if ($create_agent) {
 				"Quiet":"' . (int)$quiet.'",
 				"Cps":"' . (int)$cps.'"}';
 
+			// Create the secondary groups
+			enterprise_hook('agents_update_secondary_groups',
+				array($id_agente, explode(',', $secondary_groups), array())
+			);
+
 			$unsafe_alias = io_safe_output($alias);
 			db_pandora_audit("Agent management",
 				"Created agent $unsafe_alias", false, true, $info);

pandora_console/godmode/agentes/modificar_agente.php

@@ -177,11 +177,11 @@ echo "</td>";
 echo "<td>";
 echo __('Operative System') . '&nbsp;';
 
-$pre_fields = db_get_all_rows_sql('select distinct(tagente.id_os),tconfig_os.description from tagente,tconfig_os where tagente.id_os = tconfig_os.id_os');
+$pre_fields = db_get_all_rows_sql('select distinct(tagente.id_os),tconfig_os.name from tagente,tconfig_os where tagente.id_os = tconfig_os.id_os');
 $fields = array();
 
 foreach ($pre_fields as $key => $value) {
-		$fields[$value['id_os']] =  $value['description'];
+		$fields[$value['id_os']] =  $value['name'];
 }
 
 html_print_select($fields,"os",$os,'this.form.submit()','All',0);
@@ -536,11 +536,18 @@ if ($agents !== false) {
 		if($agent["alias"] == ''){
 			$agent["alias"] = $agent["nombre"];
 		}
+
+		if($agent["id_os"] == 100){
+			$cluster = db_get_row_sql('select id from tcluster where id_agent = '.$agent['id_agente']);
+			echo '<a href="index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$cluster['id'].'&step=1&update=1">'.$agent['nombre'].'</a>';
+			
+		}else{
 			echo "<a alt =".$agent["nombre"]." href='index.php?sec=gagente&
 			sec2=godmode/agentes/configurar_agente&tab=$main_tab&
 			id_agente=" . $agent["id_agente"] . "'>" .
 			'<span style="font-size: 7pt" title="' . $agent["nombre"] . '">'.$agent["alias"].'</span>' .
 			"</a>";
+		}		
 		echo "</strong>";
 
 		$in_planned_downtime = db_get_sql('SELECT executed FROM tplanned_downtime 

pandora_console/godmode/modules/manage_network_templates.php

@@ -190,7 +190,7 @@ $table->head = array ();
 $table->head[0] = __('Name');
 $table->head[1] = __('Description');
 $table->head[2] = '<span style="margin-right:7%;">'.__('Action') .'</span>'.
-	html_print_checkbox('all_delete', 0, false, true, false, 'check_all_checkboxes();');
+	html_print_checkbox('all_delete', 0, false, true, false);
 $table->size = array ();
 $table->size[1] = '65%';
 $table->size[2] = '15%';
@@ -239,12 +239,16 @@ echo '</div></form>';
 
 ?>
 <script type="text/javascript">
-function check_all_checkboxes() {
+	 // If you click on the input type checkbox with id checkbox-all_delete
-	if ($("input[name=all_delete]").attr('checked')) {
+	 $('#checkbox-all_delete').click(function() {
-		$(".check_delete").attr('checked', true);
+            // If selected (if the checked property equals true)
+            if ($(this).prop('checked')) {
+                // Select each input that has the class .check_delete
+                $('.check_delete').prop('checked', true);
+            } else {
+                // deselect every input that has the class .check_delete
+                $('.check_delete').prop('checked', false);
             }
-	else {
+        });
-		$(".check_delete").attr('checked', false);
+
-	}
-}
 </script>

pandora_console/godmode/reporting/map_builder.php

@@ -234,7 +234,7 @@ echo "<td style='width:25%;'>";
 
 echo __('Group') . '&nbsp;';
 $own_info = get_user_info($config['id_user']);
-if (!$own_info['is_admin'] && !check_acl ($config['id_user'], 0, "AW"))
+if (!$own_info['is_admin'] && !check_acl ($config['id_user'], 0, "VR"))
 	$return_all_group = false;
 else
 	$return_all_group = true;

pandora_console/godmode/reporting/reporting_builder.item_editor.php

@@ -125,7 +125,6 @@ switch ($action) {
 		$name = '';
 		$description = null;
 		$sql = null;
-		$show_in_two_columns = 0;
 		$show_in_same_row = 0;
 		$show_in_landscape = 0;
 		$hide_notinit_agents = 0;
@@ -167,7 +166,6 @@ switch ($action) {
 				$name = '';
 				$description = null;
 				$sql = null;
-				$show_in_two_columns = 0;
 				$show_in_same_row = 0;
 				$show_in_landscape = 0;
 				$hide_notinit_agents = 0;
@@ -195,7 +193,6 @@ switch ($action) {
 			$style = json_decode(io_safe_output($item['style']), true);
 			
 			$show_in_same_row = $style['show_in_same_row'];
-			$show_in_two_columns = $style['show_in_two_columns'];
 			$show_in_landscape = $style['show_in_landscape'];
 			$hide_notinit_agents = $style['hide_notinit_agents'];
 			$dyn_height = $style['dyn_height'];
@@ -1548,11 +1545,6 @@ You can of course remove the warnings, that's why we include the source and do n
 			</td>
 		</tr>
 
-		<tr id="row_show_in_two_columns" style="" class="datos">
-			<td style="font-weight:bold;"><?php echo __('Show in two columns');?></td>
-			<td><?php html_print_checkbox('show_in_two_columns', 1, $show_in_two_columns);?></td>
-		</tr>
-
 		<tr id="row_dyn_height" style="" class="datos">
 			<td style="font-weight:bold;"><?php echo __('Height (dynamic graphs)');?></td>
 			<td><?php html_print_input_text('dyn_height', $dyn_height, '', 7, 7);?></td>
@@ -1582,8 +1574,7 @@ You can of course remove the warnings, that's why we include the source and do n
 			<td>
 				<?php
 				html_print_checkbox('show_in_landscape', 1,
-					$show_in_landscape, false, false,
+					$show_in_landscape, false, false);
-					'if ($(\'input[name=show_in_landscape]\').is(\':checked\')) $(\'input[name=show_in_two_columns]\').attr(\'checked\', false);');
 				?>
 			</td>
 		</tr>
@@ -2827,7 +2818,6 @@ function chooseType() {
 	$("#row_quantity").hide();
 	$("#row_exception_condition_value").hide();
 	$("#row_exception_condition").hide();
-	$("#row_show_in_two_columns").hide();
 	$("#row_dyn_height").hide();
 	$("#row_show_in_same_row").hide();
 	$("#row_historical_db_check").hide();
@@ -2883,7 +2873,6 @@ function chooseType() {
 			$("#row_period").show();
 			$("#row_servers").show();
 			$("#row_group").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_event_filter").show();
 			$("#row_event_graphs").show();
 			
@@ -2944,7 +2933,6 @@ function chooseType() {
 			$("#row_period1").show();
 			$("#row_module").show();
 			$("#row_interval").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3018,7 +3006,6 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3027,7 +3014,6 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_lapse_calc").show();
 			$("#row_lapse").show();
 			$("#row_visual_format").show();
@@ -3039,7 +3025,6 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_lapse_calc").show();
 			$("#row_lapse").show();
 			$("#row_visual_format").show();
@@ -3051,7 +3036,6 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_lapse_calc").show();
 			$("#row_lapse").show();
 			$("#row_visual_format").show();
@@ -3063,7 +3047,6 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3072,7 +3055,6 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3080,14 +3062,12 @@ function chooseType() {
 			$("#row_description").show();
 			$("#row_agent").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
 		case 'text':
 			$("#row_description").show();
 			$("#row_text").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3098,7 +3078,6 @@ function chooseType() {
 			$("#row_header").show();
 			$("#row_custom").show();
 			$("#row_custom_example").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_dyn_height").show();
 			$("#row_servers").show();
 			$("#row_historical_db_check").show();
@@ -3129,7 +3108,6 @@ function chooseType() {
 			$("#row_field_separator").show();
 			$("#row_line_separator").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3138,7 +3116,6 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3147,7 +3124,6 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3156,7 +3132,6 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3165,7 +3140,6 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3174,14 +3148,12 @@ function chooseType() {
 			$("#row_agent").show();
 			$("#row_module").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
 		case 'alert_report_group':
 			$("#row_description").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_group").show();
 			$("#row_servers").show();
 			$("#row_historical_db_check").hide();
@@ -3191,7 +3163,6 @@ function chooseType() {
 			$("#row_description").show();
 			$("#row_agent").show();
 			$("#row_period").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3265,7 +3236,6 @@ function chooseType() {
 			$("#general_list").show();
 			$("#row_order_uptodown").show();
 			$("#row_show_resume").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_show_in_same_row").show();
 			
 			var checked = $("input[name='last_value']").prop("checked");
@@ -3284,7 +3254,6 @@ function chooseType() {
 			$("#general_list").show();
 			$("#row_order_uptodown").show();
 			$("#row_show_address_agent").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_show_resume").show();
 			$("#row_working_time").show();
 			$('#row_hide_notinit_agents').show();
@@ -3315,7 +3284,6 @@ function chooseType() {
 			$("#row_order_uptodown").show();
 			$("#row_show_resume").show();
 			$("#row_show_graph").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_historical_db_check").hide();
 			break;
 		
@@ -3328,7 +3296,6 @@ function chooseType() {
 			$("#row_order_uptodown").show();
 			$("#row_show_resume").show();
 			$("#row_show_graph").show();
-			$("#row_show_in_two_columns").show();
 			
 			var checked = $("input[name='last_value']").prop("checked");
 			
@@ -3356,7 +3323,6 @@ function chooseType() {
 			$("#row_group").show();
 			$("#row_agent_multi").show();
 			$("#row_module_multi").show();
-			$("#row_show_in_two_columns").show();
 			$("#row_servers").show();
 			$("#id_agents").change(event_change_id_agent_inventory);
 			$("#id_agents").trigger('change');
@@ -3374,7 +3340,6 @@ function chooseType() {
 			$("#row_agent_multi").show();
 			$("#row_module_multi").show();
 			$("#row_date").show();
-			$("#row_show_in_two_columns").show();
 			
 			
 			$("#id_agents")

pandora_console/godmode/reporting/reporting_builder.php

@@ -1201,7 +1201,6 @@ switch ($action) {
 						$values['line_separator'] = get_parameter('line');
 						
 						$style = array();
-						$style['show_in_two_columns'] = get_parameter('show_in_two_columns', 0);
 						$style['show_in_same_row'] = get_parameter('show_in_same_row', 0);
 						$style['show_in_landscape'] = get_parameter('show_in_landscape', 0);
 						$style['hide_notinit_agents'] = get_parameter('hide_notinit_agents', 0);
@@ -1541,7 +1540,6 @@ switch ($action) {
 						$values['line_separator'] = get_parameter('line');
 						
 						$style = array();
-						$style['show_in_two_columns'] = get_parameter('show_in_two_columns', 0);
 						$style['show_in_same_row'] = get_parameter('show_in_same_row', 0);
 						$style['show_in_landscape'] = get_parameter('show_in_landscape', 0);
 						$style['hide_notinit_agents'] = get_parameter('hide_notinit_agents', 0);

pandora_console/godmode/reporting/visual_console_builder.data.php

@@ -126,16 +126,11 @@ else {
 }
 	
 $table->data[1][0] = __('Group:');
-$groups = users_get_groups ($config['id_user'], 'RW');
 
-$own_info = get_user_info($config['id_user']);
 // Only display group "All" if user is administrator
 // or has "RW" privileges
-if ($own_info['is_admin'] || $vconsole_write || $vconsole_manage)
-	$display_all_group = true;
-else
-	$display_all_group = false;
 
+$display_all_group = (users_is_admin() || users_can_manage_group_all("RW"));
 $table->data[1][1] = html_print_select_groups($config['id_user'], "RW",
 	$display_all_group, 'id_group', $idGroup, '', '', '', true);
 $backgrounds_list = list_files(

pandora_console/include/ajax/config.ajax.php

@@ -0,0 +1,10 @@
+<?php
+
+$token_name = get_parameter('token_name',0);
+
+$value_token = db_get_value('value',
+		'tconfig', 'token', $token_name);
+    
+echo (bool)$value_token;
+
+?>

pandora_console/include/ajax/events.php

@@ -148,7 +148,7 @@ if ($perform_event_response) {
 						break;
 				}
 
-				echo system("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $timeout_bin . " 90 " . io_safe_output($command) . " 2>&1\"", $ret_val);
+				system("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $timeout_bin . " 90 " . io_safe_output($command) . " 2>&1\"", $ret_val);
 			}
 		}
 		else {
@@ -163,7 +163,7 @@ if ($perform_event_response) {
 					$timeout_bin = '/usr/bin/timeout';
 					break;
 			}
-			echo system($timeout_bin . ' 90 '.io_safe_output($command).' 2>&1');
+			system($timeout_bin . ' 90 '.io_safe_output($command).' 2>&1');
 		}
 	}
 	else {
@@ -178,7 +178,7 @@ if ($perform_event_response) {
 				$timeout_bin = '/usr/bin/timeout';
 				break;
 		}
-		echo system($timeout_bin . ' 90 '.io_safe_output($command).' 2>&1');
+		system($timeout_bin . ' 90 '.io_safe_output($command).' 2>&1');
 	}
 	
 	return;

pandora_console/include/auth/mysql.php

@@ -349,7 +349,7 @@ function process_user_login_remote ($login, $pass, $api = false) {
 				
 				foreach ($attributes as $attr) {
 					$attr = explode('=', $attr, 2);
-					if(in_array($attr[1],$sr[$attr[0]])) {
+					if(preg_match('/' . $attr[1] . '/', $sr[$attr[0]][0])){
 						$permissions[$i]["profile"] = $ldap_adv_perm['profile'];
 						$permissions[$i]["groups"] = $ldap_adv_perm['group'];
 						$permissions[$i]["tags"] = implode(",",$ldap_adv_perm['tags']);

pandora_console/include/class/Tree.class.php

@@ -546,6 +546,7 @@ class Tree {
 											$group_filter
 											$agent_search_filter
 											$agent_status_filter
+										GROUP BY ta.id_agente
 										ORDER BY $order_fields";
 							}
 						}

pandora_console/include/config_process.php

@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180625';
+$build_version = 'PC180626';
 $pandora_version = 'v7.0NG.724';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions_api.php

@@ -3384,7 +3384,7 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3) {
 		return;
 	}
 	
-	if ($other['data'][2] < 15 or $other['data'][2] > 17) {
+	if ($other['data'][2] < 15 or $other['data'][2] > 18) {
 		returnError('error_create_snmp_module', __('Error in creation SNMP module. Invalid id_module_type for a SNMP module.'));
 		return;
 	}

pandora_console/include/functions_gis.php

@@ -446,20 +446,12 @@ function gis_add_agent_point($layerName, $pointName, $lat, $lon, $icon = null, $
  * Get the agents in layer but not by group in layer.
  * 
  * @param integer $idLayer Layer ID.
- * @param array $fields Fields of row tagente to return.
  * 
  * @return array The array rows of tagente of agents in the layer.
  */
-function gis_get_agents_layer($idLayer, $fields = null) {
+function gis_get_agents_layer($idLayer) {
 
-	if ($fields === null) {
+	$sql = "SELECT id_agente, nombre
-		$select = '*';
-	}
-	else {
-		$select = implode(',',$fields);
-	}
-	
-	$sql = "SELECT $select
 			FROM tagente
 			WHERE id_agente IN (
 				SELECT tagente_id_agente
@@ -467,16 +459,14 @@ function gis_get_agents_layer($idLayer, $fields = null) {
 				WHERE tgis_map_layer_id_tmap_layer = $idLayer)";
 	$agents = db_get_all_rows_sql($sql);
 
+	$returned_agents = array();
 	if ($agents !== false) {
 		foreach ($agents as $index => $agent) {
-			$agents[$index] = $agent['nombre'];
+			$returned_agents[$agent['id_agente']] = $agent['nombre'];
 		}
 	}
-	else {
-		return array();
-	}
 
-	return $agents;
+	return $returned_agents;
 }
 
 function gis_add_point_path($layerName, $lat, $lon, $color, $manual = 1, $id) {

pandora_console/include/functions_menu.php

@@ -324,13 +324,6 @@ function menu_print_menu (&$menu) {
 			//Print second level submenu
 			if (isset($sub['sub2'])) {
 			
-				//Display if father is selected
-				$display = "style='display:none;'";
-				
-				if ($selected) {
-					$display = "";
-				}
-				
 				$submenu2_list = '';
 				
 				$count_sub2 = 0;
@@ -374,12 +367,9 @@ function menu_print_menu (&$menu) {
 				
 				// Added a top on inline styles
 				$top = menu_calculate_top($config['count_main_menu'], $count_sub, $count_sub2);
-				if ($top !== 0) {
+
-					$display = rtrim($display, "'");
-					$display .= "top: " . $top . "px;'";
-				}
 				//Add submenu2 to submenu string
-				$submenu_output .= "<ul id='sub" . str_replace(' ','_',$sub["id"]) . "' class=submenu2>";
+				$submenu_output .= "<ul style= top:" . $top . "px;  id='sub" . str_replace(' ','_',$sub["id"]) . "' class=submenu2>";
 				$submenu_output .= $submenu2_list;
 				$submenu_output .= "</ul>";
 			}

pandora_console/include/javascript/jquery.pandora.js

@@ -59,6 +59,33 @@ $(document).ready (function () {
 	});
 
 	$("a.show_systemalert_dialog").click (function () {
+		jQuery.post ("ajax.php",
+			{"page": "include/ajax/config.ajax",
+			 "token_name": 'visual_animation'
+		},
+		function (data, status) {
+			if(data){
+				$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.001;z-index:1'></div>" );
+				jQuery.post ("ajax.php",
+					{"page": "operation/system_alert"},
+						function (data, status) {
+							
+							$("#alert_messages").css('width','auto');
+							$("#alert_messages").css('height','auto');
+							
+							$("#alert_messages").css('visibility','hidden');
+							$("#alert_messages").empty ().append (data);
+							$("#alert_messages").css('display','block');
+							
+							setTimeout( function() {
+			          animation_modal('alert_messages');
+			     }, 50);
+						},
+						"html"
+					);
+					return false;
+			}
+			else{
 				$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
 				jQuery.post ("ajax.php",
 					{"page": "operation/system_alert"},
@@ -71,14 +98,50 @@ $(document).ready (function () {
 						"html"
 					);
 				return false;
+			}
+			},
+			"html"
+		);
 	});
 	
 	$("a.modalpopup").click (function () {
+		var elem = $(this).attr("id");
+		
+		jQuery.post ("ajax.php",
+			{"page": "include/ajax/config.ajax",
+			 "token_name": 'visual_animation'
+		},
+			function (data, status) {
+				if(data){
+					$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.001;z-index:1'></div>" );
+						jQuery.post ("ajax.php",
+							{
+								"page": "general/alert_enterprise",
+								"message": elem
+							},
+							function (data, status) {
+								
+								$("#alert_messages").css('width','auto');
+								$("#alert_messages").css('height','auto');
+								
+								$("#alert_messages").css('visibility','hidden');
+								$("#alert_messages").empty ().append (data);
+								$("#alert_messages").css('display','block');
+								
+								setTimeout( function() {
+									animation_modal('alert_messages');
+						 }, 50);
+							},
+							"html"
+						);
+					return false;
+				}
+				else{
 					$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
 					jQuery.post ("ajax.php",
 					{
 						"page": "general/alert_enterprise",
-					"message": $(this).attr("id")
+						"message": elem
 					},
 					function (data, status) {
 						$("#alert_messages").hide ()
@@ -89,16 +152,59 @@ $(document).ready (function () {
 					"html"
 				);
 			return false;			
-	});
+		}		
+	},
+	"html"
+	);
+});
 
 // Creacion de ventana modal y botones
 
 	$(".publienterprise").click (function () {
-		$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
+		
+		var elem = $(this).attr("id");
+		
+		jQuery.post ("ajax.php",
+			{"page": "include/ajax/config.ajax",
+			 "token_name": 'visual_animation'
+		},
+			function (data, status) {
+				
+		if(data){
+					
+			$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.001;z-index:1'></div>" );
 				jQuery.post ("ajax.php",
 					{
 						"page": "general/alert_enterprise",
-				"message": $(this).attr("id")
+						"message": elem
+					},
+					function (data, status) {
+						
+						$("#alert_messages").css('width','auto');
+						$("#alert_messages").css('height','auto');
+						
+						$("#alert_messages").css('visibility','hidden');
+						$("#alert_messages").empty ().append (data);
+						$("#alert_messages").css('display','block');
+						
+						setTimeout( function() {
+							animation_modal('alert_messages');
+				 }, 50);
+					},
+					"html"
+				);
+
+				return false;
+			
+		}
+		else{
+			
+		$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
+		
+		jQuery.post ("ajax.php",
+			{
+				"page": "general/alert_enterprise",
+				"message": elem
 			},
 			function (data, status) {
 				$("#alert_messages").hide ()
@@ -109,9 +215,13 @@ $(document).ready (function () {
 			"html"
 		);
 
-
 		return false;
-	});
+		}
+		},
+		"html"
+	);	
+});
+	
 	
 	$(".publienterprisehide").click (function () {
 		$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
@@ -372,3 +482,23 @@ function forced_title_callback() {
 		$('#forced_title_layer').hide().empty();
 	});
 }
+
+function animation_modal(id){
+	
+	var animation_width = $("#"+id).css('width');
+	var animation_height =  $("#"+id).css('height');
+	var posanimation_left = parseInt($('#'+id).css('left'));
+	var preanimation_left = parseInt($('#'+id).css('left'))+parseInt($('#'+id).css('left'))/2;
+	$('#'+id).css({'width':'100px','height':'60px'});
+	$("#alert_messages").css('visibility','visible');
+	$('#'+id).css('left',+preanimation_left+'px');
+	$('#'+id).css('opacity',0);
+	
+	$('#opacidad').animate({'opacity':0.8},2000);
+	
+	$("#"+id)
+	.animate({'width': animation_width,'left':posanimation_left+'px','opacity':1},1000)
+	.animate({'height': animation_height},1000);
+		
+}
+

pandora_console/include/styles/pandora.css

@@ -3596,7 +3596,6 @@ div.simple_value > a > span.text p
 	position:fixed;
 	width:750px;
 	max-width:750px;
-	min-width:750px;
 	top: 20%;
 	background:white;
 }

pandora_console/install.php

@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.724';
-$build = '180625';
+$build = '180626';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);

pandora_console/operation/agentes/graphs.php

@@ -388,7 +388,7 @@ echo "</div>";
 			});
 		}
 		
-		var requestSparseGraph = function (moduleId, period, showEvents, width, height, title, showAlerts, avgOnly, date, unit, type_g) {
+		var requestSparseGraph = function (moduleId, period, showEvents, width, height, title, showAlerts, date, unit, type_g) {
 			return requestGraph('sparse', {
 				page: 'include/ajax/graph.ajax',
 				print_sparse_graph: 1,
@@ -488,7 +488,7 @@ echo "</div>";
 				$container.html($errorMessage.html());
 			}
 
-			requestSparseGraph(moduleId, period, showEvents, width, height, title, showAlerts, avgOnly, date, unit, type_g)
+			requestSparseGraph(moduleId, period, showEvents, width, height, title, showAlerts, date, unit, type_g)
 				.done(handleSuccess)
 				.fail(handleError);
 		}

pandora_console/operation/agentes/pandora_networkmap.editor.php

@@ -222,8 +222,14 @@ else {
 	$table->data[0][1] = html_print_input_text ('name', $name, '', 30,
 		100,true);
 	$table->data[1][0] = __('Group');
-	$table->data[1][1] = html_print_select_groups(false, "AR", true,
+
-		'id_group', $id_group, '', '', 0, true);
+	// Only display group "All" if user is administrator
+	// or has "AR" privileges
+
+	$display_all_group = (users_is_admin() || users_can_manage_group_all("AR"));
+	
+	$table->data[1][1] = html_print_select_groups($config['id_user'], "AR",
+	$display_all_group, 'id_group', $idGroup, '', '', '', true);
 	
 	$table->data[2][0] = __('Node radius');
 	$table->data[2][1] = html_print_input_text ('node_radius', $node_radius, '', 2,

pandora_console/operation/agentes/stat_win.php

@@ -466,6 +466,6 @@ ui_include_time_picker(true);
 	});
 
 	$(window).resize(function() {
-		$("#field_list").css('height', ($(window).height() - 160) + 'px');
+		$("#field_list").css('height', ($(document).height() - 160) + 'px');
 	});
 </script>

pandora_console/operation/events/events.build_table.php

@@ -763,14 +763,16 @@ else {
 			echo '<div style="width:' . $table->width . ';" class="action-buttons">';
 			//~ if (!$readonly && tags_check_acl ($config["id_user"], 0, "EW", $event['clean_tags']) == 1) {
 			if (!$readonly && $show_validate_button) {
-				html_print_button(__('Validate selected'), 'validate_button', false, 'validate_selected();', 'class="sub ok"');
+				html_print_button(__('In progress selected'), 'validate_button', false, 'validate_selected(2);', 'class="sub ok"');
+				echo "  ";
+				html_print_button(__('Validate selected'), 'validate_button', false, 'validate_selected(1);', 'class="sub ok"');
 				// Fix: validated_selected JS function has to be included with the proper user ACLs 
 				?>
 				<script type="text/javascript">
-					function validate_selected() {
+					function validate_selected(new_status) {
 						$(".chk_val").each(function() { 
 							if($(this).is(":checked")) {
-								validate_event_advanced($(this).val(),1);
+								validate_event_advanced($(this).val(), new_status);
 							}
 						});  
 					}

pandora_console/operation/gis_maps/public_console.php

@@ -146,10 +146,7 @@ if ($layers != false) {
 			$agentNamesByGroup = agents_get_group_agents($layer['tgrupo_id_grupo'],
 				false, 'none', true, true, false);
 		}
-		$agentNamesByLayer = gis_get_agents_layer($layer['id_tmap_layer'],
+		$agentNamesByLayer = gis_get_agents_layer($layer['id_tmap_layer']);
-			array('nombre'));
-		
-		
 
 		$agentNames = array_unique($agentNamesByGroup + $agentNamesByLayer);
 
@@ -168,7 +165,6 @@ if ($layers != false) {
 				}
 			}
 
-			
 			$icon = gis_get_agent_icon_map($idAgent, true);
 			$icon_size = getimagesize($icon);
 			$icon_width = $icon_size[0];

pandora_console/operation/gis_maps/render_view.php

@@ -182,10 +182,7 @@ if ($layers != false) {
 			$agentNamesByGroup = agents_get_group_agents($layer['tgrupo_id_grupo'],
 				false, 'none', true, true, false);
 		}
-		$agentNamesByLayer = gis_get_agents_layer($layer['id_tmap_layer'],
+		$agentNamesByLayer = gis_get_agents_layer($layer['id_tmap_layer']);
-			array('nombre'));
-		
-		
 
 		$agentNames = array_unique($agentNamesByGroup + $agentNamesByLayer);
 

pandora_console/operation/snmpconsole/snmp_browser.php

@@ -50,7 +50,7 @@ if (is_ajax()) {
 		else {
 			snmp_browser_print_tree ($snmp_tree);
 			echo html_print_submit_button(__('Create network components'),'create_network_component', 
-				false, array('style' => 'display: none', 'class' => 'sub add'), true);
+				false, array('style' => 'display: none; position: fixed; bottom: 55px; right: 80px;', 'class' => 'sub add'), true);
 				
 			echo '<div id="dialog_error" style="display: none" title="Network components">';
 			echo "<div>";

pandora_console/operation/visual_console/public_console.php

@@ -196,7 +196,7 @@ $ignored_params['refr'] = '';
 		$('body').css('margin','0');
 		$('body').css('height','100%');
 		$('body').css('overflow','hidden');
-		
+		$('p').css('margin-top','25px');
 		$(".module_graph .menu_graph").css('display','none');
 		
 		$(".parent_graph").each(function(){

pandora_console/operation/visual_console/render_view.php

@@ -311,6 +311,7 @@ $ignored_params['refr'] = '';
 		});
 		
 		$('.item > div').each( function() {
+			$(this).css('margin-bottom','20px');
 			if ($(this).css('float')=='left' || $(this).css('float')=='right') {
 				if($(this).attr('id').indexOf('clock') || $(this).attr('id').indexOf('overlay')){
 					$(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.724
-%define release     180625
+%define release     180626
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.724
-%define release     180625
+%define release     180626
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.724-180625
+Version: 7.0NG.724-180626
 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.724-180625"
+pandora_version="7.0NG.724-180626"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.724";
-my $pandora_build = "180625";
+my $pandora_build = "180626";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.724";
-my $pandora_build = "180625";
+my $pandora_build = "180626";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.724
-%define release     180625
+%define release     180626
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.724
-%define release     180625
+%define release     180626
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.724"
-PI_BUILD="180625"
+PI_BUILD="180626"
 
 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.724 PS180625";
+my $version = "7.0NG.724 PS180626";
 
 # 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.724 PS180625";
+my $version = "7.0NG.724 PS180626";
 
 # save program name for logging
 my $progname = basename($0);