ported 3274:3290 from 1.1.2 (Eugene)

 - improved macro variables substitution in message body/subject (Eugene)
 - minor fix of static linkage (Eugene)
 - fixed support of PostgreSQL (Eugene)
 - fixed DBinsert_id function for oracle (Eugene)
 - fixed autoregistration in oracle system (Eugene)
 - updated postgresql cheme, added start value for sequencers (Eugene)
 - fixed limitation of return value of some items (Eugene)
 - added color selection for trigger severity 'warning' and 'information' (Eugene)



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

1 files changed, 13 insertions, 5 deletions

diff --git a/frontends/php/report5.php b/frontends/php/report5.php
index 5413490d..54aa7e39 100644
--- a/frontends/php/report5.php
+++ b/frontends/php/report5.php
@@ -75,7 +75,7 @@
 	{
 		$time_dif=365*24*3600;
 	}
-        $result=DBselect("select h.host, t.triggerid, t.description, t.priority, count(a.alarmid)
+        $result=DBselect("select h.host, t.triggerid, t.description, t.priority, count(a.alarmid) as count
 	from hosts h, triggers t, functions f, items i, alarms a where 
 	h.hostid = i.hostid and
 	i.itemid = f.itemid and
@@ -88,9 +88,17 @@
         while($row=DBfetch($result))
         {
                 $priority_style=NULL;
-                if($row["priority"]==0)         $priority=S_NOT_CLASSIFIED;
-                elseif($row["priority"]==1)     $priority=S_INFORMATION;
-                elseif($row["priority"]==2)     $priority=S_WARNING;
+                if($row["priority"]==0)       $priority=S_NOT_CLASSIFIED;
+                elseif($row["priority"]==1)     
+		{
+			$priority=S_INFORMATION;
+                        $priority_style="information";
+		}
+                elseif($row["priority"]==2)
+		{
+		     $priority=S_WARNING;
+                        $priority_style="warning";
+		}
                 elseif($row["priority"]==3)
                 {
                         $priority=S_AVERAGE;
@@ -112,7 +120,7 @@
 			$row["host"],
 			expand_trigger_description($row["triggerid"]),
 			new CCol($priority,$priority_style),
-			$row["count(a.alarmid)"],
+			$row["count"],
 			));
 	}
 	$table->show();