- merged from branches/1.4.1 rev. 4239:4240 (Eugene) [fixed 'count' function for trigger expression]

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

4 files changed, 113 insertions, 42 deletions

diff --git a/ChangeLog b/ChangeLog
index 82b060e8..e819e597 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Changes for 1.5:
 
+ - fixed 'count' function for trigger expression (Eugene)
  - added availability to export/import templates for hosts (Artem)
  - added availability of using "['%" character for key (Eugene)
  - added login/logout (Artem)
diff --git a/do b/do
index 2d6d1871..05b160a7 100755
--- a/do
+++ b/do
@@ -23,7 +23,7 @@ cleanwarnings="no"
 docat="yes"
 help="no"
 noparam=0
-def="--enable-agent --enable-server --with-mysql --prefix=`pwd` --with-ldap"
+def="--enable-agent --enable-server --with-mysql --prefix=`pwd` --with-curl --with-ldap"
 
 for cmd
 do
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 858622f1..7bd3ad4f 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -181,7 +181,7 @@
 		$allowed_functions['sum']	= 'ticks';
 		$allowed_functions['last']	= 'float';
 		$allowed_functions['diff']	= 'float';
-		$allowed_functions['count']	= 'float';
+		$allowed_functions['count']	= array('float', '');
 		$allowed_functions['prev']	= 'float';
 		$allowed_functions['change']	= 'float';
 		$allowed_functions['abschange']	= 'float';
@@ -240,18 +240,28 @@
 				return -1;
 			}
 
-			if( 'float' == $allowed_functions[$function]
-				&& (validate_float($parameter)!=0) )
-			{
-				error('['.$parameter.'] is not a float');
-				return -1;
-			}
+			if( !is_array($allowed_functions[$function]) )
+				$allowed_functions[$function] = array($allowed_functions[$function]);
+
+			$parameter = split(',', $parameter, count($allowed_functions[$function]));
 
-			if( 'ticks' == $allowed_functions[$function]
-				&& (validate_ticks($parameter)!=0) )
+			foreach($allowed_functions[$function] as $pid => $params)
 			{
-				error('['.$parameter.'] is not a float');
-				return -1;
+				if(!isset($parameter[$pid])) continue;
+
+				if( 'float' == $params 
+					&& (validate_float($parameter[$pid])!=0) )
+				{
+					error('['.$parameter[$pid].'] is not a float');
+					return -1;
+				}
+
+				if( 'ticks' == $params 
+					&& (validate_ticks($parameter[$pid])!=0) )
+				{
+					error('['.$parameter[$pid].'] is not a float');
+					return -1;
+				}
 			}
 		}
 	# Process macros
diff --git a/frontends/php/popup_trexpr.php b/frontends/php/popup_trexpr.php
index 41b348ce..05dbd94c 100644
--- a/frontends/php/popup_trexpr.php
+++ b/frontends/php/popup_trexpr.php
@@ -40,6 +40,33 @@ include_once "include/page_header.php";
 		'=' => '=',
 		'#' => 'NOT');
 
