- added frontend-side support of quotes and triger expression validation (Eugene)

 - merged rev. 4305:4307 [improved trigger expression syntax and validation]
 - merged rev. 4329:4331 [more support for quotes in key parameters]
 - merged rev. 4344:4346 [minor improovments]
 - merged rev. 4431:4432 [added availability of using ":," character for key]



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

1 files changed, 10 insertions, 10 deletions

diff --git a/frontends/php/include/nodes.inc.php b/frontends/php/include/nodes.inc.php
index c1e8d6b2..b8e14035 100644
--- a/frontends/php/include/nodes.inc.php
+++ b/frontends/php/include/nodes.inc.php
@@ -50,11 +50,11 @@
 	{
 		global $ZBX_CURNODEID, $ZBX_CURMASTERID;
 
-               if( !eregi('^'.ZBX_EREG_NODE_FORMAT.'$', $name) )
-               {
-                       error("Incorrect characters used for Node name");
-                       return false;
-               }
+		if( !eregi('^'.ZBX_EREG_NODE_FORMAT.'$', $name) )
+		{
+			error("Incorrect characters used for Node name");
+			return false;
+		}
 
 		switch($node_type)
 		{
@@ -103,11 +103,11 @@
 
 	function	update_node($nodeid,$new_nodeid,$name,$timezone,$ip,$port,$slave_history,$slave_trends)
 	{
-               if( !eregi('^'.ZBX_EREG_NODE_FORMAT.'$', $name) )
-               {
-                       error("Incorrect characters used for Node name");
-                       return false;
-               }
+		if( !eregi('^'.ZBX_EREG_NODE_FORMAT.'$', $name) )
+		{
+			error("Incorrect characters used for Node name");
+			return false;
+		}
 
 		$result = DBexecute('update nodes set nodeid='.$new_nodeid.',name='.zbx_dbstr($name).','.
 				'timezone='.$timezone.',ip='.zbx_dbstr($ip).',port='.$port.','.