- added housekeeping procedure for table sessions (Alexei)

 - changed width=\"X%\" to width=X% in *.php (Alexei)
 - Status of a trigger will blink if it was changes during last 60
 seconds (Alexei)
 - Zabbix daemons to update triggers.lastchange when triggers.values
 is changed (Alexei)
 - added misc/init.d/debian/zabbix-[suckerd|trapperd] (Alexei)
 - removed misc/init.d/debian/zabbix-server (Alexei)
 - send_email() will timeout after 10 seconds (Alexei)
 - DBadd_alarm() renamed to add_alarm() (Alexei)
 - support for SCO OpenServer (Alexei). Thanks to Alexender Kirhenstein.
 - ./configure will correctly define socklen_t (Alexei)
 - <center> changed to <div align=center> (Alexei)
 - reason of problem in screen IT Services (Alexei)
 - added frontends.php/helpdesk.php (Alexei)
 - added tables: problems, problems_comments,categories (Alexei)
 - added "...#form" to button Change in form Configuration of Users (Alexei)
 - "Just for information" changed to "Information" (Alexei)
 - fixed ./configure to correctly find zlib (Alexei)
 - housekeeping to delete no more than HousekeepingFrequency*3600 records
 from table history and history_str at once (MySQL only) (Alexei)


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

1 files changed, 23 insertions, 13 deletions

diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php
index df6d8ceb..ed0409ec 100644
--- a/frontends/php/tr_status.php
+++ b/frontends/php/tr_status.php
@@ -239,10 +239,10 @@
 			if($priority==4) $p4=$count;
 			if($priority==5) $p5=$count;
 		}
-		echo "\n<TABLE BORDER=0 COLS=6 WIDTH=\"100%\" BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=0>";
+		echo "\n<TABLE BORDER=0 COLS=6 align=center WIDTH=100% BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=0>";
 		echo "<TR ALIGN=CENTER>";
 		echo "<TD><B>Not classified: $p0</B></TD>";
-		echo "<TD><B>Just information: $p1</B></TD>";
+		echo "<TD><B>Information: $p1</B></TD>";
 		echo "<TD><B>Warning: $p2</B></TD>";
 		echo "<TD BGCOLOR=#DDAAAA><B>Average: $p3</B></TD>";
 		echo "<TD BGCOLOR=#FF8888><B>High: $p4</B></TD>";
@@ -255,7 +255,7 @@
 		show_table_header("<A HREF=\"tr_status.php?onlytrue=$onlytrue&noactions=$noactions&compact=$compact&fullscreen=1&sort=$sort\">TRIGGERS $time</A>");
 	}
   
-	echo "<TABLE BORDER=0 COLS=5 WIDTH=\"100%\" BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
+	echo "<TABLE BORDER=0 COLS=5 WIDTH=100% BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
 
 	echo "<TR ALIGN=CENTER>";
 	if(isset($fullscreen))
@@ -277,20 +277,20 @@
 	if($compact!='true') {echo "<BR><FONT SIZE=-1>Expression</FONT></B>";}
 	echo "</TD>";
 
-	echo "<TD WIDTH=\"5%\"><B>Status</B></TD>";
+	echo "<TD WIDTH=5%><B>Status</B></TD>";
 
 	if(!isset($sort)||(isset($sort) && $sort=="priority"))
 	{
-		echo "<TD WIDTH=\"9%\" ALIGN=CENTER><B>PRIORITY</B></TD>";
+		echo "<TD WIDTH=9% ALIGN=CENTER><B>PRIORITY</B></TD>";
 	}
 	else
 	{
 		echo "<TD ALIGN=CENTER><B><A HREF=\"tr_status.php?sort=priority&onlytrue=$onlytrue&noactions=$noactions&compact=$compact&select=$select&txt_select=$txt_select$fullscreen$cond\">Priority</a>";
 	}
 	if($noactions=='true')
-		echo "<TD WIDTH=\"12%\" ALIGN=CENTER>";
+		echo "<TD WIDTH=12% ALIGN=CENTER>";
 	else
-		echo "<TD WIDTH=\"5%\" ALIGN=CENTER>";
+		echo "<TD WIDTH=5% ALIGN=CENTER>";
 
 	if(isset($sort) && $sort=="lastchange")
 	{
@@ -304,9 +304,9 @@
    
 	if($noactions!='true')
 	{  
-		echo "<TD WIDTH=\"8%\" NOSAVE><B>Actions</B></TD>";
+		echo "<TD WIDTH=8% NOSAVE><B>Actions</B></TD>";
 	}
-	echo "<TD WIDTH=\"9%\"><B>Comments</B></TD>";
+	echo "<TD WIDTH=9%><B>Comments</B></TD>";
 	echo "</TR>\n";
 
 	if(isset($hostid))
@@ -391,15 +391,25 @@
 			echo "<BR><FONT COLOR=\"#000000\" SIZE=-2>".explode_exp($row["expression"],1)."</FONT>";
 		}
 		echo "</TD>";
+		if( (time(NULL)-$row["lastchange"])<60)
+		{
+			$blink1="<blink>";
+			$blink2="</blink>";
+		}
+		else
+		{
+			$blink1="";
+			$blink2="";
+		}
 		if($row["value"]==0)
-			{ echo "<TD ALIGN=CENTER><FONT COLOR=\"00AA00\">FALSE</FONT></TD>";}
+			{ echo "<TD ALIGN=CENTER>$blink1<FONT COLOR=\"00AA00\">FALSE</FONT>$blink2</TD>";}
 		else if($row["value"]==2)
-			{  echo "<TD ALIGN=CENTER><FONT COLOR=\"AAAAAA\">UNKNOWN</FONT></TD>"; }
+			{  echo "<TD ALIGN=CENTER>$blink1<FONT COLOR=\"AAAAAA\">UNKNOWN</FONT>$blink2</TD>"; }
 		else
-			{  echo "<TD ALIGN=CENTER><FONT COLOR=\"AA0000\">TRUE</FONT></TD>"; }
+			{  echo "<TD ALIGN=CENTER>$blink1<FONT COLOR=\"AA0000\">TRUE</FONT>$blink2</TD>"; }
 
 		if($row["priority"]==0)		echo "<TD ALIGN=CENTER>Not classified</TD>";
-		elseif($row["priority"]==1)	echo "<TD ALIGN=CENTER>Just information</TD>";
+		elseif($row["priority"]==1)	echo "<TD ALIGN=CENTER>Information</TD>";
 		elseif($row["priority"]==2)	echo "<TD ALIGN=CENTER>Warning</TD>";
 		elseif($row["priority"]==3)	echo "<TD ALIGN=CENTER BGCOLOR=#DDAAAA>Average</TD>";
 		elseif($row["priority"]==4)	echo "<TD ALIGN=CENTER BGCOLOR=#FF8888>High</TD>";