- split hostname and DNS name (Eugene)

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

1 files changed, 7 insertions, 12 deletions

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');
 					}