Refactor user templates

com.woltlab.wcf/templates/email_notification_userFollowFollowing.tpl

@@ -12,7 +12,7 @@
 	{capture assign='userContent'}
 	<table cellpadding="0" cellspacing="0" border="0">
 		<tr>
-			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$user->username}">{@$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
+			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$user->username}">{unsafe:$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
 			<td class="boxContent">
 				{include file='email_userInformationHeadline'}
 			</td>

com.woltlab.wcf/templates/email_userInformationHeadline.tpl

@@ -4,7 +4,7 @@
 <div>
 	{if $__wcf->getSession()->getPermission('user.profile.canViewUserProfile') && $user->isAccessible('canViewProfile')}
 		{if $user->isVisibleOption('gender') && $user->gender}{$user->getFormattedUserOption('gender')}, {/if}
-		{if $user->isVisibleOption('birthday') && $user->getAge()}{@$user->getAge()}, {/if}
+		{if $user->isVisibleOption('birthday') && $user->getAge()}{$user->getAge()}, {/if}
 		{if $user->isVisibleOption('location') && $user->location}{lang}wcf.user.membersList.location{/lang}, {/if}
 	{/if}
 	{lang}wcf.user.membersList.registrationDate{/lang}

com.woltlab.wcf/templates/groupedUserReactionList.tpl

@@ -1,7 +1,7 @@
 {foreach from=$groupedUsers item=group}
 	{if $group}
 		<section class="section sectionContainerList">
-			<h2 class="sectionTitle">{@$group}</h2>
+			<h2 class="sectionTitle">{unsafe:$group}</h2>
 	{/if}
 
 	{if $group|count}

com.woltlab.wcf/templates/groupedUserTrophyList.tpl

@@ -1,13 +1,13 @@
 {if $userTrophyList|count}
 	<ol class="containerList jsUserTrophyList">
 		{foreach from=$userTrophyList item=userTrophy}
-			<li data-object-id="{@$userTrophy->userTrophyID}">
+			<li data-object-id="{$userTrophy->userTrophyID}">
 				<div class="box48">
-					<div><a href="{link controller='Trophy' object=$userTrophy->getTrophy()}{/link}">{@$userTrophy->getTrophy()->renderTrophy(48)}</a></div>
+					<div><a href="{link controller='Trophy' object=$userTrophy->getTrophy()}{/link}">{unsafe:$userTrophy->getTrophy()->renderTrophy(48)}</a></div>
 
 					<div class="containerHeadline">
 						<h3><a href="{link controller='Trophy' object=$userTrophy->getTrophy()}{/link}">{$userTrophy->getTrophy()->getTitle()}</a></h3>
-						<small>{if !$userTrophy->getDescription()|empty}<span class="separatorRight">{@$userTrophy->getDescription()}</span> {/if}{@$userTrophy->time|time}</small>
+						<small>{if !$userTrophy->getDescription()|empty}<span class="separatorRight">{unsafe:$userTrophy->getDescription()}</span> {/if}{time time=$userTrophy->time}</small>
 					</div>
 				</div>
 			</li>

com.woltlab.wcf/templates/ignoredUsers.tpl

