Bug fixes. Changes in manual.txt.

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

2 files changed, 7 insertions, 6 deletions

diff --git a/frontends/php/include/config.inc b/frontends/php/include/config.inc
index 40647d09..ce536f35 100644
--- a/frontends/php/include/config.inc
+++ b/frontends/php/include/config.inc
@@ -454,6 +454,7 @@
 
 	function	implode_exp ($expression, $triggerid)
 	{
+//		echo "Expression:$expression<br>";
 		$exp='';
 		for($i=0;$i<strlen($expression);$i++)
 		{
@@ -658,7 +659,7 @@
 		$result=DBselect($sql);
 		for($i=0;$i<DBnum_rows($result);$i++)
 		{
-			delete_function_by_triggerid(DBget_field($result,$i,0));
+			delete_trigger(DBget_field($result,$i,0));
 		}
 
 		$sql="delete from functions where itemid=$itemid";
@@ -765,13 +766,13 @@
 				{
 					if($expression[$z] == ':')
 					{
-						$expression=substr($expression,0,$z)."$host:$key".substr($expression,$z);
+						$expression=substr($expression,0,$z)."$host:$key".substr($expression,$z+1);
 						
 						break;
 					}
 				}
 
-				add_trigger($expression,$description,0,2,"");
+				add_trigger($expression,$description,0,0,"");
 			}
 		}
 	}
diff --git a/frontends/php/include/db.inc b/frontends/php/include/db.inc
index ac0035f1..b954e648 100644
--- a/frontends/php/include/db.inc
+++ b/frontends/php/include/db.inc
@@ -1,10 +1,10 @@
 <?
 
-//	$DB_TYPE	="POSTGRESQL";
-	$DB_TYPE	="MYSQL";
+	$DB_TYPE	="POSTGRESQL";
+//	$DB_TYPE	="MYSQL";
 	$DB_SERVER	="localhost";
 	$DB_DATABASE	="zabbix";
-	$DB_USER	="root";
+	$DB_USER	="zabbix";
 //	$DB_USER	="root";
 	$DB_PASSWORD	="";