Skip to content

Refactor multifactor templates #6347

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 2 commits into from
Jun 16, 2025
Merged

Refactor multifactor templates #6347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e9f71
Remove unnecessary `@` and replace all other `@` with `unsafe:`
Cyperghost Jun 12, 2025
28eb851
Use the `time` TemplatePlugin and no longer the deprecated `plainTime…
Cyperghost Jun 13, 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
6 changes: 3 additions & 3 deletions com.woltlab.wcf/templates/__multifactorTotpDeviceNode.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

<tr>
<td class="columnText">{$device[deviceName]}</td>
<td class="columnDate">{$device[createTime]|plainTime}</td>
<td class="columnDate">{if $device[useTime]}{$device[useTime]|plainTime}{else}&ndash;{/if}</td>
<td class="columnDate">{time time=$device[createTime] type='plainTime'}</td>
<td class="columnDate">{if $device[useTime]}{time time=$device[useTime] type='plainTime'}{else}&ndash;{/if}</td>
<td class="columnText">
{foreach from=$container item='child'}
{if $child->isAvailable()}
{@$child->getHtml()}
{unsafe:$child->getHtml()}
{/if}
{/foreach}
</td>
Expand Down
10 changes: 5 additions & 5 deletions com.woltlab.wcf/templates/__multifactorTotpDevicesContainer.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
{if $container->getLabel() !== null}
{if $container->getDescription() !== null}
<header class="sectionHeader">
<h2 class="sectionTitle">{@$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
<p class="sectionDescription">{@$container->getDescription()}</p>
<h2 class="sectionTitle">{unsafe:$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
<p class="sectionDescription">{unsafe:$container->getDescription()}</p>
</header>
{else}
<h2 class="sectionTitle">{@$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
<h2 class="sectionTitle">{unsafe:$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
{/if}
{/if}

Expand All @@ -28,7 +28,7 @@
<tbody>
{foreach from=$container item='child'}
{if $child->isAvailable()}
{@$child->getHtml()}
{unsafe:$child->getHtml()}
{/if}
{/foreach}
</tbody>
Expand All @@ -40,6 +40,6 @@

<script data-relocate="true">
require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Container/Default'], function(DefaultContainerDependency) {
new DefaultContainerDependency('{@$container->getPrefixedId()|encodeJS}Container');
new DefaultContainerDependency('{unsafe:$container->getPrefixedId()|encodeJS}Container');
});
</script>
14 changes: 7 additions & 7 deletions com.woltlab.wcf/templates/__multifactorTotpNewDeviceContainer.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@
{if $container->getLabel() !== null}
{if $container->getDescription() !== null}
<header class="sectionHeader">
<h2 class="sectionTitle">{@$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
<p class="sectionDescription">{@$container->getDescription()}</p>
<h2 class="sectionTitle">{unsafe:$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
<p class="sectionDescription">{unsafe:$container->getDescription()}</p>
</header>
{else}
<h2 class="sectionTitle">{@$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
<h2 class="sectionTitle">{unsafe:$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
{/if}
{/if}

{lang}wcf.user.security.multifactor.totp.newDevice.description{/lang}

<div class="multifactorTotpNewDevice">
{if $container->getNodeById('secret')->isAvailable()}
{@$container->getNodeById('secret')->getFieldHtml()}
{unsafe:$container->getNodeById('secret')->getFieldHtml()}
{/if}

<div class="multifactorTotpNewDeviceFields">
{foreach from=$container item='child'}
{if $child->getId() !== 'secret' && $child->getId() !== 'submitButton' && $child->isAvailable()}
{@$child->getHtml()}
{unsafe:$child->getHtml()}
{/if}
{/foreach}

{if $container->getNodeById('submitButton')->isAvailable()}
<div class="formSubmit">
{@$container->getNodeById('submitButton')->getHtml()}
{unsafe:$container->getNodeById('submitButton')->getHtml()}
</div>
{/if}
</div>
Expand All @@ -41,6 +41,6 @@

<script data-relocate="true">
require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Container/Default'], function(DefaultContainerDependency) {
new DefaultContainerDependency('{@$container->getPrefixedId()|encodeJS}Container');
new DefaultContainerDependency('{unsafe:$container->getPrefixedId()|encodeJS}Container');
});
</script>
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/multifactorAuthentication.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{include file='authFlowHeader'}

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

<div class="authOtherOptionButtons" hidden>
<div class="authOtherOptionButtons__separator">
Expand Down
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/multifactorDisable.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

{include file='header' __disableAds=true __sidebarLeftHasMenu=true}

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

{include file='footer' __disableAds=true}
6 changes: 3 additions & 3 deletions com.woltlab.wcf/templates/multifactorManage.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

{if $backupForm}
{if $form->showsSuccessMessage()}
<woltlab-core-notice type="success">{@$form->getSuccessMessage()}</woltlab-core-notice>
<woltlab-core-notice type="success">{unsafe:$form->getSuccessMessage()}</woltlab-core-notice>
{/if}

{@$backupForm->getNodeById('existingCodesContainer')->getHtml()}
{unsafe:$backupForm->getNodeById('existingCodesContainer')->getHtml()}
{else}
{@$form->getHtml()}
{unsafe:$form->getHtml()}
{/if}

{include file='footer' __disableAds=true}
2 changes: 1 addition & 1 deletion wcfsetup/install/files/acp/templates/multifactorAuthentication.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</div>
</header>

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

<div class="authOtherOptionButtons" hidden>
<div class="authOtherOptionButtons__separator">
Expand Down