- Zabbix1.5.b commit (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5468 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 363 insertions, 73 deletions

diff --git a/frontends/php/events.php b/frontends/php/events.php
index 1c551cdd..0fb8229c 100644
--- a/frontends/php/events.php
+++ b/frontends/php/events.php
@@ -23,11 +23,13 @@
 	require_once "include/hosts.inc.php";
 	require_once "include/events.inc.php";
 	require_once "include/discovery.inc.php";
+	require_once "include/html.inc.php";
 
 	$page["title"] = "S_LATEST_EVENTS";
 	$page["file"] = "events.php";
 	$page['hist_arg'] = array('groupid','hostid');
-	
+	$page['scripts'] = array('url.js');
+
 	define('ZBX_PAGE_DO_REFRESH', 1);
 
 include_once "include/page_header.php";
@@ -37,8 +39,7 @@ include_once "include/page_header.php";
 	$allow_discovery = check_right_on_discovery(PERM_READ_ONLY);
 
 	$allowed_sources[] = EVENT_SOURCE_TRIGGERS;
-	if($allow_discovery)
-		$allowed_sources[] = EVENT_SOURCE_DISCOVERY;
+	if($allow_discovery) $allowed_sources[] = EVENT_SOURCE_DISCOVERY;
 
 	define('PAGE_SIZE',	100);
 //		VAR			TYPE	OPTIONAL FLAGS	VALIDATION	EXCEPTION
@@ -47,34 +48,60 @@ include_once "include/page_header.php";
 		"show_unknown"=>	array(T_ZBX_INT, O_OPT,	P_SYS,	IN(array(0,1)),	NULL),
 		"groupid"=>			array(T_ZBX_INT, O_OPT,	P_SYS,	DB_ID,	NULL),
 		"hostid"=>			array(T_ZBX_INT, O_OPT,	P_SYS,	DB_ID,	NULL),
+		"triggerid"=>		array(T_ZBX_INT, O_OPT,	P_SYS,	DB_ID,	NULL),
 		"start"=>			array(T_ZBX_INT, O_OPT,	P_SYS,	BETWEEN(0,65535)."({}%".PAGE_SIZE."==0)",	NULL),
 		"next"=>			array(T_ZBX_STR, O_OPT,	P_SYS,	NULL,			NULL),
-		"prev"=>			array(T_ZBX_STR, O_OPT,	P_SYS,	NULL,			NULL)
+		"prev"=>			array(T_ZBX_STR, O_OPT,	P_SYS,	NULL,			NULL),
+		"filter_rst"=>		array(T_ZBX_INT, O_OPT,	P_SYS,	IN(array(0,1)),	NULL),
+		"filter_set"=>		array(T_ZBX_STR, O_OPT,	P_SYS,	null,	NULL),
+//ajax
+		'favobj'=>		array(T_ZBX_STR, O_OPT, P_ACT,	NULL,			NULL),
+		'favid'=>		array(T_ZBX_STR, O_OPT, P_ACT,  NOT_EMPTY,		'isset({favobj})'),
+		'state'=>		array(T_ZBX_INT, O_OPT, P_ACT,  NOT_EMPTY,		'isset({favobj}) && ("filter"=={favobj})'),
 	);
 
 	$_REQUEST['source'] = get_request('source', get_profile('web.events.source', 0));
 	
 	check_fields($fields);
-	validate_sort_and_sortorder();
-	
-	$source = get_request('source', EVENT_SOURCE_TRIGGERS);
-	$show_unknown = get_request('show_unknown',get_profile('web.events.show_unknown',0));
+	validate_sort_and_sortorder('e.eventid',ZBX_SORT_DOWN);
+
+// filter prepare	
+	if(isset($_REQUEST['filter_rst'])){
+		$_REQUEST['triggerid'] = 0;
+		$_REQUEST['show_unknown'] = 0;
+	}
 
+	$_REQUEST['triggerid'] = get_request('triggerid',get_profile('web.events.filter.triggerid',0));
+	$show_unknown = get_request('show_unknown',get_profile('web.events.filter.show_unknown',0));
+
+	if(isset($_REQUEST['filter_set'])){
+		update_profile('web.events.filter.triggerid',$_REQUEST['triggerid']);
+		update_profile('web.events.filter.show_unknown',$show_unknown);
+	}
+// --------------
+
+	$source = get_request('source', EVENT_SOURCE_TRIGGERS);
 	update_profile('web.events.source',$source);
