CSRF protection for forms

diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl
index 8056baf7749cf23c5611fc5a35a49690e1aa51d9..a090721e04b24d4d3797e2757840666fad058cd4 100644 (file)
--- a/com.woltlab.wcf/templates/accountManagement.tpl
+++ b/com.woltlab.wcf/templates/accountManagement.tpl
@@ -18,9 +18,7 @@
 
 {include file='userNotice'}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <p class="warning">{lang}wcf.user.accountManagement.warning{/lang}</p>
 
@@ -289,8 +287,8 @@
        </div>
        
        <div class="formSubmit">
-               {@SECURITY_TOKEN_INPUT_TAG}
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/disclaimer.tpl b/com.woltlab.wcf/templates/disclaimer.tpl
index 5cdb0bc74ed5388a3abb0c79748b449d13d8b521..22e25911ec7249ccd83a3aa0889ee4f42d6931ad 100644 (file)
--- a/com.woltlab.wcf/templates/disclaimer.tpl
+++ b/com.woltlab.wcf/templates/disclaimer.tpl
@@ -16,9 +16,7 @@
 
 {include file='userNotice'}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -43,6 +41,7 @@
        <div class="formSubmit">
                <input type="submit" name="accept" value="{lang}wcf.user.register.disclaimer.accept{/lang}" accesskey="s" />
                <a class="button" href="{link}{/link}">{lang}wcf.user.register.disclaimer.decline{/lang}</a>
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
        {/if}
 </form>

diff --git a/com.woltlab.wcf/templates/emailActivation.tpl b/com.woltlab.wcf/templates/emailActivation.tpl
index e0383c1df85553344acd8a325e5a79db673585b6..da398c23c60d1ce6388ba5d942351945d49de56d 100644 (file)
--- a/com.woltlab.wcf/templates/emailActivation.tpl
+++ b/com.woltlab.wcf/templates/emailActivation.tpl
@@ -16,9 +16,7 @@
 
 {include file='userNotice'}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -79,6 +77,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/emailNewActivationCode.tpl b/com.woltlab.wcf/templates/emailNewActivationCode.tpl
index 46546ead4dbbc3c31278a1c04b3ca0e951c2691e..2958ac6c85b66eba0ec3796d634e677a110c0735 100644 (file)
--- a/com.woltlab.wcf/templates/emailNewActivationCode.tpl
+++ b/com.woltlab.wcf/templates/emailNewActivationCode.tpl
@@ -15,9 +15,7 @@
 
 {include file='userNotice'}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -78,6 +76,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl
index eb51d0154a5b7fec9a25d9beccc7d0e58b71b52d..e91de2836327781489895c9bc690426191d198fe 100644 (file)
--- a/com.woltlab.wcf/templates/login.tpl
+++ b/com.woltlab.wcf/templates/login.tpl
@@ -24,9 +24,7 @@
 
 {include file='userNotice'}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -153,6 +151,7 @@
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="url" value="{@$url}" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/lostPassword.tpl b/com.woltlab.wcf/templates/lostPassword.tpl
index fe8b3a341db9eedde9cb7cc36cf2e1a34c3c163e..319a90b45804f6b002d2abb789874ae6ef1245ac 100644 (file)
--- a/com.woltlab.wcf/templates/lostPassword.tpl
+++ b/com.woltlab.wcf/templates/lostPassword.tpl
@@ -26,9 +26,7 @@
 
 <p class="info">{lang}wcf.user.lostPassword.description{/lang}</p>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -88,6 +86,7 @@
                
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/mail.tpl b/com.woltlab.wcf/templates/mail.tpl
index 65d218a17ae4cf43bc5d8292ee704b687374a37e..5b994a82106b3f904d4799b1909bb7b29752726b 100644 (file)
--- a/com.woltlab.wcf/templates/mail.tpl
+++ b/com.woltlab.wcf/templates/mail.tpl
@@ -15,9 +15,7 @@
 
 {include file='userNotice'}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -110,6 +108,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index ceed61997d80cf2437320879f7253c2249ac9435..f9ddba4d3166d6e5598d15a771099804cd572e4f 100644 (file)
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -92,6 +92,7 @@
                        <div class="formSubmit">
                                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                                <input type="hidden" name="letter" value="{$letter}" />
