diff --git a/com.woltlab.wcf/templates/shared_bbcodeAttributesFormField.tpl b/com.woltlab.wcf/templates/shared_bbcodeAttributesFormField.tpl index ee66399a41f..e7dac863dee 100644 --- a/com.woltlab.wcf/templates/shared_bbcodeAttributesFormField.tpl +++ b/com.woltlab.wcf/templates/shared_bbcodeAttributesFormField.tpl @@ -9,48 +9,48 @@
- +
- +
- +
- +
- +
  1. -
  2. -
  3. @@ -60,30 +60,30 @@
    - +
    1. -
    2. -
    3. @@ -97,7 +97,7 @@ {/if} diff --git a/com.woltlab.wcf/templates/shared_contentLanguageFormField.tpl b/com.woltlab.wcf/templates/shared_contentLanguageFormField.tpl index 7ac2873394e..463a05b7fb8 100644 --- a/com.woltlab.wcf/templates/shared_contentLanguageFormField.tpl +++ b/com.woltlab.wcf/templates/shared_contentLanguageFormField.tpl @@ -13,17 +13,17 @@ require(['WoltLabSuite/Core/Language/Chooser', 'Dom/Traverse', 'Dom/Util'], function(LanguageChooser, DomTraverse, DomUtil) { var languages = { {implode from=$field->getContentLanguages() item=contentLanguage} - '{@$contentLanguage->languageID}': { - iconPath: '{@$contentLanguage->getIconPath()|encodeJS}', - languageName: '{@$contentLanguage|encodeJS}' + '{$contentLanguage->languageID}': { + iconPath: '{unsafe:$contentLanguage->getIconPath()|encodeJS}', + languageName: '{unsafe:$contentLanguage|encodeJS}' } {/implode} }; LanguageChooser.init( - DomUtil.identify(DomTraverse.childByTag(elById('{@$field->getPrefixedId()|encodeJS}Container'), 'DD')), - '{@$field->getPrefixedId()|encodeJS}', - {if $field->getValue()}{@$field->getValue()}{else}0{/if}, + DomUtil.identify(DomTraverse.childByTag(elById('{unsafe:$field->getPrefixedId()|encodeJS}Container'), 'DD')), + '{unsafe:$field->getPrefixedId()|encodeJS}', + {if $field->getValue()}{$field->getValue()}{else}0{/if}, languages, undefined, {if !$field->isRequired()}true{else}false{/if} diff --git a/com.woltlab.wcf/templates/shared_emptyFormFieldDependency.tpl b/com.woltlab.wcf/templates/shared_emptyFormFieldDependency.tpl index 215cbe7d1e3..24e312e81f0 100644 --- a/com.woltlab.wcf/templates/shared_emptyFormFieldDependency.tpl +++ b/com.woltlab.wcf/templates/shared_emptyFormFieldDependency.tpl @@ -1,7 +1,7 @@ require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Empty'], function(EmptyFieldDependency) { - // dependency '{@$dependency->getId()}' + // dependency '{unsafe:$dependency->getId()|encodeJS}' new EmptyFieldDependency( - '{@$dependency->getDependentNode()->getPrefixedId()|encodeJS}Container', - '{@$dependency->getField()->getPrefixedId()|encodeJS}' + '{unsafe:$dependency->getDependentNode()->getPrefixedId()|encodeJS}Container', + '{unsafe:$dependency->getField()->getPrefixedId()|encodeJS}' ); }); diff --git a/com.woltlab.wcf/templates/shared_fileProcessorFormField.tpl b/com.woltlab.wcf/templates/shared_fileProcessorFormField.tpl index d57b84d4845..bb3ef01b4c3 100644 --- a/com.woltlab.wcf/templates/shared_fileProcessorFormField.tpl +++ b/com.woltlab.wcf/templates/shared_fileProcessorFormField.tpl @@ -26,7 +26,7 @@ {if $field->isBigPreview()}true{else}false{/if}, {if $field->isSimpleReplace()}true{else}false{/if}, {if $field->isHideDeleteButton()}true{else}false{/if}, - {if $field->getThumbnailSize() === null}undefined{else}'{$field->getThumbnailSize()|encodeJS}'{/if}, + {if $field->getThumbnailSize() === null}undefined{else}'{unsafe:$field->getThumbnailSize()|encodeJS}'{/if}, [{implode from=$actionButtons item=actionButton}{ title: '{unsafe:$actionButton['title']|encodeJS}', icon: {if $actionButton['icon'] === null}undefined{else}'{unsafe:$actionButton['icon']->toHtml()|encodeJS}'{/if}, diff --git a/com.woltlab.wcf/templates/shared_form.tpl b/com.woltlab.wcf/templates/shared_form.tpl index 9ecac272d9a..f6988e3b09d 100644 --- a/com.woltlab.wcf/templates/shared_form.tpl +++ b/com.woltlab.wcf/templates/shared_form.tpl @@ -11,21 +11,21 @@ , FormBuilderManager {/if} ) { - FormBuilderFieldDependencyManager.register('{@$form->getId()|encodeJS}'); + FormBuilderFieldDependencyManager.register('{unsafe:$form->getId()|encodeJS}'); {if $form->isAjax()} - FormBuilderManager.registerForm('{@$form->getId()|encodeJS}'); + FormBuilderManager.registerForm('{unsafe:$form->getId()|encodeJS}'); {/if} }); {if $form->hasValidationErrors() && $form->showsErrorMessage()} - {@$form->getErrorMessage()} + {unsafe:$form->getErrorMessage()} {/if} {if $form->showsSuccessMessage()} - {@$form->getSuccessMessage()} + {unsafe:$form->getSuccessMessage()} {if !$objectEditLink|empty} {lang}wcf.global.success.add.editCreatedObject{/lang} {/if} @@ -38,7 +38,7 @@ *}{foreach from=$form->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* *}> {else} -
      getClasses()|empty} class="{implode from=$form->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{* @@ -47,7 +47,7 @@ {/if} {foreach from=$form item='child'} {if $child->isAvailable()} - {@$child->getHtml()} + {unsafe:$child->getHtml()} {/if} {/foreach} @@ -55,7 +55,7 @@
      {foreach from=$form->getButtons() item=button} {if $button->isAvailable()} - {@$button->getHtml()} + {unsafe:$button->getHtml()} {/if} {/foreach}
      diff --git a/com.woltlab.wcf/templates/shared_formContainer.tpl b/com.woltlab.wcf/templates/shared_formContainer.tpl index 50bac7d81b0..bec0d15161e 100644 --- a/com.woltlab.wcf/templates/shared_formContainer.tpl +++ b/com.woltlab.wcf/templates/shared_formContainer.tpl @@ -6,11 +6,11 @@ {if $container->getLabel() !== null} {if $container->getDescription() !== null}
      -

      {@$container->getLabel()}{if $container->markAsRequired()} *{/if}

      -

      {@$container->getDescription()}

      +

      {unsafe:$container->getLabel()}{if $container->markAsRequired()} *{/if}

      +

      {unsafe:$container->getDescription()}

      {else} -

      {@$container->getLabel()}{if $container->markAsRequired()} *{/if}

      +

      {unsafe:$container->getLabel()}{if $container->markAsRequired()} *{/if}

      {/if} {/if} @@ -21,6 +21,6 @@ diff --git a/com.woltlab.wcf/templates/shared_formContainerChildren.tpl b/com.woltlab.wcf/templates/shared_formContainerChildren.tpl index 67486e39066..db254a76b2f 100644 --- a/com.woltlab.wcf/templates/shared_formContainerChildren.tpl +++ b/com.woltlab.wcf/templates/shared_formContainerChildren.tpl @@ -1,5 +1,5 @@ {foreach from=$container item='child'} {if $child->isAvailable()} - {@$child->getHtml()} + {unsafe:$child->getHtml()} {/if} -{/foreach} \ No newline at end of file +{/foreach} diff --git a/com.woltlab.wcf/templates/shared_formContainerDependencies.tpl b/com.woltlab.wcf/templates/shared_formContainerDependencies.tpl index 20b7a7477ef..75838e38b71 100644 --- a/com.woltlab.wcf/templates/shared_formContainerDependencies.tpl +++ b/com.woltlab.wcf/templates/shared_formContainerDependencies.tpl @@ -1,7 +1,7 @@ {if !$container->getDependencies()|empty} {/if} diff --git a/com.woltlab.wcf/templates/shared_formField.tpl b/com.woltlab.wcf/templates/shared_formField.tpl index 9a3f40c80a9..a71293f7992 100644 --- a/com.woltlab.wcf/templates/shared_formField.tpl +++ b/com.woltlab.wcf/templates/shared_formField.tpl @@ -3,9 +3,9 @@ *}{foreach from=$field->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* *}{if !$field->checkDependencies()} style="display: none;"{/if}{* *}> -
      {if $field->getLabel() !== null}{if $field->isRequired() && $form->marksRequiredFields()} *{/if}{/if}
      +
      {if $field->getLabel() !== null}{if $field->isRequired() && $form->marksRequiredFields()} *{/if}{/if}
      - {@$field->getFieldHtml()} + {unsafe:$field->getFieldHtml()} {include file='shared_formFieldErrors'} {include file='shared_formFieldDescription'} diff --git a/com.woltlab.wcf/templates/shared_formFieldDataHandler.tpl b/com.woltlab.wcf/templates/shared_formFieldDataHandler.tpl index 7fba0f0d860..736cbae6d04 100644 --- a/com.woltlab.wcf/templates/shared_formFieldDataHandler.tpl +++ b/com.woltlab.wcf/templates/shared_formFieldDataHandler.tpl @@ -2,7 +2,7 @@ diff --git a/com.woltlab.wcf/templates/shared_formFieldDependencies.tpl b/com.woltlab.wcf/templates/shared_formFieldDependencies.tpl index c3525c32505..d1488f08595 100644 --- a/com.woltlab.wcf/templates/shared_formFieldDependencies.tpl +++ b/com.woltlab.wcf/templates/shared_formFieldDependencies.tpl @@ -1,7 +1,7 @@ {if !$field->getDependencies()|empty} {/if} diff --git a/com.woltlab.wcf/templates/shared_formFieldDescription.tpl b/com.woltlab.wcf/templates/shared_formFieldDescription.tpl index b21aac75634..a6262351b7c 100644 --- a/com.woltlab.wcf/templates/shared_formFieldDescription.tpl +++ b/com.woltlab.wcf/templates/shared_formFieldDescription.tpl @@ -1,3 +1,3 @@ {if $field->getDescription() !== null} - {@$field->getDescription()} + {unsafe:$field->getDescription()} {/if} diff --git a/com.woltlab.wcf/templates/shared_formFieldError.tpl b/com.woltlab.wcf/templates/shared_formFieldError.tpl index fa9cafc1c60..e73edbfb29b 100644 --- a/com.woltlab.wcf/templates/shared_formFieldError.tpl +++ b/com.woltlab.wcf/templates/shared_formFieldError.tpl @@ -1 +1 @@ -{@$error->getMessage()} +{unsafe:$error->getMessage()} diff --git a/com.woltlab.wcf/templates/shared_formFieldErrors.tpl b/com.woltlab.wcf/templates/shared_formFieldErrors.tpl index e90727329ea..d6cf3b29ed8 100644 --- a/com.woltlab.wcf/templates/shared_formFieldErrors.tpl +++ b/com.woltlab.wcf/templates/shared_formFieldErrors.tpl @@ -1,3 +1,3 @@ {foreach from=$field->getValidationErrors() item='validationError'} - {@$validationError->getHtml()} + {unsafe:$validationError->getHtml()} {/foreach} diff --git a/com.woltlab.wcf/templates/shared_iconFormField.tpl b/com.woltlab.wcf/templates/shared_iconFormField.tpl index 88a1ec3941c..656071753fb 100644 --- a/com.woltlab.wcf/templates/shared_iconFormField.tpl +++ b/com.woltlab.wcf/templates/shared_iconFormField.tpl @@ -1,6 +1,6 @@ {if $field->getIcon()} - {@$field->getIcon()->toHtml(64)} + {unsafe:$field->getIcon()->toHtml(64)} {/if} {if !$field->isImmutable()} @@ -16,9 +16,9 @@ diff --git a/com.woltlab.wcf/templates/shared_messageFormSmileyTab.tpl b/com.woltlab.wcf/templates/shared_messageFormSmileyTab.tpl index 8cc54918263..eb4fbbe1bf5 100644 --- a/com.woltlab.wcf/templates/shared_messageFormSmileyTab.tpl +++ b/com.woltlab.wcf/templates/shared_messageFormSmileyTab.tpl @@ -3,7 +3,7 @@ {foreach from=$smileyCategories item=smileyCategory} {assign var=__tabCount value=$__tabCount + 1} {assign var='__smileyAnchor' value='smilies-'|concat:$smileyCategory->categoryID} -
    4. +
    5. {/foreach} {/capture} @@ -20,28 +20,28 @@ {if $__tabCount > 1} {foreach from=$smileyCategories item=smileyCategory} -
      +
      {if $__firstSmileyCategory->categoryID == $smileyCategory->categoryID} - {@$__defaultSmilies} + {unsafe:$__defaultSmilies} {else} {include file='shared_messageFormSmilies' smilies=$__wcf->getSmileyCache()->getCategorySmilies($smileyCategory->categoryID)} {/if}
      {/foreach} {else} - {@$__defaultSmilies} + {unsafe:$__defaultSmilies} {/if} {event name='fields'}
      diff --git a/com.woltlab.wcf/templates/shared_messageFormSmilies.tpl b/com.woltlab.wcf/templates/shared_messageFormSmilies.tpl index d17bafa2752..0beb6d4f6be 100644 --- a/com.woltlab.wcf/templates/shared_messageFormSmilies.tpl +++ b/com.woltlab.wcf/templates/shared_messageFormSmilies.tpl @@ -1,5 +1,5 @@ diff --git a/com.woltlab.wcf/templates/shared_multilineItemListFormField.tpl b/com.woltlab.wcf/templates/shared_multilineItemListFormField.tpl index 15734a3ae80..2f65d4673df 100644 --- a/com.woltlab.wcf/templates/shared_multilineItemListFormField.tpl +++ b/com.woltlab.wcf/templates/shared_multilineItemListFormField.tpl @@ -24,8 +24,8 @@ {jsphrase name='wcf.global.button.edit'} WoltLabLanguage.registerPhrase("wcf.acp.option.type.lineBreakSeparatedText.error.duplicate", '{jslang __literal=true}wcf.acp.option.type.lineBreakSeparatedText.error.duplicate{/jslang}'); - new MultilineItemListFormField(document.getElementById('lineBreakSeparatedTextOption_{@$field->getPrefixedId()|encodeJS}'), { - submitFieldName: '{@$field->getPrefixedId()|encodeJS}[]', + new MultilineItemListFormField(document.getElementById('lineBreakSeparatedTextOption_{unsafe:$field->getPrefixedId()|encodeJS}'), { + submitFieldName: '{unsafe:$field->getPrefixedId()|encodeJS}[]', }); }); {if $field->isFilterable()} @@ -38,7 +38,7 @@ {jsphrase name='wcf.global.filter.visibility.highlightActive'} {jsphrase name='wcf.global.filter.visibility.showAll'} - new UiItemListFilter('lineBreakSeparatedTextOption_{@$field->getPrefixedId()|encodeJS}'); + new UiItemListFilter('lineBreakSeparatedTextOption_{unsafe:$field->getPrefixedId()|encodeJS}'); }); {/if} diff --git a/com.woltlab.wcf/templates/shared_multipleLanguageInputJavascript.tpl b/com.woltlab.wcf/templates/shared_multipleLanguageInputJavascript.tpl index 373dd9df195..861ae701052 100644 --- a/com.woltlab.wcf/templates/shared_multipleLanguageInputJavascript.tpl +++ b/com.woltlab.wcf/templates/shared_multipleLanguageInputJavascript.tpl @@ -5,16 +5,16 @@ 'wcf.global.button.disabledI18n': '{jslang}wcf.global.button.disabledI18n{/jslang}' }); - var availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} }; - var values = { {implode from=$i18nValues[$elementIdentifier] key=languageID item=value}'{@$languageID}': '{$value}'{/implode} }; + var availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{$languageID}: '{$languageName}'{/implode} }; + var values = { {implode from=$i18nValues[$elementIdentifier] key=languageID item=value}'{$languageID}': '{$value}'{/implode} }; - var element = elById('{@$elementIdentifier}'); + var element = elById('{unsafe:$elementIdentifier|encodeJS}'); var type = LanguageInput; if (element && element.nodeName === 'TEXTAREA' && element.classList.contains('wysiwygTextarea')) { type = LanguageText; } - type['init']('{@$elementIdentifier}', values, availableLanguages, {if $forceSelection}true{else}false{/if}); + type['init']('{unsafe:$elementIdentifier|encodeJS}', values, availableLanguages, {if $forceSelection}true{else}false{/if}); }); {/if} diff --git a/com.woltlab.wcf/templates/shared_multiplePagesSelectionFormField.tpl b/com.woltlab.wcf/templates/shared_multiplePagesSelectionFormField.tpl index d01a04d12aa..ed723e850b6 100644 --- a/com.woltlab.wcf/templates/shared_multiplePagesSelectionFormField.tpl +++ b/com.woltlab.wcf/templates/shared_multiplePagesSelectionFormField.tpl @@ -3,9 +3,9 @@ {if $field->getVisibleEverywhereFieldId() !== null} {/if} diff --git a/com.woltlab.wcf/templates/shared_multipleSelectFormField.tpl b/com.woltlab.wcf/templates/shared_multipleSelectFormField.tpl index 7f5fdd38290..1765d7744fa 100644 --- a/com.woltlab.wcf/templates/shared_multipleSelectFormField.tpl +++ b/com.woltlab.wcf/templates/shared_multipleSelectFormField.tpl @@ -10,6 +10,6 @@ value="{$__fieldNestedOption[value]}" {if $field->getValue() !== null && $__fieldNestedOption[value]|in_array:$field->getValue() && $__fieldNestedOption[isSelectable]} selected{/if} {if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if} - >{@' '|str_repeat:$__fieldNestedOption[depth] * 4}{@$__fieldNestedOption[label]} + >{unsafe:' '|str_repeat:$__fieldNestedOption[depth] * 4}{unsafe:$__fieldNestedOption[label]} {/foreach} diff --git a/com.woltlab.wcf/templates/shared_multipleSelectionFormField.tpl b/com.woltlab.wcf/templates/shared_multipleSelectionFormField.tpl index eba2225e910..1aa4aa4d125 100644 --- a/com.woltlab.wcf/templates/shared_multipleSelectionFormField.tpl +++ b/com.woltlab.wcf/templates/shared_multipleSelectionFormField.tpl @@ -11,7 +11,7 @@ 'wcf.global.filter.visibility.showAll': '{jslang}wcf.global.filter.visibility.showAll{/jslang}' }); - new UiItemListFilter('{@$field->getPrefixedId()|encodeJS}_list'); + new UiItemListFilter('{unsafe:$field->getPrefixedId()|encodeJS}_list'); }); {/if} @@ -29,7 +29,7 @@ *}{if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if}{* *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* *}> - {@$__fieldNestedOption[label]} + {unsafe:$__fieldNestedOption[label]} {/foreach} diff --git a/com.woltlab.wcf/templates/shared_nonEmptyFormFieldDependency.tpl b/com.woltlab.wcf/templates/shared_nonEmptyFormFieldDependency.tpl index 4fd408ae4f5..30d3fbeeed5 100644 --- a/com.woltlab.wcf/templates/shared_nonEmptyFormFieldDependency.tpl +++ b/com.woltlab.wcf/templates/shared_nonEmptyFormFieldDependency.tpl @@ -1,7 +1,7 @@ require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/NonEmpty'], function(NonEmptyFieldDependency) { - // dependency '{@$dependency->getId()}' + // dependency '{unsafe:$dependency->getId()|encodeJS}' new NonEmptyFieldDependency( - '{@$dependency->getDependentNode()->getPrefixedId()|encodeJS}Container', - '{@$dependency->getField()->getPrefixedId()|encodeJS}' + '{unsafe:$dependency->getDependentNode()->getPrefixedId()|encodeJS}Container', + '{unsafe:$dependency->getField()->getPrefixedId()|encodeJS}' ); }); diff --git a/com.woltlab.wcf/templates/shared_numericFormField.tpl b/com.woltlab.wcf/templates/shared_numericFormField.tpl index 075057f995a..1c83a94bae7 100644 --- a/com.woltlab.wcf/templates/shared_numericFormField.tpl +++ b/com.woltlab.wcf/templates/shared_numericFormField.tpl @@ -3,7 +3,7 @@ {/if} {if $field->getSuffix() !== null} - {@$field->getSuffix()} + {unsafe:$field->getSuffix()} {/if} diff --git a/com.woltlab.wcf/templates/shared_numericRangeFormField.tpl b/com.woltlab.wcf/templates/shared_numericRangeFormField.tpl index db31ffbcfbf..8eba2e7cfaa 100644 --- a/com.woltlab.wcf/templates/shared_numericRangeFormField.tpl +++ b/com.woltlab.wcf/templates/shared_numericRangeFormField.tpl @@ -3,7 +3,7 @@ id="{$field->getPrefixedId()}_from" name="{$field->getPrefixedId()}[from]" value="{$field->getFromValue()}" - step="{@$field->getDefaultStep()}" + step="{$field->getDefaultStep()}" placeholder="{lang}wcf.date.period.start{/lang}" {if !$field->getFieldClasses()|empty} class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if} {if $field->isAutofocused()} autofocus{/if} diff --git a/com.woltlab.wcf/templates/shared_pollOptionsFormField.tpl b/com.woltlab.wcf/templates/shared_pollOptionsFormField.tpl index c7a4d94350f..bdf7dbdea5a 100644 --- a/com.woltlab.wcf/templates/shared_pollOptionsFormField.tpl +++ b/com.woltlab.wcf/templates/shared_pollOptionsFormField.tpl @@ -14,9 +14,9 @@ {jsphrase name='wcf.poll.maxVotes.error.invalid'} var pollEditor = new UiPollEditor( - DomUtil.identify(DomTraverse.childByTag(elById('{@$field->getPrefixedId()|encodeJS}Container'), 'DD')), - [ {implode from=$field->getValue() item=pollOption}{ optionID: {@$pollOption[optionID]}, optionValue: '{$pollOption[optionValue]|encodeJS}' }{/implode} ], - '{@$field->getPrefixedWysiwygId()}', + DomUtil.identify(DomTraverse.childByTag(elById('{unsafe:$field->getPrefixedId()|encodeJS}Container'), 'DD')), + [ {implode from=$field->getValue() item=pollOption}{ optionID: {$pollOption[optionID]}, optionValue: '{unsafe:$pollOption[optionValue]|encodeJS}' }{/implode} ], + '{unsafe:$field->getPrefixedWysiwygId()|encodeJS}', { isAjax: {if $field->getDocument()->isAjax()}true{else}false{/if}, maxOptions: {POLL_MAX_OPTIONS} @@ -24,7 +24,7 @@ ); EventHandler.add('WoltLabSuite/Core/Form/Builder/Manager', 'registerField', function(data) { - if (data.formId === '{@$field->getDocument()->getId()|encodeJS}' && data.field.getId() === '{@$field->getPrefixedId()|encodeJS}') { + if (data.formId === '{unsafe:$field->getDocument()->getId()|encodeJS}' && data.field.getId() === '{unsafe:$field->getPrefixedId()|encodeJS}') { data.field.setPollEditor(pollEditor); } }); diff --git a/com.woltlab.wcf/templates/shared_radioButtonFormField.tpl b/com.woltlab.wcf/templates/shared_radioButtonFormField.tpl index e93a26c95c4..21026d7ee4b 100644 --- a/com.woltlab.wcf/templates/shared_radioButtonFormField.tpl +++ b/com.woltlab.wcf/templates/shared_radioButtonFormField.tpl @@ -21,6 +21,6 @@ *}{if $field->getValue() !== null && $field->getValue() == $__fieldValue} checked{/if}{* *}{if $field->isImmutable()} disabled{/if}{* *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* - *}> {@$__fieldLabel} + *}> {unsafe:$__fieldLabel} {/foreach} diff --git a/com.woltlab.wcf/templates/shared_ratingFormField.tpl b/com.woltlab.wcf/templates/shared_ratingFormField.tpl index 77b5b041022..503dfab2ca5 100644 --- a/com.woltlab.wcf/templates/shared_ratingFormField.tpl +++ b/com.woltlab.wcf/templates/shared_ratingFormField.tpl @@ -1,6 +1,6 @@
        {foreach from=$field->getRatings() item=rating} -
      • +
    @@ -28,6 +28,6 @@ diff --git a/com.woltlab.wcf/templates/shared_selectFormField.tpl b/com.woltlab.wcf/templates/shared_selectFormField.tpl index 2ae1f396bba..132b154174f 100644 --- a/com.woltlab.wcf/templates/shared_selectFormField.tpl +++ b/com.woltlab.wcf/templates/shared_selectFormField.tpl @@ -10,6 +10,6 @@ value="{$__fieldNestedOption[value]}" {if $field->getValue() !== null && $field->getValue() == $__fieldNestedOption[value] && $__fieldNestedOption[isSelectable]} selected{/if} {if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if} - >{@' '|str_repeat:$__fieldNestedOption[depth] * 4}{@$__fieldNestedOption[label]} + >{unsafe:' '|str_repeat:$__fieldNestedOption[depth] * 4}{unsafe:$__fieldNestedOption[label]} {/foreach} diff --git a/com.woltlab.wcf/templates/shared_singleMediaSelectionFormField.tpl b/com.woltlab.wcf/templates/shared_singleMediaSelectionFormField.tpl index 26339b8a5d1..f2dae45e9cf 100644 --- a/com.woltlab.wcf/templates/shared_singleMediaSelectionFormField.tpl +++ b/com.woltlab.wcf/templates/shared_singleMediaSelectionFormField.tpl @@ -1,11 +1,11 @@ {if $field->isImmutable() && $field->getValue()} {if $field->getMedia()->isImage && $field->getMedia()->hasThumbnail('small')}
    - {@$field->getMedia()->getThumbnailTag('small')} + {unsafe:$field->getMedia()->getThumbnailTag('small')}
    {else}
    - {@$field->getMedia()->getElementTag(16)} + {unsafe:$field->getMedia()->getElementTag(16)}

    {$field->getMedia()->getTitle()}

    @@ -14,7 +14,7 @@ {if $field->isImageOnly()}
    {if $field->getValue() && $field->getMedia()->hasThumbnail('small')} - {@$field->getMedia()->getThumbnailTag('small')} + {unsafe:$field->getMedia()->getThumbnailTag('small')} {/if}
    {/if} @@ -30,7 +30,7 @@ require(['WoltLabSuite/Core/Media/Manager/Select'], function(MediaManagerSelect) { new MediaManagerSelect({ - buttonClass: 'jsMediaSelectButton_{@$field->getPrefixedId()|encodeJS}', + buttonClass: 'jsMediaSelectButton_{unsafe:$field->getPrefixedId()|encodeJS}', {if $field->isImageOnly()} dialogTitle: '{jslang}wcf.media.chooseImage{/jslang}', imagesOnly: 1 diff --git a/com.woltlab.wcf/templates/shared_singleSelectionFormField.tpl b/com.woltlab.wcf/templates/shared_singleSelectionFormField.tpl index 7c6b698481a..20875552737 100644 --- a/com.woltlab.wcf/templates/shared_singleSelectionFormField.tpl +++ b/com.woltlab.wcf/templates/shared_singleSelectionFormField.tpl @@ -11,7 +11,7 @@ 'wcf.global.filter.visibility.showAll': '{jslang}wcf.global.filter.visibility.showAll{/jslang}' }); - new UiItemListFilter('{@$field->getPrefixedId()|encodeJS}_list'); + new UiItemListFilter('{unsafe:$field->getPrefixedId()|encodeJS}_list'); }); @@ -25,7 +25,7 @@ *}{if !$field->getFieldClasses()|empty} class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{* *}{if $field->getValue() == $__fieldNestedOption[value] && $__fieldNestedOption[isSelectable]} checked{/if}{* *}{if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if}{* - *}> {@$__fieldNestedOption[label]} + *}> {unsafe:$__fieldNestedOption[label]} {/foreach} @@ -39,7 +39,7 @@ *}value="{$__fieldNestedOption[value]}"{* *}{if $field->getValue() == $__fieldNestedOption[value] && $__fieldNestedOption[isSelectable]} selected{/if}{* *}{if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if}{* - *}>{@' '|str_repeat:$__fieldNestedOption[depth] * 4}{@$__fieldNestedOption[label]} + *}>{unsafe:' '|str_repeat:$__fieldNestedOption[depth] * 4}{unsafe:$__fieldNestedOption[label]} {/foreach} {/if} diff --git a/com.woltlab.wcf/templates/shared_sourceCodeFormField.tpl b/com.woltlab.wcf/templates/shared_sourceCodeFormField.tpl index 50f3abe04bf..8a2474aafc3 100644 --- a/com.woltlab.wcf/templates/shared_sourceCodeFormField.tpl +++ b/com.woltlab.wcf/templates/shared_sourceCodeFormField.tpl @@ -10,6 +10,6 @@ diff --git a/com.woltlab.wcf/templates/shared_suffixFormFieldContainer.tpl b/com.woltlab.wcf/templates/shared_suffixFormFieldContainer.tpl index 3f03bf2fa1f..9300d905356 100644 --- a/com.woltlab.wcf/templates/shared_suffixFormFieldContainer.tpl +++ b/com.woltlab.wcf/templates/shared_suffixFormFieldContainer.tpl @@ -3,23 +3,23 @@ *}{foreach from=$element->getField()->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* *}{if !$element->getField()->checkDependencies()} style="display: none;"{/if}{* *}> -
    {if $element->getLabel() !== null}{/if}
    +
    {if $element->getLabel() !== null}{/if}
    - {@$element->getField()->getFieldHtml()} + {unsafe:$element->getField()->getFieldHtml()} {if $element->getSuffixField() !== null && $element->getSuffixField()->isAvailable()} {if !$element->suffixHasSelectableOptions()} {if $element->getSuffixLabel() !== ''} - {@$element->getSuffixLabel()} + {unsafe:$element->getSuffixLabel()} {/if} {else} - {@$element->getSelectedSuffixOption()[label]} {icon name='caret-down' type='solid'} + {unsafe:$element->getSelectedSuffixOption()[label]} {icon name='caret-down' type='solid'} @@ -32,14 +32,14 @@
    {if $element->getDescription() !== null} - {@$element->getDescription()} + {unsafe:$element->getDescription()} {/if} {include file='shared_formFieldErrors' field=$element->getField()} {if $element->getSuffixField() !== null && $element->getSuffixField()->isAvailable()} {foreach from=$element->getSuffixField()->getValidationErrors() item='validationError'} - {@$validationError->getHtml()} + {unsafe:$validationError->getHtml()} {/foreach} {/if} @@ -52,8 +52,8 @@ diff --git a/com.woltlab.wcf/templates/shared_tabFormContainer.tpl b/com.woltlab.wcf/templates/shared_tabFormContainer.tpl index 99e0cc6ceef..754e9e438eb 100644 --- a/com.woltlab.wcf/templates/shared_tabFormContainer.tpl +++ b/com.woltlab.wcf/templates/shared_tabFormContainer.tpl @@ -10,6 +10,6 @@ diff --git a/com.woltlab.wcf/templates/shared_tabMenuFormContainer.tpl b/com.woltlab.wcf/templates/shared_tabMenuFormContainer.tpl index 0aa4039c0b7..22813ffbe31 100644 --- a/com.woltlab.wcf/templates/shared_tabMenuFormContainer.tpl +++ b/com.woltlab.wcf/templates/shared_tabMenuFormContainer.tpl @@ -3,11 +3,11 @@ *}{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* *}{if !$container->checkDependencies()} style="display: none;"{/if}{* *}> -