Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

pandora_console/include/functions_events.php

@@ -855,10 +855,11 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
 			$returned = ui_print_info_message ( __('No events'),'',true );
 			return $returned;
 		}
-		else	
+		else
 			echo ui_print_info_message ( __('No events') );
 	}
 	else {
+		$table = new stdClass();
 		$table->id = 'latest_events_table';
 		$table->cellpadding = 0;
 		$table->cellspacing = 0;

pandora_console/operation/agentes/group_view.php

@@ -82,6 +82,7 @@ $total_agentes = 0;
 $monitor_ok = 0;
 $monitor_warning = 0;
 $monitor_critical = 0;
+$monitor_unknown = 0;
 $agents_unknown = 0;
 foreach ($result_groups as $data) {
 	$total_agentes += $data["_total_agents_"];

pandora_console/operation/agentes/tactical.php

@@ -228,7 +228,7 @@ $acltags = tags_get_user_module_and_tags ($config['id_user'], $access = 'ER', $u
 
 if (!empty($acltags)) {
 	$tags_condition = tags_get_acl_tags_event_condition($acltags, false, $user_strict);
-
+	
 	if (!empty($tags_condition)) {
 		$events = events_print_event_table ("estado<>1 AND ($tags_condition)", 10, "100%",true,false,true);
 		ui_toggle($events, __('Latest events'));
@@ -243,7 +243,7 @@ if ($is_admin) {
 	require($config['homedir'] . '/godmode/servers/servers.build_table.php');
 	
 }
-$out .= '<table cellpadding=0 cellspacing=0 class="databox pies"  style="margin-top:15px;" width=100%><tr><td>';
+$out = '<table cellpadding=0 cellspacing=0 class="databox pies"  style="margin-top:15px;" width=100%><tr><td>';
 	$out .= '<fieldset class="databox tactical_set">
 			<legend>' . 
 				__('Event graph') . 

pandora_console/operation/events/events.build_table.php

@@ -14,6 +14,7 @@
 // GNU General Public License for more details.
 
 if(!isset($table->width)) {
+	$table = new stdClass();
 	$table->width = '100%';
 }
 
@@ -500,7 +501,7 @@ foreach ($result as $event) {
 		if (!empty($event_user_comments)) {
 			$last_key = key(array_slice($event_user_comments, -1, 1, true));
 			$date_format = $config['date_format'];
-
+			
 			foreach ($event_user_comments as $key => $event_user_comment) {
 				$event_user_comment_str .= sprintf('%s: %s<br>%s: %s<br>%s: %s<br>',
 					__('Date'), date($date_format, $event_user_comment['utimestamp']),
@@ -591,7 +592,7 @@ foreach ($result as $event) {
 					array ("title" => __('Validate event')));
 				$data[$i] .= '</a>';
 			}
-
+			
 			// Delete event
 			if ((tags_checks_event_acl($config["id_user"], $event["id_grupo"], "EM", $event['clean_tags'],$childrens_ids) == 1)) {
 				if($event['estado'] != 2) {
@@ -677,7 +678,7 @@ if (!empty ($table->data)) {
 					});  
 				}
 			</script>
-			<?php			
+			<?php
 		}
 		//~ if (!$readonly && tags_check_acl ($config["id_user"], 0,"EM", $event['clean_tags']) == 1) {
 		if (!$readonly && ($show_delete_button)) {

pandora_console/operation/events/events.php

@@ -25,6 +25,8 @@ require_once ($config['homedir'].'/include/functions_ui.php');
 
 check_login ();
 
+
+
 if (! check_acl ($config["id_user"], 0, "ER")) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access event viewer");
@@ -46,10 +48,7 @@ if (!$meta) {
 	if (isset($config['event_replication']) &&  
 		$config['event_replication'] == 1) {
 		
-		if ($config['show_events_in_local'] == 0) {
-			return;
-		}
-		else {
+		if ((bool)$config['show_events_in_local']) {
 			$readonly = true;
 		}
 	}
@@ -223,6 +222,8 @@ $date_from = (string)get_parameter('date_from', '');
 $date_to = (string)get_parameter('date_to', '');
 $server_id = (int)get_parameter('server_id', 0);
 
+
+
 $text_agent = (string) get_parameter("text_agent");
 $id_agent = get_parameter('id_agent', 0);
 if ($id_agent != 0) {
@@ -243,6 +244,7 @@ if ($id_agent_module != 0) {
 }
 
 
+
 $tag_with_json = base64_decode(get_parameter("tag_with", '')) ;
 $tag_with_json_clean = io_safe_output($tag_with_json);
 $tag_with_base64 = base64_encode($tag_with_json_clean);
@@ -263,6 +265,8 @@ users_get_groups ($config["id_user"], "ER");
 
 $ids = (array) get_parameter ("eventid", -1);
 
+
+
 $params = "search=" . rawurlencode(io_safe_input($search)) . 
 	"&event_type=" . $event_type .
 	"&severity=" . $severity . 
@@ -295,6 +299,8 @@ if ($meta) {
 
 $url = "index.php?sec=eventos&sec2=operation/events/events&" . $params;
 
+
+
 // Header
 if ($config["pure"] == 0 || $meta) {
 	$pss = get_user_info($config['id_user']);

pandora_console/operation/events/events_list.php

@@ -35,12 +35,13 @@ if (! check_acl ($config["id_user"], 0, "ER")) {
 	return;
 }
 
-if(defined('METACONSOLE')){
+if (defined('METACONSOLE')) {
 	$jump = '  ';
 }
-else{
+else {
 	$jump = "<br>";
 }
+
 if (is_ajax()) {
 	$get_filter_values = get_parameter('get_filter_values', 0);
 	$save_event_filter = get_parameter('save_event_filter', 0);
@@ -141,7 +142,7 @@ $strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_use
 $tags = tags_get_user_tags($config['id_user'], 'ER');
 
 
-if ($id_agent == 0 && $text_agent != '') {
+if ($id_agent == 0 && $text_agent != __('All')) {
 	$id_agent = -1;
 }
 
@@ -419,6 +420,7 @@ else {
 
 //----------------------------------------------------------------------
 //- INI ADVANCE FILTER -------------------------------------------------
+$table_advanced = new stdClass();
 $table_advanced->id = 'events_filter_form_advanced';
 $table_advanced->width = '98%';
 $table_advanced->cellspacing = 4;
@@ -542,6 +544,7 @@ $table_advanced->rowclass[] = '';
 //- END ADVANCE FILTER -------------------------------------------------
 
 
+$table = new stdClass();
 $table->id = 'events_filter_form';
 $table->width = '100%';
 $table->cellspacing = 4;