2 files changed, 5 insertions, 11 deletions
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php
index 270e5deb..e9087568 100644
--- a/frontends/php/include/actions.inc.php
+++ b/frontends/php/include/actions.inc.php
@@ -895,7 +895,7 @@ function get_actions_for_event($eventid){
 				' AND '.DBin_node('a.alertid').
 			order_by('a.clock,a.alertid,mt.description,a.sendto,a.status,a.retries'));
 		
-	while(($row=DBfetch($result))&&($col<$num)){
+	while($row=DBfetch($result)){
 		$time=date("Y.M.d H:i:s",$row["clock"]);
 
 		if($row["status"] == ALERT_STATUS_SENT){
@@ -912,14 +912,8 @@ function get_actions_for_event($eventid){
 		}
 		$sendto=$row["sendto"];
 
-		$pre = new CTag('pre','yes');
-		$pre->AddItem(array(bold(S_SUBJECT.': '),$row["subject"]));
-		$subject = empty($row["subject"]) ? '' : $pre;
+		$message = array(bold(S_SUBJECT.': '),br(),$row["subject"],br(),br(),bold(S_MESSAGE.': '),br(),$row['message']);
 		
-		$pre = new CTag('pre','yes');
-		$pre->AddItem($row["message"]);
-		$message = array($subject, $pre);
-
 		if($row["error"] == ""){
 			$error=new CSpan(SPACE,"off");
 		}
@@ -933,8 +927,8 @@ function get_actions_for_event($eventid){
 			new CCol($status, 'top'),
 			new CCol($retries, 'top'),
 			new CCol($sendto, 'top'),
-			new CCol($message, 'top'),
-			new CCol($error, 'top')));
+			new CCol($message, 'wraptext top'),
+			new CCol($error, 'wraptext top')));
 	}
 
 return $table;
diff --git a/frontends/php/include/events.inc.php b/frontends/php/include/events.inc.php
index 851a3499..0117b878 100644
--- a/frontends/php/include/events.inc.php
+++ b/frontends/php/include/events.inc.php
@@ -419,7 +419,7 @@ function make_small_eventlist($triggerid,&$trigger_data){
 			$tdc->AddOption('width','10');
 
 			$sql='SELECT COUNT(a.alertid) as failed '.
-					' FROM alerts a,functions f,items i,events e'.
+					' FROM alerts a '.
 					' WHERE a.eventid='.$row['eventid'].
 						' AND a.status='.ALERT_STATUS_FAILED;
 			$alerts=DBfetch(DBselect($sql));