Skip to content

Commit c0925cd

Browse files
committed
Refactor the template files to use unsafe, or remove unnecessary outputs with @.
1 parent 5ccd512 commit c0925cd

20 files changed

+76
-77
lines changed

com.woltlab.wcf/templates/__box.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<{if $box->showHeader}section{else}div{/if} class="box{if $box->getImage()} boxWithImage{/if}{if $box->showEditButton()} boxWithEditButton{/if}{if $box->cssClassName} {$box->cssClassName}{/if}" data-box-identifier="{@$box->identifier}">
1+
<{if $box->showHeader}section{else}div{/if} class="box{if $box->getImage()} boxWithImage{/if}{if $box->showEditButton()} boxWithEditButton{/if}{if $box->cssClassName} {$box->cssClassName}{/if}" data-box-identifier="{$box->identifier}">
22
{if $box->showEditButton()}
33
<a href="{link controller='BoxEdit' id=$box->boxID isACP=true}{/link}" class="boxEditButton jsTooltip" title="{lang}wcf.page.box.edit{/lang}">{icon name='pen-to-square'}</a>
44
{/if}
55
{if $box->getImage()}
66
<div class="boxImage">
77
{if $box->hasLink()}
8-
<a href="{$box->getLink()}">{@$box->getImage()}</a>
8+
<a href="{$box->getLink()}">{unsafe:$box->getImage()}</a>
99
{else}
10-
{@$box->getImage()}
10+
{unsafe:$box->getImage()}
1111
{/if}
1212
</div>
1313
{/if}
@@ -23,6 +23,6 @@
2323
{/if}
2424

2525
<div class="boxContent{if $box->boxType == 'text'} htmlContent{/if}">
26-
{@$box->getContent()}
26+
{unsafe:$box->getContent()}
2727
</div>
2828
{if $box->showHeader}</section>{else}</div>{/if}

com.woltlab.wcf/templates/authorSidebarBox.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="box">
22
<div class="boxContent box96">
3-
{@$userProfile->getAvatar()->getImageTag(96)}
3+
{unsafe:$userProfile->getAvatar()->getImageTag(96)}
44

55
<div>
66
<div class="containerHeadline">
@@ -9,10 +9,10 @@
99
</h3>
1010
{if MODULE_USER_RANK}
1111
{if $userProfile->getUserTitle()}
12-
<p><span class="badge userTitleBadge{if $userProfile->getRank() && $userProfile->getRank()->cssClassName} {@$userProfile->getRank()->cssClassName}{/if}">{$userProfile->getUserTitle()}</span></p>
12+
<p><span class="badge userTitleBadge{if $userProfile->getRank() && $userProfile->getRank()->cssClassName} {$userProfile->getRank()->cssClassName}{/if}">{$userProfile->getUserTitle()}</span></p>
1313
{/if}
1414
{if $userProfile->getRank() && $userProfile->getRank()->rankImage}
15-
<p><span class="userRankImage">{@$userProfile->getRank()->getImage()}</span></p>
15+
<p><span class="userRankImage">{unsafe:$userProfile->getRank()->getImage()}</span></p>
1616
{/if}
1717
{/if}
1818
</div>

com.woltlab.wcf/templates/boxPaidSubscriptions.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="containerContent">
1111
<ul class="buttonList">
1212
{foreach from=$subscription->getPurchaseButtons() item=button}
13-
<li>{@$button}</li>
13+
<li>{unsafe:$button}</li>
1414
{/foreach}
1515
</ul>
1616
</div>

com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{if !PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION && $__wcf->user->canPurchasePaidSubscriptions()}
1717
<ul class="buttonList">
1818
{foreach from=$subscription->getPurchaseButtons() item=button}
19-
<li>{@$button}</li>
19+
<li>{unsafe:$button}</li>
2020
{/foreach}
2121
</ul>
2222
{/if}

com.woltlab.wcf/templates/boxRecentActivity.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@
4444
{jsphrase name='wcf.user.recentActivity.more'}
4545
{jsphrase name='wcf.user.recentActivity.noMoreEntries'}
4646
47-
setup(document.getElementById('boxRecentActivity{unsafe:$boxID|encodeJS}'));
47+
setup(document.getElementById('boxRecentActivity{$boxID}'));
4848
});
4949
</script>

