- [DEV-171] improvements to event details (Artem)

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

1 files changed, 1 insertions, 59 deletions

diff --git a/frontends/php/include/blocks.inc.php b/frontends/php/include/blocks.inc.php
index 1111b993..8443449c 100644
--- a/frontends/php/include/blocks.inc.php
+++ b/frontends/php/include/blocks.inc.php
@@ -22,7 +22,6 @@
 require_once "include/graphs.inc.php";
 require_once "include/screens.inc.php";
 require_once "include/maps.inc.php";
-require_once "include/actions.inc.php";
 
 
 // Author: Aly
@@ -530,64 +529,7 @@ function make_latest_issues(){
 					ZBX_FLAG_EVENT);
 					
 //actions								
-			$actions= new CTable(' - ');
-
-			$sql='SELECT COUNT(a.alertid) as cnt '.
-					' FROM alerts a '.
-					' WHERE a.eventid='.$row_event['eventid'];
-
-					
-			$alerts=DBfetch(DBselect($sql));
-
-			if(isset($alerts['cnt']) && ($alerts['cnt'] > 0)){
-				$sql='SELECT COUNT(a.alertid) as sent '.
-						' FROM alerts a '.
-						' WHERE a.eventid='.$row_event['eventid'].
-							' AND a.status='.ALERT_STATUS_SENT;
-
-				$alerts=DBfetch(DBselect($sql));
-
-				$alert_cnt = new CSpan($alerts['sent'],'green');
-				if($alerts['sent']){
-					$hint=get_actions_hint_by_eventid($row_event['eventid'],ALERT_STATUS_SENT);
-					$alert_cnt->SetHint($hint);
-				}
-				$tdl = new CCol(($alerts['sent'])?$alert_cnt:SPACE);
-				$tdl->AddOption('width','10');
-
-				$sql='SELECT COUNT(a.alertid) as inprogress '.
-						' FROM alerts a '.
-						' WHERE a.eventid='.$row_event['eventid'].
-							' AND a.status='.ALERT_STATUS_NOT_SENT;
-
-				$alerts=DBfetch(DBselect($sql));
-
-				$alert_cnt = new CSpan($alerts['inprogress'],'orange');
-				if($alerts['inprogress']){
-					$hint=get_actions_hint_by_eventid($row_event['eventid'],ALERT_STATUS_NOT_SENT);
-					$alert_cnt->SetHint($hint);
-				}
-				$tdc = new CCol(($alerts['inprogress'])?$alert_cnt:SPACE);
-				$tdc->AddOption('width','10');
-
-				$sql='SELECT COUNT(a.alertid) as failed '.
-						' FROM alerts a '.
-						' WHERE a.eventid='.$row_event['eventid'].
-							' AND a.status='.ALERT_STATUS_FAILED;
-
-				$alerts=DBfetch(DBselect($sql));
-
-				$alert_cnt = new CSpan($alerts['failed'],'red');
-				if($alerts['failed']){
-					$hint=get_actions_hint_by_eventid($row_event['eventid'],ALERT_STATUS_FAILED);
-					$alert_cnt->SetHint($hint);
-				}
-
-				$tdr = new CCol(($alerts['failed'])?$alert_cnt:SPACE);
-				$tdr->AddOption('width','10');
-				
-				$actions->AddRow(array($tdl,$tdc,$tdr));
-			}
+			$actions = get_event_actions_stat_hints($row_event['eventid']);
 //--------			
 			$clock = new CLink(zbx_date2str(S_DATE_FORMAT_YMDHMS,$row_event['clock']),"events.php?triggerid=".$row["triggerid"].'&source=0',"action");
 			$clock->SetTarget('_blank');