-	update_profile('web.events.show_unknown',$show_unknown);
+	
+	
+	if(isset($_REQUEST['favobj'])){
+		if('filter' == $_REQUEST['favobj']){
+//			echo 'alert("'.$_REQUEST['favid'].' : '.$_REQUEST['state'].'");';
+			update_profile('web.events.filter.state',$_REQUEST['state']);
+		}
+	}	
+
+	if((PAGE_TYPE_JS == $page['type']) || (PAGE_TYPE_HTML_BLOCK == $page['type'])){
+		exit();
+	}
 
 ?>
 <?php
 	$_REQUEST["start"] = get_request("start", 0);
-	if(isset($_REQUEST["prev"]))
-	{
-		$_REQUEST["start"] -= PAGE_SIZE;
-	}
-	if(isset($_REQUEST["next"]))
-	{
-		$_REQUEST["start"]	+= PAGE_SIZE;
-	}
-	if($_REQUEST["start"] < 0) $_REQUEST["start"] = 0;
+	$_REQUEST["start"]-=(isset($_REQUEST["prev"]))?PAGE_SIZE:0;
+	$_REQUEST["start"]+=(isset($_REQUEST["next"]))?PAGE_SIZE:0;
+	$_REQUEST["start"]=($_REQUEST["start"])?$_REQUEST["start"]:0;
+	
 ?>
 <?php
 	$source = get_request('source', EVENT_SOURCE_TRIGGERS);
@@ -84,32 +111,52 @@ include_once "include/page_header.php";
 	
 	$r_form->AddOption('name','events_menu');
 