+                               {@SECURITY_TOKEN_INPUT_TAG}
                        </div>
                </form>
        </div>

diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl
index 3c861e4fe14e44324a95a5010c13e5e31edda15c..95811ab723410b12deca54153e75fbe729e37832 100644 (file)
--- a/com.woltlab.wcf/templates/moderationActivation.tpl
+++ b/com.woltlab.wcf/templates/moderationActivation.tpl
@@ -30,6 +30,8 @@
 
 {include file='userNotice'}
 
+{include file='formError'}
+
 <div class="contentNavigation">
        <nav>
                <ul>
@@ -81,6 +83,7 @@
                
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" />
+                       {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        </fieldset>
        

diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index 827473def18092eb4dd8c03318699c6c63e0fb05..fb2166d4a319935cdac7275f0b905c19787f9c3f 100644 (file)
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -31,6 +31,8 @@
 
 {include file='userNotice'}
 
+{include file='formError'}
+
 <div class="contentNavigation">
        <nav>
                <ul>
@@ -90,6 +92,7 @@
                
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" />
+                       {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        </fieldset>
        

diff --git a/com.woltlab.wcf/templates/newPassword.tpl b/com.woltlab.wcf/templates/newPassword.tpl
index 23ffb5030566d4837c0dfa530bf78383fb277a85..7a54de71b2e3280b063836fc33c27ace04f81ec0 100644 (file)
--- a/com.woltlab.wcf/templates/newPassword.tpl
+++ b/com.woltlab.wcf/templates/newPassword.tpl
@@ -15,9 +15,7 @@
 
 {include file='userNotice'}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -76,6 +74,7 @@
                
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/notificationSettings.tpl b/com.woltlab.wcf/templates/notificationSettings.tpl
index 0e1d39889cb2e96139e52087c4a48b754a77ba38..cd70385abeaead636057b1b80d622ab48e593ae8 100644 (file)
--- a/com.woltlab.wcf/templates/notificationSettings.tpl
+++ b/com.woltlab.wcf/templates/notificationSettings.tpl
@@ -35,9 +35,7 @@
 
 {include file='userNotice'}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
@@ -84,6 +82,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
index 075a8061d6ef6316fbe6cc72be9f2fa6aff142b7..f464fedfb1af9a71e4a72ed878033e44f66a0c8d 100644 (file)
--- a/com.woltlab.wcf/templates/register.tpl
+++ b/com.woltlab.wcf/templates/register.tpl
@@ -53,9 +53,7 @@
        <p class="info">{lang}wcf.user.3rdparty.{$__wcf->session->getVar('__3rdPartyProvider')}.register{/lang}</p>
 {/if}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -248,6 +246,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/registerActivation.tpl b/com.woltlab.wcf/templates/registerActivation.tpl
index e6e62ba98c1f3ffe679570043e840d373e43f1cd..266516d4333561c6c7ab188598f97c0f484fb6a9 100644 (file)
--- a/com.woltlab.wcf/templates/registerActivation.tpl
+++ b/com.woltlab.wcf/templates/registerActivation.tpl
@@ -17,9 +17,7 @@
 
 {if $__wcf->user->userID && $__wcf->user->activationCode}<p class="info">{lang}wcf.user.registerActivation.info{/lang}</p>{/if}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -80,6 +78,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/registerNewActivationCode.tpl b/com.woltlab.wcf/templates/registerNewActivationCode.tpl
index 5122f84e0a6be95815488f17b9f9ac2ea5b98611..6d8ee1ca36d8987957cc85bafc076d071fd8db5c 100644 (file)
--- a/com.woltlab.wcf/templates/registerNewActivationCode.tpl
+++ b/com.woltlab.wcf/templates/registerNewActivationCode.tpl
@@ -15,9 +15,7 @@
 
 {include file='userNotice'}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
        
 <div class="contentNavigation">
        {hascontent}
@@ -91,6 +89,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl
index 1c671f1d51992ea643b5ba8ae5fede7e98dc3121..11ecc2ba36f2922c35a0ba5db631bb001ea734da 100644 (file)
--- a/com.woltlab.wcf/templates/search.tpl
+++ b/com.woltlab.wcf/templates/search.tpl
@@ -16,9 +16,7 @@
 
 {include file='userNotice'}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $errorMessage|isset}
        <p class="error">{@$errorMessage}</p>
@@ -128,6 +126,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/searchArea.tpl b/com.woltlab.wcf/templates/searchArea.tpl
index 96c18e6d23619823ee9435b16a541e0d0df94b52..e16ff8ce5c942b150e335fea27c966ba31d4e9dc 100644 (file)
--- a/com.woltlab.wcf/templates/searchArea.tpl
+++ b/com.woltlab.wcf/templates/searchArea.tpl
@@ -22,6 +22,7 @@
                </ul>
                
                {@$__searchHiddenInputFields}
+               {@SECURITY_TOKEN_INPUT_TAG}
        </form>
 </aside>
 

diff --git a/com.woltlab.wcf/templates/signatureEdit.tpl b/com.woltlab.wcf/templates/signatureEdit.tpl
index 4b825d9b241666dfe74588b0aaa3484ec1d2bc85..c456d63203ce8b343e3b18bca3c54e381c74359f 100644 (file)
--- a/com.woltlab.wcf/templates/signatureEdit.tpl
+++ b/com.woltlab.wcf/templates/signatureEdit.tpl
@@ -30,9 +30,7 @@
 
 {include file='userNotice'}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
@@ -103,6 +101,7 @@
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                        <button id="previewButton" class="jsOnly" accesskey="p">{lang}wcf.global.button.preview{/lang}</button>
+                       {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        {/if}
 </form>

diff --git a/com.woltlab.wcf/templates/userPanel.tpl b/com.woltlab.wcf/templates/userPanel.tpl
index 194b1d3300841a370095dfabca2c55be599884e4..b7ef9ad73047799dfed27f783acfd0abc2067e0d 100644 (file)
--- a/com.woltlab.wcf/templates/userPanel.tpl
+++ b/com.woltlab.wcf/templates/userPanel.tpl
@@ -122,6 +122,7 @@
                                                <div class="formSubmit">
                                                        <input type="submit" id="loginSubmitButton" name="submitButton" value="{lang}wcf.user.button.login{/lang}" accesskey="s" />
                                                        <input type="hidden" name="url" value="{$__wcf->session->requestURI}" />
+                                                       {@SECURITY_TOKEN_INPUT_TAG}
                                                </div>
                                        </fieldset>
                                        

diff --git a/com.woltlab.wcf/templates/userSearch.tpl b/com.woltlab.wcf/templates/userSearch.tpl
index b4636648789512feb15d941c262f98107f437b66..5a905730d41da25d967c8241ca01067312a5324b 100644 (file)
--- a/com.woltlab.wcf/templates/userSearch.tpl
+++ b/com.woltlab.wcf/templates/userSearch.tpl
@@ -28,6 +28,8 @@
 
 {include file='userNotice'}
 
+{include file='formError'}
+
 {if $errorField == 'search'}
        <p class="error">{lang}wcf.user.search.error.noMatches{/lang}</p>
 {/if}
@@ -73,6 +75,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index 27e2255f86f0ce2aed7d27cc7101177e6375ffb1..5f426b2204e0106fba765d7db1d5ed92c4c275d0 100644 (file)
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -59,6 +59,7 @@
                        
                        <div class="formSubmit">
                                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                               {@SECURITY_TOKEN_INPUT_TAG}
                        </div>
                </form>
        </div>

diff --git a/wcfsetup/install/files/acp/templates/applicationEdit.tpl b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
index 94eb26d3c93ea4fabaf6a660629322f3a7e41beb..cf269da04a8a0cd99037be4c982e9271bec70963 100644 (file)
--- a/wcfsetup/install/files/acp/templates/applicationEdit.tpl
+++ b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
@@ -19,9 +19,7 @@
        <h1>{lang}wcf.acp.application.edit.title{/lang}{if $application->isPrimary} <span class="icon icon16 icon-ok-sign jsTooltip" title="{lang}wcf.acp.application.primaryApplication{/lang}"></span>{/if}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
@@ -127,6 +125,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/attachmentList.tpl b/wcfsetup/install/files/acp/templates/attachmentList.tpl
index 91b6a097baca8155dde8f8bbe228904895ed1d5d..6e106bcd4601cde33539c4f80c83d86ddea24214 100644 (file)
--- a/wcfsetup/install/files/acp/templates/attachmentList.tpl
+++ b/wcfsetup/install/files/acp/templates/attachmentList.tpl
@@ -15,6 +15,8 @@
        <p>{lang}wcf.acp.attachment.stats{/lang}</p>
 </header>
 
+{include file='formError'}
+
 <form method="post" action="{link controller='AttachmentList'}{/link}">
        <div class="container containerPadding marginTop">
                <fieldset>
@@ -48,6 +50,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
index 3f592f28a26f6b0c5a34bd4718a82596b2bd47bc..b8d87313680437ec44a7eb458c874831c9a1c3ed 100644 (file)
--- a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
@@ -35,6 +35,7 @@
                {event name='attributeFields'}
        </fieldset>
 {/capture}
+
 <script data-relocate="true">
 //<![CDATA[
        $(function() {
@@ -78,9 +79,7 @@
        <p class="info">{lang}wcf.acp.bbcode.add.userGroupOptionInfo{/lang}</p>
 {/if}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -269,6 +268,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
index 12bb93e2ea3bdab96cdb7a40b24f72d1074f4480..c2febc3ae1d9d9268eddb5d8d485f2278b9a6abe 100644 (file)
--- a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.bbcode.mediaProvider.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -85,6 +83,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
index d8eda3853b6f5a6191deb134bba0440bb253be59..ddb80a44cfb0ec8a552dfaa4830b27e43dd6dc90 100644 (file)
--- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@ -19,9 +19,7 @@
        <h1>{@$objectType->getProcessor()->getLanguageVariable($action)}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{@$action}{/lang}</p>
@@ -169,6 +167,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index bb694b42e6fbd030975bec8d1cfa9c84915f13e7..545fc8bc42cfcaf76f9a16dbd073f0e933c2d268 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.cronjob.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <p class="info">{lang}wcf.acp.cronjob.intro{/lang}</p>
 
@@ -141,6 +139,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/dataImport.tpl b/wcfsetup/install/files/acp/templates/dataImport.tpl
index 233a16d3ac45c437868a5d5f55fdf188f96ef322..064362928cc4c8849bebcb1fe8a1bb18db687aa7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/dataImport.tpl
+++ b/wcfsetup/install/files/acp/templates/dataImport.tpl
@@ -42,9 +42,7 @@
        {/if}
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $showInnoDBWarning}
        <p class="warning">{lang}wcf.acp.index.innoDBWarning{/lang}</p>
@@ -123,8 +121,9 @@
                        </div>
                
                        <div class="formSubmit">
-                               {@SID_INPUT_TAG}
                                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                               {@SID_INPUT_TAG}
+                               {@SECURITY_TOKEN_INPUT_TAG}
                        </div>
                </form>
        {/if}
@@ -234,6 +233,7 @@
                <div class="formSubmit">
                        <input type="hidden" name="exporterName" value="{$exporterName}" />
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                       {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        </form>
 {/if}

diff --git a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
index 338c9b9524368dd3026c299edcaa06390a57a923..b11df8b5279177dc9ad7140bfec4eb520cf3c796 100644 (file)
--- a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
+++ b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
@@ -24,6 +24,8 @@
        <h1>{lang}wcf.acp.exceptionLog{/lang}</h1>
 </header>
 
+{include file='formError'}
+
 {if !$logFiles|empty}
        <form method="get" action="{link controller='ExceptionLogView'}{/link}">
                <div class="container containerPadding marginTop">
@@ -48,6 +50,7 @@
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                        {@SID_INPUT_TAG}
+                       {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        </form>
 {/if}

diff --git a/wcfsetup/install/files/acp/templates/labelAdd.tpl b/wcfsetup/install/files/acp/templates/labelAdd.tpl
index 9f3915f6e92d91a17e1fc2daa046055983783159..3a49b3f053559440f043ce47d620cd5d57466787 100644 (file)
--- a/wcfsetup/install/files/acp/templates/labelAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelAdd.tpl
@@ -21,9 +21,7 @@
        <h1>{lang}wcf.acp.label.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -118,6 +116,7 @@
                
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                       {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        </form>
 {else}

diff --git a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
index a54204a4e29b292de561756170f1d9c38ce2449a..a1d9bc42e8540203571512bef47094889e17bc3b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
@@ -22,9 +22,7 @@
        <h1>{lang}wcf.acp.label.group.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -116,6 +114,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/languageAdd.tpl b/wcfsetup/install/files/acp/templates/languageAdd.tpl
index 7992d9e389879400d592736ef9493b8b5f4ceb61..b7c272a2cd715684412d88d9415c021b7cb450ff 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageAdd.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.language.{@$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{@$action}{/lang}</p>
@@ -109,6 +107,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/languageExport.tpl b/wcfsetup/install/files/acp/templates/languageExport.tpl
index 46fd1755ae41eab2579b75f53e65b597372663e2..4256e8457143a69a2748957d16b0b84dc92ac421 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageExport.tpl
+++ b/wcfsetup/install/files/acp/templates/languageExport.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.language.export{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.acp.language.add.success{/lang}</p>
@@ -63,6 +61,7 @@
        
        <div class="formSubmit">
                <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/languageImport.tpl b/wcfsetup/install/files/acp/templates/languageImport.tpl
index 0f26c3be8165493a0297ed6ebbe9e75c4a16ca17..6bcc872eb1bf2e16b139baa558676fd9014f1d3c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageImport.tpl
+++ b/wcfsetup/install/files/acp/templates/languageImport.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.language.import{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.add{/lang}</p>
@@ -64,6 +62,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/languageItemList.tpl b/wcfsetup/install/files/acp/templates/languageItemList.tpl
index df962b3f48f4c23a239d301b56cc4f976dc2d831..3daf88239e9e5fa3ee1889ecc71ba3d96672e81f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemList.tpl
@@ -13,6 +13,8 @@
        <h1>{lang}wcf.acp.language.item.list{/lang}</h1>
 </header>
 
+{include file='formError'}
+
 <form method="post" action="{link controller='LanguageItemList'}{/link}">
        <div class="container containerPadding marginTop">
                <fieldset>
@@ -66,6 +68,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
index 801dd1536426ef77f3b307d6d01610b422099232..fbe44d93656933c3669d04417fa5cb5dcde0bdb4 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
+++ b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
@@ -14,9 +14,7 @@
        <h1>{lang}wcf.acp.language.multilingualism{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
@@ -63,6 +61,7 @@
        
        <div class="formSubmit">
                <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
index cd7ed2ed97c0ca034fe5b6ae37ff86cc8894f64c..970cbf20f2cac1635a952aa027f85dab046e7e89 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.languageServer.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.acp.languageServer.{$action}.success{/lang}</p>
@@ -49,6 +47,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl
index 162c574b4dc138fe71a7aa69d129cdffe0b31a1e..7ceeacac068ddb727de08c17b4bb6e1238b84804 100644 (file)
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -17,9 +17,7 @@
        <h1>{@$pageTitle|language}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <form method="post" action="{link controller='Login'}{/link}">
        <div class="container containerPadding marginTop">
@@ -65,6 +63,7 @@
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="url" value="{$url}" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl
index 3e313a62bba306c397a41f2702e015b305860d1f..3c3ddcfccfc122e1ee720da37a8d0a3d7ace6437 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -12,9 +12,7 @@
        <h1>{lang}wcf.acp.masterPassword.enter{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <form method="post" action="{link controller='MasterPassword'}{/link}">
        <div class="container containerPadding marginTop">
@@ -47,6 +45,7 @@
        <div class="formSubmit">
                <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="url" value="{$url}" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl
index 0984f8686eb6cfdd5a92aa86467ed6e6ddcf9e41..4d82259f6b33961aff4adcfc29b066caac7f5adf 100644 (file)
--- a/wcfsetup/install/files/acp/templates/option.tpl
+++ b/wcfsetup/install/files/acp/templates/option.tpl
@@ -33,9 +33,7 @@
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
 {/if}
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -84,6 +82,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" name="__submit" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl
index d50346251aa4cb5d43633681e5a5420d94c3b19b..3a6d91509c830eb33e1d45e48655d60237527948 100644 (file)
--- a/wcfsetup/install/files/acp/templates/optionImport.tpl
+++ b/wcfsetup/install/files/acp/templates/optionImport.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.option.import{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.acp.option.import.success{/lang}</p>
@@ -54,6 +52,7 @@
        
        <div class="formSubmit">
                <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 686ef9edbba1cd9333a46f644b1d44611624506f..d447d99a0f256c8371f1f89f1994752eeb3818d0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -24,9 +24,7 @@
        <h1>{lang}{@$pageTitle}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        <nav>
@@ -126,6 +124,7 @@
                        <div class="formSubmit">
                                <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                                <input type="hidden" name="action" value="{$action}" />
+                               {@SECURITY_TOKEN_INPUT_TAG}
                        </div>
                </form>
        </div>

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
index 60c5f59957d93d9c971f8c9666e8d470ef60aa31..9cff933b14d5c12d394e604e4a78d79bc3badde6 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.updateServer.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $packageUpdateServer|isset && $packageUpdateServer->errorMessage}
        <p class="warning">{lang}wcf.acp.updateServer.lastErrorMessage{/lang}<br />{$packageUpdateServer->errorMessage}</p>
@@ -71,6 +69,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
index 920a4a82b799b961f1e557191e68167ebcc0e97f..88d3b3c8f6cf6615ac04c1bd3e5da73baddba57d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
@@ -45,9 +45,7 @@
        <h1>{lang}wcf.acp.pageMenu.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -219,6 +217,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/smileyAdd.tpl b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
index 1bb3add6495abd9787d7cf62db576aab73ae1933..389bea960fc3a874de2e4f2e1eb20400e0a55d8f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/smileyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.smiley.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -133,6 +131,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index b2b7adbec1a0b929c608e34ade826b73f80291c3..8c97571e9dfb050bde11f5ea38705c181d597314 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -63,9 +63,7 @@
        {if $action == 'edit'}<p>{$styleName}</p>{/if}
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -569,6 +567,7 @@
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="tmpHash" value="{$tmpHash}" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/styleExport.tpl b/wcfsetup/install/files/acp/templates/styleExport.tpl
index da1d745a679402d1b7e7608a6c3968bf8266dc85..e34fd66634cc62636de67c3e0f8601daa8eab313 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleExport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleExport.tpl
@@ -19,6 +19,8 @@
        <h1>{lang}wcf.acp.style.exportStyle{/lang}</h1>
 </header>
 
+{include file='formError'}
+
 <div class="contentNavigation">
        <nav>
                <ul>
@@ -88,6 +90,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.acp.style.button.exportStyle{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/styleImport.tpl b/wcfsetup/install/files/acp/templates/styleImport.tpl
index eabeba1a58d213656c7a3ae55eddfe4607efff5c..396e3dd31b33efd8fd8ea0d1ab5598e9006e53e9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleImport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleImport.tpl
@@ -4,6 +4,8 @@
        <h1>{lang}wcf.acp.style.importStyle{/lang}</h1>
 </header>
 
+{include file='formError'}
+
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.add{/lang}</p>
 {/if}
@@ -48,6 +50,7 @@
        
        <div class="formSubmit">
                <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/tagAdd.tpl b/wcfsetup/install/files/acp/templates/tagAdd.tpl
index 7189b2d72e754fdfb906eef1cda063a0f8a0cf6d..b3df2a06d859d5a1967e26f7f4596c0c9f084416 100644 (file)
--- a/wcfsetup/install/files/acp/templates/tagAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/tagAdd.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.tag.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -108,6 +106,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/tagList.tpl b/wcfsetup/install/files/acp/templates/tagList.tpl
index 29309338d53013ef5a956eadc76c19d262641e93..ae0de50e485875cdb8ed5dc9e95958329e15eba5 100644 (file)
--- a/wcfsetup/install/files/acp/templates/tagList.tpl
+++ b/wcfsetup/install/files/acp/templates/tagList.tpl
@@ -12,6 +12,8 @@
        <h1>{lang}wcf.acp.tag.list{/lang}</h1>
 </header>
 
+{include file='formError'}
+
 {if $items}
        <form action="{link controller='TagList'}{/link}">
                <div class="container containerPadding marginTop">
@@ -30,6 +32,7 @@
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                        {@SID_INPUT_TAG}
+                       {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        </form>
 {/if}

diff --git a/wcfsetup/install/files/acp/templates/templateAdd.tpl b/wcfsetup/install/files/acp/templates/templateAdd.tpl
index c422f09f258eb064ac0c5f9796e35f708e8e57b0..79ba3742767c112f20cb31d85ef72714c0022b50 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateAdd.tpl
@@ -5,9 +5,7 @@
        {if $action == 'edit'}<p>{$template->getPath()}</p>{/if}
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -79,6 +77,7 @@
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                        {if $copy}<input type="hidden" name="copy" value="{@$copy}" />{/if}
+                       {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        </form>
 {else}

diff --git a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
index 4d5ae54ae55044cc8adeac0236ed76ab37c146dc..3212832a7bf0620c4eecabf2b963b3b7d189a233 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.template.group.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -81,6 +79,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl
index e9203e704356f30d3ce1e15a3e7d9ffa0dde3834..de7a0d7f61a6deed820fd61b9ff618f146d6d9c8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateList.tpl
@@ -24,6 +24,8 @@
        <h1>{lang}wcf.acp.template.list{/lang}</h1>
 </header>
 
+{include file='formError'}
+
 <form method="post" action="{link controller='TemplateList'}{/link}">
        <div class="container containerPadding marginTop">
                <fieldset>
@@ -64,6 +66,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
index ea7460dc38cb236b738c9982fcd1ed116fd5c339..38fe89c27c6a1d05702fa0a3e49b551363b14c3d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
@@ -14,9 +14,7 @@
        <h1>{lang}wcf.acp.user.activityPoint.option{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
@@ -54,6 +52,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 5bed3a254bf9800adffefb54a7eba5bd362472be..b75b609a560bceab432496379a862de0fbb0bdaf 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -13,9 +13,7 @@
        {if $action == 'edit'}<p>{$user->username}</p>{/if}
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $userID|isset && $__wcf->user->userID == $userID}
        <p class="warning">{lang}wcf.acp.user.edit.warning.selfEdit{/lang}</p>
@@ -416,6 +414,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
index 5f631f964f1937a0cd446889bd9dbe15e19c996f..4dd485f3df403a225e23560ccd2fbbb0b6a8b243 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
+++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.user.assignToGroup{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -54,6 +52,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
index 8aee0224ef2beb17094e89493faae6221c275f32..13ca916e7ff14479247424101ed8bf6efee34c8e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
@@ -76,9 +76,7 @@
        <h1>{lang}wcf.acp.user.bulkProcessing{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <p class="warning">{lang}wcf.acp.user.bulkProcessing.warning{/lang}</p>
 
@@ -336,6 +334,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index a5c23819fddd8bb1c69817c78b3d53fc826db3f7..89dc72ee21a458f84752cea9d896f980709f0790 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -12,6 +12,8 @@
        <h1>{lang}wcf.acp.user.exportEmailAddress{/lang}</h1>
 </header>
 
+{include file='formError'}
+
 <div class="contentNavigation">
        {hascontent}
                <nav>
@@ -69,6 +71,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index ad9b098d673e2c8afdb034b765f236ca4599ebf8..9a27edbfdd097d5635d9cbb08cf438f7fb65cecd 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -13,9 +13,7 @@
        <h1>{lang}wcf.acp.group.{@$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $warningSelfEdit|isset}
        <p class="warning">{lang}wcf.acp.group.edit.warning.selfIsMember{/lang}</p>
@@ -178,6 +176,7 @@
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="action" value="{@$action}" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userGroupOption.tpl b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
index cf08e24b53bad68e018320f1bf1fe17cb4f69d33..3bd1d90fe37951cf1cd91bb80c2549734fdd0a38 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
@@ -15,6 +15,8 @@
        <h1>{lang}wcf.acp.group.option.editingOption{/lang}</h1>
 </header>
 
+{include file='formError'}
+
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
 {/if}
@@ -55,6 +57,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index fd83c4c004de637e48ad190a1acdba16b9592f76..174d7eb53fdda60b7d64ef350798e4ae670b9588 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -24,9 +24,7 @@
        <h1>{lang}{@$pageTitle}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        <nav>
@@ -145,6 +143,7 @@
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="action" value="{@$action}" />
                <input type="hidden" name="userIDs" value="{implode from=$userIDs item=userID glue=','}{@$userID}{/implode}" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userMerge.tpl b/wcfsetup/install/files/acp/templates/userMerge.tpl
index a57a25ce36069c11632e5a390beb5cc813de926d..a6095b48e960fd08ed4c5e20a64467695a995c15 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMerge.tpl
+++ b/wcfsetup/install/files/acp/templates/userMerge.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.user.merge{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 <div class="contentNavigation">
        {hascontent}
@@ -62,6 +60,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
index aac12d8cf1f89f714e354091d886054cdad62171..5ed66f8c05126a836a7d36016986265c5d226295 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.user.option.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -223,6 +221,7 @@
                
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                       {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        </form>
 {else}

diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
index ef9abe89b792f0417d836f8838d43b9166f72959..9a1033bdb08b8f5d606f93bd4fc2ad7041b2693a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.user.option.category.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -59,6 +57,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
index 6b1bba2a822483799671615dac5ced4e2c55bff6..5b90aca72440d16cff0bace102b87fc93b8af007 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.user.option.setDefaults{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.edit{/lang}</p>
@@ -56,6 +54,7 @@
                
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                       {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        </form>
 {else}

diff --git a/wcfsetup/install/files/acp/templates/userRankAdd.tpl b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
index 379374ee656a20bcfb35ce0ec2713b75a2aa2e25..61f37a74b78314d7b31cc0b89bbc494a09a161e1 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userRankAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
@@ -4,9 +4,7 @@
        <h1>{lang}wcf.acp.user.rank.{$action}{/lang}</h1>
 </header>
 
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
+{include file='formError'}
 
 {if $success|isset}
        <p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
@@ -176,6 +174,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index d36e368f4f37d2f136f5a98a64d3ecec939d4c16..60e811408223d1e1495b9fd9f571d17b7d40303a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -13,6 +13,8 @@
        <h1>{lang}wcf.acp.user.search{/lang}</h1>
 </header>
 
+{include file='formError'}
+
 {if $errorField == 'search'}
        <p class="error">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>
 {/if}
@@ -230,6 +232,7 @@
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {@SECURITY_TOKEN_INPUT_TAG}
        </div>
 </form>