com.woltlab.wcf/templates/boxSignedInAs.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="box96">
2-
{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(96)}
2+
{unsafe:$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(96)}
33

44
<div>
55
<div class="containerHeadline">
@@ -9,10 +9,10 @@
99
</h3>
1010
{if MODULE_USER_RANK}
1111
{if $__wcf->getUserProfileHandler()->getUserTitle()}
12-
<p><span class="badge userTitleBadge{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->cssClassName} {@$__wcf->getUserProfileHandler()->getRank()->cssClassName}{/if}">{$__wcf->getUserProfileHandler()->getUserTitle()}</span></p>
12+
<p><span class="badge userTitleBadge{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->cssClassName} {$__wcf->getUserProfileHandler()->getRank()->cssClassName}{/if}">{$__wcf->getUserProfileHandler()->getUserTitle()}</span></p>
1313
{/if}
1414
{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->rankImage}
15-
<p><span class="userRankImage">{@$__wcf->getUserProfileHandler()->getRank()->getImage()}</span></p>
15+
<p><span class="userRankImage">{unsafe:$__wcf->getUserProfileHandler()->getRank()->getImage()}</span></p>
1616
{/if}
1717
{/if}
1818
</div>

com.woltlab.wcf/templates/boxStaffOnline.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<div class="sidebarListItem__meta">
1717
<div class="sidebarListItem__meta__userRank">
1818
{if $userOnline->getUserTitle()}
19-
<p><span class="badge userTitleBadge{if $userOnline->getRank() && $userOnline->getRank()->cssClassName} {@$userOnline->getRank()->cssClassName}{/if}">{$userOnline->getUserTitle()}</span></p>
19+
<p><span class="badge userTitleBadge{if $userOnline->getRank() && $userOnline->getRank()->cssClassName} {$userOnline->getRank()->cssClassName}{/if}">{$userOnline->getUserTitle()}</span></p>
2020
{/if}
2121
{if $userOnline->getRank() && $userOnline->getRank()->rankImage}
22-
<p><span class="userRankImage">{@$userOnline->getRank()->getImage()}</span></p>
22+
<p><span class="userRankImage">{unsafe:$userOnline->getRank()->getImage()}</span></p>
2323
{/if}
2424
</div>
2525
</div>

com.woltlab.wcf/templates/boxStatistics.tpl

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

77
{if USERS_ONLINE_RECORD}
88
<dt>{lang}wcf.user.mostOnlineUsers{/lang}</dt>
9-
<dd title="{@USERS_ONLINE_RECORD_TIME|plainTime}" class="jsTooltip">{#USERS_ONLINE_RECORD}</dd>
9+
<dd title="{USERS_ONLINE_RECORD_TIME|plainTime}" class="jsTooltip">{#USERS_ONLINE_RECORD}</dd>
1010
{/if}
1111

1212
<dt>{lang}wcf.user.newestMember{/lang}</dt>

com.woltlab.wcf/templates/boxTodaysBirthdays.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
userList = new UserList({
3232
className: 'wcf\\data\\user\\UserBirthdayAction',
3333
parameters: {
34-
date: '{@TIME_NOW|date:'Y-m-d'}',
34+
date: '{TIME_NOW|date:'Y-m-d'}',
3535
sortField: '{$sortField}',
3636
sortOrder: '{$sortOrder}'
3737
}
38-
}, '{@$box->getTitle()|encodeJS} ({@TIME_NOW|date})');
38+
}, '{unsafe:$box->getTitle()|encodeJS} ({TIME_NOW|date})');
3939
}
4040
4141
userList.open();

com.woltlab.wcf/templates/boxTrophyCategories.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ol class="boxMenu">
22
{foreach from=$categories item=categoryItem}
3-
<li{if $activeCategory && $activeCategory->categoryID == $categoryItem->categoryID} class="active"{/if} data-category-id="{@$categoryItem->categoryID}">
4-
<a href="{@$categoryItem->getLink()}" class="boxMenuLink">
3+
<li{if $activeCategory && $activeCategory->categoryID == $categoryItem->categoryID} class="active"{/if} data-category-id="{$categoryItem->categoryID}">
4+
<a href="{$categoryItem->getLink()}" class="boxMenuLink">
55
<span class="boxMenuLinkTitle">{$categoryItem->getTitle()}</span>
66
</a>
77
</li>

0 commit comments

Comments
 (0)