diff --git a/com.woltlab.wcf/templates/__menu.tpl b/com.woltlab.wcf/templates/__menu.tpl index 60fdec1f875..557a9af7642 100644 --- a/com.woltlab.wcf/templates/__menu.tpl +++ b/com.woltlab.wcf/templates/__menu.tpl @@ -3,7 +3,7 @@ {event name='menuBefore'} {foreach from=$menuItemNodeList item=menuItemNode} -
  • +
  • getURL() appendClassname=false} class="boxMenuLink"{if $menuItemNode->isActiveNode()} aria-current="page"{/if}> {$menuItemNode->getTitle()} {if $menuItemNode->getOutstandingItems() > 0} @@ -14,10 +14,10 @@ {/if} - {if $menuItemNode->hasChildren()}
      {else}{/if} + {if $menuItemNode->hasChildren()}
        {else}{/if} {if !$menuItemNode->hasChildren() && $menuItemNode->isLastSibling()} - {@"
      "|str_repeat:$menuItemNode->getOpenParentNodes()} + {unsafe:"
    • "|str_repeat:$menuItemNode->getOpenParentNodes()} {/if} {/foreach} diff --git a/com.woltlab.wcf/templates/authFlowFooter.tpl b/com.woltlab.wcf/templates/authFlowFooter.tpl index e11435ce926..7817b1aa288 100644 --- a/com.woltlab.wcf/templates/authFlowFooter.tpl +++ b/com.woltlab.wcf/templates/authFlowFooter.tpl @@ -21,7 +21,7 @@ -{@FOOTER_CODE} +{unsafe:FOOTER_CODE} diff --git a/com.woltlab.wcf/templates/authFlowHeader.tpl b/com.woltlab.wcf/templates/authFlowHeader.tpl index 37eb473276e..ace5dc7267d 100644 --- a/com.woltlab.wcf/templates/authFlowHeader.tpl +++ b/com.woltlab.wcf/templates/authFlowHeader.tpl @@ -9,7 +9,7 @@ {/if} {/if} - {if $pageTitle}{@$pageTitle} - {/if}{PAGE_TITLE|phrase} + {if $pageTitle}{unsafe:$pageTitle} - {/if}{PAGE_TITLE|phrase} {include file='headInclude'} @@ -18,14 +18,14 @@ {/if} {if !$headContent|empty} - {@$headContent} + {unsafe:$headContent} {/if} getActivePage() != null} data-page-id="{@$__wcf->getActivePage()->pageID}" data-page-identifier="{$__wcf->getActivePage()->identifier}"{/if} - {if !$__pageDataAttributes|empty}{@$__pageDataAttributes}{/if} + data-template="{$templateName}" data-application="{$templateNameApplication}"{if $__wcf->getActivePage() != null} data-page-id="{$__wcf->getActivePage()->pageID}" data-page-identifier="{$__wcf->getActivePage()->identifier}"{/if} + {if !$__pageDataAttributes|empty}{unsafe:$__pageDataAttributes}{/if} class="authFlow{if $__wcf->getActivePage() != null && $__wcf->getActivePage()->cssClassName} {$__wcf->getActivePage()->cssClassName}{/if}{if !$__pageCssClassName|empty} {$__pageCssClassName}{/if}"> @@ -49,12 +49,12 @@ -
    +
    {if $__disableContentHeader|empty} {if !$contentHeader|empty} - {@$contentHeader} + {unsafe:$contentHeader} {else} {if $contentTitle|empty} {if $__wcf->isLandingPage() && USE_PAGE_TITLE_ON_LANDING_PAGE} @@ -68,8 +68,8 @@ {if !$contentTitle|empty}
    -

    {@$contentTitle}{if !$contentTitleBadge|empty} {@$contentTitleBadge}{/if}

    - {if !$contentDescription|empty}

    {@$contentDescription}

    {/if} +

    {unsafe:$contentTitle}{if !$contentTitleBadge|empty} {unsafe:$contentTitleBadge}{/if}

    + {if !$contentDescription|empty}

    {unsafe:$contentDescription}

    {/if}
    {/if} diff --git a/com.woltlab.wcf/templates/authFlowRedirect.tpl b/com.woltlab.wcf/templates/authFlowRedirect.tpl index c36e867ab86..069a85c3824 100644 --- a/com.woltlab.wcf/templates/authFlowRedirect.tpl +++ b/com.woltlab.wcf/templates/authFlowRedirect.tpl @@ -1,13 +1,13 @@ {capture assign='pageTitle'}{lang}wcf.page.redirect.title{/lang}{/capture} {capture assign='headContent'} - + {/capture} {include file='authFlowHeader'} -
    -

    {@$message}

    +
    +

    {unsafe:$message}


    {lang}wcf.page.redirect.url{/lang}

    diff --git a/com.woltlab.wcf/templates/breadcrumbs.tpl b/com.woltlab.wcf/templates/breadcrumbs.tpl index af8e3f5e5a7..2c0bc6a58e6 100644 --- a/com.woltlab.wcf/templates/breadcrumbs.tpl +++ b/com.woltlab.wcf/templates/breadcrumbs.tpl @@ -17,7 +17,7 @@ {$breadcrumb->getLabel()} {if $__microdata} - + {assign var='__breadcrumbPos' value=$__breadcrumbPos+1} {/if} diff --git a/com.woltlab.wcf/templates/error.tpl b/com.woltlab.wcf/templates/error.tpl index 2e41fe8a292..0142f32760f 100644 --- a/com.woltlab.wcf/templates/error.tpl +++ b/com.woltlab.wcf/templates/error.tpl @@ -12,7 +12,7 @@ {if $exception !== null} {/if} {/if} @@ -21,7 +21,7 @@
    {icon size=64 name='circle-exclamation'}

    - {@$message} + {unsafe:$message}

    diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl index 5977933dee8..b82160dd9d6 100644 --- a/com.woltlab.wcf/templates/footer.tpl +++ b/com.woltlab.wcf/templates/footer.tpl @@ -5,11 +5,11 @@
    {content} {if !$boxesContentBottom|empty} - {@$boxesContentBottom} + {unsafe:$boxesContentBottom} {/if} {foreach from=$__wcf->getBoxHandler()->getBoxes('contentBottom') item=box} - {@$box->render()} + {unsafe:$box->render()} {/foreach} {/content}
    @@ -17,14 +17,14 @@ {/hascontent} {if MODULE_WCF_AD && $__disableAds|empty} - {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.content')} + {unsafe:$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.content')} {/if}
    {hascontent} {/hascontent} @@ -36,11 +36,11 @@
    {content} {if !$boxesBottom|empty} - {@$boxesBottom} + {unsafe:$boxesBottom} {/if} {foreach from=$__wcf->getBoxHandler()->getBoxes('bottom') item=box} - {@$box->render()} + {unsafe:$box->render()} {/foreach} {/content}
    @@ -53,11 +53,11 @@
    {content} {if !$footerBoxes|empty} - {@$footerBoxes} + {unsafe:$footerBoxes} {/if} {foreach from=$__wcf->getBoxHandler()->getBoxes('footerBoxes') item=box} - {@$box->render()} + {unsafe:$box->render()} {/foreach} {/content}
    @@ -84,7 +84,7 @@ -{@FOOTER_CODE} +{unsafe:FOOTER_CODE} diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl index 7a2b509fbc8..145afe4d29b 100644 --- a/com.woltlab.wcf/templates/headInclude.tpl +++ b/com.woltlab.wcf/templates/headInclude.tpl @@ -1,11 +1,11 @@ {include file='headIncludeRobotsMetaTag'} -{implode from=$__wcf->getMetaTagHandler() item=__metaTag glue="\n"}{@$__metaTag}{/implode} +{implode from=$__wcf->getMetaTagHandler() item=__metaTag glue="\n"}{unsafe:$__metaTag}{/implode} {event name='metaTags'} -{@$__wcf->getStyleHandler()->getStylesheet()} +{unsafe:$__wcf->getStyleHandler()->getStylesheet()} {event name='stylesheets'} @@ -13,4 +13,4 @@ {include file='headIncludeJavaScript'} {include file='headIncludeIcons'} -{@HEAD_CODE} +{unsafe:HEAD_CODE} diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl index 12170f5a41b..09a180419e8 100644 --- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl +++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl @@ -3,20 +3,20 @@ *} - + {js application='wcf' file='require' bundle='WoltLabSuite.Core' core='true' hasTiny=true} @@ -41,8 +41,8 @@ {js application='wcf' file='3rdParty/tslib' bundle='WoltLabSuite.Core' core='true' hasTiny=true} diff --git a/com.woltlab.wcf/templates/headIncludeJsonLd.tpl b/com.woltlab.wcf/templates/headIncludeJsonLd.tpl index 48931de3d53..6af018c5733 100644 --- a/com.woltlab.wcf/templates/headIncludeJsonLd.tpl +++ b/com.woltlab.wcf/templates/headIncludeJsonLd.tpl @@ -4,10 +4,10 @@ { "@context": "http://schema.org", "@type": "WebSite", -"url": {@$__websiteUrl|json}, +"url": {unsafe:$__websiteUrl|json}, "potentialAction": { "@type": "SearchAction", -"target": {@$__searchTargetUrl|json}, +"target": {unsafe:$__searchTargetUrl|json}, "query-input": "required name=search_term_string" } } diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl index 6d5627ee129..c50cc6e949c 100644 --- a/com.woltlab.wcf/templates/header.tpl +++ b/com.woltlab.wcf/templates/header.tpl @@ -9,7 +9,7 @@ {/if} {/if} - {if $pageTitle}{@$pageTitle} - {/if}{PAGE_TITLE|phrase} + {if $pageTitle}{unsafe:$pageTitle} - {/if}{PAGE_TITLE|phrase} {include file='headInclude'} @@ -18,14 +18,14 @@ {/if} {if !$headContent|empty} - {@$headContent} + {unsafe:$headContent} {/if} getActivePage() != null} data-page-id="{@$__wcf->getActivePage()->pageID}" data-page-identifier="{$__wcf->getActivePage()->identifier}"{/if} - {if !$__pageDataAttributes|empty}{@$__pageDataAttributes}{/if} + data-template="{$templateName}" data-application="{$templateNameApplication}"{if $__wcf->getActivePage() != null} data-page-id="{$__wcf->getActivePage()->pageID}" data-page-identifier="{$__wcf->getActivePage()->identifier}"{/if} + {if !$__pageDataAttributes|empty}{unsafe:$__pageDataAttributes}{/if} class="{if $__wcf->getActivePage() != null && $__wcf->getActivePage()->cssClassName}{$__wcf->getActivePage()->cssClassName}{/if}{if !$__pageCssClassName|empty} {$__pageCssClassName}{/if}"> @@ -43,11 +43,11 @@
    {content} {if !$headerBoxes|empty} - {@$headerBoxes} + {unsafe:$headerBoxes} {/if} {foreach from=$__wcf->getBoxHandler()->getBoxes('headerBoxes') item=box} - {@$box->render()} + {unsafe:$box->render()} {/foreach} {/content}
    @@ -62,18 +62,18 @@
    {content} {if !$boxesTop|empty} - {@$boxesTop} + {unsafe:$boxesTop} {/if} {foreach from=$__wcf->getBoxHandler()->getBoxes('top') item=box} - {@$box->render()} + {unsafe:$box->render()} {/foreach} {/content}
    {/hascontent} -
    +
    {if !$beforeMaincontent|empty} {unsafe:$beforeMaincontent} {/if} @@ -91,16 +91,16 @@ {* WCF2.1 Fallback *} {if !$sidebar|empty} {if !$sidebarOrientation|isset || $sidebarOrientation == 'left'} - {@$sidebar} + {unsafe:$sidebar} {/if} {/if} {if !$sidebarLeft|empty} - {@$sidebarLeft} + {unsafe:$sidebarLeft} {/if} {foreach from=$__wcf->getBoxHandler()->getBoxes('sidebarLeft') item=box} - {@$box->render()} + {unsafe:$box->render()} {/foreach} {event name='boxesSidebarLeftBottom'} @@ -113,7 +113,7 @@ {if MODULE_WCF_AD && $__disableAds|empty && $__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}
    - {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')} + {unsafe:$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}
    {/if} @@ -123,16 +123,16 @@ {* WCF2.1 Fallback *} {if !$sidebar|empty} {if !$sidebarOrientation|isset || $sidebarOrientation == 'right'} - {@$sidebar} + {unsafe:$sidebar} {/if} {/if} {if !$sidebarRight|empty} - {@$sidebarRight} + {unsafe:$sidebarRight} {/if} {foreach from=$__wcf->getBoxHandler()->getBoxes('sidebarRight') item=box} - {@$box->render()} + {unsafe:$box->render()} {/foreach} {event name='boxesSidebarRightBottom'} @@ -140,18 +140,18 @@ {if MODULE_WCF_AD && $__disableAds|empty && $__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}
    - {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')} + {unsafe:$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}
    {/if} {/capture}
    - {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if} + {if MODULE_WCF_AD && $__disableAds|empty}{unsafe:$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if} {if $__disableContentHeader|empty} {if !$contentHeader|empty} - {@$contentHeader} + {unsafe:$contentHeader} {else} {if $contentTitle|empty} {if $__wcf->isLandingPage() && USE_PAGE_TITLE_ON_LANDING_PAGE} @@ -165,15 +165,15 @@ {if !$contentTitle|empty}
    -

    {@$contentTitle}{if !$contentTitleBadge|empty} {@$contentTitleBadge}{/if}

    - {if !$contentDescription|empty}

    {@$contentDescription}

    {/if} +

    {unsafe:$contentTitle}{if !$contentTitleBadge|empty} {unsafe:$contentTitleBadge}{/if}

    + {if !$contentDescription|empty}

    {unsafe:$contentDescription}

    {/if}
    {hascontent}
    diff --git a/com.woltlab.wcf/templates/pageHeader.tpl b/com.woltlab.wcf/templates/pageHeader.tpl index 87e63217b16..04d6867c71d 100644 --- a/com.woltlab.wcf/templates/pageHeader.tpl +++ b/com.woltlab.wcf/templates/pageHeader.tpl @@ -23,11 +23,11 @@
    {content} {if !$boxesHero|empty} - {@$boxesHero} + {unsafe:$boxesHero} {/if} {foreach from=$__wcf->getBoxHandler()->getBoxes('hero') item=box} - {@$box->render()} + {unsafe:$box->render()} {/foreach} {/content}
    diff --git a/com.woltlab.wcf/templates/pageHeaderLogo.tpl b/com.woltlab.wcf/templates/pageHeaderLogo.tpl index 8afd6a05dc4..28e40084776 100644 --- a/com.woltlab.wcf/templates/pageHeaderLogo.tpl +++ b/com.woltlab.wcf/templates/pageHeaderLogo.tpl @@ -1,14 +1,14 @@ \ No newline at end of file + diff --git a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl index ced6a1fe4d3..964e95dcce0 100644 --- a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl +++ b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl @@ -14,7 +14,7 @@
  • {foreach from=$availableAcpSearchProviders key='availableAcpSearchProviderName' item='availableAcpSearchProviderLabel'} -
  • {@$availableAcpSearchProviderLabel}
    • +
  • {unsafe:$availableAcpSearchProviderLabel}
    • {/foreach} diff --git a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl index 6fae9ee7816..ac1c4c5e12b 100644 --- a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl +++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl @@ -3,7 +3,7 @@ {if $__wcf->user->userID} {if PACKAGE_ID}