Skip to content

Commit 2c1d736

Browse files
pasieronenpasieronen
committed
Merged Tony's safe/escape fixes for meeting/idtracker templates (Django 1.x)
 - Legacy-Id: 1817
1 parent bef1219 commit 2c1d736

8 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎ietf/templates/idtracker/document_entry.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
{% else %}
1616
<td></td><td></td>
1717
{% endif %}
18-
<td>{{ doc.document.title }} ({{ doc.document.intended_status }})</td></tr>
18+
<td>{{ doc.document.title|escape }} ({{ doc.document.intended_status|escape }})</td></tr>
1919
<tr><td></td><td></td><td><a href="{{ doc.document.doclink }}">{{ doc.document.displayname|safe }}</a></td></tr>
2020
{% if doc.primary_flag %}
2121
<tr><td></td><td>Token:</td><td><a href="mailto:{{ doc.token_email|urlencode }}">{{ doc.token_name }}</a></td></tr>
2222
{% if doc.note %}
23-
<tr><td></td><td>Note:</td><td>{{ doc.note|urlize }}</td></tr>
23+
<tr><td></td><td>Note:</td><td>{{ doc.note|safe|urlize }}</td></tr>
2424
{% endif %}
2525
{% endif %}

‎ietf/templates/idtracker/documentcomment_detail.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1 class="first">Comment on {{ object.document.document.displayname_with_link|s
3434
<span class="{{ object.get_ballot_display }}">[IESG Evaluation {{ object.get_ballot_display|upper }}] </span>
3535
{% endif %}
3636

37-
<pre>{{ object.comment_text|wrap_long_lines }}</pre></td></tr>
37+
<pre>{{ object.comment_text|wrap_long_lines|escape }}</pre></td></tr>
3838
</table>
3939

4040
<form action="."><p><input type="button" value="Back" onClick="history.go(-1)"/></p></form>

‎ietf/templates/idtracker/idinternal_detail.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ <h1>Comment Log [<a href="/feed/comments/{{ object.document.filename }}/">atom f
203203
<span class="{{ comment.get_ballot_display }}">[IESG Evaluation {{ comment.get_ballot_display|upper }}] </span>
204204
{% endif %}
205205

206-
{{ comment.comment_text|removetags:"b br"|truncatewords_html:"20" }}
206+
{{ comment.comment_text|removetags:"b br"|truncatewords_html:"20"|escape }}
207207
[<a href="{{ comment.get_absolute_url }}">more</a>]
208208
</td>
209209

‎ietf/templates/idtracker/states.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ <h1 class="first">Main I-D States</h1>
2727

2828
{% for state in states %}
2929
<tr class="states">
30-
<td class="state">{{ state.state }}</td>
31-
<td>{{ state.description }}</td>
30+
<td class="state">{{ state.state|escape }}</td>
31+
<td>{{ state.description|escape }}</td>
3232
<td>
3333
<ul class="states">
3434
{% for next in state.nextstate.all %}
@@ -47,11 +47,11 @@ <h1>Sub States</h1>
4747

4848
{% for substate in substates %}
4949
<tr class="states">
50-
<td class="state">{{ substate.sub_state }}</td>
51-
<td>{{ substate.description }}</td>
50+
<td class="state">{{ substate.sub_state|escape }}</td>
51+
<td>{{ substate.description|escape }}</td>
5252
</tr>
5353
{% endfor %}
5454
</table>
5555

5656
{% endblock %}
57-
css
57+
css

‎ietf/templates/meeting/agenda.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h4>{{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting_date|date:"F j, Y" }
3232
<tr>
3333
<td colspan="4">
3434
{{ slot.registration.time_desc }} {{ slot.registration.name }}
35-
{% if venue.reg_area_name %} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{ venue.reg_area_name|slugify }}">{{ venue.reg_area_name }}</a>{% endif %}
35+
{% if venue.reg_area_name %} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{ venue.reg_area_name|slugify }}">{{ venue.reg_area_name|escape }}</a>{% endif %}
3636
</td>
3737
</tr>
3838
{% endif %}
@@ -43,7 +43,7 @@ <h4>{{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting_date|date:"F j, Y" }
4343
<td colspan="4">
4444
<br />
4545
{{ slot.break_info.time_desc }} {{ slot.break_info.name }}
46-
{% if venue.break_area_name and slot.break_info.show_break_location %} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{ venue.break_area_name|slugify }}">{{ venue.break_area_name }}</a>{% endif %}
46+
{% if venue.break_area_name and slot.break_info.show_break_location %} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{ venue.break_area_name|slugify }}">{{ venue.break_area_name|escape }}</a>{% endif %}
4747
</td>
4848
</tr>
4949
{% endif %}

‎ietf/templates/meeting/agenda.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
{% for slot in timeslots %}{% ifchanged %}
1010

1111
{{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting_date|date:"F j, Y" }}{% if slot.reg_info %}
12-
{{ slot.registration.time_desc }} {{ slot.registration.name }}{% if venue.reg_area_name %} - {{ venue.reg_area_name }}{% endif %}{% endif %}
13-
{% endifchanged %}{% if slot.session_name %}{% if slot.break_info %}{{ slot.break_info.time_desc }} {{ slot.break_info.name }}{% if venue.break_area_name and slot.break_info.show_break_location %} - {{ venue.break_area_name }}{% endif %}
12+
{{ slot.registration.time_desc }} {{ slot.registration.name }}{% if venue.reg_area_name %} - {{ venue.reg_area_name|escape }}{% endif %}{% endif %}
13+
{% endifchanged %}{% if slot.session_name %}{% if slot.break_info %}{{ slot.break_info.time_desc }} {{ slot.break_info.name }}{% if venue.break_area_name and slot.break_info.show_break_location %} - {{ venue.break_area_name|escape }}{% endif %}
1414
{% endif %}{{ slot.time_desc }} {{ slot.session_name }}{% if slot.is_plenary %} - {{ slot.sessions.0.room_id.room_name|safe }}{% endif %}{% ifequal slot.sessions.0.acronym "plenaryw" %}
1515

1616
{{ plenaryw_agenda }}{% endifequal %}{% ifequal slot.sessions.0.acronym "plenaryt" %}

‎ietf/templates/meeting/list.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h2 class="divider">Training</h2>
3838
<tr><a name="wg-{{ wg.acronym }}"></a>
3939
<td style="width:12em;"><b>{{ wg.acronym|upper }}{% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br/>
4040
{% for slide in wg.slides %}
41-
<a href="http://www3.ietf.org/proceedings/{{ slide.file_loc }}">{{ slide.slide_name }}</a><br/>
41+
<a href="http://www3.ietf.org/proceedings/{{ slide.file_loc }}">{{ slide.slide_name|escape }}</a><br/>
4242
{% endfor %}
4343
</td></tr></table>
4444
{% endfor %}

‎ietf/templates/meeting/m_agenda.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ <h4>{{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting_date|date:"F j, Y" }
5959
<tr>
6060
<td colspan="4">
6161
{{ slot.registration.time_desc }} {{ slot.registration.name }}
62-
{% if venue.reg_area_name %} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{ venue.reg_area_name|slugify }}">{{ venue.reg_area_name }}</a>{% endif %}
62+
{% if venue.reg_area_name %} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{ venue.reg_area_name|slugify }}">{{ venue.reg_area_name|escape }}</a>{% endif %}
6363
</td>
6464
</tr>
6565
{% endif %}
@@ -70,7 +70,7 @@ <h4>{{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting_date|date:"F j, Y" }
7070
<td colspan="4">
7171
<br />
7272
{{ slot.break_info.time_desc }} {{ slot.break_info.name }}
73-
{% if venue.break_area_name and slot.break_info.show_break_location %} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{ venue.break_area_name|slugify }}">{{ venue.break_area_name }}</a>{% endif %}
73+
{% if venue.break_area_name and slot.break_info.show_break_location %} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{ venue.break_area_name|slugify }}">{{ venue.break_area_name|escape }}</a>{% endif %}
7474
</td>
7575
</tr>
7676
{% endif %}

0 commit comments

Comments
 (0)