Skip to content

Commit 5ede1da

Browse files
committed
Use unsafe:…|encodeJS to output strings in JavaScript
1 parent d0fc12f commit 5ede1da

6 files changed

+11
-11
lines changed

com.woltlab.wcf/templates/shared_formFieldDataHandler.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<script data-relocate="true">
33
require([
44
'tslib',
5-
'{$field->getJavaScriptDataHandlerModule()}',
5+
'{unsafe:$field->getJavaScriptDataHandlerModule()|encodeJS}',
66
'WoltLabSuite/Core/Form/Builder/Manager'
77
], function(
88
tslib,

com.woltlab.wcf/templates/shared_messageFormAttachments.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{jsphrase name='wcf.attachment.moreOptions'}
2424
2525
require(["WoltLabSuite/Core/Component/Attachment/List"], ({ setup }) => {
26-
setup("{if $wysiwygSelector|isset}{$wysiwygSelector}{else}text{/if}");
26+
setup("{if $wysiwygSelector|isset}{unsafe:$wysiwygSelector|encodeJS}{else}text{/if}");
2727
});
2828
</script>
2929

com.woltlab.wcf/templates/shared_multipleLanguageInputJavascript.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
'wcf.global.button.disabledI18n': '{jslang}wcf.global.button.disabledI18n{/jslang}'
66
});
77
8-
var availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
9-
var values = { {implode from=$i18nValues[$elementIdentifier] key=languageID item=value}'{@$languageID}': '{$value}'{/implode} };
8+
var availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{$languageID}: '{$languageName}'{/implode} };
9+
var values = { {implode from=$i18nValues[$elementIdentifier] key=languageID item=value}'{$languageID}': '{$value}'{/implode} };
1010
11-
var element = elById('{@$elementIdentifier}');
11+
var element = elById('{unsafe:$elementIdentifier|encodeJS}');
1212
var type = LanguageInput;
1313
if (element && element.nodeName === 'TEXTAREA' && element.classList.contains('wysiwygTextarea')) {
1414
type = LanguageText;
1515
}
1616
17-
type['init']('{@$elementIdentifier}', values, availableLanguages, {if $forceSelection}true{else}false{/if});
17+
type['init']('{unsafe:$elementIdentifier|encodeJS}', values, availableLanguages, {if $forceSelection}true{else}false{/if});
1818
});
1919
</script>
2020
{/if}

com.woltlab.wcf/templates/shared_multiplePagesSelectionFormField.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
{if $field->getVisibleEverywhereFieldId() !== null}
44
<script data-relocate="true">
55
{
6-
const label = document.querySelector('label[for="{$field->getPrefixedId()}"]');
6+
const label = document.querySelector('label[for="{unsafe:$field->getPrefixedId()|encodeJS}"]');
77
8-
document.querySelectorAll('input[name="{$field->getVisibleEverywhereFieldId()}"]').forEach((input) => {
8+
document.querySelectorAll('input[name="{unsafe:$field->getVisibleEverywhereFieldId()|encodeJS}"]').forEach((input) => {
99
input.addEventListener("change", () => {
1010
setLabelText(input.value);
1111
});
@@ -15,7 +15,7 @@
1515
label.innerHTML = parseInt(value) === 0 ? '{unsafe:$field->getLabel()|encodeJS}' : '{unsafe:$field->getInvertedLabel()|encodeJS}';
1616
}
1717
18-
setLabelText(document.querySelector('input[name="{$field->getVisibleEverywhereFieldId()}"]:checked').value);
18+
setLabelText(document.querySelector('input[name="{unsafe:$field->getVisibleEverywhereFieldId()|encodeJS}"]:checked').value);
1919
}
2020
</script>
2121
{/if}

com.woltlab.wcf/templates/shared_ratingFormField.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<script data-relocate="true">
3030
require(['WoltLabSuite/Core/Form/Builder/Field/Controller/Rating'], function(FormBuilderFieldRating) {
3131
new FormBuilderFieldRating(
32-
'{$field->getPrefixedId()}',
32+
'{unsafe:$field->getPrefixedId()|encodeJS}',
3333
{if $field->getValue() !== null}{$field->getValue()}{else}''{/if}
3434
);
3535
});

com.woltlab.wcf/templates/shared_wysiwygAttachmentFormField.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{jsphrase name='wcf.attachment.moreOptions'}
2626
2727
require(["WoltLabSuite/Core/Component/Attachment/List"], ({ setup }) => {
28-
setup("{$field->getPrefixedWysiwygId()}");
28+
setup("{unsafe:$field->getPrefixedWysiwygId()|encodeJS}");
2929
});
3030
</script>
3131
</div>

0 commit comments

Comments
 (0)