- split hostname and DNS name (Eugene)

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

5 files changed, 35 insertions, 47 deletions

diff --git a/frontends/php/include/export.inc.php b/frontends/php/include/export.inc.php
index 6f9ff48f..f9ff5ac9 100644
--- a/frontends/php/include/export.inc.php
+++ b/frontends/php/include/export.inc.php
@@ -29,6 +29,7 @@
 				'host'		=> 'name'),
 			'elements'	=> array(
 				'useip'		=> '',
+				'dns'		=> '',
 				'ip'		=> '',
 				'port'		=> '',
 				'status'	=> '')
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 33f527f1..d37405c2 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -3387,8 +3387,9 @@
 		$host 	= get_request("host",	"");
 		$port 	= get_request("port",	get_profile("HOST_PORT",10050));
 		$status	= get_request("status",	HOST_STATUS_MONITORED);
-		$useip	= get_request("useip",	"no");
-		$ip	= get_request("ip",	"");
+		$useip	= get_request("useip",	0);
+		$dns	= get_request("dns",	"");
+		$ip	= get_request("ip",	"0.0.0.0");
 
 		$useprofile = get_request("useprofile","no");
 
@@ -3427,7 +3428,8 @@
 			$host	= $db_host["host"];
 			$port	= $db_host["port"];
 			$status	= $db_host["status"];
-			$useip	= $db_host["useip"]==1 ? 'yes' : 'no';
+			$useip	= $db_host["useip"];
+			$dns	= $db_host["dns"];
 			$ip	= $db_host["ip"];
 
 // add groups
@@ -3468,10 +3470,6 @@
 		$clear_templates = array_diff($clear_templates,array_keys($templates));
 		asort($templates);
 
-		if($show_only_tmp){
-			$useip = "no";
-		}
-
 		$frmHost = new CFormTable($frm_title,"hosts.php");
 		$frmHost->SetHelp("web.hosts.host.php");
 		$frmHost->AddVar("config",get_request("config",0));
@@ -3509,22 +3507,21 @@
 // onChange does not work on some browsers: MacOS, KDE browser
 		if($show_only_tmp)
 		{
-			$useip = "no";
-			$frmHost->AddVar("useip",$useip);
+			$frmHost->AddVar("useip",0);
+			$frmHost->AddVar("ip","");
+			$frmHost->AddVar("dns","");
 		}
 		else
 		{
-			$frmHost->AddRow(S_USE_IP_ADDRESS,new CCheckBox("useip",$useip,"submit()"));
-		}
-
-		if($useip=="yes")
-		{
+			$frmHost->AddRow(S_DNS_NAME,new CTextBox("dns",$dns,"40"));
 			$frmHost->AddRow(S_IP_ADDRESS,new CTextBox("ip",$ip,"15"));
+
+			$cmbConnectBy = new CComboBox('useip', $useip);
+			$cmbConnectBy->AddItem(0, S_DNS_NAME);
+			$cmbConnectBy->AddItem(1, S_IP_ADDRESS);
+			$frmHost->AddRow(S_CONNECT_TO,$cmbConnectBy);
 		}
-		else
-		{
-			$frmHost->AddVar("ip",$ip);
-		}
+
 
 		if($show_only_tmp)
 		{
@@ -3536,11 +3533,10 @@
 		}
 		else
 		{
-			$frmHost->AddRow(S_PORT,new CTextBox("port",$port,6));	
+			$frmHost->AddRow(S_PORT,new CNumericBox("port",$port,5));	
 
 			$cmbStatus = new CComboBox("status",$status);
 			$cmbStatus->AddItem(HOST_STATUS_MONITORED,	S_MONITORED);
-//			$cmbStatus->AddItem(HOST_STATUS_TEMPLATE,	S_TEMPLATE);
 			$cmbStatus->AddItem(HOST_STATUS_NOT_MONITORED,	S_NOT_MONITORED);
 			$frmHost->AddRow(S_STATUS,$cmbStatus);	
 		}
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index ae1cf4db..1d7e785d 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -134,7 +134,7 @@ require_once "include/items.inc.php";
 		return false;
 	}
 
-	function	db_save_host($host,$port,$status,$useip,$ip,$templates,$hostid=null)
+	function	db_save_host($host,$port,$status,$useip,$dns,$ip,$templates,$hostid=null)
 	{
 		global $ZBX_CURNODEID;
 		
@@ -156,16 +156,12 @@ require_once "include/items.inc.php";
 			return false;
 		}
 
-		if($useip=="on" || $useip=="yes" || $useip==1)		$useip=1;
-		else							$useip=0;
-
-
 		if($hostid==null)
 		{
 			$hostid = get_dbid("hosts","hostid");
 			$result = DBexecute("insert into hosts".
-				" (hostid,host,port,status,useip,ip,disable_until,available)".
-				" values ($hostid,".zbx_dbstr($host).",$port,$status,$useip,".zbx_dbstr($ip).",0,"
+				" (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,"
 				.HOST_AVAILABLE_UNKNOWN.")");
 		}
 		else
