From e5ef8796293a7d36face4704fb59831e1a3d4f47 Mon Sep 17 00:00:00 2001
From: hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>
Date: Mon, 19 Sep 2005 16:57:19 +0000
Subject:  - added support of macros $1,..., $9 (Alexei)

git-svn-id: svn://svn.zabbix.com/trunk@2061 97f52cf1-0a1b-0410-bd0e-c28be96e8082
---
 frontends/php/screenedit.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'frontends/php/screenedit.php')

diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php
index ba7ed66c..b2555041 100644
--- a/frontends/php/screenedit.php
+++ b/frontends/php/screenedit.php
@@ -154,13 +154,13 @@
 				show_table2_v_delimiter();
 				echo nbsp(S_PARAMETER);
 				show_table2_h_delimiter();
-				$result=DBselect("select h.host,i.description,i.itemid from hosts h,items i where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 order by h.host,i.description");
+				$result=DBselect("select h.host,i.description,i.itemid,i.key_ from hosts h,items i where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 order by h.host,i.description");
 				echo "<select name=\"resourceid\" size=1>";
 				echo "<OPTION VALUE='0'>(none)";
 				for($i=0;$i<DBnum_rows($result);$i++)
 				{
 					$host_=DBget_field($result,$i,0);
-					$description_=DBget_field($result,$i,1);
+					$description_=item_description(DBget_field($result,$i,1),DBget_field($result,$i,3));
 					$itemid_=DBget_field($result,$i,2);
 					echo "<OPTION VALUE='$itemid_' ".iif($resourceid==$itemid_,"selected","").">$host_: $description_";
 				}
@@ -172,13 +172,13 @@
 				show_table2_v_delimiter();
 				echo nbsp(S_PARAMETER);
 				show_table2_h_delimiter();
-				$result=DBselect("select h.host,i.description,i.itemid from hosts h,items i where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 order by h.host,i.description");
+				$result=DBselect("select h.host,i.description,i.itemid,i.key_ from hosts h,items i where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 order by h.host,i.description");
 				echo "<select name=\"resourceid\" size=1>";
 				echo "<OPTION VALUE='0'>(none)";
 				for($i=0;$i<DBnum_rows($result);$i++)
 				{
 					$host_=DBget_field($result,$i,0);
-					$description_=DBget_field($result,$i,1);
+					$description_=item_description(DBget_field($result,$i,1),DBget_field($result,$i,3));
 					$itemid_=DBget_field($result,$i,2);
 					echo "<OPTION VALUE='$itemid_' ".iif($resourceid==$itemid_,"selected","").">$host_: $description_";
 				}
-- 
cgit