- added EOL character to make HTML source more readable (Alexei)

 - added new column "severity" to history of alarms (Alexei)
 - status of triggers. If Select is used, no refresh (Alexei)
 - support for MIN algorithm for IT Services (Alexei)
 - support for timeticks for SNMP values. Thanks to Daniel
 Ester. (Alexei)


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

1 files changed, 18 insertions, 1 deletions

diff --git a/frontends/php/services.php b/frontends/php/services.php
index 452f8727..579156c8 100644
--- a/frontends/php/services.php
+++ b/frontends/php/services.php
@@ -86,6 +86,10 @@
 		{
 			echo "<td>MAX of childs</td>";
 		}
+		else if($service["algorithm"] == SERVICE_ALGORITHM_MIN)
+		{
+			echo "<td>MIN of childs</td>";
+		}
 		else
 		{
 			echo "<td>unknown</td>";
@@ -130,6 +134,10 @@
 		{
 			echo "<td>MAX of childs</td>";
 		}
+		else if($row["algorithm"] == SERVICE_ALGORITHM_MIN)
+		{
+			echo "<td>MIN of childs</td>";
+		}
 		else
 		{
 			echo "<td>unknown</td>";
@@ -221,17 +229,26 @@
 		{
 			echo "<OPTION VALUE='0' SELECTED>Do not calculate";
 			echo "<OPTION VALUE='1'>MAX";
+			echo "<OPTION VALUE='2'>MIN";
 		}
-		if($algorithm == SERVICE_ALGORITHM_MAX)
+		else if($HTTP_GET_VARS["algorithm"] == SERVICE_ALGORITHM_MAX)
 		{
 			echo "<OPTION VALUE='0'>Do not calculate";
 			echo "<OPTION VALUE='1' SELECTED>MAX";
+			echo "<OPTION VALUE='2'>MIN";
+		}
+		else if($HTTP_GET_VARS["algorithm"] == SERVICE_ALGORITHM_MIN)
+		{
+			echo "<OPTION VALUE='0'>Do not calculate";
+			echo "<OPTION VALUE='1'>MAX";
+			echo "<OPTION VALUE='2' SELECTED>MIN";
 		}
 	}
 	else
 	{
 		echo "<OPTION VALUE='0'>Do not calculate";
 		echo "<OPTION VALUE='1' SELECTED>MAX";
+		echo "<OPTION VALUE='2'>MIN";
 	}
 	echo "</SELECT>";