Skip to content

Commit 6958488

Browse files
committed
Turn autoescaping off for everything in text/plain email templates.
- Legacy-Id: 2764
1 parent 7ce52ca commit 6958488

4 files changed

Lines changed: 18 additions & 15 deletions

File tree

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
From: The IESG <iesg-secretary@ietf.org>
1+
{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
22
To: IETF-Announce <ietf-announce@ietf.org>{% if cc %}
3-
Cc: {{ cc|safe }}{% endif %}
4-
Subject: {{ action_type }} Action: '{{ doc.title }}' to {{ status }} ({{ doc.filename_with_rev|safe }})
3+
Cc: {{ cc }}{% endif %}
4+
Subject: {{ action_type }} Action: '{{ doc.title }}' to {{ status }} ({{ doc.filename_with_rev }})
55

66
{% filter wordwrap:73 %}The IESG has approved the following document{{ docs|pluralize }}:{% for d in docs %}
77
- '{{ d.filled_title }}'
8-
({{ d.filename_with_rev|safe }}) as {{ d.full_status }}{% endfor %}
8+
({{ d.filename_with_rev }}) as {{ d.full_status }}{% endfor %}
99

1010
{{ made_by }}
1111

1212
{{ contacts }}
1313

1414
A URL of this {{ doc_type }} is:
15-
{{ doc_url|safe }}
15+
{{ doc_url }}
1616
{% endfilter %}
17+
{% endautoescape %}

ietf/templates/idrfc/issue_ballot_mail.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
To: Internet Engineering Steering Group <iesg@ietf.org>
1+
{% autoescape off %}To: Internet Engineering Steering Group <iesg@ietf.org>
22
From: IESG Secretary <iesg-secretary@ietf.org>
33
Reply-To: IESG Secretary <iesg-secretary@ietf.org>
4-
Subject: Evaluation: {{ doc.file_tag|safe }} to {{ status }}
4+
Subject: Evaluation: {{ doc.file_tag }} to {{ status }}
55

6-
{% filter wordwrap:73 %}Evaluation for {{ doc.file_tag|safe }} can be found at {{ doc_url }}
6+
{% filter wordwrap:73 %}Evaluation for {{ doc.file_tag }} can be found at {{ doc_url }}
77

88
{% if doc.lc_expiration_date %}Last call to expire on: {{ doc.lc_expiration_date }}
99

1010
{% endif %}{% endfilter %}
1111
Please return the full line with your position.
1212

1313
Yes No-Objection Discuss Abstain
14-
{% for ad, fmt in active_ad_positions %}{{ fmt|safe }}
14+
{% for ad, fmt in active_ad_positions %}{{ fmt }}
1515
{% endfor %}{% if inactive_ad_positions %}
1616

17-
{% for ad, fmt in inactive_ad_positions %}{{ fmt|safe }}
17+
{% for ad, fmt in inactive_ad_positions %}{{ fmt }}
1818
{% endfor %}{% endif %}
1919

2020
"Yes" or "No-Objection" positions from 2/3 of non-recused ADs,
@@ -33,7 +33,8 @@ DISCUSSES AND COMMENTS
3333
{% endif %}
3434
{% endfor %}{% endfilter %}
3535
---- following is a DRAFT of message to be sent AFTER approval ---
36-
{{ doc.idinternal.ballot.approval_text|safe }}{% if doc.idinternal.ballot.ballot_writeup %}
36+
{{ doc.idinternal.ballot.approval_text }}{% if doc.idinternal.ballot.ballot_writeup %}
3737

38-
{{ doc.idinternal.ballot.ballot_writeup|safe }}
38+
{{ doc.idinternal.ballot.ballot_writeup }}
3939
{% endif %}
40+
{% endautoescape%}

ietf/templates/liaisons/liaison_mail.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Title: {{ liaison.title }}
1+
{% autoescape off %}Title: {{ liaison.title }}
22
Submission Date: {{ liaison.submitted_date }}
33
URL of the IETF Web page: {% url liaison_detail object_id=liaison.pk %}
44
{% if liaison.deadline_date %}Please reply by {{ liaison.deadline_date }}{% endif %}
@@ -16,3 +16,4 @@ Attachment(s):
1616
{% empty %}
1717
No document has been attached
1818
{% endfor %}
19+
{% endautoescape %}

ietf/templates/liaisons/pending_liaison_mail.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following liaison statement will remain pending (and not public available) in the system until you approve it:
2-
2+
{% autoescape off %}
33
Title: {{ liaison.title }}
44
Submission Date: {{ liaison.submitted_date }}
55
URL of the IETF Web page: {% url liaison_approval_detail liaison.pk %}
@@ -18,6 +18,6 @@ Attachment(s):
1818
{% empty %}
1919
No document has been attached
2020
{% endfor %}
21-
21+
{% endautoescape %}
2222

2323
Please visit {% url liaison_approval_detail liaison.pk %} in order to approve the liaison statement.

0 commit comments

Comments
 (0)