1.1 --- a/actions/EventAggregatorSummary.py Mon Jan 31 01:18:10 2011 +0100
1.2 +++ b/actions/EventAggregatorSummary.py Sun Feb 06 01:50:51 2011 +0100
1.3 @@ -17,6 +17,9 @@
1.4 from MoinMoin import wikiutil
1.5 import EventAggregatorSupport
1.6
1.7 +escape = EventAggregatorSupport.escape
1.8 +escattr = EventAggregatorSupport.escattr
1.9 +
1.10 Dependencies = ['pages']
1.11
1.12 # Action class and supporting functions.
1.13 @@ -42,7 +45,8 @@
1.14
1.15 selected = self._get_selected_for_list(category_pagename, category_pagenames)
1.16
1.17 - category_list.append('<option value="%s" %s>%s</option>' % (category_pagename, selected, category_name))
1.18 + category_list.append('<option value="%s" %s>%s</option>' % (
1.19 + escattr(category_pagename), selected, escape(category_name)))
1.20
1.21 # Initialise month lists and defaults.
1.22
1.23 @@ -73,8 +77,8 @@
1.24 descriptions = form.get("descriptions", [None])[0]
1.25
1.26 descriptions_list = [
1.27 - '<option value="%s" %s>%s</option>' % ("page", self._get_selected("page", descriptions), _("page")),
1.28 - '<option value="%s" %s>%s</option>' % ("comment", self._get_selected("comment", descriptions), _("comment"))
1.29 + '<option value="%s" %s>%s</option>' % ("page", self._get_selected("page", descriptions), escape(_("page"))),
1.30 + '<option value="%s" %s>%s</option>' % ("comment", self._get_selected("comment", descriptions), escape(_("comment")))
1.31 ]
1.32
1.33 # Format.
1.34 @@ -82,39 +86,39 @@
1.35 format = form.get("format", [None])[0]
1.36
1.37 format_list = [
1.38 - '<option value="%s" %s>%s</option>' % ("iCalendar", self._get_selected("iCalendar", format), _("iCalendar")),
1.39 - '<option value="%s" %s>%s</option>' % ("RSS", self._get_selected("RSS", format), _("RSS 2.0"))
1.40 + '<option value="%s" %s>%s</option>' % ("iCalendar", self._get_selected("iCalendar", format), escape(_("iCalendar"))),
1.41 + '<option value="%s" %s>%s</option>' % ("RSS", self._get_selected("RSS", format), escape(_("RSS 2.0")))
1.42 ]
1.43
1.44 right_arrow = unicode('\xe2\x86\x92', "utf-8")
1.45
1.46 d = {
1.47 "buttons_html" : buttons_html,
1.48 - "category_label" : _("Categories"),
1.49 + "category_label" : escape(_("Categories")),
1.50 "category_list" : "\n".join(category_list),
1.51 "start_month_list" : "\n".join(start_month_list),
1.52 - "start_label" : _("Start day (optional), month and year"),
1.53 - "start_day_default" : start_day_default,
1.54 - "start_year_default" : start_year_default,
1.55 - "start_criteria_label" : _("or special criteria"),
1.56 - "start_criteria_default": start_criteria_default,
1.57 - "start_eval_label" : right_arrow,
1.58 - "start_criteria_eval" : start_criteria_evaluated,
1.59 + "start_label" : escape(_("Start day (optional), month and year")),
1.60 + "start_day_default" : escattr(start_day_default),
1.61 + "start_year_default" : escattr(start_year_default),
1.62 + "start_criteria_label" : escape(_("or special criteria")),
1.63 + "start_criteria_default": escattr(start_criteria_default),
1.64 + "start_eval_label" : escattr(right_arrow),
1.65 + "start_criteria_eval" : escape(start_criteria_evaluated),
1.66 "end_month_list" : "\n".join(end_month_list),
1.67 - "end_label" : _("End day (optional), month and year"),
1.68 - "end_day_default" : end_day_default,
1.69 - "end_year_default" : end_year_default,
1.70 - "end_criteria_label" : _("or special criteria"),
1.71 - "end_criteria_default" : end_criteria_default,
1.72 + "end_label" : escape(_("End day (optional), month and year")),
1.73 + "end_day_default" : escattr(end_day_default),
1.74 + "end_year_default" : escattr(end_year_default),
1.75 + "end_criteria_label" : escape(_("or special criteria")),
1.76 + "end_criteria_default" : escattr(end_criteria_default),
1.77 "end_eval_label" : right_arrow,
1.78 - "end_criteria_eval" : end_criteria_evaluated,
1.79 - "descriptions_label" : _("Use descriptions from..."),
1.80 + "end_criteria_eval" : escape(end_criteria_evaluated),
1.81 + "descriptions_label" : escape(_("Use descriptions from...")),
1.82 "descriptions_list" : "\n".join(descriptions_list),
1.83 - "format_label" : _("Summary format"),
1.84 + "format_label" : escape(_("Summary format")),
1.85 "format_list" : "\n".join(format_list),
1.86 - "parent_label" : _("Parent page"),
1.87 - "parent_name" : form.get("parent", [""])[0],
1.88 - "resolution" : resolution,
1.89 + "parent_label" : escape(_("Parent page")),
1.90 + "parent_name" : escattr(form.get("parent", [""])[0]),
1.91 + "resolution" : escattr(resolution),
1.92 }
1.93
1.94 return '''