-	if($source == EVENT_SOURCE_DISCOVERY)
-	{
-		$table = get_history_of_discovery_events($_REQUEST["start"], PAGE_SIZE);
-	}
-	else
-	{
-		validate_group_with_host(PERM_READ_ONLY, array("allow_all_hosts","monitored_hosts","with_items"));
+	if(EVENT_SOURCE_TRIGGERS == $source){
+	
+	    $available_groups= get_accessible_groups_by_user($USER_DETAILS,PERM_READ_ONLY, null, null, get_current_nodeid());
+		$available_hosts = get_accessible_hosts_by_user($USER_DETAILS, PERM_READ_ONLY, null, null, get_current_nodeid());
 
-		$table = get_history_of_triggers_events($_REQUEST["start"], PAGE_SIZE, $_REQUEST["groupid"],$_REQUEST["hostid"]);
+		if(isset($_REQUEST['triggerid']) && ($_REQUEST['triggerid']>0)){
+			$sql = 'SELECT DISTINCT h.hostid '.
+					' FROM hosts h, functions f, items i'.
+					' WHERE i.itemid=f.itemid '.
+						' AND h.hostid=i.hostid '.
+						' AND h.hostid IN ('.$available_hosts.') '.
+						' AND f.triggerid='.$_REQUEST['triggerid'];
+						
+			if($host = DBfetch(DBselect($sql,1))){
+				$_REQUEST['hostid'] = $host['hostid'];							
+				if($group = DBfetch(DBselect('SELECT DISTINCT hg.groupid '.
+									' FROM hosts_groups hg'.
+									' WHERE hg.hostid='.$_REQUEST['hostid'].
+										' AND hg.hostid in ('.$available_hosts.') ')))
+				{
+					$_REQUEST['groupid'] = $group['groupid'];
+				}
+			}
+			else{
+				unset($_REQUEST['triggerid']);
+			}
+		}
+		
+		validate_group_with_host(PERM_READ_ONLY, array("allow_all_hosts","monitored_hosts","with_items"));
 
 		$cmbGroup = new CComboBox("groupid",$_REQUEST["groupid"],"submit()");
 		$cmbHosts = new CComboBox("hostid",$_REQUEST["hostid"],"submit()");
 
 		$cmbGroup->AddItem(0,S_ALL_SMALL);
 		
-	        $availiable_groups= get_accessible_groups_by_user($USER_DETAILS,PERM_READ_LIST, null, null, get_current_nodeid());
-		$availiable_hosts = get_accessible_hosts_by_user($USER_DETAILS, PERM_READ_LIST, null, null, get_current_nodeid());
-
-	        $result=DBselect("select distinct g.groupid,g.name from groups g, hosts_groups hg, hosts h, items i ".
-	                " where g.groupid in (".$availiable_groups.") ".
-	                " and hg.groupid=g.groupid and h.status=".HOST_STATUS_MONITORED.
-	                " and h.hostid=i.hostid and hg.hostid=h.hostid and i.status=".ITEM_STATUS_ACTIVE.
-	                " order by g.name");
+        $result=DBselect('SELECT DISTINCT g.groupid,g.name '.
+						' FROM groups g, hosts_groups hg, hosts h, items i '.
+	                	' WHERE g.groupid in ('.$available_groups.') '.
+			                ' AND hg.groupid=g.groupid '.
+							' AND h.status='.HOST_STATUS_MONITORED.
+			                ' AND h.hostid=i.hostid '.
+							' AND hg.hostid=h.hostid '.
+							' AND i.status='.ITEM_STATUS_ACTIVE.
+		                ' ORDER BY g.name');
 
-		while($row=DBfetch($result))
-		{
+		while($row=DBfetch($result)){
 			$cmbGroup->AddItem(
 					$row['groupid'],
 					get_node_name_by_elid($row['groupid']).$row['name']
@@ -118,24 +165,22 @@ include_once "include/page_header.php";
 		$r_form->AddItem(array(S_GROUP.SPACE,$cmbGroup));
 		
 		$cmbHosts->AddItem(0,S_ALL_SMALL);
-		if($_REQUEST['groupid'] > 0)
-		{
-			$sql='SELECT h.hostid,h.host '.
+		if($_REQUEST['groupid'] > 0){
+			$sql='SELECT DISTINCT h.hostid,h.host '.
 				' FROM hosts h,items i,hosts_groups hg '.
 				' WHERE h.status='.HOST_STATUS_MONITORED.
 					' AND h.hostid=i.hostid AND hg.groupid='.$_REQUEST['groupid'].
-					' AND hg.hostid=h.hostid AND h.hostid in ('.$availiable_hosts.') '.
-				' GROUP BY h.hostid,h.host '.
+					' AND hg.hostid=h.hostid AND h.hostid in ('.$available_hosts.') '.
+//				' GROUP BY h.hostid,h.host '.
 				' ORDER BY h.host';
 		}
-		else
-		{
-			$sql='SELECT h.hostid,h.host '.
+		else{
+			$sql='SELECT DISTINCT h.hostid,h.host '.
 				' FROM hosts h,items i '.
 				' WHERE h.status='.HOST_STATUS_MONITORED.
 					' AND h.hostid=i.hostid'.
-					' AND h.hostid in ('.$availiable_hosts.') '.
-				' GROUP BY h.hostid,h.host '.
+					' AND h.hostid in ('.$available_hosts.') '.
+//				' GROUP BY h.hostid,h.host '.
 				' ORDER BY h.host';
 		}
 		$result=DBselect($sql);
@@ -150,48 +195,293 @@ include_once "include/page_header.php";
 		$r_form->AddItem(array(SPACE.S_HOST.SPACE,$cmbHosts));
 	}
 	
-	if($allow_discovery)
-	{
+	if($allow_discovery){
 		$cmbSource = new CComboBox('source', $source, 'submit()');
 		$cmbSource->AddItem(EVENT_SOURCE_TRIGGERS, S_TRIGGER);
 		$cmbSource->AddItem(EVENT_SOURCE_DISCOVERY, S_DISCOVERY);
 		$r_form->AddItem(array(S_SOURCE, SPACE, $cmbSource));
 	}
-	show_table_header(S_HISTORY_OF_EVENTS_BIG.SPACE.date("[H:i:s]",time()),$r_form);
-//	echo BR;
 
-	$r_form = new CForm();
-	$r_form->SetMethod('get');
+	show_table_header(S_HISTORY_OF_EVENTS_BIG.SPACE.date("[H:i:s]",time()),$r_form);
 	
-	$r_form->AddVar('start',$_REQUEST['start']);
+	if($source == EVENT_SOURCE_DISCOVERY){
+		$table = get_history_of_discovery_events($_REQUEST["start"], PAGE_SIZE);
+	}
+	else{
+		$config = select_config();
 
-	$btnPrev = new CButton("prev","<< Prev ".PAGE_SIZE);
-	if($_REQUEST["start"] <= 0)
-		$btnPrev->SetEnabled('no');
-	$r_form->AddItem($btnPrev);
+		$sql_from = $sql_cond = '';
+
+		if($_REQUEST["hostid"] > 0){
+			$sql_cond = ' and h.hostid='.$_REQUEST["hostid"];
+		}
+		else if($_REQUEST["groupid"] > 0){
+			$sql_from = ', hosts_groups hg ';
+			$sql_cond = ' and h.hostid=hg.hostid and hg.groupid='.$_REQUEST["groupid"];
+		}
+		else{
+			$sql_from = ', hosts_groups hg ';
+			$sql_cond = ' and h.hostid in ('.$available_hosts.') ';
+		}
+		
+		$sql_cond.=(isset($_REQUEST['triggerid']) && ($_REQUEST['triggerid']>0))?(' AND t.triggerid='.$_REQUEST['triggerid'].' '):'';
 
-	$btnNext = new CButton("next","Next ".PAGE_SIZE." >>");
-	if($table->GetNumRows() < PAGE_SIZE)
-		$btnNext->SetEnabled('no');
-	$r_form->AddItem($btnNext);
+//---
+		$triggers = array();
+		$trigger_list = '';
+
+		$sql = 'SELECT DISTINCT t.triggerid,t.priority,t.description,t.expression,h.host,t.type '.
+				' FROM triggers t, functions f, items i, hosts h '.$sql_from.
+				' WHERE '.DBin_node('t.triggerid').
+					' AND t.triggerid=f.triggerid '.
+					' AND f.itemid=i.itemid '.
+					' AND i.hostid=h.hostid '.
+					' AND h.status='.HOST_STATUS_MONITORED.
+					$sql_cond;
+							
+		$rez = DBselect($sql);
+		while($rowz = DBfetch($rez)){
+			$triggers[$rowz['triggerid']] = $rowz;
+			$trigger_list.=$rowz['triggerid'].',';
+		}
+
+		$trigger_list = '('.trim($trigger_list,',').')';
+		$sql_cond=($show_unknown == 0)?(' AND e.value<>'.TRIGGER_VALUE_UNKNOWN.' '):('');
+
+		$table = new CTableInfo(S_NO_EVENTS_FOUND); 
+		$table->SetHeader(array(
+				make_sorting_link(S_TIME,'e.eventid'),
+				is_show_subnodes() ? S_NODE : null,
+				$_REQUEST["hostid"] == 0 ? S_HOST : null,
+				S_DESCRIPTION,
+				S_VALUE,
+				S_SEVERITY,
+				S_DURATION,
+				($config['event_ack_enable'])?S_ACK:NULL,
+				S_ACTIONS
+			));
+
+		if(!empty($triggers)){
+			$sql = 'SELECT e.eventid, e.objectid as triggerid, e.clock, e.value, e.acknowledged '.
+					' FROM events e '.
+					' WHERE e.object='.EVENT_OBJECT_TRIGGER.
+						' AND e.objectid IN '.$trigger_list.
+						$sql_cond.
+//					' ORDER BY e.object DESC,e.objectid DESC,e.eventid DESC';
+					order_by('e.eventid');
+
+			$result = DBselect($sql,10*($_REQUEST['start']+PAGE_SIZE));
+		}
+
+		$col=0;
+		$skip = $_REQUEST['start'];
+
+		while(!empty($triggers) && ($col<PAGE_SIZE) && ($row=DBfetch($result))){
+			
+			if($skip > 0){
+				if((0 == $show_unknown) && ($row['value'] == TRIGGER_VALUE_UNKNOWN)) continue;
+				$skip--;
+				continue;
+			}
+		
+			if($row["value"] == TRIGGER_VALUE_FALSE){
+				$value=new CCol(S_OFF,"off");
+			}
+			elseif($row["value"] == TRIGGER_VALUE_TRUE){
+				$value=new CCol(S_ON,"on");
+			}
+			else{
+				$value=new CCol(S_UNKNOWN_BIG,"unknown");
+			}
+
+			$row = array_merge($triggers[$row['triggerid']],$row);
+			if((0 == $show_unknown) && (!event_initial_time($row,$show_unknown))) continue;
+			
+			$duration = zbx_date2age($row['clock']);
+			if($next_event = get_next_event($row,$show_unknown)){
+				$duration = zbx_date2age($row['clock'],$next_event['clock']);
+			}
+// Actions								
+			$actions= new CTable(' - ');
+
+			$sql='SELECT COUNT(a.alertid) as cnt_all'.
+					' FROM alerts a,functions f,items i,events e'.
+					' WHERE a.eventid='.$row['eventid'].
+						' AND e.eventid = a.eventid'.
+						' AND f.triggerid=e.objectid '.
+						' AND i.itemid=f.itemid '.
+						' AND i.hostid IN ('.$available_hosts.') ';
+
+					
+			$alerts=DBfetch(DBselect($sql));
+
+			if(isset($alerts['cnt_all']) && ($alerts['cnt_all'] > 0)){
+				$mixed = 0;
+// Sent
+				$sql='SELECT COUNT(a.alertid) as sent '.
+						' FROM alerts a,functions f,items i,events e'.
+						' WHERE a.eventid='.$row['eventid'].
+							' AND a.status='.ALERT_STATUS_SENT.
+							' AND e.eventid = a.eventid'.
+							' AND f.triggerid=e.objectid '.
+							' AND i.itemid=f.itemid '.
+							' AND i.hostid IN ('.$available_hosts.') ';
+
+				$tmp=DBfetch(DBselect($sql));
+				$alerts['sent'] = $tmp['sent'];
+				$mixed+=($alerts['sent'])?ALERT_STATUS_SENT:0;
+// In progress
+				$sql='SELECT COUNT(a.alertid) as inprogress '.
+						' FROM alerts a,functions f,items i,events e'.
+						' WHERE a.eventid='.$row['eventid'].
+							' AND a.status='.ALERT_STATUS_NOT_SENT.
+							' AND e.eventid = a.eventid'.
+							' AND f.triggerid=e.objectid '.
+							' AND i.itemid=f.itemid '.
+							' AND i.hostid IN ('.$available_hosts.') ';
+
+				$tmp=DBfetch(DBselect($sql));
+				$alerts['inprogress'] = $tmp['inprogress'];
+// Failed
+				$sql='SELECT COUNT(a.alertid) as failed '.
+						' FROM alerts a,functions f,items i,events e'.
+						' WHERE a.eventid='.$row['eventid'].
+							' AND a.status='.ALERT_STATUS_FAILED.
+							' AND e.eventid = a.eventid'.
+							' AND f.triggerid=e.objectid '.
+							' AND i.itemid=f.itemid '.
+							' AND i.hostid IN ('.$available_hosts.') ';
+
+				$tmp=DBfetch(DBselect($sql));
+				$alerts['failed'] = $tmp['failed'];
+				$mixed+=($alerts['failed'])?ALERT_STATUS_FAILED:0;
+
+
+				if($alerts['inprogress']){
+					$status = new CSpan(S_IN_PROGRESS,'orange');
+				}
+				else if(ALERT_STATUS_SENT == $mixed){
+					$status = new CSpan(S_OK,'green');
+				}
+				else if(ALERT_STATUS_FAILED == $mixed){
+					$status = new CSpan(S_FAILED,'red');
+				}
+				else{
+					$tdl = new CCol(($alerts['sent'])?(new CSpan($alerts['sent'],'green')):SPACE);
+					$tdl->AddOption('width','10');
+					
+					$tdr = new CCol(($alerts['failed'])?(new CSpan($alerts['failed'],'red')):SPACE);
+					$tdr->AddOption('width','10');
+
+					$status = new CRow(array($tdl,$tdr));
+				}
+
+				$actions->AddRow($status);
+			}
+//--------		
+
+			if($config['event_ack_enable']){
+				if($row['acknowledged'] == 1){
+					$ack=new CLink(S_YES,'acknow.php?eventid='.$row['eventid'],'action');
+				}
+				else{
+					$ack= new CLink(S_NO,'acknow.php?eventid='.$row['eventid'],'on');
+				}
+			}
+
+			$table->AddRow(array(
+				date("Y.M.d H:i:s",$row["clock"]),
+				get_node_name_by_elid($row['triggerid']),
+				$_REQUEST["hostid"] == 0 ? $row['host'] : null,
+				new CLink(
+					expand_trigger_description_by_data($row, ZBX_FLAG_EVENT),
+					"events.php?triggerid=".$row["triggerid"],"action"
+					),
+				$value,
+				new CCol(get_severity_description($row["priority"]), get_severity_style($row["priority"])),
+				$duration,
+				($config['event_ack_enable'])?$ack:NULL,
+				$actions
+			));
+				
+			$col++;
+		}
+	}
+
+
+/************************* FILTER **************************/
+/***********************************************************/
+
+	$prev = 'Prev 100';
+	$next='Next 100';
+	if($_REQUEST["start"] > 0){
+		$prev = new Clink('Prev '.PAGE_SIZE, 'events.php?prev=1'.url_param('start'),'styled');
+	}
 	
-	$l_form = new CForm();
-	$l_form->SetMethod('get');
+	if($table->GetNumRows() >= PAGE_SIZE){
+		$next = new Clink('Next '.PAGE_SIZE, 'events.php?next=1'.url_param('start'),'styled');
+	}	
+
+	$filterForm = new CFormTable(S_FILTER);//,'events.php?','POST',null,'sform');
+	$filterForm->AddOption('name','zbx_filter');
+	$filterForm->AddOption('id','zbx_filter');
+
+	if(EVENT_SOURCE_TRIGGERS == $source){
 	
-	if($source == EVENT_SOURCE_TRIGGERS){
-		$link = array('[', 
-			new CLink($show_unknown!=1?S_SHOW_UNKNOWN:S_HIDE_UNKNOWN,
-				"events.php?show_unknown=".($show_unknown!=1?'1':'0')
-			), 
-			']'.SPACE
-		);
+/*	
+		$filterForm->AddRow(S_PERIOD,array(
+								S_FROM.SPACE, new CTextBox('filter_since_day','',2),
+								new CTextBox('filter_since_month','',2),
+								new CTextBox('filter_since_year','',4),
+								S_TILL.SPACE, new CTextBox('filter_till_day','',2),
+								new CTextBox('filter_till_month','',2),
+								new CTextBox('filter_till_year','',4),
+							));
+*/	
+		$filterForm->AddVar('triggerid',$_REQUEST['triggerid']);
+		
+		if(isset($_REQUEST['triggerid']) && ($_REQUEST['triggerid']>0)){
+			$trigger = expand_trigger_description($_REQUEST['triggerid']);
+		} else{
+			$trigger = "";
+		}
+		$row = new CRow(array(
+						new CCol(S_TRIGGER,'form_row_l'),
+						new CCol(array(
+									new CTextBox("trigger",$trigger,96,'yes'),
+									new CButton("btn1",S_SELECT,"return PopUp('popup.php?"."dstfrm=".$filterForm->GetName()."&dstfld1=triggerid&dstfld2=trigger"."&srctbl=triggers&srcfld1=triggerid&srcfld2=description&real_hosts=1');",'T')
+								),'form_row_r')
+							));
+							
+		$filterForm->AddRow($row);
+
+		$filterForm->AddVar('show_unknown',$show_unknown);
+		
+		$unkcbx = new CCheckBox('show_unk',$show_unknown,null,'1');
+		$unkcbx->SetAction('javascript: create_var("'.$filterForm->GetName().'", "show_unknown", (this.checked?1:0), 0); ');
 		
-		$l_form->AddItem(array($link, SPACE, SPACE));
+		$filterForm->AddRow(S_SHOW_UNKNOWN,$unkcbx);
+
+		$reset = new CButton("filter_rst",S_RESET);
+		$reset->SetType('button');
+		$reset->SetAction('javascript: var uri = new url(location.href); uri.setArgument("filter_rst",1); location.href = uri.getUrl();');
+
+		$filterForm->AddItemToBottomRow($reset);
+		$filterForm->AddItemToBottomRow(new CButton("filter_set",S_FILTER));
 	}
-	
-	show_table_header($l_form,$r_form);
+
+	$navigation = array(
+						new CSpan(array('&laquo; ',$prev),'textcolorstyles'),
+						new CSpan(' | ','divider'),
+						new CSpan(array($next,' &raquo;'),'textcolorstyles'));
+						
+	$filter = create_filter(S_FILTER,$navigation,$filterForm,'tr_filter',get_profile('web.events.filter.state',1));
+	$filter->Show();
+//-------
 
 	$table->Show();
+	
+	show_thin_table_header(SPACE,$navigation);
 ?>
 <?php