[checkmk-commits] Check_MK Git: check_mk: #1607 FIX check_http: Fixed broken links in escaped plugin output

Module: check_mk Branch: master Commit: 1a642346ce31bbde44ea7a57343b1b3b5faea81e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a642346ce31bb… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Dec 3 15:31:58 2014 +0100 #1607 FIX check_http: Fixed broken links in escaped plugin output --- .werks/1607 | 9 +++++++++ ChangeLog | 1 + web/htdocs/lib.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1607 b/.werks/1607 new file mode 100644 index 0000000..88c35af --- /dev/null +++ b/.werks/1607 @@ -0,0 +1,9 @@ +Title: check_http: Fixed broken links in escaped plugin output +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417617101 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index dfe8d90..f35b1ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 1585 FIX: Dashboard: Fixed mass client CPU load consumption when making graph dashlets too small... * 1586 FIX: Dashboard: Toggling edit/non-edit is now reflected when reloading the page * 1605 FIX: Fixed perfometer of check check_mk-printer_supply_ricoh + * 1607 FIX: check_http: Fixed broken links in escaped plugin output WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index cf06dd6..b372d7f 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -315,7 +315,7 @@ def format_plugin_output(output, row = None): if config.escape_plugin_output: output = re.sub("http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+", lambda p: '<a href="%s"><img class=pluginurl align=absmiddle title="%s" src="images/pluginurl.png"></a>' % - (p.group(0), p.group(0)), output) + (p.group(0).replace('&quot;', ''), p.group(0).replace('&quot;', '')), output) return output