- character '.' can be used in definition of monitored paramaters

 (Alexei)
 - added average-only mode for trends (Alexei)
 - fixed bug with unexpected change of item status to NOT SUPPORTED. This
 bug appeared because of incomplete processing of timeout situations (Alexei)
 - constant DELAY_ON_NETWORK_FAILURE is set to 60 (Alexei)
 - cleanup of PHP scripts


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

1 files changed, 13 insertions, 5 deletions

diff --git a/frontends/php/include/config.inc b/frontends/php/include/config.inc
index 9ef36dd4..d28e1b1f 100644
--- a/frontends/php/include/config.inc
+++ b/frontends/php/include/config.inc
@@ -156,7 +156,7 @@
 
 //		echo "Validating simple:$expression<br>";
 //		if (eregi('^\{([0-9a-zA-Z\_\.]+)\:([0-9a-zA-Z\_]+)\.((diff)|(min)|(max)|(last)|(nodata))\(([0-9\.]+)\)\}$', $expression, &$arr)) 
-		if (eregi('^\{([0-9a-zA-Z[.-.]\_\.]+)\:([]\[0-9a-zA-Z\_\/]+)\.((diff)|(min)|(max)|(last)|(prev))\(([0-9\.]+)\)\}$', $expression, &$arr)) 
+		if (eregi('^\{([0-9a-zA-Z[.-.]\_\.]+)\:([]\[0-9a-zA-Z\_\/\.]+)\.((diff)|(min)|(max)|(last)|(prev))\(([0-9\.]+)\)\}$', $expression, &$arr)) 
 		{
 			$host=$arr[1];
 			$key=$arr[2];
@@ -777,10 +777,10 @@
 			}
 			if( ($expression[$i] == '}')&&($state=="") )
 			{
-#				echo "HOST:$host<BR>";
-#				echo "KEY:$key<BR>";
-#				echo "FUNCTION:$function<BR>";
-#				echo "PARAMETER:$parameter<BR>";
+//				echo "HOST:$host<BR>";
+//				echo "KEY:$key<BR>";
+//				echo "FUNCTION:$function<BR>";
+//				echo "PARAMETER:$parameter<BR>";
 				$state='';
 		
 				$sql="select i.itemid from items i,hosts h where i.key_='$key' and h.host='$host' and h.hostid=i.hostid";
@@ -844,6 +844,14 @@
 					$state="FUNCTION";
 					continue;
 				}
+				// Support for '.' in KEY
+				if($state == "FUNCTION")
+				{
+					$state="FUNCTION";
+					$key=$key.".".$function;
+					$function="";
+					continue;
+				}
 			}
 			if($state == "HOST")
 			{