Skip to content

Commit fce7a80

Browse files
CyperghostCyperghost
committed
Remove unnecessary @ and replace all other @ with unsafe: 
1 parent 899990c commit fce7a80

13 files changed

+28
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{include file='authFlowHeader'}
22

3-
{@$form->getHtml()}
3+
{unsafe:$form->getHtml()}
44

55
{include file='authFlowFooter'}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{include file='authFlowHeader'}
22

3-
{@$form->getHtml()}
3+
{unsafe:$form->getHtml()}
44

55
{include file='authFlowFooter'}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{lang}wcf.user.changeEmail.needReactivation.mail.html.intro{/lang}
88

99
{capture assign=button}
10-
<a href="{link controller='EmailActivation' isHtmlEmail=true}u={@$mailbox->getUser()->userID}&a={@$mailbox->getUser()->reactivationCode}{/link}">
10+
<a href="{link controller='EmailActivation' isHtmlEmail=true}u={$mailbox->getUser()->userID}&a={$mailbox->getUser()->reactivationCode}{/link}">
1111
{lang}wcf.user.changeEmail.needReactivation.mail.html.activate{/lang}
1212
</a>
1313
{/capture}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{assign var='notificationContent' value=$notification[notificationContent]}
1414
{assign var='notificationType' value=$notification[notificationType]}
1515
{if $notificationContent|is_array}{if !$notificationContent[variables]|empty}{foreach from=$notificationContent[variables] key='__key' item='__item'}{assign var=$__key value=$__item}{/foreach}{/if}{include file=$notificationContent[template] application=$notificationContent[application] variables=$notificationContent[variables]}{*
16-
*}{else}{@$notificationContent}{/if}
16+
*}{else}{unsafe:$notificationContent}{/if}
1717
{/implode}
1818

1919
---------------
@@ -38,7 +38,7 @@
3838

3939
{include file=$notificationContent[template] application=$notificationContent[application] variables=$notificationContent[variables]}
4040
{else}
41-
{@$notificationContent}
41+
{unsafe:$notificationContent}
4242
{/if}
4343
</div>
4444
{/foreach}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
1616
body, body * {
17-
font-family: {@$style->getEmailFontFamily()};
17+
font-family: {unsafe:$style->getEmailFontFamily()};
1818
font-size: {$style->getVariable('wcfFontSizeDefault')};
1919
}
2020
@@ -148,20 +148,20 @@
148148
{/capture}
149149
{include file='email_paddingHelper' block=true class='header' content=$header sandbox=true}
150150

151-
{if $beforeContent|isset}{@$beforeContent}{/if}
151+
{if $beforeContent|isset}{unsafe:$beforeContent}{/if}
152152

153153
{include file='email_paddingHelper' block=true class='content' content=$content sandbox=true}
154154

155-
{if $afterContent|isset}{@$afterContent}{/if}
155+
{if $afterContent|isset}{unsafe:$afterContent}{/if}
156156

157157
{capture assign='footer'}
158158
{hascontent}
159159
<span style="font-size: 0;">-- <br></span>
160160
{content}
161161
{if MAIL_SIGNATURE_HTML|phrase}
162-
{@MAIL_SIGNATURE_HTML|phrase}
162+
{unsafe:MAIL_SIGNATURE_HTML|phrase}
163163
{else}
164-
{@MAIL_SIGNATURE|phrase|newlineToBreak}
164+
{unsafe:MAIL_SIGNATURE|phrase|newlineToBreak}
165165
{/if}
166166
{/content}{/hascontent}{/capture}
167167
{include file='email_paddingHelper' block=true class='footer' content=$footer sandbox=true}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{lang}wcf.user.lostPassword.mail.html.intro{/lang}
88

