diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2002-07-22 06:44:04 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2002-07-22 06:44:04 +0000 |
| commit | 45108597411d23e7030e3c99befb8eeb4cb61e66 (patch) | |
| tree | e86f35b8c463abb9e4ac513a05358c2da34a5f48 /frontends/php/map.php | |
| parent | e5b52615a7de5b7be7bcb55d6b520d203787ff61 (diff) | |
| download | zabbix-45108597411d23e7030e3c99befb8eeb4cb61e66.tar.gz zabbix-45108597411d23e7030e3c99befb8eeb4cb61e66.tar.xz zabbix-45108597411d23e7030e3c99befb8eeb4cb61e66.zip | |
Better support of %s in trigger descriptions.
git-svn-id: svn://svn.zabbix.com/trunk@437 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/map.php')
| -rw-r--r-- | frontends/php/map.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/frontends/php/map.php b/frontends/php/map.php index 879c49ab..f42d8a0d 100644 --- a/frontends/php/map.php +++ b/frontends/php/map.php @@ -116,8 +116,13 @@ if($count==1) { $color=$red; - $result1=DBselect("select t.description from items i,functions f,triggers t,hosts h where h.hostid=i.hostid and i.hostid=$hostid and i.itemid=f.itemid and f.triggerid=t.triggerid and t.value=1 and t.status=0 and h.status in (0,2) and i.status=0"); + $result1=DBselect("select t.description,t.triggerid from items i,functions f,triggers t,hosts h where h.hostid=i.hostid and i.hostid=$hostid and i.itemid=f.itemid and f.triggerid=t.triggerid and t.value=1 and t.status=0 and h.status in (0,2) and i.status=0"); $label=DBget_field($result1,0,0); + + if( strstr($label,"%s")) + { + $label=expand_trigger_description(DBget_field($result1,0,1)); + } } else if($count>1) { |