Skip to content

Commit 94d89f5

Browse files
CyperghostCyperghost
authored
Merge pull request #6347 from WoltLab/6.2-multifactor-templates-unsafe
Refactor multifactor templates
2 parents 9d2f03e + 28eb851 commit 94d89f5

7 files changed

Lines changed: 21 additions & 21 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

22
<tr>
33
<td class="columnText">{$device[deviceName]}</td>
4-
<td class="columnDate">{$device[createTime]|plainTime}</td>
5-
<td class="columnDate">{if $device[useTime]}{$device[useTime]|plainTime}{else}&ndash;{/if}</td>
4+
<td class="columnDate">{time time=$device[createTime] type='plainTime'}</td>
5+
<td class="columnDate">{if $device[useTime]}{time time=$device[useTime] type='plainTime'}{else}&ndash;{/if}</td>
66
<td class="columnText">
77
{foreach from=$container item='child'}
88
{if $child->isAvailable()}
9-
{@$child->getHtml()}
9+
{unsafe:$child->getHtml()}
1010
{/if}
1111
{/foreach}
1212
</td>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
{if $container->getLabel() !== null}
77
{if $container->getDescription() !== null}
88
<header class="sectionHeader">
9-
<h2 class="sectionTitle">{@$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
10-
<p class="sectionDescription">{@$container->getDescription()}</p>
9+
<h2 class="sectionTitle">{unsafe:$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
10+
<p class="sectionDescription">{unsafe:$container->getDescription()}</p>
1111
</header>
1212
{else}
13-
<h2 class="sectionTitle">{@$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
13+
<h2 class="sectionTitle">{unsafe:$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
1414
{/if}
1515
{/if}
1616

@@ -28,7 +28,7 @@
2828
<tbody>
2929
{foreach from=$container item='child'}
3030
{if $child->isAvailable()}
31-
{@$child->getHtml()}
31+
{unsafe:$child->getHtml()}
3232
{/if}
3333
{/foreach}
3434
</tbody>
@@ -40,6 +40,6 @@
4040

4141
<script data-relocate="true">
4242
require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Container/Default'], function(DefaultContainerDependency) {
43-
new DefaultContainerDependency('{@$container->getPrefixedId()|encodeJS}Container');
43+
new DefaultContainerDependency('{unsafe:$container->getPrefixedId()|encodeJS}Container');
4444
});
4545
</script>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@
66
{if $container->getLabel() !== null}
77
{if $container->getDescription() !== null}
88
<header class="sectionHeader">
9-
<h2 class="sectionTitle">{@$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
10-
<p class="sectionDescription">{@$container->getDescription()}</p>
9+
<h2 class="sectionTitle">{unsafe:$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
10+
<p class="sectionDescription">{unsafe:$container->getDescription()}</p>
1111
</header>
1212
{else}
13-
<h2 class="sectionTitle">{@$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
13+
<h2 class="sectionTitle">{unsafe:$container->getLabel()}{if $container->markAsRequired()} <span class="formFieldRequired">*</span>{/if}</h2>
1414
{/if}
1515
{/if}
1616

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

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

2424
<div class="multifactorTotpNewDeviceFields">
2525
{foreach from=$container item='child'}
2626
{if $child->getId() !== 'secret' && $child->getId() !== 'submitButton' && $child->isAvailable()}
27-
{@$child->getHtml()}
27+
{unsafe:$child->getHtml()}
2828
{/if}
2929
{/foreach}
3030

3131
{if $container->getNodeById('submitButton')->isAvailable()}
3232
<div class="formSubmit">
33-
{@$container->getNodeById('submitButton')->getHtml()}
33+
{unsafe:$container->getNodeById('submitButton')->getHtml()}
3434
</div>
3535
{/if}
3636
</div>
@@ -41,6 +41,6 @@
4141

4242
<script data-relocate="true">
4343
require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Container/Default'], function(DefaultContainerDependency) {
44-
new DefaultContainerDependency('{@$container->getPrefixedId()|encodeJS}Container');
44+
new DefaultContainerDependency('{unsafe:$container->getPrefixedId()|encodeJS}Container');
4545
});
4646
</script>

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

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

55
{include file='authFlowHeader'}
66

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

99
<div class="authOtherOptionButtons" hidden>
1010
<div class="authOtherOptionButtons__separator">

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

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

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

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

77
{include file='footer' __disableAds=true}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

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

13-
{@$backupForm->getNodeById('existingCodesContainer')->getHtml()}
13+
{unsafe:$backupForm->getNodeById('existingCodesContainer')->getHtml()}
1414
{else}
15-
{@$form->getHtml()}
15+
{unsafe:$form->getHtml()}
1616
{/if}
1717

1818
{include file='footer' __disableAds=true}

‎wcfsetup/install/files/acp/templates/multifactorAuthentication.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</div>
1010
</header>
1111

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

1414
<div class="authOtherOptionButtons" hidden>
1515
<div class="authOtherOptionButtons__separator">

0 commit comments

Comments
 (0)