@@ -3,7 +3,9 @@
 {capture assign='contentTitleBadge'}<span class="badge">{#$items}</span>{/capture}
 
 {capture assign='contentInteractionPagination'}
-	{pages print=true assign=pagesLinks controller='IgnoredUsers' link="pageNo=%d"}
+	{if $pages > 1}
+		<woltlab-core-pagination page="{$pageNo}" count="{$pages}" url="{link controller='IgnoredUsers'}{/link}"></woltlab-core-pagination>
+	{/if}
 {/capture}
 
 {include file='header' __sidebarLeftHasMenu=true}
@@ -12,7 +14,7 @@
 	<div class="section sectionContainerList">
 		<ol class="containerList userList jsReloadPageWhenEmpty">
 			{foreach from=$objects item=user}
-				<li class="jsIgnoredUser" data-object-id="{@$user->getObjectID()}">
+				<li class="jsIgnoredUser" data-object-id="{$user->getObjectID()}">
 					<div class="box48">
 						{user object=$user type='avatar48' ariaHidden='true' tabindex='-1'}
 
@@ -42,11 +44,11 @@
 	</div>
 
 	<footer class="contentFooter">
-		{hascontent}
+		{if $pages > 1}
 			<div class="paginationBottom">
-				{content}{@$pagesLinks}{/content}
+				<woltlab-core-pagination page="{$pageNo}" count="{$pages}" url="{link controller='IgnoredUsers'}{/link}"></woltlab-core-pagination>
 			</div>
-		{/hascontent}
+		{/if}
 
 		{hascontent}
 			<nav class="contentFooterNavigation">

com.woltlab.wcf/templates/messageUserOptionOutput.tpl

@@ -1,13 +1,17 @@
 {hascontent}
 	<div id="{$option->optionName}" class="htmlContent">
 		{content}
-			{@$value}
+			{unsafe:$value}
 		{/content}
 	</div>
 
 	<script data-relocate="true">
-	$(function() {
-		$('#{$option->optionName}').parents('dl:eq(0)').addClass('wide');
-	});
+		const element = document.getElementById('{unsafe:$option->optionName|encodeJS}');
+		if (element) {
+			const dl = element.closest('dl');
+			if (dl) {
+				dl.classList.add('wide');
+			}
+		}
 	</script>
-{/hascontent}
+{/hascontent}

com.woltlab.wcf/templates/shared_bbcode_user.tpl

@@ -2,5 +2,5 @@
 	{* user no longer exists, use plain output rather than using a broken link *}
 	{$username}{* no newline after the tag
 *}{else}
-	<a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}" class="userMention userLink" data-object-id="{@$userProfile->userID}">{@$userProfile->getFormattedUsername()}</a>{* no newline after the tag
+	<a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}" class="userMention userLink" data-object-id="{$userProfile->userID}">{unsafe:$userProfile->getFormattedUsername()}</a>{* no newline after the tag
 *}{/if}

com.woltlab.wcf/templates/shared_userConditions.tpl

@@ -17,7 +17,7 @@
 			{/if}
 
 			{foreach from=$conditionObjectTypes item='condition'}
-				{@$condition->getProcessor()->getHtml()}
+				{unsafe:$condition->getProcessor()->getHtml()}
 			{/foreach}
 
 			{if $conditionGroup != 'userOptions'}

com.woltlab.wcf/templates/shared_userFormField.tpl

@@ -9,9 +9,9 @@
 
 <script data-relocate="true">
 	require(['WoltLabSuite/Core/Ui/ItemList/User'], function(UiItemListUser) {
-		UiItemListUser.init('{@$field->getPrefixedId()|encodeJS}', {
+		UiItemListUser.init('{unsafe:$field->getPrefixedId()|encodeJS}', {
 			{if $field->getMaximumMultiples() !== -1}
-				maxItems: {@$field->getMaximumMultiples()},
+				maxItems: {$field->getMaximumMultiples()},
 			{/if}
 		});
 	});

com.woltlab.wcf/templates/shared_userOptionsCondition.tpl

@@ -1,8 +1,8 @@
 {foreach from=$optionTree item='category'}
 	<section class="section">
 		<header class="sectionHeader">
-			<h2 class="sectionTitle">{lang}wcf.user.option.category.{@$category[object]->categoryName}{/lang}</h2>
-			{hascontent}<p class="sectionDescription">{content}{lang __optional=true}wcf.user.option.category.{@$category[object]->categoryName}.description{/lang}{/content}</p>{/hascontent}
+			<h2 class="sectionTitle">{lang}wcf.user.option.category.{$category[object]->categoryName}{/lang}</h2>
+			{hascontent}<p class="sectionDescription">{content}{lang __optional=true}wcf.user.option.category.{$category[object]->categoryName}.description{/lang}{/content}</p>{/hascontent}
 		</header>
 
 		{include file='optionFieldList' options=$category[options] langPrefix='wcf.user.option.'}

com.woltlab.wcf/templates/user.tpl

@@ -55,7 +55,7 @@
 					'wcf.user.editProfile': '{jslang}wcf.user.editProfile{/jslang}'
 				});
 
