- startrd developement of dbmanager on serverside

- minor fixes of template linkage on frontend

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

4 files changed, 13 insertions, 26 deletions

diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index 72700800..55cd9665 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -424,13 +424,13 @@
 
 			if($templateid != null)
 			{
-				$tmp_graph = get_graph_by_graphid($db_graph["templateid"]);
+				$tmp_host = DBfetch(get_hosts_by_graphid($db_graph["templateid"]));
 				if(is_array($templateid))
 				{
-					if(!isset($templateid[$tmp_graph["hostid"]]))
+					if(!isset($templateid[$tmp_host["hostid"]]))
 						continue;
 				}
-				elseif($tmp_graph["hostid"] != $templateid)
+				elseif($tmp_host["hostid"] != $templateid)
 					continue;
 			}
 
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index 26016cec..fc70c6b2 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -626,7 +626,7 @@ require_once "include/items.inc.php";
 			return false;
 		}
 		if($db_app && $applicationid!=null)
-		{ // delete old item with same name
+		{ // delete old application with same name
 			delete_application($db_app["applicationid"]);
 		}
 
@@ -679,7 +679,7 @@ require_once "include/items.inc.php";
 			return $applicationid;
 
 		if($templateid == 0){
-			delete_application($itemid);
+			delete_application($applicationid);
 		}
 
 	}
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php
index 89063143..4b4e6ea4 100644
--- a/frontends/php/include/items.inc.php
+++ b/frontends/php/include/items.inc.php
@@ -628,7 +628,7 @@
 		$result = delete_triggers_by_itemid($itemid);
 		if(!$result)	return	$result;
 
-		$db_gitems = DBselect('select * from graphs_items where itemid='.$itemid);
+		$db_gitems = DBselect('select distinct graphid from graphs_items where itemid='.$itemid);
 		while($db_gitem = DBfetch($db_gitems))
 		{
 			$result = delete_graph($db_gitem["graphid"]);
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 7baa9a85..376eb219 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -946,29 +946,16 @@
 
 	function	delete_dependencies_by_triggerid($triggerid)
 	{
-		$db_deps = DBselect("select triggerid_up, triggerid_down from trigger_depends".
-			" where triggerid_down=".$triggerid);
+		$db_deps = DBselect('select triggerid_up, triggerid_down from trigger_depends'.
+			' where triggerid_down='.$triggerid);
 		while($db_dep = DBfetch($db_deps))
 		{
-			delete_trigger_dependency($db_dep["triggerid_down"],$db_dep["triggerid_up"]);
+			DBexecute('update triggers set dep_level=dep_level-1 where triggerid='.$db_dep['triggerid_up']);
+			DBexecute('delete from trigger_depends'.
+				' where triggerid_up='.$db_dep['triggerid_up'].
+				' and triggerid_down='.$db_dep['triggerid_down']);
 		}
-		return TRUE;
-	}
-
-	function	delete_trigger_dependency($triggerid_down, $triggerid_up)
-	{
-		$result = DBselect("select triggerid_up from trigger_depends".
-			" where triggerid_up=$triggerid_up and triggerid_down=$triggerid_down");
-		while($row=DBfetch($result))
-		{
-			DBexecute("update triggers set dep_level=dep_level-1".
-				" where triggerid=".$row["triggerid_up"]);
-		}
-
-		DBexecute("delete from trigger_depends".
-			" where triggerid_up=$triggerid_up and triggerid_down=$triggerid_down");
-
-		return	TRUE;
+		return true;
 	}
 
 	function	insert_dependency($triggerid_down,$triggerid_up)