Skip to content

Commit 096e137

Browse files
committed
Remove unnecessary @ and replace all other @ with unsafe:
1 parent dfc34ba commit 096e137

7 files changed

Lines changed: 19 additions & 18 deletions

File tree

com.woltlab.wcf/templates/shared_languageChooser.tpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
{if $languages|count}
55
<dl{if $errorField|isset && $errorField == $__languageChooserPrefix|concat:'languageID'} class="formError"{/if}>
66
<dt>{lang}{$label}{/lang}</dt>
7-
<dd id="{@$__languageChooserPrefix}languageIDContainer">
7+
<dd id="{$__languageChooserPrefix}languageIDContainer">
88
<noscript>
9-
<select name="{@$__languageChooserPrefix}languageID" id="{@$__languageChooserPrefix}languageID">
9+
<select name="{$__languageChooserPrefix}languageID" id="{$__languageChooserPrefix}languageID">
1010
{foreach from=$languages item=_language}
1111
<option value="{$_language->languageID}">{$_language}</option>
1212
{/foreach}
@@ -19,14 +19,14 @@
1919
require(['WoltLabSuite/Core/Language/Chooser'], function(LanguageChooser) {
2020
var languages = {
2121
{implode from=$languages item=_language}
22-
'{@$_language->languageID}': {
23-
iconPath: '{@$_language->getIconPath()|encodeJS}',
24-
languageName: '{@$_language|encodeJS}'
22+
'{$_language->languageID}': {
23+
iconPath: '{unsafe:$_language->getIconPath()|encodeJS}',
24+
languageName: '{unsafe:$_language|encodeJS}'
2525
}
2626
{/implode}
2727
};
2828
29-
LanguageChooser.init('{@$__languageChooserPrefix}languageIDContainer', '{@$__languageChooserPrefix}languageID', {$languageID}, languages)
29+
LanguageChooser.init('{unsafe:$__languageChooserPrefix|encodeJS}languageIDContainer', '{unsafe:$__languageChooserPrefix|encodeJS}languageID', {$languageID}, languages)
3030
});
3131
</script>
3232
{/if}

com.woltlab.wcf/templates/shared_multipleLanguageInputJavascript.tpl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
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}: '{unsafe:$languageName|encodeJS}'{/implode} };
9+
{* `$value` already encoded in `I18nHandler::assignVariables()` *}
10+
var values = { {implode from=$i18nValues[$elementIdentifier] key=languageID item=value}'{$languageID}': '{unsafe:$value}'{/implode} };
1011
11-
var element = elById('{@$elementIdentifier}');
12+
var element = elById('{unsafe:$elementIdentifier|encodeJS}');
1213
var type = LanguageInput;
1314
if (element && element.nodeName === 'TEXTAREA' && element.classList.contains('wysiwygTextarea')) {
1415
type = LanguageText;
1516
}
1617
17-
type['init']('{@$elementIdentifier}', values, availableLanguages, {if $forceSelection}true{else}false{/if});
18+
type['init']('{unsafe:$elementIdentifier|encodeJS}', values, availableLanguages, {if $forceSelection}true{else}false{/if});
1819
});
1920
</script>
2021
{/if}

wcfsetup/install/files/acp/templates/languageAdd.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<header class="contentHeader">
44
<div class="contentHeaderTitle">
5-
<h1 class="contentTitle">{lang}wcf.acp.language.{@$action}{/lang}</h1>
5+
<h1 class="contentTitle">{lang}wcf.acp.language.{$action}{/lang}</h1>
66
</div>
77

88
<nav class="contentHeaderNavigation">
@@ -14,6 +14,6 @@
1414
</nav>
1515
</header>
1616

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

1919
{include file='footer'}

wcfsetup/install/files/acp/templates/languageExport.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{if $errorType == 'noValidSelection'}
2828
{lang}wcf.global.form.error.noValidSelection{/lang}
2929
{else}
30-
{lang}wcf.acp.language.languageID.error.{@$errorType}{/lang}
30+
{lang}wcf.acp.language.languageID.error.{$errorType}{/lang}
3131
{/if}
3232
</small>
3333
{/if}
@@ -48,7 +48,7 @@
4848
{if $errorType == 'empty'}
4949
{lang}wcf.global.form.error.empty{/lang}
5050
{else}
51-
{lang}wcf.acp.language.export.package.error.{@$errorType}{/lang}
51+
{lang}wcf.acp.language.export.package.error.{$errorType}{/lang}
5252
{/if}
5353
</small>
5454
{/if}

wcfsetup/install/files/acp/templates/languageImport.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
{if $errorType == 'empty'}
5252
{lang}wcf.global.form.error.empty{/lang}
5353
{else}
54-
{lang}wcf.acp.language.add.source.error.{@$errorType}{/lang}
54+
{lang}wcf.acp.language.add.source.error.{$errorType}{/lang}
5555
{/if}
5656
</small>
5757
{/if}
@@ -73,7 +73,7 @@
7373
{if $errorType == 'empty'}
7474
{lang}wcf.global.form.error.empty{/lang}
7575
{else}
76-
{lang}wcf.acp.language.add.package.error.{@$errorType}{/lang}
76+
{lang}wcf.acp.language.add.package.error.{$errorType}{/lang}
7777
{/if}
7878
</small>
7979
{/if}

wcfsetup/install/files/acp/templates/languageItemAdd.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
</nav>
1515
</header>
1616

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

1919
{include file='footer'}

wcfsetup/install/files/acp/templates/languageMultilingualism.tpl

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

4444
{if $errorField == 'languageIDs'}
4545
<small class="innerError">
46-
{lang}wcf.acp.language.multilingualism.languages.error.{@$errorType}{/lang}
46+
{lang}wcf.acp.language.multilingualism.languages.error.{$errorType}{/lang}
4747
</small>
4848
{/if}
4949
</dd>

0 commit comments

Comments
 (0)