Skip to content

Refactor box-templates to use unsafe and remove unnecessary @ #6311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cyperghost merged 5 commits into from
Jun 3, 2025
Merged

Refactor box-templates to use unsafe and remove unnecessary @ #6311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c0925cd
Refactor the template files to use `unsafe`, or remove unnecessary ou…
Cyperghost Jun 2, 2025
c0ed98a
Use the `time` template function instead of the deprecated `time` mod…
Cyperghost Jun 3, 2025
ccf42a1
Use the `time` template function instead of the deprecated `plainTime…
Cyperghost Jun 3, 2025
6115107
Use the `time` template function instead of the deprecated `plainTime…
Cyperghost Jun 3, 2025
fa95577
Add missing `unsafe:`
Cyperghost Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions com.woltlab.wcf/templates/__box.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<{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}">
<{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}">
{if $box->showEditButton()}
<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>
{/if}
{if $box->getImage()}
<div class="boxImage">
{if $box->hasLink()}
<a href="{$box->getLink()}">{@$box->getImage()}</a>
<a href="{$box->getLink()}">{unsafe:$box->getImage()}</a>
{else}
{@$box->getImage()}
{unsafe:$box->getImage()}
{/if}
</div>
{/if}
Expand All @@ -23,6 +23,6 @@
{/if}

<div class="boxContent{if $box->boxType == 'text'} htmlContent{/if}">
{@$box->getContent()}
{unsafe:$box->getContent()}
</div>
{if $box->showHeader}</section>{else}</div>{/if}
6 changes: 3 additions & 3 deletions com.woltlab.wcf/templates/authorSidebarBox.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="box">
<div class="boxContent box96">
{@$userProfile->getAvatar()->getImageTag(96)}
{unsafe:$userProfile->getAvatar()->getImageTag(96)}

<div>
<div class="containerHeadline">
Expand All @@ -9,10 +9,10 @@
</h3>
{if MODULE_USER_RANK}
{if $userProfile->getUserTitle()}
<p><span class="badge userTitleBadge{if $userProfile->getRank() && $userProfile->getRank()->cssClassName} {@$userProfile->getRank()->cssClassName}{/if}">{$userProfile->getUserTitle()}</span></p>
<p><span class="badge userTitleBadge{if $userProfile->getRank() && $userProfile->getRank()->cssClassName} {$userProfile->getRank()->cssClassName}{/if}">{$userProfile->getUserTitle()}</span></p>
{/if}
{if $userProfile->getRank() && $userProfile->getRank()->rankImage}
<p><span class="userRankImage">{@$userProfile->getRank()->getImage()}</span></p>
<p><span class="userRankImage">{unsafe:$userProfile->getRank()->getImage()}</span></p>
{/if}
{/if}
</div>
Expand Down
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/boxPaidSubscriptions.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="containerContent">
<ul class="buttonList">
{foreach from=$subscription->getPurchaseButtons() item=button}
<li>{@$button}</li>
<li>{unsafe:$button}</li>
{/foreach}
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{if !PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION && $__wcf->user->canPurchasePaidSubscriptions()}
<ul class="buttonList">
{foreach from=$subscription->getPurchaseButtons() item=button}
<li>{@$button}</li>
<li>{unsafe:$button}</li>
{/foreach}
</ul>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/boxRecentActivity.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
{jsphrase name='wcf.user.recentActivity.more'}
{jsphrase name='wcf.user.recentActivity.noMoreEntries'}

setup(document.getElementById('boxRecentActivity{unsafe:$boxID|encodeJS}'));
Comment thread
dtdesign marked this conversation as resolved.
setup(document.getElementById('boxRecentActivity{$boxID}'));
});
</script>
6 changes: 3 additions & 3 deletions com.woltlab.wcf/templates/boxSignedInAs.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="box96">
{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(96)}
{unsafe:$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(96)}