-				new WCF.User.Profile.Editor({@$user->userID}, {if $editOnInit}true{else}false{/if});
+				new WCF.User.Profile.Editor({$user->userID}, {if $editOnInit}true{else}false{/if});
 			{/if}
 
 			{event name='javascriptInit'}
@@ -105,7 +105,7 @@
 			{if $menuItem->getContentManager()->isVisible($userID)}
 				<div id="{$menuItem->getIdentifier()}" class="tabMenuContent" data-menu-item="{$menuItem->menuItem}">
 					{if $menuItem === $__wcf->getUserProfileMenu()->getActiveMenuItem($userID)}
-						{@$profileContent}
+						{unsafe:$profileContent}
 					{/if}
 				</div>
 			{/if}

com.woltlab.wcf/templates/userBirthdayList.tpl

@@ -2,18 +2,18 @@
 	<div class="section sectionContainerList">
 		<ol class="containerList jsGroupedUserList">
 			{foreach from=$users item=user}
-				<li data-object-id="{@$user->userID}">
+				<li data-object-id="{$user->userID}">
 					<div class="box48">
 						{user object=$user type='avatar48' ariaHidden='true' tabindex='-1'}
 
 						<div class="details userInformation">
 							<div class="containerHeadline">
 								<h3>{user object=$user}{if MODULE_USER_RANK}
 									{if $user->getUserTitle()}
-										<span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>
+										<span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>
 									{/if}
 									{if $user->getRank() && $user->getRank()->rankImage}
-										<span class="userRankImage">{@$user->getRank()->getImage()}</span>
+										<span class="userRankImage">{unsafe:$user->getRank()->getImage()}</span>
 									{/if}
 								{/if}</h3>
 							</div>

com.woltlab.wcf/templates/userException.tpl

@@ -12,26 +12,26 @@
 	<div class="box64 userException">
 		{icon size=64 name='circle-exclamation'}
 		<p id="errorMessage" class="fullPageErrorMessage userExceptionMessage" data-exception-class-name="{$exceptionClassName}">
-			{@$message}
+			{unsafe:$message}
 		</p>
 	</div>
 </div>
 
 <script data-relocate="true">
 	if (document.referrer) {
-		$('#errorMessage').append('<br><br><a href="' + document.referrer + '">{lang}wcf.page.error.backward{/lang}</a>');
+		document.getElementById('errorMessage').insertAdjacentHTML('beforeend', `<br><br><a href="${ document.referrer }">{lang}wcf.page.error.backward{/lang}</a>`);
 	}
 </script>
 
 {if ENABLE_DEBUG_MODE}
 	<!-- 
-	{$name} thrown in {$file} ({@$line})
+	{$name} thrown in {$file} ({$line})
 	Stacktrace:
 	{$stacktrace}
 	-->
 	<script>
-		console.debug('{$name|encodeJS} thrown in {$file|encodeJS} ({@$line})');
-		console.debug('Stacktrace:\n{@$stacktrace|encodeJS}');
+		console.debug('{$name|encodeJS} thrown in {$file|encodeJS} ({$line})');
+		console.debug('Stacktrace:\n{unsafe:$stacktrace|encodeJS}');
 	</script>
 {/if}
 

com.woltlab.wcf/templates/userInformationButtons.tpl

@@ -8,16 +8,16 @@
 
 				{if $user->userID != $__wcf->user->userID}
 					{if $user->isAccessible('canViewEmailAddress')}
