- [DEV-137] fixes in template linkage. Tnx to Palmertree. (Artem)

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

6 files changed, 16 insertions, 21 deletions

diff --git a/frontends/php/hosts.php b/frontends/php/hosts.php
index 9babf324..0b7c0f2d 100644
--- a/frontends/php/hosts.php
+++ b/frontends/php/hosts.php
@@ -179,7 +179,6 @@ include_once 'include/page_header.php';
 								$host['ip'],$host['proxy_hostid'],$templates_tmp,null,$host_groups);
 			}
 //----------
-
 			$result = DBend($result);
 			
 			show_messages($result, S_LINK_TO_TEMPLATE, S_CANNOT_LINK_TO_TEMPLATE);
@@ -543,7 +542,7 @@ include_once 'include/page_header.php';
 		while($db_host=DBfetch($db_hosts)){		
 			if(!uint_in_array($db_host["hostid"],$hosts)) continue;
 
-			$host=get_host_by_hostid($db_host["hostid"]);
+			$host = get_host_by_hostid($db_host["hostid"]);
 			$result &= update_host_status($db_host["hostid"],$status);
 			
 			if($result){
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index b30763e5..57a675ea 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -172,15 +172,14 @@ require_once "include/httptest.inc.php";
 	 *
 	 *     NOTE: templates = array(id => name, id2 => name2, ...)
 	 */
-	function	db_save_host($host,$port,$status,$useip,$dns,$ip,$proxy_hostid,$templates,$hostid=null){
-		if( !eregi('^'.ZBX_EREG_HOST_FORMAT.'$', $host) )
-		{
+	function db_save_host($host,$port,$status,$useip,$dns,$ip,$proxy_hostid,$templates,$hostid=null){
+		
+		if(!eregi('^'.ZBX_EREG_HOST_FORMAT.'$', $host)){
 			error("Incorrect characters used for Hostname");
 			return false;
 		}
 
- 		if ( !empty($dns) && !eregi('^'.ZBX_EREG_DNS_FORMAT.'$', $dns)) 
-		{
+ 		if(!empty($dns) && !eregi('^'.ZBX_EREG_DNS_FORMAT.'$', $dns)){
 			error("Incorrect characters used for DNS");
 			return false;
 		}
@@ -229,7 +228,7 @@ require_once "include/httptest.inc.php";
 
 		if($result) $result = $hostid;
 		
-		return $result;
+	return $result;
 	}
 
 	/*
@@ -245,7 +244,7 @@ require_once "include/httptest.inc.php";
 	 *
 	 *     NOTE: templates = array(id => name, id2 => name2, ...)
 	 */
-	function	add_host($host,$port,$status,$useip,$dns,$ip,$proxy_hostid,$templates,$newgroup,$groups){
+	function add_host($host,$port,$status,$useip,$dns,$ip,$proxy_hostid,$templates,$newgroup,$groups){
 		$hostid = db_save_host($host,$port,$status,$useip,$dns,$ip,$proxy_hostid,$templates);
 		if(!$hostid)
 			return $hostid;
@@ -287,7 +286,7 @@ require_once "include/httptest.inc.php";
 
 		$new_templates = array_diff($templates, $old_templates);
 
-		$result = db_save_host($host,$port,$status,$useip,$dns,$ip,$proxy_hostid,$new_templates,$hostid);
+		$result = (bool) db_save_host($host,$port,$status,$useip,$dns,$ip,$proxy_hostid,$new_templates,$hostid);
 		if(!$result)
 			return $result;
 
@@ -298,7 +297,7 @@ require_once "include/httptest.inc.php";
 			sync_host_with_templates($hostid,array_keys($new_templates));
 		}
 
-		return	$result;
+	return	$result;
 	}
 
 	/*
@@ -603,8 +602,7 @@ require_once "include/httptest.inc.php";
 					' and status in ('.HOST_STATUS_MONITORED.','.HOST_STATUS_NOT_MONITORED.')'
 					);
 		}
-		else
-		{
+		else{
 			return 1;
 		}
 	}
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php
index ee13f9b2..5552f4a5 100644
--- a/frontends/php/include/items.inc.php
+++ b/frontends/php/include/items.inc.php
@@ -284,7 +284,7 @@
 			DBexecute('INSERT INTO items_applications (itemappid,itemid,applicationid) VALUES('.$itemappid.','.$itemid.','.$appid.')');
 		}
 
-		info('Added new item '.$host['host'].':$key');
+		info('Added new item '.$host['host'].':'.$key);
 
 // add items to child hosts
 
@@ -473,8 +473,7 @@
 
 		$item_data = get_item_by_itemid($itemid);
 
-		foreach($restore_rules as $var_name => $info)
-		{
+		foreach($restore_rules as $var_name => $info){
 			if (!isset($info['db_varname'])) $info['db_varname'] = $var_name;
 
 			if ($item_data['type'] == ITEM_TYPE_HTTPTEST && !isset($info['httptest']))
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index d2b6a68c..575278cd 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -1417,7 +1417,6 @@
 
 		delete_dependencies_by_triggerid($triggerid);
 
-
 		foreach($deps as $id => $triggerid_up){
 			if(!$result2=add_trigger_dependency($triggerid, $triggerid_up)){
 				error(S_INCORRECT_DEPENDENCY.' ['.expand_trigger_description($triggerid_up).']');
diff --git a/frontends/php/items.php b/frontends/php/items.php
index a41581df..ae6f79a9 100644
--- a/frontends/php/items.php
+++ b/frontends/php/items.php
@@ -412,7 +412,7 @@ include_once "include/page_header.php";
 		$applications = get_request("applications",array());
 
 		$delay_flex = get_request('delay_flex',array());
-		$db_delay_flex = "";
+		$db_delay_flex = '';
 		foreach($delay_flex as $val)
 			$db_delay_flex .= $val['delay'].'/'.$val['period'].';';
 		$db_delay_flex = trim($db_delay_flex,";");
diff --git a/frontends/php/triggers.php b/frontends/php/triggers.php
index 07d0ed26..96635cb3 100644
--- a/frontends/php/triggers.php
+++ b/frontends/php/triggers.php
@@ -241,7 +241,7 @@ include_once "include/page_header.php";
 			else{ /* groups */
 				$hosts_ids = array();
 				$group_ids = '';
-				foreach($_REQUEST['copy_targetid'] as $group_id){
+				foreach($_REQUEST['copy_targetid'] as $id => $group_id){
 					$group_ids .= $group_id.',';
 				}
 				$group_ids = trim($group_ids,',');
@@ -289,7 +289,7 @@ include_once "include/page_header.php";
 		$result = false;
 		
 		DBstart();
-		foreach($_REQUEST["g_triggerid"] as $triggerid){
+		foreach($_REQUEST["g_triggerid"] as $id => $triggerid){
 			if(!check_right_on_trigger_by_triggerid(null, $triggerid)) continue;
 
 			$res = DBselect('SELECT triggerid FROM triggers t WHERE t.triggerid='.zbx_dbstr($triggerid));
@@ -314,7 +314,7 @@ include_once "include/page_header.php";
 		$result = false;
 		
 		DBstart();
-		foreach($_REQUEST["g_triggerid"] as $triggerid){
+		foreach($_REQUEST["g_triggerid"] as $id => $triggerid){
 			if(!check_right_on_trigger_by_triggerid(null, $triggerid)) continue;
 
 			$res=DBselect("SELECT triggerid FROM triggers t WHERE t.triggerid=".zbx_dbstr($triggerid));