- [DEV-137] added Hint to acknowledged events (Artem)

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

6 files changed, 37 insertions, 24 deletions

diff --git a/frontends/php/acknow.php b/frontends/php/acknow.php
index dc4638c3..ce347fca 100644
--- a/frontends/php/acknow.php
+++ b/frontends/php/acknow.php
@@ -152,13 +152,14 @@ include_once "include/page_header.php";
 
 		$db_acks = get_acknowledges_by_eventid($db_data["eventid"]);
 		while($db_ack = DBfetch($db_acks)){
+			
 			$db_user = get_user_by_userid($db_ack["userid"]);
 			$table->AddRow(array(
 				new CCol($db_user["alias"],"user"),
 				new CCol(date("d-m-Y h:i:s A",$db_ack["clock"]),"time")),
 				"title");
 	
-			$msgCol = new CCol(new CScript(nl2br($db_ack["message"])));
+			$msgCol = new CCol(zbx_nl2br($db_ack['message']));
 			$msgCol->SetColspan(2);
 			$table->AddRow($msgCol,"msg");
 		}
diff --git a/frontends/php/include/acknow.inc.php b/frontends/php/include/acknow.inc.php
index 4e84ade5..e8a4563e 100644
--- a/frontends/php/include/acknow.inc.php
+++ b/frontends/php/include/acknow.inc.php
@@ -19,6 +19,7 @@
 **/
 ?>
 <?php
