- [DEV-108] Proxy configuration GUI

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

3 files changed, 13 insertions, 11 deletions

diff --git a/frontends/php/hosts.php b/frontends/php/hosts.php
index 50f524ac..0100530a 100644
--- a/frontends/php/hosts.php
+++ b/frontends/php/hosts.php
@@ -197,7 +197,7 @@ include_once "include/page_header.php";
 
 			$result = update_host($_REQUEST["hostid"],
 				$_REQUEST["host"],$_REQUEST["port"],$_REQUEST["status"],$useip,$_REQUEST["dns"],
-				$_REQUEST["ip"],$templates,$_REQUEST["newgroup"],$groups);
+				$_REQUEST["ip"],$_REQUEST["proxyid"],$templates,$_REQUEST["newgroup"],$groups);
 
 			$msg_ok 	= S_HOST_UPDATED;
 			$msg_fail 	= S_CANNOT_UPDATE_HOST;
@@ -207,7 +207,7 @@ include_once "include/page_header.php";
 		} else {
 			$hostid = add_host(
 				$_REQUEST["host"],$_REQUEST["port"],$_REQUEST["status"],$useip,$_REQUEST["dns"],
-				$_REQUEST["ip"],$templates,$_REQUEST["newgroup"],$groups);
+				$_REQUEST["ip"],$_REQUEST["proxyid"],$templates,$_REQUEST["newgroup"],$groups);
 
 			$msg_ok 	= S_HOST_ADDED;
 			$msg_fail 	= S_CANNOT_ADD_HOST;
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index adac2801..7a843557 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -182,7 +182,7 @@ require_once "include/items.inc.php";
 	 *
 	 *     NOTE: templates = array(id => name, id2 => name2, ...)
 	 */
-	function	db_save_host($host,$port,$status,$useip,$dns,$ip,$templates,$hostid=null)
+	function	db_save_host($host,$port,$status,$useip,$dns,$ip,$proxyid,$templates,$hostid=null)
 	{
 		if( !eregi('^'.ZBX_EREG_HOST_FORMAT.'$', $host) )
 		{
@@ -211,8 +211,8 @@ require_once "include/items.inc.php";
 		{
 			$hostid = get_dbid("hosts","hostid");
 			$result = DBexecute("insert into hosts".
-				" (hostid,host,port,status,useip,dns,ip,disable_until,available)".
-				" values ($hostid,".zbx_dbstr($host).",$port,$status,$useip,".zbx_dbstr($dns).",".zbx_dbstr($ip).",0,"
+				" (hostid,proxyid,host,port,status,useip,dns,ip,disable_until,available)".
+				" values ($hostid,$proxyid,".zbx_dbstr($host).",$port,$status,$useip,".zbx_dbstr($dns).",".zbx_dbstr($ip).",0,"
 				.HOST_AVAILABLE_UNKNOWN.")");
 		}
 		else
@@ -223,7 +223,7 @@ require_once "include/items.inc.php";
 				return false;
 			}
 
-			$result = DBexecute("update hosts set host=".zbx_dbstr($host).",".
+			$result = DBexecute("update hosts set proxyid=$proxyid,host=".zbx_dbstr($host).",".
 				"port=$port,useip=$useip,dns=".zbx_dbstr($dns).",ip=".zbx_dbstr($ip)." where hostid=$hostid");
 
 			update_host_status($hostid, $status);
@@ -254,9 +254,9 @@ require_once "include/items.inc.php";
 	 *
 	 *     NOTE: templates = array(id => name, id2 => name2, ...)
 	 */
-	function	add_host($host,$port,$status,$useip,$dns,$ip,$templates,$newgroup,$groups)
+	function	add_host($host,$port,$status,$useip,$dns,$ip,$proxyid,$templates,$newgroup,$groups)
 	{
-		$hostid = db_save_host($host,$port,$status,$useip,$dns,$ip,$templates);
+		$hostid = db_save_host($host,$port,$status,$useip,$dns,$ip,$proxyid,$templates);
 		if(!$hostid)
 			return $hostid;
 		else
@@ -286,7 +286,7 @@ require_once "include/items.inc.php";
 	 *
 	 *     NOTE: templates = array(id => name, id2 => name2, ...)
 	 */
-	function	update_host($hostid,$host,$port,$status,$useip,$dns,$ip,$templates,$newgroup,$groups)
+	function	update_host($hostid,$host,$port,$status,$useip,$dns,$ip,$proxyid,$templates,$newgroup,$groups)
 	{
 		$old_templates = get_templates_by_hostid($hostid);
 		$unlinked_templates = array_diff($old_templates, $templates);
@@ -299,7 +299,7 @@ require_once "include/items.inc.php";
 
 		$new_templates = array_diff($templates, $old_templates);
 
-		$result = db_save_host($host,$port,$status,$useip,$dns,$ip,$new_templates,$hostid);
+		$result = db_save_host($host,$port,$status,$useip,$dns,$ip,$proxyid,$new_templates,$hostid);
 		if(!$result)
 			return $result;
 
diff --git a/frontends/php/include/import.inc.php b/frontends/php/include/import.inc.php
index 696d6b8f..30c6151d 100644
--- a/frontends/php/include/import.inc.php
+++ b/frontends/php/include/import.inc.php
@@ -131,6 +131,7 @@
 							0, /* useip */
 							"", /* dns */
 							"", /* ip */
+							0,
 							array(),
 							null,
 							array());
@@ -193,9 +194,10 @@
 					if(!isset($data['useip']))	$data['useip'] = 0;
 					if(!isset($data['dns']))	$data['dns'] = "";
 					if(!isset($data['ip']))		$data['ip'] = "";
+					if(!isset($data['proxyid']))	$data['proxyid'] = "";
 
 					if(update_host($data['hostid'], $data['name'], $data['port'], $data['status'],
-						$data['useip'], $data['dns'], $data['ip'], $data['templates'], null, $data['groups']))
+						$data['useip'], $data['dns'], $data['ip'], $data['proxyid'], $data['templates'], null, $data['groups']))
 					{
 						info('Host ['.$data['name'].'] updated');
 					}