- [DEV-108] GUI

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

6 files changed, 73 insertions, 81 deletions

diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index e0703aff..1324b8a5 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -142,6 +142,7 @@
 //	define('HOST_STATUS_UNREACHABLE',	2);
 	define('HOST_STATUS_TEMPLATE',		3);
 	define('HOST_STATUS_DELETED',		4);
+	define('HOST_STATUS_PROXY',		5);
 
 	define('HOST_AVAILABLE_UNKNOWN',	0);
 	define('HOST_AVAILABLE_TRUE',		1);
diff --git a/frontends/php/include/discovery.inc.php b/frontends/php/include/discovery.inc.php
index ec46a3b5..05e8b4e0 100644
--- a/frontends/php/include/discovery.inc.php
+++ b/frontends/php/include/discovery.inc.php
@@ -148,7 +148,7 @@
 		return $dcheckid;
 	}
 
-	function	add_discovery_rule($proxyid, $name, $iprange, $delay, $status, $dchecks)
+	function	add_discovery_rule($proxy_hostid, $name, $iprange, $delay, $status, $dchecks)
 	{
 		if( !validate_ip_range($iprange) )
 		{
@@ -158,8 +158,8 @@
 		}
 
 		$druleid = get_dbid('drules', 'druleid');
-		$result = DBexecute('insert into drules (druleid,proxyid,name,iprange,delay,status) '.
-			' values ('.$druleid.','.$proxyid.','.zbx_dbstr($name).','.zbx_dbstr($iprange).','.$delay.','.$status.')');
+		$result = DBexecute('insert into drules (druleid,proxy_hostid,name,iprange,delay,status) '.
+			' values ('.$druleid.','.$proxy_hostid.','.zbx_dbstr($name).','.zbx_dbstr($iprange).','.$delay.','.$status.')');
 
 		if($result)
 		{
@@ -173,7 +173,7 @@
 		return $result;
 	}
 
-	function	update_discovery_rule($druleid, $proxyid, $name, $iprange, $delay, $status, $dchecks)
+	function	update_discovery_rule($druleid, $proxy_hostid, $name, $iprange, $delay, $status, $dchecks)
 	{
 		if( !validate_ip_range($iprange) )
 		{
@@ -182,7 +182,7 @@
 		
 		}
 
-		$result = DBexecute('update drules set proxyid='.$proxyid.',name='.zbx_dbstr($name).',iprange='.zbx_dbstr($iprange).','.
+		$result = DBexecute('update drules set proxy_hostid='.$proxy_hostid.',name='.zbx_dbstr($name).',iprange='.zbx_dbstr($iprange).','.
 			'delay='.$delay.',status='.$status.' where druleid='.$druleid);
 
 		if($result)
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 4926b14d..b79963d6 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -178,7 +178,7 @@
 		
 		if(isset($_REQUEST['druleid']) && $rule_data && (!isset($_REQUEST["form_refresh"]) || isset($_REQUEST["register"])))
 		{
-			$proxyid	= $rule_data['proxyid'];
+			$proxy_hostid	= $rule_data['proxy_hostid'];
 			$name		= $rule_data['name'];
 			$iprange	= $rule_data['iprange'];
 			$delay		= $rule_data['delay'];
@@ -195,7 +195,7 @@
 		}
 		else
 		{
-			$proxyid	= get_request("proxyid",0);
+			$proxy_hostid	= get_request("proxy_hostid",0);
 			$name		= get_request('name','');
 			$iprange	= get_request('iprange','192.168.0.1-255');
 			$delay		= get_request('delay',3600);
@@ -210,12 +210,13 @@
 
 		$form->AddRow(S_NAME, new CTextBox('name', $name, 40));
 //Proxy
-		$cmbProxy = new CComboBox("proxyid", $proxyid);
+		$cmbProxy = new CComboBox("proxy_hostid", $proxy_hostid);
 
 		$cmbProxy->AddItem(0, S_NO_PROXY);
-		$db_proxies = DBselect('SELECT proxyid,name FROM proxies');
+		$db_proxies = DBselect('select hostid,host from hosts'.
+				' where status in ('.HOST_STATUS_PROXY.') and '.DBin_node('hostid'));
 		while ($db_proxy = DBfetch($db_proxies))
-			$cmbProxy->AddItem($db_proxy['proxyid'], $db_proxy['name']);
+			$cmbProxy->AddItem($db_proxy['hostid'], $db_proxy['host']);
 
 		$form->AddRow(S_DISCOVERY_BY_PROXY,$cmbProxy);
 //----------
@@ -4176,13 +4177,13 @@ include_once 'include/discovery.inc.php';
 
 		$newgroup	= get_request("newgroup","");
 
-		$host 	= get_request("host",	"");
-		$port 	= get_request("port",	get_profile("HOST_PORT",10050));
-		$status	= get_request("status",	HOST_STATUS_MONITORED);
-		$useip	= get_request("useip",	0);
-		$dns	= get_request("dns",	"");
-		$ip	= get_request("ip",	"0.0.0.0");
-		$proxyid= get_request("proxyid","");
+		$host 		= get_request("host",	"");
+		$port 		= get_request("port",	get_profile("HOST_PORT",10050));
+		$status		= get_request("status",	HOST_STATUS_MONITORED);
+		$useip		= get_request("useip",	0);
+		$dns		= get_request("dns",	"");
+		$ip		= get_request("ip",	"0.0.0.0");
+		$proxy_hostid	= get_request("proxy_hostid","");
 
 		$useprofile = get_request("useprofile","no");
 
@@ -4217,7 +4218,7 @@ include_once 'include/discovery.inc.php';
 
 		if(isset($_REQUEST["hostid"]) && !isset($_REQUEST["form_refresh"]))
 		{
-			$proxyid	= $db_host["proxyid"];
+			$proxy_hostid	= $db_host["proxy_hostid"];
 			$host		= $db_host["host"];
 			$port		= $db_host["port"];
 			$status		= $db_host["status"];
@@ -4335,12 +4336,13 @@ include_once 'include/discovery.inc.php';
 			$frmHost->AddRow(S_PORT,new CNumericBox("port",$port,5));	
 
 //Proxy
-			$cmbProxy = new CComboBox("proxyid", $proxyid);
+			$cmbProxy = new CComboBox("proxy_hostid", $proxy_hostid);
 
 			$cmbProxy->AddItem(0, S_NO_PROXY);
-			$db_proxies = DBselect('SELECT proxyid,name FROM proxies');
+			$db_proxies = DBselect('SELECT hostid,host FROM hosts'.
+					' where status in ('.HOST_STATUS_PROXY.') and '.DBin_node('hostid'));
 			while ($db_proxy = DBfetch($db_proxies))
-				$cmbProxy->AddItem($db_proxy['proxyid'], $db_proxy['name']);
+				$cmbProxy->AddItem($db_proxy['hostid'], $db_proxy['host']);
 
 			$frmHost->AddRow(S_MONITORED_BY_PROXY,$cmbProxy);
 //----------
@@ -4459,11 +4461,10 @@ include_once 'include/discovery.inc.php';
 		if(isset($_REQUEST["groupid"]) && !isset($_REQUEST["form_refresh"]))
 		{
 			$name=$group["name"];
-			$db_hosts=DBselect("SELECT distinct h.hostid,host FROM hosts h, hosts_groups hg".
-				" WHERE h.status<>".HOST_STATUS_DELETED.
-				" AND h.hostid=hg.hostid".
-				" AND hg.groupid=".$_REQUEST["groupid"].
-				" order by host");
+			$db_hosts=DBselect('SELECT distinct h.hostid,host FROM hosts h, hosts_groups hg'.
+					' WHERE h.status in ('.HOST_STATUS_MONITORED.','.HOST_STATUS_NOT_MONITORED.','.HOST_STATUS_TEMPLATE.')'.
+					' AND h.hostid=hg.hostid AND hg.groupid='.$_REQUEST['groupid'].
+					' order by host');
 			while($db_host=DBfetch($db_hosts))
 			{
 				if(uint_in_array($db_host["hostid"],$hosts)) continue;
@@ -4485,10 +4486,10 @@ include_once 'include/discovery.inc.php';
 		$frmHostG->AddRow(S_GROUP_NAME,new CTextBox("gname",$name,30));
 
 		$cmbHosts = new CListBox("hosts[]",$hosts,10);
-		$db_hosts=DBselect("SELECT distinct hostid,host FROM hosts".
-			" WHERE status<>".HOST_STATUS_DELETED.
-			" AND hostid in (".get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,get_current_nodeid()).")".
-			" order by host");
+		$db_hosts=DBselect('SELECT distinct hostid,host FROM hosts'.
+				' WHERE status in ('.HOST_STATUS_MONITORED.','.HOST_STATUS_NOT_MONITORED.','.HOST_STATUS_TEMPLATE.')'.
+				' AND hostid in ('.get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,get_current_nodeid()).')'.
+				' order by host');
 		while($db_host=DBfetch($db_hosts))
 		{
 			$cmbHosts->AddItem(
@@ -4523,58 +4524,58 @@ include_once 'include/discovery.inc.php';
 
 		$hosts = array();
 		$frm_title = S_PROXY;
-		if(isset($_REQUEST["proxyid"]))
+		if(isset($_REQUEST["hostid"]))
 		{
-			$proxy = get_proxy_by_proxyid($_REQUEST["proxyid"]);
-			$frm_title = S_PROXY." \"".$proxy["name"]."\"";
+			$proxy = get_host_by_hostid($_REQUEST["hostid"]);
+			$frm_title = S_PROXY." \"".$proxy["host"]."\"";
 		}
-		if(isset($_REQUEST["proxyid"]) && !isset($_REQUEST["form_refresh"]))
+		if(isset($_REQUEST["hostid"]) && !isset($_REQUEST["form_refresh"]))
 		{
-			$name=$proxy["name"];
+			$name=$proxy["host"];
 			$db_hosts=DBselect("SELECT hostid FROM hosts".
 				" WHERE status not in (".HOST_STATUS_DELETED.") ".
-				" AND proxyid=".$_REQUEST["proxyid"]);
+				" AND proxy_hostid=".$_REQUEST["hostid"]);
 			while($db_host=DBfetch($db_hosts))
 				array_push($hosts, $db_host["hostid"]);
 		}
 		else
 		{
-			$name=get_request("pname","");
+			$name=get_request("host","");
 		}
 		$frmHostG = new CFormTable($frm_title,"hosts.php");
 		$frmHostG->SetHelp("web.proxy.php");
 		$frmHostG->AddVar("config",get_request("config",5));
-		if(isset($_REQUEST["proxyid"]))
+		if(isset($_REQUEST["hostid"]))
 		{
-			$frmHostG->AddVar("proxyid",$_REQUEST["proxyid"]);
+			$frmHostG->AddVar("hostid",$_REQUEST["hostid"]);
 		}
 
-		$frmHostG->AddRow(S_PROXY_NAME,new CTextBox("pname",$name,30));
+		$frmHostG->AddRow(S_PROXY_NAME,new CTextBox("host",$name,30));
 
 		$cmbHosts = new CListBox("hosts[]",$hosts,10);
-		$db_hosts=DBselect("SELECT hostid,proxyid,host FROM hosts".
-			" WHERE status not in (".HOST_STATUS_DELETED.") ".
-			" AND hostid in (".get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,get_current_nodeid()).")".
-			" order by host");
+		$db_hosts=DBselect('select hostid,proxy_hostid,host from hosts'.
+			' where status in ('.HOST_STATUS_MONITORED.','.HOST_STATUS_NOT_MONITORED.') '.
+			' and hostid in ('.get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,get_current_nodeid()).')'.
+			' order by host');
 		while($db_host=DBfetch($db_hosts))
 		{
 			$cmbHosts->AddItem(
 					$db_host["hostid"],
 					get_node_name_by_elid($db_host["hostid"]).$db_host["host"],
 					NULL,
-					$db_host["proxyid"] == 0 || (isset($_REQUEST["proxyid"]) && $db_host["proxyid"] == $_REQUEST["proxyid"]));
+					$db_host["proxy_hostid"] == 0 || (isset($_REQUEST["hostid"]) && $db_host["proxy_hostid"] == $_REQUEST["hostid"]));
 		}
 		$frmHostG->AddRow(S_HOSTS,$cmbHosts);
 
 		$frmHostG->AddItemToBottomRow(new CButton("save",S_SAVE));
-		if(isset($_REQUEST["proxyid"]))
+		if(isset($_REQUEST["hostid"]))
 		{
 			$frmHostG->AddItemToBottomRow(SPACE);
 			$frmHostG->AddItemToBottomRow(new CButton("clone",S_CLONE));
 			$frmHostG->AddItemToBottomRow(SPACE);
 			$frmHostG->AddItemToBottomRow(
 				new CButtonDelete("Delete selected proxy?",
-					url_param("form").url_param("config").url_param("proxyid")
+					url_param("form").url_param("config").url_param("hostid")
 				)
 			);
 		}
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index 5973d7e6..f97eb553 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -181,7 +181,7 @@ require_once "include/items.inc.php";
 	 *
 	 *     NOTE: templates = array(id => name, id2 => name2, ...)
 	 */
-	function	db_save_host($host,$port,$status,$useip,$dns,$ip,$proxyid,$templates,$hostid=null)
+	function	db_save_host($host,$port,$status,$useip,$dns,$ip,$proxy_hostid,$templates,$hostid=null)
 	{
 		if( !eregi('^'.ZBX_EREG_HOST_FORMAT.'$', $host) )
 		{
@@ -210,8 +210,8 @@ require_once "include/items.inc.php";
 		{
 			$hostid = get_dbid("hosts","hostid");
 			$result = DBexecute("insert into hosts".
-				" (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,"
+				" (hostid,proxy_hostid,host,port,status,useip,dns,ip,disable_until,available)".
+				" values ($hostid,$proxy_hostid,".zbx_dbstr($host).",$port,$status,$useip,".zbx_dbstr($dns).",".zbx_dbstr($ip).",0,"
 				.HOST_AVAILABLE_UNKNOWN.")");
 		}
 		else
@@ -222,7 +222,7 @@ require_once "include/items.inc.php";
 				return false;
 			}
 
-			$result = DBexecute("update hosts set proxyid=$proxyid,host=".zbx_dbstr($host).",".
+			$result = DBexecute("update hosts set proxy_hostid=$proxy_hostid,host=".zbx_dbstr($host).",".
 				"port=$port,useip=$useip,dns=".zbx_dbstr($dns).",ip=".zbx_dbstr($ip)." where hostid=$hostid");
 
 			update_host_status($hostid, $status);
@@ -253,9 +253,9 @@ require_once "include/items.inc.php";
 	 *
 	 *     NOTE: templates = array(id => name, id2 => name2, ...)
 	 */
-	function	add_host($host,$port,$status,$useip,$dns,$ip,$proxyid,$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,$proxyid,$templates);
+		$hostid = db_save_host($host,$port,$status,$useip,$dns,$ip,$proxy_hostid,$templates);
 		if(!$hostid)
 			return $hostid;
 		else
@@ -285,7 +285,7 @@ require_once "include/items.inc.php";
 	 *
 	 *     NOTE: templates = array(id => name, id2 => name2, ...)
 	 */
-	function	update_host($hostid,$host,$port,$status,$useip,$dns,$ip,$proxyid,$templates,$newgroup,$groups)
+	function	update_host($hostid,$host,$port,$status,$useip,$dns,$ip,$proxy_hostid,$templates,$newgroup,$groups)
 	{
 		$old_templates = get_templates_by_hostid($hostid);
 		$unlinked_templates = array_diff($old_templates, $templates);
@@ -298,7 +298,7 @@ require_once "include/items.inc.php";
 
 		$new_templates = array_diff($templates, $old_templates);
 
-		$result = db_save_host($host,$port,$status,$useip,$dns,$ip,$proxyid,$new_templates,$hostid);
+		$result = db_save_host($host,$port,$status,$useip,$dns,$ip,$proxy_hostid,$new_templates,$hostid);
 		if(!$result)
 			return $result;
 
@@ -500,43 +500,45 @@ require_once "include/items.inc.php";
 		}
 	
 		if($proxyid==null)
-			$result = DBselect("select * from proxies where ".DBin_node('proxyid')." AND name=".zbx_dbstr($name));
+			$result = DBselect('select * from hosts where status in ('.HOST_STATUS_PROXY.')'.
+					' and '.DBin_node('hostid').' AND host='.zbx_dbstr($name));
 		else
-			$result = DBselect("select * from proxies where ".DBin_node('proxyid')." AND name=".zbx_dbstr($name).
-				" and proxyid<>$proxyid");
+			$result = DBselect('select * from hosts where status in ('.HOST_STATUS_PROXY.')'.
+					' and '.DBin_node('hostid').' AND host='.zbx_dbstr($name).
+					' and hostid<>'.$proxyid);
 		
 		if(DBfetch($result))
 		{
-			error("Group '$name' already exists");
+			error("Proxy '$name' already exists");
 			return false;
 		}
 		if($proxyid==null)
 		{
-			$proxyid=get_dbid("proxies","proxyid");
-			if(!DBexecute("insert into proxies (proxyid,name) values (".$proxyid.",".zbx_dbstr($name).")"))
+			$proxyid=get_dbid('hosts','hostid');
+			if(!DBexecute('insert into hosts (hostid,host,status)'.
+					' values ('.$proxyid.','.zbx_dbstr($name).','.HOST_STATUS_PROXY.')'))
 				return false;
 			return $proxyid;
-
 		}
 		else
-			return DBexecute("update proxies set name=".zbx_dbstr($name)." where proxyid=$proxyid");
+			return DBexecute('update hosts set host='.zbx_dbstr($name).' where hostid='.$proxyid);
 	}
 
 	function	delete_proxy($proxyid)
 	{
-		if(!DBexecute("update hosts set proxyid=0 where proxyid=$proxyid"))
+		if(!DBexecute("update hosts set proxy_hostid=0 where proxy_hostid=$proxyid"))
 			return false;
 
-		return DBexecute("delete from proxies where proxyid=$proxyid");
+		return DBexecute("delete from hosts where hostid=$proxyid");
 	}
 
 	function	update_hosts_by_proxyid($proxyid,$hosts=array())
 	{
-		DBexecute('update hosts set proxyid=0 where proxyid='.$proxyid);
+		DBexecute('update hosts set proxy_hostid=0 where proxy_hostid='.$proxyid);
 
 		foreach($hosts as $hostid)
 		{
-			DBexecute('update hosts set proxyid='.$proxyid.' where hostid='.$hostid);
+			DBexecute('update hosts set proxy_hostid='.$proxyid.' where hostid='.$hostid);
 		}
 	}
 
@@ -562,18 +564,6 @@ require_once "include/items.inc.php";
 		return $result;
 	}
 
-	function	get_proxy_by_proxyid($proxyid)
-	{
-		$result=DBselect("select * from proxies where proxyid=".$proxyid);
-		$row=DBfetch($result);
-		if($row)
-		{
-			return $row;
-		}
-		error("No proxies with proxyid=[$proxyid]");
-		return  false;
-	}
-
 	function get_host_by_itemid($itemid)
 	{
 		$sql="select h.* from hosts h, items i where i.hostid=h.hostid and i.itemid=$itemid";
diff --git a/frontends/php/include/import.inc.php b/frontends/php/include/import.inc.php
index 30c6151d..e3697ac9 100644
--- a/frontends/php/include/import.inc.php
+++ b/frontends/php/include/import.inc.php
@@ -194,10 +194,9 @@
 					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['proxyid'], $data['templates'], null, $data['groups']))
+						$data['useip'], $data['dns'], $data['ip'], 0, $data['templates'], null, $data['groups']))
 					{
 						info('Host ['.$data['name'].'] updated');
 					}
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 0c87f44a..e6488d23 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -687,6 +687,7 @@
 	'S_PROXY'=>				'Proxy',
 	'S_CREATE_PROXY'=>			'Create Proxy',
 	'S_PROXY_NAME'=>			'Proxy name',
+	'S_ACCESSED'=>				'Accessed',
 //	Host profiles
 	'S_HOST_PROFILE'=>			'Host profile',
 	'S_DEVICE_TYPE'=>			'Device type',