-						<li><a class="jsTooltip" href="mailto:{@$user->getEncodedEmail()}" title="{lang}wcf.user.button.mail{/lang}">{icon name='envelope' type='solid'} <span class="invisible">{lang}wcf.user.button.mail{/lang}</span></a></li>
+						<li><a class="jsTooltip" href="mailto:{unsafe:$user->getEncodedEmail()}" title="{lang}wcf.user.button.mail{/lang}">{icon name='envelope' type='solid'} <span class="invisible">{lang}wcf.user.button.mail{/lang}</span></a></li>
 					{/if}
 				{/if}
 
 				{if $__wcf->user->userID && $user->userID != $__wcf->user->userID}
 					{if !$__wcf->getUserProfileHandler()->isIgnoredByUser($user->userID)}
 						{if $__wcf->getUserProfileHandler()->isFollowing($user->userID)}
-							<li class="jsOnly"><a href="#" data-following="1" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.unfollow{/lang}">{icon name='circle-minus'} <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
+							<li class="jsOnly"><a href="#" data-following="1" data-object-id="{$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.unfollow{/lang}">{icon name='circle-minus'} <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
 						{else}
-							<li class="jsOnly"><a href="#" data-following="0" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.follow{/lang}">{icon name='circle-plus'} <span class="invisible">{lang}wcf.user.button.follow{/lang}</span></a></li>
+							<li class="jsOnly"><a href="#" data-following="0" data-object-id="{$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.follow{/lang}">{icon name='circle-plus'} <span class="invisible">{lang}wcf.user.button.follow{/lang}</span></a></li>
 						{/if}
 					{/if}
 				{/if}

com.woltlab.wcf/templates/userInformationHeadline.tpl

@@ -8,18 +8,18 @@
 		{/if}
 		{if MODULE_USER_RANK}
 			{if $user->getUserTitle()}
-				<span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>
+				<span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>
 			{/if}
 			{if $user->getRank() && $user->getRank()->rankImage}
-				<span class="userRankImage">{@$user->getRank()->getImage()}</span>
+				<span class="userRankImage">{unsafe:$user->getRank()->getImage()}</span>
 			{/if}
 		{/if}
 	</h3>
 </div>
 <ul class="inlineList commaSeparated">
 	{if $__wcf->getSession()->getPermission('user.profile.canViewUserProfile') && !$user->isProtected()}
 		{if $user->isVisibleOption('gender') && $user->gender}<li>{$user->getFormattedUserOption('gender')}</li>{/if}
-		{if $user->isVisibleOption('birthday') && $user->getAge()}<li>{@$user->getAge()}</li>{/if}
+		{if $user->isVisibleOption('birthday') && $user->getAge()}<li>{$user->getAge()}</li>{/if}
 		{if $user->isVisibleOption('location') && $user->location}<li>{lang}wcf.user.membersList.location{/lang}</li>{/if}
 	{/if}
 	<li>{lang}wcf.user.membersList.registrationDate{/lang}</li>

com.woltlab.wcf/templates/userInformationStatistics.tpl

@@ -8,7 +8,7 @@
 {/if}
 
 {if $user->activityPoints}
