16 Dec
2011
16 Dec
'11
12:17 p.m.
Module: check_mk
Branch: master
Commit: 719af387b776151e645ca50201e0fe1c3e07941e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=719af387b77615…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Dec 16 12:17:30 2011 +0100
FIX: quote # in PNP image links also
---
ChangeLog | 1 +
web/htdocs/js/check_mk.js | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cf6d929..92239e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -106,6 +106,7 @@
* FIX: fix row highlight after status page reload
* FIX: single dataset layout honors column header settings
* FIX: quote '#' in PNP links (when # is contained in services)
+ * FIX: quote '#' in PNP image links also
Checks & Agents:
* FIX: lnx_if: assume interfaces as up if ethtool is missing or
diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js
index 6e9aae2..f0ff5e3 100644
--- a/web/htdocs/js/check_mk.js
+++ b/web/htdocs/js/check_mk.js
@@ -347,7 +347,7 @@ function pnp_response_handler(data, code) {
response = eval(code);
for(var i = 0; i < response.length; i++) {
var view = data['view'] == '' ? '0' :
data['view'];
- create_graph(data, '&' +
response[i]['image_url'].replace('&view='+view, ''));
+ create_graph(data, '&' +
response[i]['image_url'].replace('#',
'%23').replace('&view='+view, ''));
}
view = null;
i = null;
@@ -395,8 +395,8 @@ function render_pnp_graphs(container, site, host, service, pnpview,
base_url, pn
'pnp_url': pnp_url, 'site': site,
'host': host, 'service': service,
'with_link': with_link, 'view': pnpview};
- get_url(pnp_url + 'index.php/json?&host=' + host + '&srv=' +
service + '&source=0&view=' + pnpview,
- pnp_response_handler, data,
pnp_error_response_handler);
+ get_url(pnp_url + 'index.php/json?&host=' + encodeURIComponent(host) +
'&srv=' + encodeURIComponent(service) + '&source=0&view=' +
pnpview,
+ pnp_response_handler, data, pnp_error_response_handler);
}
// ----------------------------------------------------------------------------