- reverted original spancheck patch. No more warnings. (Alexei)

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

3 files changed, 6 insertions, 14 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 58c0cd35..678931fd 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1747,13 +1747,13 @@ echo "</head>";
 		$result=DBselect($sql);
 		while($row=DBfetch($result))
 		{
-			sync_host_with_template($hostid,$row["templateid"],$row["items"],$row["triggers"],$row["actions"],
-                                                $row["graphs"],$row["screens"]);
+			sync_host_with_template($hostid,$row["templateid"],$row["items"],$row["triggers"],
+                                                $row["graphs"]);
 		}
 	}
 
 	# Sync host with hard-linked template
-	function	sync_host_with_template($hostid,$templateid,$items,$triggers,$actions,$graphs,$screens)
+	function	sync_host_with_template($hostid,$templateid,$items,$triggers,$graphs)
 	{
 		if(!isset($templateid)||($templateid==0))
 		{
@@ -1777,14 +1777,6 @@ echo "</head>";
 			add_trigger_to_linked_hosts($row["triggerid"],$hostid);
 		}
 
-		// Sync actions
-		$sql="select distinct a.actionid from actions a,hosts h, items i,triggers t,functions f where h.hostid=$templateid and h.hostid=i.hostid and t.triggerid=f.triggerid and i.itemid=f.itemid";
-		$result=DBselect($sql);
-		while($row=DBfetch($result))
-		{	
-			add_action_to_linked_hosts($row["actionid"],$hostid);
-		}
-
 		// Sync graphs
 		$sql="select distinct gi.gitemid from graphs g,graphs_items gi,items i where i.itemid=gi.itemid and i.hostid=$templateid and g.graphid=gi.graphid";
 		$result=DBselect($sql);
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 9232b99d..128bd681 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -1690,7 +1690,7 @@
 		show_table2_h_delimiter();
 		echo "<select class=\"biginput\" name=\"actiontype\" size=\"1\" onChange=\"submit()\">";
 		echo "<option value=\"0\""; if($actiontype==0) echo " selected"; echo ">".S_SEND_MESSAGE;
-		echo "<option value=\"1\""; if($actiontype==1) echo " selected"; echo ">".S_REMOTE_COMMAND;
+		echo "<option value=\"1\" disabled "; if($actiontype==1) echo " selected"; echo ">".S_REMOTE_COMMAND;
 		echo "</select>";
 
 
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index 8e268a83..3907dc74 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -133,8 +133,8 @@
 		$result=DBselect($sql);
 		while($row=DBfetch($result))
 		{
-			add_template_linkage($hostid,$row["templateid"],$row["items"],$row["triggers"],$row["actions"],
-						$row["graphs"],$row["screens"]);
+			add_template_linkage($hostid,$row["templateid"],$row["items"],$row["triggers"],
+						$row["graphs"]);
 		}
 	}