From 979fcceb99e555800fdfbc2cecf4ba585e780b73 Mon Sep 17 00:00:00 2001
From: osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>
Date: Wed, 19 Apr 2006 14:47:21 +0000
Subject:  - code optimization (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@2744 97f52cf1-0a1b-0410-bd0e-c28be96e8082
---
 frontends/php/include/validate.inc.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'frontends/php/include/validate.inc.php')

diff --git a/frontends/php/include/validate.inc.php b/frontends/php/include/validate.inc.php
index 0e8ba889..4517c221 100644
--- a/frontends/php/include/validate.inc.php
+++ b/frontends/php/include/validate.inc.php
@@ -67,9 +67,7 @@
 			$expression = str_replace('{'.$f.'}','$_REQUEST["'.$f.'"]',$expression);
 //$debug .= $f." = ".$_REQUEST[$f].BR;
 		}
-		$expression=rtrim($expression,"&");
-		if($expression[strlen($expression)-1]=='&')	$expression[strlen($expression)-1]=0;
-		if($expression[strlen($expression)-1]=='&')	$expression[strlen($expression)-1]=0;
+		$expression = trim($expression,"& ");
 		$exec = "return (".$expression.") ? 1 : 0;";
 
 		$ret = eval($exec);
@@ -269,7 +267,7 @@
 			{
 				if($flags&P_SYS)
 				{
-					info("Critical error. Incorrect value for [".$field."]");
+					info("Critical error. Incorrect value for [".$field."] = '".$_REQUEST[$field]."'");
 					return ZBX_VALID_ERROR;
 				}
 				else
-- 
cgit