Module: check_mk
Branch: master
Commit: 3ddf1b99d98ab8148a5831c4d770641a333ff53f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ddf1b99d98ab8…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Apr 9 16:17:39 2014 +0200
Add three missing attrencodes
---
web/htdocs/index.py | 6 +++---
web/htdocs/views.py | 6 +++---
web/htdocs/wato.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/web/htdocs/index.py b/web/htdocs/index.py
index d18635a..0f1b25e 100644
--- a/web/htdocs/index.py
+++ b/web/htdocs/index.py
@@ -308,15 +308,15 @@ def handler(req, fields = None, profiling = True):
html.unplug()
apache.log_error("%s %s %s" % (req.uri, _('Internal error') +
':', e), apache.APLOG_ERR) # log in all cases
if plain_error:
- html.write(_("Internal error") + ": %s\n" % e)
+ html.write(_("Internal error") + ": %s\n" %
html.attrencode(e))
elif not fail_silently:
html.header(_("Internal error"))
if config.debug:
html.show_error("%s: %s<pre>%s</pre>" %
- (_('Internal error'), e, format_exception()))
+ (_('Internal error'), html.attrencode(e),
html.attrencode(format_exception())))
else:
url = html.makeuri([("debug", "1")])
- html.show_error("%s: %s (<a
href=\"%s\">%s</a>)" % (_('Internal error') + ':',
e, url, _('Retry with debug mode')))
+ html.show_error("%s: %s (<a
href=\"%s\">%s</a>)" % (_('Internal error') + ':',
html.attrencode(e), url, _('Retry with debug mode')))
html.footer()
response_code = apache.OK
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index dd3d124..c7fd5e3 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -492,10 +492,10 @@ def page_edit_views(msg=None):
html.write('<td>')
title = view['title']
if not view["hidden"]:
- html.write("<a
href=\"view.py?view_name=%s\">%s</a>" % (viewname, title))
+ html.write("<a
href=\"view.py?view_name=%s\">%s</a>" % (viewname,
html.attrencode(title)))
else:
- html.write(title)
- html.help(view['description'])
+ html.write(html.attrencode(title))
+ html.help(html.attrencode(view['description']))
html.write("</td>")
# Datasource
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index f15f138..785e332 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -15734,7 +15734,7 @@ def mode_bi_edit_rule(phase):
if new:
return _("BI - Create New Rule")
else:
- return _("BI - Edit Rule") + " " + ruleid
+ return _("BI - Edit Rule") + " " +
html.attrencode(ruleid)
elif phase == "buttons":