-	<dt>{if $disableDialogLinks}<span>{lang}wcf.user.activityPoint{/lang}</span>{else}<a href="#" class="activityPointsDisplay jsTooltip" title="{lang}wcf.user.activityPoint.showActivityPoints{/lang}" data-user-id="{@$user->userID}">{lang}wcf.user.activityPoint{/lang}</a>{/if}</dt>
+	<dt>{if $disableDialogLinks}<span>{lang}wcf.user.activityPoint{/lang}</span>{else}<a href="#" class="activityPointsDisplay jsTooltip" title="{lang}wcf.user.activityPoint.showActivityPoints{/lang}" data-user-id="{$user->userID}">{lang}wcf.user.activityPoint{/lang}</a>{/if}</dt>
 	<dd>{#$user->activityPoints}</dd>
 {/if}
 

com.woltlab.wcf/templates/userListItem.tpl

@@ -1,4 +1,4 @@
-<li data-object-id="{@$user->userID}">
+<li data-object-id="{$user->userID}">
 	<div class="box48">
 		{user object=$user type='avatar48' ariaHidden='true' tabindex='-1'}
 

com.woltlab.wcf/templates/userMenuSidebar.tpl

@@ -9,7 +9,7 @@
 				<ol class="boxMenu">
 					{foreach from=$__wcf->getUserMenu()->getMenuItems($menuCategory->menuItem) item=menuItem}
 						<li{if $menuItem->menuItem|in_array:$__userMenuActiveItems} class="active"{/if}>
-							<a href="{$menuItem->getProcessor()->getLink()}" class="boxMenuLink"><span class="boxMenuLinkTitle">{@$menuItem}</span></a>
+							<a href="{$menuItem->getProcessor()->getLink()}" class="boxMenuLink"><span class="boxMenuLinkTitle">{unsafe:$menuItem}</span></a>
 						</li>
 					{/foreach}
 				</ol>

com.woltlab.wcf/templates/userNotice.tpl

@@ -2,7 +2,7 @@
 	{if OFFLINE && $__wcf->session->getPermission('admin.general.canViewPageDuringOfflineMode')}
 		<woltlab-core-notice type="warning">
 			<p><strong>{lang}wcf.page.offline{/lang}</strong></p>
-			<div>{if OFFLINE_MESSAGE_ALLOW_HTML}{@OFFLINE_MESSAGE|phrase}{else}{@OFFLINE_MESSAGE|phrase|newlineToBreak}{/if}</div>
+			<div>{if OFFLINE_MESSAGE_ALLOW_HTML}{unsafe:OFFLINE_MESSAGE|phrase}{else}{unsafe:OFFLINE_MESSAGE|phrase|newlineToBreak}{/if}</div>
 		</woltlab-core-notice>
 	{/if}
 
@@ -35,7 +35,7 @@
 							</button>
 						{/if}
 
-						{@$notice}
+						{unsafe:$notice}
 					</div>
 				{else}
 					<woltlab-core-notice type="{$notice->cssClassName}" class="notice{if $notice->isDismissible} noticeDismissible active{/if}">
@@ -45,7 +45,7 @@
 							</button>
 						{/if}
 
-						{@$notice}
+						{unsafe:$notice}
 					</woltlab-core-notice>
 				{/if}
 			{/foreach}
@@ -63,6 +63,6 @@
 
 {if $__userNotice|trim}
 	<div class="userNotice">
-		{@$__userNotice}
+		{unsafe:$__userNotice}
 	</div>
 {/if}

com.woltlab.wcf/templates/userOptionFieldList.tpl

@@ -2,15 +2,15 @@
 	{assign var=option value=$optionData[object]}
 	<dl class="{$option->optionName}Input{if $errorType|is_array && $errorType[$option->optionName]|isset} formError{/if}">
 		<dt{if $optionData[cssClassName]} class="{$optionData[cssClassName]}"{/if}>{if $isSearchMode|empty || !$optionData[hideLabelInSearch]}<label for="{$option->optionName}">{$langPrefix|concat:$option->optionName|phrase}</label>{if $inSearchMode|empty && $option->required} <span class="customOptionRequired">*</span>{/if}{/if}</dt>
-		<dd>{@$optionData[html]}
-			<small>{lang __optional=true}{@$langPrefix}{$option->optionName}.description{/lang}</small>
+		<dd>{unsafe:$optionData[html]}
+			<small>{lang __optional=true}{$langPrefix}{$option->optionName}.description{/lang}</small>
 
 			{if $errorType|is_array && $errorType[$option->optionName]|isset}
 				<small class="innerError">
 					{if $errorType[$option->optionName] == 'empty'}
 						{lang}wcf.global.form.error.empty{/lang}
 					{else}
-						{lang}{@$langPrefix}error.{$errorType[$option->optionName]}{/lang}
+						{lang}{$langPrefix}error.{$errorType[$option->optionName]}{/lang}
 					{/if}
 				</small>
 			{/if}

com.woltlab.wcf/templates/userProfileAboutEditable.tpl

@@ -1,16 +1,16 @@
 {foreach from=$optionTree item=categoryLevel1}
 	{foreach from=$categoryLevel1[categories] item=categoryLevel2}
 		<section class="section">
-			<h2 class="sectionTitle">{lang}wcf.user.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</h2>
+			<h2 class="sectionTitle">{lang}wcf.user.option.category.{$categoryLevel2[object]->categoryName}{/lang}</h2>
 
 			{if $categoryLevel2[object]->categoryName == 'profile.personal' && MODULE_USER_RANK && $__wcf->session->getPermission('user.profile.canEditUserTitle')}
 				<dl>
 					<dt><label for="__userTitle">{lang}wcf.user.userTitle{/lang}</label></dt>
 					<dd>
-						<input type="text" id="__userTitle" name="values[__userTitle]" value="{$__userTitle}" class="long" maxlength="{@USER_TITLE_MAX_LENGTH}">
+						<input type="text" id="__userTitle" name="values[__userTitle]" value="{$__userTitle}" class="long" maxlength="{USER_TITLE_MAX_LENGTH}">
 						{if $errorType[__userTitle]|isset}
 							<small class="innerError">
-								{lang}wcf.user.userTitle.error.{@$errorType[__userTitle]}{/lang}
+								{lang}wcf.user.userTitle.error.{$errorType[__userTitle]}{/lang}
 							</small>
 						{/if}
 						<small>{lang}wcf.user.userTitle.description{/lang}</small>

com.woltlab.wcf/templates/userProfileLikeItem.tpl

@@ -7,13 +7,13 @@
 				<div class="containerHeadline">
 					<h3>
 						{user object=$like->getUserProfile()}
-						<small class="separatorLeft">{@$like->time|time}</small>
+						<small class="separatorLeft">{time time=$like->time}</small>
 					</h3>
-					<div>{@$like->getTitle()}</div>
+					<div>{unsafe:$like->getTitle()}</div>
 					<small class="containerContentType">{$like->getObjectTypeDescription()}</small>
 				</div>
 
-				<div class="containerContent">{@$like->getDescription()}</div>
+				<div class="containerContent">{unsafe:$like->getDescription()}</div>
 			</div>
 		</div>
 	</li>

com.woltlab.wcf/templates/userProfileLikes.tpl

@@ -5,11 +5,11 @@
 			'wcf.like.reaction.more': '{jslang}wcf.like.reaction.more{/jslang}'
 		});
 