+
 function get_last_event_by_triggerid($triggerid){
 	$event_data = DBfetch(DBselect('SELECT * '.
 				' FROM events '.
@@ -34,8 +35,7 @@ function get_acknowledges_by_eventid($eventid){
 	return DBselect("select * from acknowledges where eventid=$eventid");
 }
 
-function	add_acknowledge_coment($eventid, $userid, $message)
-{
+function add_acknowledge_coment($eventid, $userid, $message){
 	$result = set_event_acnowledged($eventid);
 	if(!$result)
 		return $result;
@@ -51,7 +51,7 @@ function	add_acknowledge_coment($eventid, $userid, $message)
 	return $acknowledgeid;
 }
 
-function	set_event_acnowledged($eventid){
+function set_event_acnowledged($eventid){
 	return DBexecute("update events set acknowledged=1 where eventid=$eventid");
 }
 
@@ -66,9 +66,10 @@ function make_acktab_by_eventid($eventid){
 		$table->AddRow(array(
 			date('d-m-Y h:i:s A',$ack['clock']),
 			$user['alias'],
-			new CCol(nl2br($ack['message']),'wraptext')
+			new CCol(zbx_nl2br($ack['message']),'wraptext')
 		));
 	}
+
 return $table;
 }
 ?>
diff --git a/frontends/php/include/blocks.inc.php b/frontends/php/include/blocks.inc.php
index c8826467..0bea0b80 100644
--- a/frontends/php/include/blocks.inc.php
+++ b/frontends/php/include/blocks.inc.php
@@ -19,9 +19,10 @@
 **/
 ?>
 <?php
-require_once "include/graphs.inc.php";
-require_once "include/screens.inc.php";
-require_once "include/maps.inc.php";
+require_once('include/graphs.inc.php');
+require_once('include/screens.inc.php');
+require_once('include/maps.inc.php');
+require_once('include/users.inc.php');
 
 
 // Author: Aly
@@ -173,7 +174,7 @@ return $table;
 // Author: Aly
 function make_system_summary(){
 	global $USER_DETAILS;
-	$config=select_config();
+	$config = select_config();
 	
 	$available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,PERM_RES_IDS_ARRAY);
 	$available_triggers = get_accessible_triggers(PERM_READ_ONLY,PERM_RES_IDS_ARRAY);
@@ -202,7 +203,7 @@ function make_system_summary(){
 				' AND t.triggerid=f.triggerid '.
 				' AND t.status='.TRIGGER_STATUS_ENABLED.
 			' ORDER BY g.name';
-	$gr_result=DBselect($sql);
+	$gr_result = DBselect($sql);
 					
 	while($group = DBFetch($gr_result)){
 		$group_row = new CRow();
@@ -300,7 +301,6 @@ function make_system_summary(){
 						$description = expand_trigger_description_by_data(
 								array_merge($row_inf, array("clock"=>$row_inf_event["clock"])),
 								ZBX_FLAG_EVENT);
-								
 						
 //actions								
 						$actions= get_event_actions_status($row_inf_event['eventid']);
@@ -487,7 +487,6 @@ function make_latest_issues(){
 		if(trigger_dependent($row["triggerid"]))	continue;
 
 		$host = null;
-
 		$menus = '';
 
 		$host_nodeid = id2nodeid($row['hostid']);
@@ -517,9 +516,14 @@ function make_latest_issues(){
 		$res_events = DBSelect($event_sql,1);
 
 		while($row_event=DBfetch($res_events)){
+			$ack = NULL;
 			if($config['event_ack_enable']){
 				if($row_event['acknowledged'] == 1){
+					$ack_info = make_acktab_by_eventid($row_event['eventid']);
+					$ack_info->AddOption('style','width: auto;');
+					
 					$ack=new CLink(S_YES,'acknow.php?eventid='.$row_event['eventid'],'action');
+					$ack->SetHint($ack_info);
 				}
 				else{
 					$ack= new CLink(S_NO,'acknow.php?eventid='.$row_event['eventid'],'on');
@@ -534,7 +538,6 @@ function make_latest_issues(){
 			$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');
 			
 			$table->AddRow(array(
 				get_node_name_by_elid($row['triggerid']),
@@ -542,7 +545,7 @@ function make_latest_issues(){
 				new CCol($description,get_severity_style($row["priority"])),
 				$clock,
 				zbx_date2age($row_event['clock']),
-				($config['event_ack_enable'])?(new CCol($ack,"center")):NULL,
+				$ack,
 				$actions
 			));			
 		}
diff --git a/frontends/php/include/func.inc.php b/frontends/php/include/func.inc.php
index 241ca486..0881d5dd 100644
--- a/frontends/php/include/func.inc.php
+++ b/frontends/php/include/func.inc.php
@@ -337,6 +337,14 @@ function str_in_array($needle,$haystack,$strict=false){
 return false;
 }
 
+function zbx_nl2br(&$str){
+	$str_res = array();
+	$str_arr = explode("\n",$str);
+	foreach($str_arr as $id => $str_line){
+		array_push($str_res,$str_line,BR());
+	}
+return $str_res;
+}
 /************* END ZBX MISC *************/
 
 ?>
\ No newline at end of file
diff --git a/frontends/php/styles/table.css b/frontends/php/styles/table.css
index 10eda665..7335c764 100644
--- a/frontends/php/styles/table.css
+++ b/frontends/php/styles/table.css
@@ -455,15 +455,15 @@ table.tabletree tr.even_row:hover td		{	background-color: #DFDFDF;}
 /*****************************************/
 /*************** Table Info **************/
 
-table.tableinfo
-{
+table.tableinfo{
 	empty-cells:show;
 	color: #000000;
-	width: 100%;
+	width: 100%; 
 	background-color: #AAAAAA;
 	border-spacing:	1px; /* cellspacing */
 	border-width: 0px;
 }
+
 table.tableinfo tr td {
 	white-space: nowrap;
 	word-spacing:	0px;
diff --git a/frontends/php/tr_events.php b/frontends/php/tr_events.php
index d4398c10..be526728 100644
--- a/frontends/php/tr_events.php
+++ b/frontends/php/tr_events.php
@@ -19,13 +19,13 @@
 **/
 ?>
 <?php
-	require_once "include/config.inc.php";
-	require_once "include/acknow.inc.php";
-	require_once "include/actions.inc.php";
-	require_once "include/events.inc.php";
-	require_once "include/triggers.inc.php";
-	require_once "include/users.inc.php";
-	require_once "include/html.inc.php";
+	require_once('include/config.inc.php');
+	require_once('include/acknow.inc.php');
+	require_once('include/actions.inc.php');
+	require_once('include/events.inc.php');
+	require_once('include/triggers.inc.php');
+	require_once('include/users.inc.php');
+	require_once('include/html.inc.php');
 
 	$page["title"]		= "S_EVENT_DETAILS";
 	$page["file"]		= "tr_events.php";