summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--TODO2
-rw-r--r--frontends/php/include/config.inc.php2
-rw-r--r--frontends/php/sysmap.php2
4 files changed, 4 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 66b90132..bd6e1e1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
Changes for 1.1alpha5:
-
+
+ - fixed mouse navigation for multiple maps in one screen (Alexei)
- fixed unmodified item parameter "Keep trends (in days)" (Alexei)
- fixed support of negative values for SNMP integers (Alexei)
- added support of functiona dayofweek() for triggers (Alexei)
diff --git a/TODO b/TODO
index 1422e12b..15a80e3f 100644
--- a/TODO
+++ b/TODO
@@ -14,11 +14,9 @@ ZABBIX 1.1:
- disk stats under Linux 2.6.x
- handle unavailability of MySQL gracefully
- - check, if alerts are generated in 1.1
- check SUSE 9.2 startup scripts. Parameter -u is misplaced.
- get rid of limit of user defined parameters for agent
- test everything on 64bit platforms:
- - fix multiple maps on one screen
- apply patches for DNS checks
TKOM:
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index d27de304..88f739ba 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -4772,7 +4772,7 @@ echo "</head>";
function get_map_imagemap($sysmapid)
{
- $map="\n<map name=links>";
+ $map="\n<map name=links$sysmapid"."_".rand(0,100000).">";
$result=DBselect("select h.host,sh.shostid,sh.sysmapid,sh.hostid,sh.label,sh.x,sh.y,h.status,sh.icon,sh.url from sysmaps_hosts sh,hosts h where sh.sysmapid=$sysmapid and h.hostid=sh.hostid");
for($i=0;$i<DBnum_rows($result);$i++)
{
diff --git a/frontends/php/sysmap.php b/frontends/php/sysmap.php
index 4d9fd4f8..df4bc886 100644
--- a/frontends/php/sysmap.php
+++ b/frontends/php/sysmap.php
@@ -82,7 +82,7 @@
echo "<TD ALIGN=CENTER>";
if(isset($_GET["sysmapid"]))
{
- $map="\n<map name=links>";
+ $map="\n<map name=links".$_GET["sysmapid"]."_".rand(0,100000).">";
$result=DBselect("select h.host,sh.shostid,sh.sysmapid,sh.hostid,sh.label,sh.x,sh.y,h.status from sysmaps_hosts sh,hosts h where sh.sysmapid=".$_GET["sysmapid"]." and h.hostid=sh.hostid");
for($i=0;$i<DBnum_rows($result);$i++)
{