- added copyright notice to source files (Alexei)

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

2 files changed, 5 insertions, 5 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 083aa2a5..1c19e876 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -522,7 +522,7 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 // Before str()
 // 		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)|(str))\(([0-9a-zA-Z\.\_\/\,]+)\)\}$', $expression, &$arr)) 
- 		if (eregi('^\{([0-9a-zA-Z\_\.-]+)\:([]\[0-9a-zA-Z\_\/\.\,]+)\.([a-z]{3,6})\(([0-9a-zA-Z\_\/\.\,]+)\)\}$', $expression, &$arr)) 
+ 		if (eregi('^\{([0-9a-zA-Z\_\.-]+)\:([]\[0-9a-zA-Z\_\/\.\,\:]+)\.([a-z]{3,6})\(([0-9a-zA-Z\_\/\.\,]+)\)\}$', $expression, &$arr)) 
 		{
 			$host=$arr[1];
 			$key=$arr[2];
@@ -1301,7 +1301,7 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 					continue;
 				}
 			}
-			if($expression[$i] == ':')
+			if(($expression[$i] == ':') && ($state == "HOST"))
 			{
 				$state="KEY";
 				continue;
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index 34b9fa4c..fd6a4d1f 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -1,10 +1,10 @@
 <?php
 
-	$DB_TYPE	="POSTGRESQL";
-//	$DB_TYPE	="MYSQL";
+//	$DB_TYPE	="POSTGRESQL";
+	$DB_TYPE	="MYSQL";
 	$DB_SERVER	="localhost";
 	$DB_DATABASE	="zabbix";
-	$DB_USER	="zabbix";
+	$DB_USER	="root";
 	$DB_PASSWORD	="";
 
 	$USER_DETAILS	="";