<div>
<div class="containerHeadline">
Expand All @@ -9,10 +9,10 @@
</h3>
{if MODULE_USER_RANK}
{if $__wcf->getUserProfileHandler()->getUserTitle()}
<p><span class="badge userTitleBadge{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->cssClassName} {@$__wcf->getUserProfileHandler()->getRank()->cssClassName}{/if}">{$__wcf->getUserProfileHandler()->getUserTitle()}</span></p>
<p><span class="badge userTitleBadge{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->cssClassName} {$__wcf->getUserProfileHandler()->getRank()->cssClassName}{/if}">{$__wcf->getUserProfileHandler()->getUserTitle()}</span></p>
{/if}
{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->rankImage}
<p><span class="userRankImage">{@$__wcf->getUserProfileHandler()->getRank()->getImage()}</span></p>
<p><span class="userRankImage">{unsafe:$__wcf->getUserProfileHandler()->getRank()->getImage()}</span></p>
{/if}
{/if}
</div>
Expand Down
4 changes: 2 additions & 2 deletions com.woltlab.wcf/templates/boxStaffOnline.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<div class="sidebarListItem__meta">
<div class="sidebarListItem__meta__userRank">
{if $userOnline->getUserTitle()}
<p><span class="badge userTitleBadge{if $userOnline->getRank() && $userOnline->getRank()->cssClassName} {@$userOnline->getRank()->cssClassName}{/if}">{$userOnline->getUserTitle()}</span></p>
<p><span class="badge userTitleBadge{if $userOnline->getRank() && $userOnline->getRank()->cssClassName} {$userOnline->getRank()->cssClassName}{/if}">{$userOnline->getUserTitle()}</span></p>
{/if}
{if $userOnline->getRank() && $userOnline->getRank()->rankImage}
<p><span class="userRankImage">{@$userOnline->getRank()->getImage()}</span></p>
<p><span class="userRankImage">{unsafe:$userOnline->getRank()->getImage()}</span></p>
{/if}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/boxStatistics.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{if USERS_ONLINE_RECORD}
<dt>{lang}wcf.user.mostOnlineUsers{/lang}</dt>
<dd title="{@USERS_ONLINE_RECORD_TIME|plainTime}" class="jsTooltip">{#USERS_ONLINE_RECORD}</dd>
<dd title="{time type='plainTime' time=USERS_ONLINE_RECORD_TIME}" class="jsTooltip">{#USERS_ONLINE_RECORD}</dd>
{/if}

<dt>{lang}wcf.user.newestMember{/lang}</dt>
Expand Down
4 changes: 2 additions & 2 deletions com.woltlab.wcf/templates/boxTodaysBirthdays.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
userList = new UserList({
className: 'wcf\\data\\user\\UserBirthdayAction',
parameters: {
date: '{@TIME_NOW|date:'Y-m-d'}',
date: '{time type='custom' time=TIME_NOW format='Y-m-d'}',
sortField: '{$sortField}',
sortOrder: '{$sortOrder}'
}
}, '{@$box->getTitle()|encodeJS} ({@TIME_NOW|date})');
}, '{unsafe:$box->getTitle()|encodeJS} ({time type='plainDate' time=TIME_NOW})');
}

userList.open();
Expand Down
4 changes: 2 additions & 2 deletions com.woltlab.wcf/templates/boxTrophyCategories.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ol class="boxMenu">
{foreach from=$categories item=categoryItem}
<li{if $activeCategory && $activeCategory->categoryID == $categoryItem->categoryID} class="active"{/if} data-category-id="{@$categoryItem->categoryID}">
<a href="{@$categoryItem->getLink()}" class="boxMenuLink">
<li{if $activeCategory && $activeCategory->categoryID == $categoryItem->categoryID} class="active"{/if} data-category-id="{$categoryItem->categoryID}">
<a href="{$categoryItem->getLink()}" class="boxMenuLink">
<span class="boxMenuLinkTitle">{$categoryItem->getTitle()}</span>
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/boxUsersOnline.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<dd>
<ul class="inlineList commaSeparated">
{foreach from=$usersOnlineList->getUsersOnlineMarkings() item=usersOnlineMarking}
<li>{@$usersOnlineMarking}</li>
<li>{unsafe:$usersOnlineMarking}</li>
{/foreach}
</ul>
</dd>
Expand Down
4 changes: 2 additions & 2 deletions com.woltlab.wcf/templates/boxWhoWasOnline.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{if $whoWasOnlineList|count < 29}
<ul class="userAvatarList">
{foreach from=$whoWasOnlineList item=userOnline}
<li><a href="{$userOnline->getLink()}" title="{$userOnline->username} ({@$userOnline->lastActivityTime|date:$whoWasOnlineTimeFormat})" class="jsTooltip">{@$userOnline->getAvatar()->getImageTag(48)}</a></li>
<li><a href="{$userOnline->getLink()}" title="{$userOnline->username} ({time type='custom' time=$userOnline->lastActivityTime format=$whoWasOnlineTimeFormat})" class="jsTooltip">{unsafe:$userOnline->getAvatar()->getImageTag(48)}</a></li>
{/foreach}
</ul>
{else}
<ul class="inlineList commaSeparated">
{foreach from=$whoWasOnlineList item=userOnline}
<li>{user object=$userOnline} ({@$userOnline->lastActivityTime|date:$whoWasOnlineTimeFormat})</li>
<li>{user object=$userOnline} ({time type='custom' time=$userOnline->lastActivityTime format=$whoWasOnlineTimeFormat})</li>
{/foreach}
</ul>
{/if}
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/tagCloudBox.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ul class="tagList">
{content}
{foreach from=$tags item=tagObj}
<li><a href="{link controller='Tagged' object=$tagObj}{if !$taggableObjectType|empty}objectType={@$taggableObjectType}{/if}{/link}" rel="tag" class="tagWeight{@$tagObj->getWeight()}">{$tagObj->name}</a></li>
<li><a href="{link controller='Tagged' object=$tagObj}{if !$taggableObjectType|empty}objectType={$taggableObjectType}{/if}{/link}" rel="tag" class="tagWeight{$tagObj->getWeight()}">{$tagObj->name}</a></li>
{/foreach}
{/content}
</ul>
Expand Down
3 changes: 1 addition & 2 deletions com.woltlab.wcf/templates/usersOnlineInfoBox.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@
<dd>
<ul class="inlineList commaSeparated">
{foreach from=$usersOnlineList->getUsersOnlineMarkings() item=usersOnlineMarking}
<li>{@$usersOnlineMarking}</li>
<li>{unsafe:$usersOnlineMarking}</li>
{/foreach}
</ul>
</dd>

