[checkmk-commits] Check_MK Git: check_mk: FIX: Nagios-Snapin: avoid duplicate slash in URL

Module: check_mk Branch: master Commit: 7ed65bd218f9b99e66a032740434856513e83942 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ed65bd218f9b9… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Apr 8 10:38:14 2011 +0200 FIX: Nagios-Snapin: avoid duplicate slash in URL --- ChangeLog | 1 + web/htdocs/sidebar.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b641de6..69fff94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ cases where OIDs are missing) Multisite: + * FIX: Nagios-Snapin: avoid duplicate slash in URL * FIX: custom_style_sheet now also honored by sidebar * Added snmp_uptime, uptime and printer_supply perfometers diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 57a8c8b..0d11e18 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -88,7 +88,7 @@ def iconbutton(what, url, target="side", handler="", name=""): html.write("<a href=\"%s\" %s %s><img class=iconbutton onmouseover=\"hilite_icon(this, 1)\" onmouseout=\"hilite_icon(this, 0)\" align=absmiddle src=\"%scheck_mk/images/button_%s_lo.png\"></a>\n " % (href, onclick, tg, defaults.url_prefix, what)) def nagioscgilink(text, target): - html.write("<li class=sidebar><a target=\"main\" class=link href=\"%s/nagios/cgi-bin/%s\">%s</a></li>" % \ + html.write("<li class=sidebar><a target=\"main\" class=link href=\"%snagios/cgi-bin/%s\">%s</a></li>" % \ (defaults.url_prefix, target, htmllib.attrencode(text))) def heading(text):