Skip to content

Commit cd4b430

Browse files
CyperghostCyperghost
authored
Merge pull request #6339 from WoltLab/6.2-message-templates-unsafe
Refactor message templates
2 parents 94d89f5 + 5f37b4c commit cd4b430

11 files changed

Lines changed: 29 additions & 29 deletions

‎com.woltlab.wcf/templates/__messageFormPoll.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
99
new UiPollEditor(
1010
"pollOptionContainer",
11-
[ {implode from=$pollOptions item=pollOption}{ optionID: {@$pollOption[optionID]}, optionValue: '{@$pollOption[optionValue]|encodeJS}' }{/implode} ],
11+
[ {implode from=$pollOptions item=pollOption}{ optionID: {$pollOption[optionID]}, optionValue: '{unsafe:$pollOption[optionValue]|encodeJS}' }{/implode} ],
1212
"",
1313
{
1414
maxOptions: {POLL_MAX_OPTIONS}
@@ -48,10 +48,10 @@
4848
<label for="pollEndTime">{lang}wcf.poll.endTime{/lang}</label>
4949
</dt>
5050
<dd>
51-
<input type="datetime" tabindex="-1" name="pollEndTime" id="pollEndTime" value="{if $pollEndTime}{@$pollEndTime|date:'c'}{/if}" class="medium">
51+
<input type="datetime" tabindex="-1" name="pollEndTime" id="pollEndTime" value="{if $pollEndTime}{time time=$pollEndTime type='custom' format='c'}{/if}" class="medium">
5252
{if $errorField == 'pollEndTime'}
5353
<small class="innerError">
54-
{lang}wcf.poll.endTime.error.{@$errorType}{/lang}
54+
{lang}wcf.poll.endTime.error.{$errorType}{/lang}
5555
</small>
5656
{/if}
5757
</dd>
@@ -64,7 +64,7 @@
6464
<input type="number" name="pollMaxVotes" id="pollMaxVotes" value="{$pollMaxVotes}" min="1" class="tiny">
6565
{if $errorField == 'pollMaxVotes'}
6666
<small class="innerError">
67-
{lang}wcf.poll.maxVotes.error.{@$errorType}{/lang}
67+
{lang}wcf.poll.maxVotes.error.{$errorType}{/lang}
6868
</small>
6969
{/if}
7070
</dd>

‎com.woltlab.wcf/templates/__messageFormPollInline.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
99
new UiPollEditor(
1010
"pollOptionContainer_{$wysiwygSelector}",
11-
[ {implode from=$pollOptions item=pollOption}{ optionID: {@$pollOption[optionID]}, optionValue: '{@$pollOption[optionValue]|encodeJS}' }{/implode} ],
11+
[ {implode from=$pollOptions item=pollOption}{ optionID: {$pollOption[optionID]}, optionValue: '{unsafe:$pollOption[optionValue]|encodeJS}' }{/implode} ],
1212
"{$wysiwygSelector}",
1313
{
1414
isAjax: true,
@@ -39,7 +39,7 @@
3939
<label for="{$wysiwygSelector}pollEndTime">{lang}wcf.poll.endTime{/lang}</label>
4040
</dt>
4141
<dd>
42-
<input type="datetime" tabindex="-1" name="pollEndTime" id="{$wysiwygSelector}pollEndTime" value="{if $pollEndTime}{@$pollEndTime|date:'c'}{/if}" class="medium">
42+
<input type="datetime" tabindex="-1" name="pollEndTime" id="{$wysiwygSelector}pollEndTime" value="{if $pollEndTime}{time time=$pollEndTime type='custom' format='c'}{/if}" class="medium">
4343
</dd>
4444
</dl>
4545
<dl>

‎com.woltlab.wcf/templates/messageFormMultilingualism.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
require(['WoltLabSuite/Core/Language/Chooser'], function(LanguageChooser) {
2222
var languages = {
2323
{implode from=$availableContentLanguages item=_language}
24-
'{@$_language->languageID}': {
25-
iconPath: '{@$_language->getIconPath()|encodeJS}',
26-
languageName: '{@$_language|encodeJS}'
24+
'{$_language->languageID}': {
25+
iconPath: '{unsafe:$_language->getIconPath()|encodeJS}',
26+
languageName: '{unsafe:$_language|encodeJS}'
2727
}
2828
{/implode}
2929
};

‎com.woltlab.wcf/templates/messageFormSettingsInline.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
{if $__messageFormSettingsInlineSettings}
1010
<dl>
11-
{@$__messageFormSettingsInlineSettings}
11+
{unsafe:$__messageFormSettingsInlineSettings}
1212
</dl>
1313
{/if}
1414

‎com.woltlab.wcf/templates/messageFormTabsInline.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
{include file='shared_messageFormAttachments'}
6060
{/if}
6161

62-
{if $__messageFormSettingsInlineContent}{@$__messageFormSettingsInlineContent}{/if}
62+
{if $__messageFormSettingsInlineContent}{unsafe:$__messageFormSettingsInlineContent}{/if}
6363

6464
{include file='__messageFormPollInline'}
6565

‎com.woltlab.wcf/templates/messageQuickReplyGuestDialog.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
{include file='shared_captcha'}
2020

2121
<div class="formSubmit">
22-
<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" data-captcha-id="{@$captchaID}">
22+
<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" data-captcha-id="{$captchaID}">
2323
</div>

‎com.woltlab.wcf/templates/messageSidebar.tpl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
{/if}
2525

2626
<div class="messageAuthorContainer">
27-
<a href="{$userProfile->getLink()}" class="username userLink" data-object-id="{@$userProfile->userID}"{if $enableMicrodata} itemprop="url"{/if}>
28-
<span{if $enableMicrodata} itemprop="name"{/if}>{@$userProfile->getFormattedUsername()}</span>
27+
<a href="{$userProfile->getLink()}" class="username userLink" data-object-id="{$userProfile->userID}"{if $enableMicrodata} itemprop="url"{/if}>
28+
<span{if $enableMicrodata} itemprop="name"{/if}>{unsafe:$userProfile->getFormattedUsername()}</span>
2929
</a>
3030
{if !$isReply}
3131
{if $userProfile->banned}
@@ -45,7 +45,7 @@
4545
{event name='beforeUserTitle'}
4646

4747
{if MODULE_USER_RANK && $userProfile->getUserTitle()}
48-
<span class="badge userTitleBadge{if $userProfile->getRank() && $userProfile->getRank()->cssClassName} {@$userProfile->getRank()->cssClassName}{/if}">{$userProfile->getUserTitle()}</span>
48+
<span class="badge userTitleBadge{if $userProfile->getRank() && $userProfile->getRank()->cssClassName} {$userProfile->getRank()->cssClassName}{/if}">{$userProfile->getUserTitle()}</span>
4949
{/if}
5050

5151
{event name='afterUserTitle'}
@@ -54,22 +54,22 @@
5454
{/hascontent}
5555

5656
{if MODULE_USER_RANK && $userProfile->getRank() && $userProfile->getRank()->rankImage}
57-
<div class="userRank">{@$userProfile->getRank()->getImage()}</div>
57+
<div class="userRank">{unsafe:$userProfile->getRank()->getImage()}</div>
5858
{/if}
5959
{/if}
6060

6161
{if !$isReply && MODULE_TROPHY && $__wcf->session->getPermission('user.profile.trophy.canSeeTrophies') && ($userProfile->isAccessible('canViewTrophies') || $userProfile->userID == $__wcf->session->userID) && $userProfile->getSpecialTrophies()|count}
6262
<div class="specialTrophyContainer">
6363
<ul>
6464
{foreach from=$userProfile->getSpecialTrophies() item=trophy}
65-
<li><a href="{@$trophy->getLink()}">{@$trophy->renderTrophy(32, true)}</a></li>
65+
<li><a href="{$trophy->getLink()}">{unsafe:$trophy->renderTrophy(32, true)}</a></li>
6666
{/foreach}
6767
</ul>
6868
</div>
6969
{/if}
7070
{else}
7171
<div class="userAvatar">
72-
<span>{@$userProfile->getAvatar()->getImageTag(128)}</span>
72+
<span>{unsafe:$userProfile->getAvatar()->getImageTag(128)}</span>
7373
</div>
7474

7575
<div class="messageAuthorContainer">
@@ -100,7 +100,7 @@
100100
{/if}
101101

102102
{if MESSAGE_SIDEBAR_ENABLE_ACTIVITY_POINTS && $userProfile->activityPoints}
103-
<dt><a href="#" class="activityPointsDisplay jsTooltip" title="{lang user=$userProfile}wcf.user.activityPoint.showActivityPoints{/lang}" data-user-id="{@$userProfile->userID}">{lang}wcf.user.activityPoint{/lang}</a></dt>
103+
<dt><a href="#" class="activityPointsDisplay jsTooltip" title="{lang user=$userProfile}wcf.user.activityPoint.showActivityPoints{/lang}" data-user-id="{$userProfile->userID}">{lang}wcf.user.activityPoint{/lang}</a></dt>
104104
<dd>{#$userProfile->activityPoints}</dd>
105105
{/if}
106106

@@ -118,7 +118,7 @@
118118
{assign var='__formattedUserOption' value=$userProfile->getFormattedUserOption($__sidebarUserOption)}
119119
{if $__formattedUserOption}
120120
<dt>{lang}wcf.user.option.{$__sidebarUserOption}{/lang}</dt>
121-
<dd>{@$__formattedUserOption}</dd>
121+
<dd>{unsafe:$__formattedUserOption}</dd>
122122
{/if}
123123
{/if}
124124
{/foreach}

‎com.woltlab.wcf/templates/poll.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
</script>
88
{/if}
99

10-
<div id="poll{@$poll->pollID}" class="pollContainer{if POLL_FULL_WIDTH} pollContainerFullWidth{/if}"{*
11-
*} data-poll-id="{@$poll->pollID}"{*
10+
<div id="poll{$poll->pollID}" class="pollContainer{if POLL_FULL_WIDTH} pollContainerFullWidth{/if}"{*
11+
*} data-poll-id="{$poll->pollID}"{*
1212
*} data-can-vote="{if $poll->canVote()}true{else}false{/if}"{*
1313
*} data-can-view-result="{if $poll->canSeeResult()}true{else}false{/if}"{*
1414
*} data-can-view-participants="{if $poll->canViewParticipants()}true{else}false{/if}"{*
1515
*} data-in-vote="{if $poll->canVote() && !$poll->isParticipant()}true{else}false{/if}"{*
1616
*} data-question="{$poll->question}"{*
17-
*} data-max-votes="{@$poll->maxVotes}"{*
17+
*} data-max-votes="{$poll->maxVotes}"{*
1818
*} data-is-public="{if $poll->isPublic}true{else}false{/if}">
1919
<section>
2020
<h2>{$poll->question} <span class="badge jsTooltip pollTotalVotesBadge" title="{lang}wcf.poll.totalVotes{/lang}">{#$poll->votes}</span></h2>

‎com.woltlab.wcf/templates/pollResult.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<li class="pollResultItem">
44
<div class="pollResultItemCaption">
55
<span class="pollOptionName">{$option->optionValue} ({#$option->votes})</span>
6-
<span class="pollOptionRelativeValue">{@$option->getRelativeVotes($poll)}%</span>
6+
<span class="pollOptionRelativeValue">{$option->getRelativeVotes($poll)}%</span>
77
</div>
88
<div class="pollMeter">
9-
<div class="pollMeterValue" style="width: {if $option->getRelativeVotes($poll)}{@$option->getRelativeVotes($poll)}%{else}0{/if}"></div>
9+
<div class="pollMeterValue" style="width: {if $option->getRelativeVotes($poll)}{$option->getRelativeVotes($poll)}%{else}0{/if}"></div>
1010
</div>
1111
</li>
1212
{/foreach}

‎com.woltlab.wcf/templates/pollVote.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<dl class="wide pollVoteContainer" data-max-votes="{@$poll->maxVotes}">
1+
<dl class="wide pollVoteContainer" data-max-votes="{$poll->maxVotes}">
22
{foreach from=$poll->getOptions() item=option}
33
<dt></dt>
44
<dd>
55
<label>
6-
{if $poll->canVote()}<input type="{if $poll->maxVotes > 1}checkbox{else}radio{/if}" name="pollOptions{@$poll->pollID}[]" value="{$option->optionID}"{if $option->voted} checked{/if}>{/if}
6+
{if $poll->canVote()}<input type="{if $poll->maxVotes > 1}checkbox{else}radio{/if}" name="pollOptions{$poll->pollID}[]" value="{$option->optionID}"{if $option->voted} checked{/if}>{/if}
77
{$option->optionValue}
88
</label>
99
</dd>

0 commit comments

Comments
 (0)