projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b1a7b2b)
Remove incorrect use of `@` from WCFSetup templates
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 31 May 2022 10:27:46 +0000 (12:27 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 31 May 2022 10:27:46 +0000 (12:27 +0200)
Most of these values appear in attributes where `"` must be escaped. While the
`"` cannot appear in some of the values, WCFSetup is not performance critical,
so simply remove them everywhere to save the developer from needing to think
about this.

wcfsetup/setup/template/footer.tpl patch | blob | blame | history
wcfsetup/setup/template/header.tpl patch | blob | blame | history
wcfsetup/setup/template/stepConfigureDB.tpl patch | blob | blame | history
wcfsetup/setup/template/stepConfigureDirectories.tpl patch | blob | blame | history
wcfsetup/setup/template/stepCreateUser.tpl patch | blob | blame | history
wcfsetup/setup/template/stepNext.tpl patch | blob | blame | history
wcfsetup/setup/template/stepSelectSetupLanguage.tpl patch | blob | blame | history
wcfsetup/setup/template/stepShowLicense.tpl patch | blob | blame | history
wcfsetup/setup/template/stepShowSystemRequirements.tpl patch | blob | blame | history

diff --git a/wcfsetup/setup/template/footer.tpl b/wcfsetup/setup/template/footer.tpl
index 82580bf002040982e7415b7844baaa7eec089713..edd82bef433c4ddf31af4e0e6669fa9d2895298f 100644 (file)
--- a/wcfsetup/setup/template/footer.tpl
+++ b/wcfsetup/setup/template/footer.tpl
@@ -5,7 +5,7 @@
                <footer id="pageFooter" class="pageFooter">
                        <div id="pageFooterCopyright" class="pageFooterCopyright">
                                <div class="layoutBoundary">
-                                       <div class="copyright"><a href="https://www.woltlab.com" rel="nofollow">Powered by <strong>WoltLab Suite&trade; {@WCF_VERSION}</strong></a></div>
+                                       <div class="copyright"><a href="https://www.woltlab.com" rel="nofollow">Powered by <strong>WoltLab Suite&trade; {WCF_VERSION}</strong></a></div>
                                </div>
                        </div>
                </footer>
diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl
index 641c4d9957ff9cd23593dd3c6722923958f7485d..9bc4a9a2d2857fcc702392cefd7d8f4dbea019b1 100644 (file)
--- a/wcfsetup/setup/template/header.tpl
+++ b/wcfsetup/setup/template/header.tpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html dir="{@$__wcf->getLanguage()->getPageDirection()}" lang="{@$__wcf->getLanguage()->getFixedLanguageCode()}">
+<html dir="{$__wcf->getLanguage()->getPageDirection()}" lang="{$__wcf->getLanguage()->getFixedLanguageCode()}">
 <head>
        <meta charset="utf-8">
        <title>{lang}wcf.global.progressBar{/lang} - {lang}wcf.global.title{/lang}</title>
@@ -49,6 +49,6 @@
                                        <header class="contentHeader">
                                                <div class="contentHeaderTitle">
                                                        <h1 class="contentTitle">{lang}wcf.global.title{/lang}</h1>
-                                                       <p class="contentHeaderDescription"><progress id="packageInstallationProgress" value="{@$progress}" max="100" style="width: 300px;" title="{@$progress}%">{@$progress}%</progress></p>
+                                                       <p class="contentHeaderDescription"><progress id="packageInstallationProgress" value="{$progress}" max="100" style="width: 300px;" title="{$progress}%">{$progress}%</progress></p>
                                                </div>
                                        </header>
diff --git a/wcfsetup/setup/template/stepConfigureDB.tpl b/wcfsetup/setup/template/stepConfigureDB.tpl
index 0329f8abb44343a9dd06181f5ac85308a8994e39..8650138c3e001f1bcf0c9c6a985bbb213bd70d9a 100644 (file)
--- a/wcfsetup/setup/template/stepConfigureDB.tpl
+++ b/wcfsetup/setup/template/stepConfigureDB.tpl
@@ -42,10 +42,10 @@
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s">
                <input type="hidden" name="send" value="1">
-               <input type="hidden" name="step" value="{@$nextStep}">
-               <input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
-               <input type="hidden" name="languageCode" value="{@$languageCode}">
-               <input type="hidden" name="dev" value="{@$developerMode}">
+               <input type="hidden" name="step" value="{$nextStep}">
+               <input type="hidden" name="tmpFilePrefix" value="{$tmpFilePrefix}">
+               <input type="hidden" name="languageCode" value="{$languageCode}">
+               <input type="hidden" name="dev" value="{$developerMode}">
                {foreach from=$directories key=application item=directory}
                        <input type="hidden" name="directories[{$application}]" value="{$directory}">
                {/foreach}
diff --git a/wcfsetup/setup/template/stepConfigureDirectories.tpl b/wcfsetup/setup/template/stepConfigureDirectories.tpl
index c6f6b1b30e97efd2ee4e9a6f7280ef948864e878..40ea12ee257793cb32ea88cc449a85e253e25dfc 100644 (file)
--- a/wcfsetup/setup/template/stepConfigureDirectories.tpl
+++ b/wcfsetup/setup/template/stepConfigureDirectories.tpl
@@ -45,10 +45,10 @@
 
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s">
-               <input type="hidden" name="step" value="{@$nextStep}">
-               <input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
-               <input type="hidden" name="languageCode" value="{@$languageCode}">
-               <input type="hidden" name="dev" value="{@$developerMode}">
+               <input type="hidden" name="step" value="{$nextStep}">
+               <input type="hidden" name="tmpFilePrefix" value="{$tmpFilePrefix}">
+               <input type="hidden" name="languageCode" value="{$languageCode}">
+               <input type="hidden" name="dev" value="{$developerMode}">
        </div>
 </form>
 
diff --git a/wcfsetup/setup/template/stepCreateUser.tpl b/wcfsetup/setup/template/stepCreateUser.tpl
index eeccd6215328c0f9f7f22d0c0b6eb2eb3eb133d1..705c529f6cfc1d6e5637c50d904385d5ef801edd 100644 (file)
--- a/wcfsetup/setup/template/stepCreateUser.tpl
+++ b/wcfsetup/setup/template/stepCreateUser.tpl
@@ -77,10 +77,10 @@
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s">
                <input type="hidden" name="send" value="1">
-               <input type="hidden" name="step" value="{@$nextStep}">
-               <input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
-               <input type="hidden" name="languageCode" value="{@$languageCode}">
-               <input type="hidden" name="dev" value="{@$developerMode}">
+               <input type="hidden" name="step" value="{$nextStep}">
+               <input type="hidden" name="tmpFilePrefix" value="{$tmpFilePrefix}">
+               <input type="hidden" name="languageCode" value="{$languageCode}">
+               <input type="hidden" name="dev" value="{$developerMode}">
                {foreach from=$directories key=application item=directory}
                        <input type="hidden" name="directories[{$application}]" value="{$directory}">
                {/foreach}
diff --git a/wcfsetup/setup/template/stepNext.tpl b/wcfsetup/setup/template/stepNext.tpl
index 4157a7ef7b91023f6d1372bfbd84dfbeaf126412..c63f46317648ef4b47119506742465164c16f583 100644 (file)
--- a/wcfsetup/setup/template/stepNext.tpl
+++ b/wcfsetup/setup/template/stepNext.tpl
@@ -7,17 +7,17 @@
        
        <p>{lang}wcf.global.next.description{/lang}</p>
        
-       <form method="post" action="install.php?step={@$nextStep}">
+       <form method="post" action="install.php?step={$nextStep|rawurlencode}">
                <div class="formSubmit">
-                       <input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
-                       <input type="hidden" name="languageCode" value="{@$languageCode}">
-                       <input type="hidden" name="dev" value="{@$developerMode}">
+                       <input type="hidden" name="tmpFilePrefix" value="{$tmpFilePrefix}">
+                       <input type="hidden" name="languageCode" value="{$languageCode}">
+                       <input type="hidden" name="dev" value="{$developerMode}">
                        {foreach from=$directories key=application item=directory}
                                <input type="hidden" name="directories[{$application}]" value="{$directory}">
                        {/foreach}
                        {if $__additionalParameters|isset}
                                {foreach from=$__additionalParameters key=__name item=__value}
-                                       <input type="hidden" name="{@$__name}" value="{@$__value}">
+                                       <input type="hidden" name="{$__name}" value="{$__value}">
                                {/foreach}
                        {/if}
                </div>
diff --git a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
index 8ed44835fa605f1ac1f0389ac8b6b4243eac74b1..30d115a303600534c6eeaed6289633b8e3bfe84b 100644 (file)
--- a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
+++ b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
@@ -21,9 +21,9 @@
                
                <div class="formSubmit">
                        <input type="submit" accesskey="s" value="{lang}wcf.global.button.next{/lang}">
-                       <input type="hidden" name="step" value="{@$nextStep}">
-                       <input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
-                       <input type="hidden" name="dev" value="{@$developerMode}">
+                       <input type="hidden" name="step" value="{$nextStep}">
+                       <input type="hidden" name="tmpFilePrefix" value="{$tmpFilePrefix}">
+                       <input type="hidden" name="dev" value="{$developerMode}">
                </div>
        </section>
 </form>
diff --git a/wcfsetup/setup/template/stepShowLicense.tpl b/wcfsetup/setup/template/stepShowLicense.tpl
index 2b584b188f29966945666b2e7e5552d4000a795c..eaaa52ed8fc1f7af7c32bd9a81f0e43459c34bbc 100644 (file)
--- a/wcfsetup/setup/template/stepShowLicense.tpl
+++ b/wcfsetup/setup/template/stepShowLicense.tpl
@@ -23,10 +23,10 @@
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.next{/lang}" accesskey="s">
                        <input type="hidden" name="send" value="1">
-                       <input type="hidden" name="step" value="{@$nextStep}">
-                       <input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
-                       <input type="hidden" name="languageCode" value="{@$languageCode}">
-                       <input type="hidden" name="dev" value="{@$developerMode}">
+                       <input type="hidden" name="step" value="{$nextStep}">
+                       <input type="hidden" name="tmpFilePrefix" value="{$tmpFilePrefix}">
+                       <input type="hidden" name="languageCode" value="{$languageCode}">
+                       <input type="hidden" name="dev" value="{$developerMode}">
                </div>
        </section>
 </form>
diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
index 4d2a8b84b511ff6ade03e20fc0bee287649e92b9..14414005d1f5da62681dffc6017039f22302cff5 100644 (file)
--- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl
+++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
@@ -286,10 +286,10 @@
 
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.x64.result || !$system.sql.result || !$system.memoryLimit.result || !$system.graphicsLibrary.result || !$system.hostname.result || !$system.cookie.result} disabled{/if} accesskey="s">
-               <input type="hidden" name="step" value="{@$nextStep}">
-               <input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
-               <input type="hidden" name="languageCode" value="{@$languageCode}">
-               <input type="hidden" name="dev" value="{@$developerMode}">
+               <input type="hidden" name="step" value="{$nextStep}">
+               <input type="hidden" name="tmpFilePrefix" value="{$tmpFilePrefix}">
+               <input type="hidden" name="languageCode" value="{$languageCode}">
+               <input type="hidden" name="dev" value="{$developerMode}">
        </div>
 </form>
 
WoltLab Suite Core (previously WoltLab Community Framework)