99
{capture assign=button}
10-
<a href="{link controller='NewPassword' object=$mailbox->getUser() isHtmlEmail=true}k={@$mailbox->getUser()->lostPasswordKey}{/link}">
10+
<a href="{link controller='NewPassword' object=$mailbox->getUser() isHtmlEmail=true}k={$mailbox->getUser()->lostPasswordKey}{/link}">
1111
{lang}wcf.user.lostPassword.mail.html.reset{/lang}
1212
</a>
1313
{/capture}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{lang}wcf.user.notification.mail.plaintext.intro{/lang}
44

55
{if $notificationContent|is_array}{include file=$notificationContent[template] application=$notificationContent[application]}{*
6-
*}{else}{@$notificationContent}{/if}
6+
*}{else}{unsafe:$notificationContent}{/if}
77

88
{lang}wcf.user.notification.mail.plaintext.outro{/lang}
99
{/capture}
@@ -15,7 +15,7 @@
1515
{if $notificationContent|is_array}
1616
{include file=$notificationContent[template] application=$notificationContent[application]}
1717
{else}
18-
{@$notificationContent}
18+
{unsafe:$notificationContent}
1919
{/if}
2020

2121
{capture assign=button}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{if $mimeType === 'text/plain'}
2-
{lang}{@$languageVariablePrefix}.mail.plaintext{/lang}
2+
{lang}{$languageVariablePrefix}.mail.plaintext{/lang}
33

4-
{@$articleContent->getMailText($mimeType)} {* this line ends with a space *}
4+
{unsafe:$articleContent->getMailText($mimeType)} {* this line ends with a space *}
55
{else}
6-
{lang}{@$languageVariablePrefix}.mail.html{/lang}
6+
{lang}{$languageVariablePrefix}.mail.html{/lang}
77
{assign var='user' value=$event->getAuthor()}
88
{assign var='article' value=$event->getUserNotificationObject()}
99

@@ -12,7 +12,7 @@
1212
{capture assign='articleContent'}
1313
<table cellpadding="0" cellspacing="0" border="0">
1414
<tr>
15-
<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$article->username}">{@$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
15+
<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$article->username}">{unsafe:$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
1616
<td class="boxContent">
1717
<div class="containerHeadline">
1818
<h3>
@@ -26,7 +26,7 @@
2626
</h3>
2727
</div>
2828
<div>
29-
{@$articleContent->getMailText($mimeType)}
29+
{unsafe:$articleContent->getMailText($mimeType)}
3030
</div>
3131
</td>
3232
</tr>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{capture assign='authorList'}{lang}wcf.user.notification.mail.authorList.plaintext{/lang}{/capture}
44
{lang}wcf.moderation.report.notification.mail.plaintext{/lang}
55

6-
{@$moderationQueue->getMailText($mimeType)} {* this line ends with a space *}
6+
{unsafe:$moderationQueue->getMailText($mimeType)} {* this line ends with a space *}
77
{else}
88
{capture assign='authorList'}{lang}wcf.user.notification.mail.authorList.html{/lang}{/capture}
99
{lang}wcf.moderation.report.notification.mail.html{/lang}
@@ -15,7 +15,7 @@
1515
<table cellpadding="0" cellspacing="0" border="0">
1616
<tr>
1717
<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}"
18-
title="{$user->username}">{@$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
18+
title="{$user->username}">{unsafe:$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
1919
<td class="boxContent">
2020
<div class="containerHeadline">
2121
<h3>
@@ -29,7 +29,7 @@
2929
</h3>
3030
</div>
3131
<div>
32-
{@$moderationQueue->getMailText($mimeType)}
32+
{unsafe:$moderationQueue->getMailText($mimeType)}
3333
</div>
3434
</td>
3535
</tr>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<table cellpadding="0" cellspacing="0" border="0" class="paddingHelper{if $block|isset && $block} block{/if}{if $outerClass|isset && $outerClass} {$outerClass}{/if}">
33
<tr>
44
<td class="{$class}">
5-
{@$content}
5+
{unsafe:$content}
66
</td>
77
</tr>
88
</table>

0 commit comments

Comments
 (0)