*** /usr/share/zabbix/hosts.php.orig	2013-08-21 15:59:26.000000000 +0200
--- /usr/share/zabbix/hosts.php	2013-10-01 11:32:26.000000000 +0200
***************
*** 680,683 ****
--- 680,684 ----
  	$table->setHeader(array(
  		new CCheckBox('all_hosts', null, "checkAll('".$form->getName()."', 'all_hosts', 'hosts');"),
+ 		_('Proxy'),
  		make_sorting_header(_('Name'), 'name'),
  		_('Applications'),
***************
*** 768,772 ****
  			' ('.$host['discoveries'].')');
  
! 		$description = array();
  		if ($host['proxy_hostid']) {
  			$proxy = API::Proxy()->get(array(
--- 769,773 ----
  			' ('.$host['discoveries'].')');
  
! 		$host_name = array();
  		if ($host['proxy_hostid']) {
  			$proxy = API::Proxy()->get(array(
***************
*** 775,782 ****
  			));
  			$proxy = reset($proxy);
! 			$description[] = $proxy['host'].':';
  		}
  
! 		$description[] = new CLink($host['name'], 'hosts.php?form=update&hostid='.$host['hostid'].url_param('groupid'));
  
  		$hostIF = ($interface['useip'] == INTERFACE_USE_IP) ? $interface['ip'] : $interface['dns'];
--- 776,785 ----
  			));
  			$proxy = reset($proxy);
! 			$proxy_name = $proxy['host'];
! 		} else {
! 			$proxy_name = '-';
  		}
  
! 		$host_name[] = new CLink($host['name'], 'hosts.php?form=update&hostid='.$host['hostid'].url_param('groupid'));
  
  		$hostIF = ($interface['useip'] == INTERFACE_USE_IP) ? $interface['ip'] : $interface['dns'];
***************
*** 848,852 ****
  		$table->addRow(array(
  			new CCheckBox('hosts['.$host['hostid'].']', null, null, $host['hostid']),
! 			$description,
  			$applications,
  			$items,
--- 851,856 ----
  		$table->addRow(array(
  			new CCheckBox('hosts['.$host['hostid'].']', null, null, $host['hostid']),
! 			$proxy_name,
! 			$host_name,
  			$applications,
  			$items,