</dl>
</div>
{/if}
Expand Down
20 changes: 10 additions & 10 deletions wcfsetup/install/files/acp/templates/__boxAddContent.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{if $boxType == 'html' || $boxType == 'tpl'}
<ul class="codemirrorToolbar">
<li><button type="button" id="codemirror-content{@$languageID}-media" class="jsTooltip" title="{lang}wcf.editor.button.media{/lang}">{icon name='file'}</button></li>
<li><button type="button" id="codemirror-content{@$languageID}-page" class="jsTooltip" title="{lang}wcf.editor.button.page{/lang}">{icon name='file-lines'}</button></li>
<li><button type="button" id="codemirror-content{$languageID}-media" class="jsTooltip" title="{lang}wcf.editor.button.media{/lang}">{icon name='file'}</button></li>
<li><button type="button" id="codemirror-content{$languageID}-page" class="jsTooltip" title="{lang}wcf.editor.button.page{/lang}">{icon name='file-lines'}</button></li>
</ul>
<script data-relocate="true">
require([
Expand All @@ -21,27 +21,27 @@
'wcf.page.search.results': '{jslang}wcf.page.search.results{/jslang}',
});

new AcpUiCodeMirrorMedia('content{@$languageID}');
new AcpUiCodeMirrorPage('content{@$languageID}');
new AcpUiCodeMirrorMedia('content{$languageID}');
new AcpUiCodeMirrorPage('content{$languageID}');
});
</script>
{/if}

{if $boxType == 'text'}
<textarea name="content[{@$languageID}]" id="content{@$languageID}"
<textarea name="content[{$languageID}]" id="content{$languageID}"
{if $boxType == 'text'}
class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.box{$action|ucfirst}-{if $action == 'edit'}{@$boxID}{else}0{/if}-{@$languageID}"
{if $action === 'edit'}data-autosave-last-edit-time="{@$box->lastUpdateTime}"{/if}
class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.box{$action|ucfirst}-{if $action == 'edit'}{$boxID}{else}0{/if}-{$languageID}"
{if $action === 'edit'}data-autosave-last-edit-time="{$box->lastUpdateTime}"{/if}
{/if}
>{if !$content[$languageID]|empty}{$content[$languageID]}{/if}</textarea>
{include file='shared_wysiwygCmsToolbar' wysiwygSelector='content'|concat:$languageID}
{include file='shared_wysiwyg' wysiwygSelector='content'|concat:$languageID}
{else}
<div dir="ltr">
<textarea name="content[{@$languageID}]" id="content{@$languageID}"
<textarea name="content[{$languageID}]" id="content{$languageID}"
{if $boxType == 'text'}
class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.box{$action|ucfirst}-{if $action == 'edit'}{@$boxID}{else}0{/if}-{@$languageID}"
{if $action === 'edit'}data-autosave-last-edit-time="{@$box->lastUpdateTime}"{/if}
class="wysiwygTextarea" data-disable-attachments="true" data-autosave="com.woltlab.wcf.box{$action|ucfirst}-{if $action == 'edit'}{$boxID}{else}0{/if}-{$languageID}"
{if $action === 'edit'}data-autosave-last-edit-time="{$box->lastUpdateTime}"{/if}
{/if}
>{if !$content[$languageID]|empty}{$content[$languageID]}{/if}</textarea>
</div>
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/acp/templates/__dashboardBoxesConfigurationFormField.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*}{if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if}{*
*}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
*}>
{@$__fieldNestedOption[label]}
{unsafe:$__fieldNestedOption[label]}
</label>
</li>
{/foreach}
Expand Down
Loading