Applying the new configuration

WoltLab · Mar 26, 2024 · f5bd2a2 · f5bd2a2
1 parent 70d29ef
commit f5bd2a2
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 15 deletions.
diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl
@@ -35,15 +35,17 @@
 						</small>
 					{/if}
 					<small>{lang}wcf.user.accountManagement.password.description{/lang}</small>
-					<small><a href="{link controller='LostPassword'}{/link}">{lang}wcf.user.lostPassword{/lang}</a></small>
+					{if $__userAuthConfig->canChangePassword}
+						<small><a href="{link controller='LostPassword'}{/link}">{lang}wcf.user.lostPassword{/lang}</a></small>
+					{/if}
 				</dd>
 			</dl>
 
 			{event name='passwordFields'}
 		</section>
 	{/if}
 
-	{if $__wcf->getSession()->getPermission('user.profile.canRename')}
+	{if $__wcf->getSession()->getPermission('user.profile.canRename') && $__userAuthConfig->canChangeUsername}
 		<section class="section">
 			<h2 class="sectionTitle">{lang}wcf.user.changeUsername{/lang}</h2>
 
@@ -71,7 +73,7 @@
 		</section>
 	{/if}
 
-	{if !$__authProvider}
+	{if !$__authProvider && $__userAuthConfig->canChangePassword}
 		<section class="section">
 			<h2 class="sectionTitle">{lang}wcf.user.changePassword{/lang}</h2>
 
@@ -114,7 +116,7 @@
 		</section>
 	{/if}
 
-	{if $__wcf->getSession()->getPermission('user.profile.canChangeEmail')}
+	{if $__wcf->getSession()->getPermission('user.profile.canChangeEmail') && $__userAuthConfig->canChangeEmail}
 		<section class="section">
 			<h2 class="sectionTitle">{lang}wcf.user.changeEmail{/lang}</h2>
 

diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl
@@ -1,4 +1,4 @@
-{if !REGISTER_DISABLED}
+{if $__userAuthConfig->canRegister}
 	{capture assign='contentDescription'}{lang}wcf.user.login.noAccount{/lang}{/capture}
 {/if}
 
@@ -48,7 +48,9 @@
 					{/if}
 				</small>
 			{/if}
-			<small><a href="{link controller='LostPassword'}{/link}">{lang}wcf.user.lostPassword{/lang}</a></small>
+			{if $__userAuthConfig->canChangePassword}
+				<small><a href="{link controller='LostPassword'}{/link}">{lang}wcf.user.lostPassword{/lang}</a></small>
+			{/if}
 		</dd>
 	</dl>
 

diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -171,7 +171,7 @@
 					rel="nofollow"
 				>{lang}wcf.user.button.login{/lang}</a>
 			</li>
-			{if !REGISTER_DISABLED}
+			{if $__userAuthConfig->canRegister}
 				<li id="userRegistration">
 					<a
 						class="registrationLink"

diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
@@ -1,6 +1,4 @@
-{if !REGISTER_DISABLED}
-	{capture assign='contentDescription'}{lang}wcf.user.register.existingUser{/lang}{/capture}
-{/if}
+{capture assign='contentDescription'}{lang}wcf.user.register.existingUser{/lang}{/capture}
 
 {include file='authFlowHeader'}
 

diff --git a/wcfsetup/install/files/lib/form/AccountManagementForm.class.php b/wcfsetup/install/files/lib/form/AccountManagementForm.class.php
@@ -12,6 +12,7 @@
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\menu\user\UserMenu;
+use wcf\system\user\authentication\configuration\UserAuthenticationConfigurationFactory;
 use wcf\system\WCF;
 use wcf\util\JSON;
 use wcf\util\StringUtil;
@@ -216,7 +217,11 @@ public function validate()
         }
 
         // user name
