Minor changes.

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

1 files changed, 3 insertions, 10 deletions

diff --git a/frontends/php/alerts.php b/frontends/php/alerts.php
index 61069c89..ac9e604b 100644
--- a/frontends/php/alerts.php
+++ b/frontends/php/alerts.php
@@ -41,11 +41,11 @@
 <?php
 	if(!isset($HTTP_GET_VARS["start"]))
 	{
-		$sql="select a.alertid,a.clock,a.type,a.sendto,a.subject,a.message,ac.triggerid,a.status,a.retries from alerts a,actions ac where a.actionid=ac.actionid order by a.clock desc limit 500";
+		$sql="select a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,ac.triggerid,a.status,a.retries from alerts a,actions ac,media_type mt where a.actionid=ac.actionid and mt.mediatypeid=a.mediatypeid order by a.clock desc limit 500";
 	}
 	else
 	{
-		$sql="select a.alertid,a.clock,a.type,a.sendto,a.subject,a.message,ac.triggerid,a.status,a.retries from alerts a,actions ac where a.actionid=ac.actionid order by a.clock desc limit ".($HTTP_GET_VARS["start"]+500);
+		$sql="select a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,ac.triggerid,a.status,a.retries from alerts a,actions ac,media_type mt where a.actionid=ac.actionid and mt.mediatypeid=a.mediatypeid order by a.clock desc limit ".($HTTP_GET_VARS["start"]+500);
 	}
 	$result=DBselect($sql);
 
@@ -78,14 +78,7 @@
 		if($col>100)	break;
 
 		echo "<TD><a href=\"alarms.php?triggerid=".$row["triggerid"]."\">".date("Y.M.d H:i:s",$row["clock"])."</a></TD>";
-		if($row["type"]=="EMAIL")
-		{
-			echo "<TD>E-mail</TD>";
-		}
-		else
-		{
-			echo "<TD>Unknown media type</TD>";
-		}
+		echo "<TD>".$row["description"]."</TD>";
 		if($row["status"] == 1)
 		{
 			echo "<TD><font color=\"00AA00\">sent</font></TD>";