diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-13 08:22:32 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-13 08:22:32 +0000 |
| commit | abaab90a1c9d3367f1ef636557cfe8e661716749 (patch) | |
| tree | 3e266e5523a635c45a7e7ef6d4571e7323f26065 /frontends/php/maps.php | |
| parent | 8901654871973b4267f106a97183001189189c82 (diff) | |
- merger rev. 4546:4547 of branches/1.4.j [developed data monitoring of multiple nodes]
git-svn-id: svn://svn.zabbix.com/trunk@4549 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/maps.php')
| -rw-r--r-- | frontends/php/maps.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/frontends/php/maps.php b/frontends/php/maps.php index 6fdff639..e0b55e17 100644 --- a/frontends/php/maps.php +++ b/frontends/php/maps.php @@ -50,9 +50,9 @@ include_once "include/page_header.php"; $all_maps = array(); - $result = DBselect("select sysmapid,name from sysmaps ". - " where ".DBid2nodeid("sysmapid")."=".$ZBX_CURNODEID. - " order by name"); + $result = DBselect('select sysmapid,name from sysmaps '. + ' where '.DBin_node('sysmapid'). + ' order by name'); while($row=DBfetch($result)) { if(!sysmap_accessiable($row["sysmapid"],PERM_READ_ONLY)) @@ -61,7 +61,9 @@ include_once "include/page_header.php"; if(!isset($all_maps[0])) $all_maps[0] = $row['sysmapid']; - $all_maps[$row['sysmapid']] = $row['name']; + $all_maps[$row['sysmapid']] = + get_node_name_by_elid($row['sysmapid']). + $row['name']; } if(isset($_REQUEST["sysmapid"]) && (!isset($all_maps[$_REQUEST["sysmapid"]]) || $_REQUEST["sysmapid"] == 0)) |