@@ -177,7 +173,7 @@ require_once "include/items.inc.php";
 			}
 
 			$result = DBexecute("update hosts set host=".zbx_dbstr($host).",".
-				"port=$port,useip=$useip,ip=".zbx_dbstr($ip)." where hostid=$hostid");
+				"port=$port,useip=$useip,dns=".zbx_dbstr($dns).",ip=".zbx_dbstr($ip)." where hostid=$hostid");
 
 			update_host_status($hostid, $status);
 		}
@@ -194,9 +190,9 @@ require_once "include/items.inc.php";
 		return $result;
 	}
 
-	function	add_host($host,$port,$status,$useip,$ip,$templates,$newgroup,$groups)
+	function	add_host($host,$port,$status,$useip,$dns,$ip,$templates,$newgroup,$groups)
 	{
-		$hostid = db_save_host($host,$port,$status,$useip,$ip,$templates);
+		$hostid = db_save_host($host,$port,$status,$useip,$dns,$ip,$templates);
 		if(!$hostid)
 			return $hostid;
 		else
@@ -213,7 +209,7 @@ require_once "include/items.inc.php";
 		return	$hostid;
 	}
 
-	function	update_host($hostid,$host,$port,$status,$useip,$ip,$templates,$newgroup,$groups)
+	function	update_host($hostid,$host,$port,$status,$useip,$dns,$ip,$templates,$newgroup,$groups)
 	{
 		$old_templates = get_templates_by_hostid($hostid);
 		$unlinked_templates = array_diff($old_templates, $templates);
@@ -226,7 +222,7 @@ require_once "include/items.inc.php";
 
 		$new_templates = array_diff($templates, $old_templates);
 
-		$result = db_save_host($host,$port,$status,$useip,$ip,$new_templates,$hostid);
+		$result = db_save_host($host,$port,$status,$useip,$dns,$ip,$new_templates,$hostid);
 		if(!$result)
 			return $result;
 
diff --git a/frontends/php/include/import.inc.php b/frontends/php/include/import.inc.php
index 07966508..2ee2eb41 100644
--- a/frontends/php/include/import.inc.php
+++ b/frontends/php/include/import.inc.php
@@ -113,8 +113,9 @@
 							$data['name'],
 							10050,
 							HOST_STATUS_TEMPLATE,
-							'no',
-							0,
+							0, /* useip */
+							"", /* dns */
+							"", /* ip */
 							array(),
 							null,
 							array());
@@ -169,18 +170,12 @@
 					
 					if(!isset($data['port']))	$data['port']	= 10050;
 					if(!isset($data['status']))	$data['status']	= 0;
-					if(!isset($data['ip']))
-					{
-						$data['useip']	= 'no';
-						$data['ip']	= 0;
-					}
-					else
-					{
-						$data['useip']	= 'yes';
-					}
+					if(!isset($data['useip']))	$data['useip'] = 0;
+					if(!isset($data['dns']))	$data['dns'] = "";
+					if(!isset($data['ip']))		$data['ip'] = "";
 
 					if(update_host($data['hostid'], $data['name'], $data['port'], $data['status'],
-						$data['useip'], $data['ip'], $data['templates'], null, $data['groups']))
+						$data['useip'], $data['dns'], $data['ip'], $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 0479e18e..a8464b85 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -519,6 +519,8 @@
 	"S_HOSTS_BIG"=>				"HOSTS",
 	"S_HOST"=>				"Host",
 	"S_HOST_BIG"=>				"HOST",
+	"S_CONNECT_TO"=>			"Connect to",
+	"S_DNS"=>				"DNS",
 	"S_IP"=>				"IP",
 	"S_PORT"=>				"Port",
 	"S_MONITORED"=>				"Monitored",
@@ -530,10 +532,8 @@
 	"S_GROUPS"=>				"Groups",
 	"S_NO_GROUPS_DEFINED"=>			"No groups defined",
 	"S_NEW_GROUP"=>				"New group",
-	"S_USE_IP_ADDRESS"=>			"Use IP address",
+	"S_DNS_NAME"=>				"DNS name",
 	"S_IP_ADDRESS"=>			"IP address",
-//	"S_USE_THE_HOST_AS_A_TEMPLATE"=>		"Use the host as a template",
-//	"S_USE_TEMPLATES_OF_THIS_HOST"=>	"Use templates of this host",
 	"S_LINK_WITH_TEMPLATE"=>		"Link with Template",
 	"S_USE_PROFILE"=>			"Use profile",
 	"S_DELETE_SELECTED_HOST_Q"=>		"Delete selected host?",