[checkmk-commits] Check_MK Git: check_mk: #1263 FIX Fixed handling of urls in views

Module: check_mk Branch: master Commit: 900a006ba2b0bb0aaa590f673ef0d6ff765a2641 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=900a006ba2b0bb… Author: Bastian Kuhn &lt;bk(a)mathias-kettner.de&gt; Date: Mon Jul 6 13:10:11 2015 +0200 #1263 FIX Fixed handling of urls in views Commas after an url are now not longer part of the url. --- .werks/1263 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/lib.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1263 b/.werks/1263 new file mode 100644 index 0000000..bdaa52d --- /dev/null +++ b/.werks/1263 @@ -0,0 +1,11 @@ +Title: Fixed handling of urls in views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1436180901 + +Commas after an url are now not longer part of the url. + diff --git a/ChangeLog b/ChangeLog index e754917..f49966b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 2379 FIX: Plugin-Output: Fixed handling of URLs within output of check_http... * 2380 FIX: Custom Host Notes painter was showing service notes when used in service based views * 2393 FIX: Fixed exception "user_confdir" not set in case of exceptions during login + * 1263 FIX: Fixed handling of urls in views... WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 6893990..89da4cd 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -341,7 +341,7 @@ def format_plugin_output(output, row = None): output = output[:a] + "running on " + h + output[e+1:] if config.escape_plugin_output: - output = re.sub("http[s]?://[^\"'>\t\s\n]+", + output = re.sub("http[s]?://[^\"'>\t\s\n,]+", lambda p: '<a href="%s"><img class=pluginurl align=absmiddle title="%s" src="images/pluginurl.png"></a>' % (p.group(0).replace('&quot;', ''), p.group(0).replace('&quot;', '')), output)