+	$metrics = array(
+		PARAM_TYPE_SECONDS => S_SECONDS,
+		PARAM_TYPE_COUNTS => S_COUNT);
+
+	$param1_sec_count = array(
+			array(
+				'C' => S_LAST_OF.' T',	/* caption */
+				'T' => T_ZBX_INT,	/* type */
+				'M' => $metrics		/* metrcis */
+			     ));
+	
+	$param1_str = array(
+			array(
+				'C' => 'T',		/* caption */
+				'T' => T_ZBX_STR,
+			     ));
+
+	$param2_sec_val = array(
+			array(
+				'C' => S_LAST_OF.' T',	/* caption */
+				'T' => T_ZBX_INT,
+			     ),
+			array(
+				'C' => 'V',		/* caption */
+				'T' => T_ZBX_STR,
+			     ));
+
 	$functions = array(
 		'abschange'	=> array(
 			'description'	=> 'Absolute difference between last and previous value {OP} N',
@@ -48,21 +75,21 @@ include_once "include/page_header.php";
 		'avg'		=> array(
 			'description'	=> 'Average value for period of T times {OP} N',
 			'operators'	=> $operators,
-			'T'             => T_ZBX_INT
+			'params'	=> $param1_sec_count
 			),
 		'delta'		=> array(
 			'description'	=> 'Difference between MAX and MIN value of T times {OP} N',
 			'operators'	=> $operators,
-			'T'             => T_ZBX_INT
+			'params'	=> $param1_sec_count
 			),
 		'change'	=> array(
 			'description'	=> 'Difference between last and previous value of T times {OP} N.',
 			'operators'	=> $operators
 			),
 		'count'		=> array(
-			'description'	=> 'Number of successfully retrieved values for period of time T {OP} N.',
+			'description'	=> 'Number of successfully retrieved values V for period of time T {OP} N.',
 			'operators'     => $operators,
-			'T'             => T_ZBX_INT
+			'params'	=> $param2_sec_val
 			),
 		'diff'		=> array(
 			'description'	=> 'N {OP} X, where X is 1 - if last and previous values differs, 0 - otherwise.',
@@ -75,12 +102,12 @@ include_once "include/page_header.php";
 		'max'		=> array(
 			'description'	=> 'Maximal value for period of time T {OP} N.',
 			'operators'     => $operators,
-			'T'             => T_ZBX_INT
+			'params'	=> $param1_sec_count
 			),
 		'min'		=> array(
 			'description'	=> 'Minimal value for period of time T {OP} N.',
 			'operators'     => $operators,
-			'T'             => T_ZBX_INT
+			'params'	=> $param1_sec_count
 			),
 		'prev'		=> array(
 			'description'	=> 'Previous value {OP} N.',
@@ -89,12 +116,12 @@ include_once "include/page_header.php";
 		'str'		=> array(
 			'description'	=> 'Find string T last value. N {OP} X, where X is 1 - if found, 0 - otherwise',
 			'operators'     => $limited_operators,
-			'T'		=> T_ZBX_STR
+			'params'	=> $param1_str
 			),
 		'sum'		=> array(
 			'description'	=> 'Sum of values for period of time T {OP} N',
 			'operators'     => $operators,
-			'T'             => T_ZBX_INT
+			'params'	=> $param1_sec_count
 			)
 		
 	);
@@ -102,8 +129,8 @@ include_once "include/page_header.php";
 		
 //		VAR			TYPE	OPTIONAL FLAGS	VALIDATION	EXCEPTION
 	$fields=array(
-		"dstfrm"=>	array(T_ZBX_STR, O_MAND,P_SYS,	NOT_EMPTY,	NULL),
-		"dstfld1"=>	array(T_ZBX_STR, O_MAND,P_SYS,	NOT_EMPTY,	NULL),
+		"dstfrm"=>	array(T_ZBX_STR, O_MAND,P_SYS,	NOT_EMPTY,	null),
+		"dstfld1"=>	array(T_ZBX_STR, O_MAND,P_SYS,	NOT_EMPTY,	null),
 		
 		"expression"=>	array(T_ZBX_STR, O_OPT, null,	null,		null),
 
@@ -113,7 +140,7 @@ include_once "include/page_header.php";
 		"paramtype"=>	array(T_ZBX_INT, O_OPT, null,	IN(PARAM_TYPE_SECONDS.','.PARAM_TYPE_COUNTS),	'isset({insert})'),
 		"value"=>	array(T_ZBX_STR, O_OPT,	null,	NOT_EMPTY,					'isset({insert})'),
 
-		"insert"=>	array(T_ZBX_STR,	O_OPT,	P_SYS|P_ACT,	NULL,	NULL)
+		"insert"=>	array(T_ZBX_STR,	O_OPT,	P_SYS|P_ACT,	null,	null)
 	);
 
 	check_fields($fields);
@@ -145,10 +172,10 @@ include_once "include/page_header.php";
 				{
 					$_REQUEST['paramtype'] = PARAM_TYPE_SECONDS;
 					$_REQUEST['param'] = $expr_res[$pat['idx']['param']];
-					if($pat['idx']['param'][0] == '#')
+					if($_REQUEST['param'][0] == '#')
 					{
 						$_REQUEST['paramtype'] = PARAM_TYPE_COUNTS;
-						$_REQUEST['param'] = ltrim('#', $expr_res[$pat['idx']['param']]);
+						$_REQUEST['param'] = ltrim($_REQUEST['param'],'#');
 					}
 				}
 					
@@ -204,7 +231,19 @@ include_once "include/page_header.php";
 	$param		= get_request('param',	0);
 	$paramtype	= get_request('paramtype',	PARAM_TYPE_SECONDS);
 	$value		= get_request('value',		0);
-	
+
+	if( !is_array($param) )
+	{
+		if( isset($functions[$function]['params']) )
+		{
+			$param = split(',', $param, count($functions[$function]['params']));
+		}
+		else
+		{
+			$param = array($param);
+		}
+	}
+
 ?>
 <script language="JavaScript" type="text/javascript">
 <!--
@@ -244,7 +283,7 @@ function InsertText(obj, value)
 			$item_data['key_'],
 			$function,
 			$paramtype == PARAM_TYPE_COUNTS ? '#' : '',
-			$param,
+			rtrim(implode(',', $param),','),
 			$operator,
 			$value);
 
@@ -294,23 +333,44 @@ if(form)
 	}
 	$form->AddRow(S_FUNCTION, $cmbFnc);
 
-	if(isset($functions[$function]['T']))
+	if(isset($functions[$function]['params']))
 	{
-		if($functions[$function]['T'] == T_ZBX_INT)
-		{
-			$cmbParamType = new CComboBox('paramtype', $paramtype);
-			$cmbParamType->AddItem(PARAM_TYPE_SECONDS, S_SECONDS);
-			$cmbParamType->AddItem(PARAM_TYPE_COUNTS, S_COUNTS);
-			
-			$form->AddRow(S_LAST_OF.' T', array(
-				new CNumericBox('param', $param, 10),
-				$cmbParamType
-				)); 
-		}
-		else
+		foreach($functions[$function]['params'] as $pid => $pf )
 		{
-			$form->AddRow('T', new CTextBox('param', $param, 30));
-			$form->AddVar('paramtype', PARAM_TYPE_SECONDS);
+			$pv = (isset($param[$pid])) ? $param[$pid] : null;
+
+			if($pf['T'] == T_ZBX_INT)
+			{
+				if( 0 == $pid) 
+				{
+					if( isset($pf['M']) && is_array($pf['M']))
+					{
+						$cmbParamType = new CComboBox('paramtype', $paramtype);
+						foreach( $pf['M'] as $mid => $caption )
+						{
+							$cmbParamType->AddItem($mid, $caption);
+						}
+					} else {
+						$form->AddVar('paramtype', PARAM_TYPE_SECONDS);
+						$cmbParamType = S_SECONDS;
+					}
+				}
+				else
+				{
+					$cmbParamType = null;
+				}
+					
+				
+				$form->AddRow(S_LAST_OF.' ', array(
+					new CNumericBox('param['.$pid.']', $pv, 10),
+					$cmbParamType
+					)); 
+			}
+			else
+			{
+				$form->AddRow($pf['C'], new CTextBox('param['.$pid.']', $pv, 30));
+				$form->AddVar('paramtype', PARAM_TYPE_SECONDS);
+			}
 		}
 	}
 	else