-		new UiReactionProfileLoader({@$userID});
+		new UiReactionProfileLoader({$userID});
 	});
 </script>
 
-<ul id="likeList" class="containerList recentActivityList likeList" data-last-like-time="{@$lastLikeTime}">
+<ul id="likeList" class="containerList recentActivityList likeList" data-last-like-time="{$lastLikeTime}">
 	<li class="containerListButtonGroup likeTypeSelection">
 		<ul class="buttonGroup" id="likeType">
 			<li><a class="button small active" data-like-type="received">{lang}wcf.like.reactionsReceived{/lang}</a></li>
@@ -19,7 +19,7 @@
 		{if $__wcf->getReactionHandler()->getReactionTypes()|count > 1}
 			<ul class="buttonGroup" id="reactionType">
 				{foreach from=$__wcf->getReactionHandler()->getReactionTypes() item=reactionType name=reactionTypeLoop}
-					<li><a class="button small jsTooltip" data-reaction-type-id="{$reactionType->reactionTypeID}" title="{$reactionType->getTitle()}" data-is-assignable="{if $reactionType->isAssignable}1{else}0{/if}">{@$reactionType->renderIcon()} <span class="invisible">{$reactionType->getTitle()}</span></a></li>
+					<li><a class="button small jsTooltip" data-reaction-type-id="{$reactionType->reactionTypeID}" title="{$reactionType->getTitle()}" data-is-assignable="{if $reactionType->isAssignable}1{else}0{/if}">{unsafe:$reactionType->renderIcon()} <span class="invisible">{$reactionType->getTitle()}</span></a></li>
 				{/foreach}
 			</ul>
 		{/if}