Enabled disclaimer for logged in users

See
http://beta.woltlab.com/index.php/Thread/1191-Nutzungsbestimmungen-Disclaimer/

diff --git a/com.woltlab.wcf/templates/disclaimer.tpl b/com.woltlab.wcf/templates/disclaimer.tpl
index 76d55ca43e549fe3b344aa3c99dd7f3a5c744f58..5cdb0bc74ed5388a3abb0c79748b449d13d8b521 100644 (file)
--- a/com.woltlab.wcf/templates/disclaimer.tpl
+++ b/com.woltlab.wcf/templates/disclaimer.tpl
@@ -39,10 +39,12 @@
                {event name='fieldsets'}
        </div>
        
+       {if !$__wcf->user->userID}
        <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>
        </div>
+       {/if}
 </form>
 
 {include file='footer'}

diff --git a/wcfsetup/install/files/lib/form/DisclaimerForm.class.php b/wcfsetup/install/files/lib/form/DisclaimerForm.class.php
index 22bbfb7da57605ab035e0eec8e03f46ea600ed43..d428310f43ee5c1cd1f21e24c7bc7d8537a4974d 100644 (file)
--- a/wcfsetup/install/files/lib/form/DisclaimerForm.class.php
+++ b/wcfsetup/install/files/lib/form/DisclaimerForm.class.php
@@ -30,13 +30,8 @@ class DisclaimerForm extends AbstractForm {
        public function readParameters() {
                parent::readParameters();
                
-               // user is already registered
-               if (WCF::getUser()->userID) {
-                       throw new PermissionDeniedException();
-               }
-               
                // registration disabled
-               if (REGISTER_DISABLED) {
+               if (!WCF::getUser()->userID && REGISTER_DISABLED) {
                        throw new NamedUserException(WCF::getLanguage()->get('wcf.user.register.error.disabled'));
                }
        }
@@ -47,7 +42,7 @@ class DisclaimerForm extends AbstractForm {
        public function readFormParameters() {
                parent::readFormParameters();
                
-               if (isset($_POST['accept'])) $this->accept = true;
+               if (!WCF::getUser()->userID && isset($_POST['accept'])) $this->accept = true;
        }
        
        /**