-        if (WCF::getSession()->getPermission('user.profile.canRename') && $this->username != WCF::getUser()->username) {
+        if (
+            WCF::getSession()->getPermission('user.profile.canRename')
+            && $this->username != WCF::getUser()->username
+            && UserAuthenticationConfigurationFactory::getInstance()->getConfigration()->canChangeUsername
+        ) {
             if (\mb_strtolower($this->username) != \mb_strtolower(WCF::getUser()->username)) {
                 if (WCF::getUser()->lastUsernameChange + WCF::getSession()->getPermission('user.profile.renamePeriod') * 86400 > TIME_NOW) {
                     throw new UserInputException('username', 'alreadyRenamed');
@@ -236,7 +241,10 @@ public function validate()
         }
 
         // password
-        if (!WCF::getUser()->authData) {
+        if (
+            !WCF::getUser()->authData
+            && UserAuthenticationConfigurationFactory::getInstance()->getConfigration()->canChangePassword
+        ) {
             if (!empty($this->newPassword)) {
                 if (($this->newPasswordStrengthVerdict['score'] ?? 4) < PASSWORD_MIN_SCORE) {
                     throw new UserInputException('newPassword', 'notSecure');
@@ -249,6 +257,7 @@ public function validate()
             WCF::getSession()->getPermission('user.profile.canChangeEmail')
             && $this->email != WCF::getUser()->email
             && $this->email != WCF::getUser()->newEmail
+            && UserAuthenticationConfigurationFactory::getInstance()->getConfigration()->canChangeEmail
         ) {
             if (empty($this->email)) {
                 throw new UserInputException('email');

diff --git a/wcfsetup/install/files/lib/form/LostPasswordForm.class.php b/wcfsetup/install/files/lib/form/LostPasswordForm.class.php
@@ -9,6 +9,7 @@
 use wcf\system\email\mime\MimePartFacade;
 use wcf\system\email\mime\RecipientAwareTextMimePart;
 use wcf\system\email\UserMailbox;
+use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\NamedUserException;
 use wcf\system\flood\FloodControl;
 use wcf\system\form\builder\container\FormContainer;
@@ -17,6 +18,7 @@
 use wcf\system\form\builder\field\validation\FormFieldValidationError;
 use wcf\system\form\builder\field\validation\FormFieldValidator;
 use wcf\system\request\LinkHandler;
+use wcf\system\user\authentication\configuration\UserAuthenticationConfigurationFactory;
 use wcf\system\WCF;
 use wcf\util\HeaderUtil;
 use wcf\util\UserUtil;
@@ -36,6 +38,16 @@ final class LostPasswordForm extends AbstractFormBuilderForm
 
     public User $user;
 
+    #[\Override]
+    public function checkPermissions()
+    {
+        parent::checkPermissions();
+
+        if (!UserAuthenticationConfigurationFactory::getInstance()->getConfigration()->canChangePassword) {
+            return new IllegalLinkException();
+        }
+    }
+
     /**
      * @inheritDoc
      */

diff --git a/wcfsetup/install/files/lib/form/RegisterForm.class.php b/wcfsetup/install/files/lib/form/RegisterForm.class.php
@@ -23,6 +23,7 @@
 use wcf\system\exception\UserInputException;
 use wcf\system\option\user\UserOptionHandler;
 use wcf\system\request\LinkHandler;
+use wcf\system\user\authentication\configuration\UserAuthenticationConfigurationFactory;
 use wcf\system\user\authentication\LoginRedirect;
 use wcf\system\user\group\assignment\UserGroupAssignmentHandler;
 use wcf\system\user\notification\object\UserRegistrationUserNotificationObject;
@@ -125,7 +126,7 @@ public function readParameters()
         }
 
         // registration disabled
-        if (REGISTER_DISABLED) {
+        if (!UserAuthenticationConfigurationFactory::getInstance()->getConfigration()->canRegister) {
             throw new NamedUserException(WCF::getLanguage()->get('wcf.user.register.error.disabled'));
         }
 

diff --git a/wcfsetup/install/files/lib/page/DisclaimerPage.class.php b/wcfsetup/install/files/lib/page/DisclaimerPage.class.php
@@ -4,6 +4,7 @@
 
 use wcf\page\AbstractPage;
 use wcf\system\exception\NamedUserException;
+use wcf\system\user\authentication\configuration\UserAuthenticationConfigurationFactory;
 use wcf\system\WCF;
 
 /**
@@ -29,7 +30,10 @@ public function readParameters()
         parent::readParameters();
 
         // registration disabled
-        if (!WCF::getUser()->userID && REGISTER_DISABLED) {
+        if (
+            !WCF::getUser()->userID
+            && !UserAuthenticationConfigurationFactory::getInstance()->getConfigration()->canRegister
+        ) {
             throw new NamedUserException(WCF::getLanguage()->get('wcf.user.register.error.disabled'));
         }
     }

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -747,6 +747,7 @@ protected function assignDefaultTemplateVariables(): void
         self::getTPL()->registerPrefilter(['event', 'hascontent', 'lang', 'jsphrase', 'jslang', 'csrfToken', 'icon']);
         self::getTPL()->assign([
             '__wcf' => $wcf,
+            '__userAuthConfig' => \wcf\system\user\authentication\configuration\UserAuthenticationConfigurationFactory::getInstance()->getConfigration(),
         ]);
 
         $isAjax = isset($_SERVER['HTTP_X_REQUESTED_WITH']) && ($_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest');

diff --git a/wcfsetup/install/files/lib/system/box/RegisterButtonBoxController.class.php b/wcfsetup/install/files/lib/system/box/RegisterButtonBoxController.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\system\box;
 
+use wcf\system\user\authentication\configuration\UserAuthenticationConfigurationFactory;
 use wcf\system\WCF;
 
 /**
@@ -24,7 +25,10 @@ class RegisterButtonBoxController extends AbstractBoxController
      */
     protected function loadContent()
     {
-        if (!WCF::getUser()->userID && !REGISTER_DISABLED) {
+        if (
+            !WCF::getUser()->userID
+            && UserAuthenticationConfigurationFactory::getInstance()->getConfigration()->canRegister
+        ) {
             $this->content = WCF::getTPL()->fetch('boxRegisterButton', 'wcf', ['box' => $this->box], true);
         }
     }