flashii/misuzu
flashii/misuzu
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed prevent_registration config var, functionally replaced by the Private section.

Browse source
This commit is contained in:
flash 2018-10-05 09:36:16 +02:00
parent 7ab2c69f5c
commit 818a8a9ade
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/auth.php
View file

@ -18,9 +18,7 @@ $usernameValidationErrors = [
$siteIsPrivate = boolval(config_get_default(false, 'Private', 'enabled')); $siteIsPrivate = boolval(config_get_default(false, 'Private', 'enabled'));
$loginPermission = $siteIsPrivate ? intval(config_get_default(0, 'Private', 'permission')) : 0; $loginPermission = $siteIsPrivate ? intval(config_get_default(0, 'Private', 'permission')) : 0;
$canResetPassword = $siteIsPrivate ? boolval(config_get_default(false, 'Private', 'password_reset')) : true; $canResetPassword = $siteIsPrivate ? boolval(config_get_default(false, 'Private', 'password_reset')) : true;
$canCreateAccount = !$siteIsPrivate $canCreateAccount = !$siteIsPrivate && !boolval(config_get_default(false, 'Auth', 'lockdown'));
&& !boolval(config_get_default(false, 'Auth', 'lockdown'))
&& !boolval(config_get_default(false, 'Auth', 'prevent_registration'));
$authUsername = $isSubmission ? ($_POST['auth']['username'] ?? '') : ($_GET['username'] ?? ''); $authUsername = $isSubmission ? ($_POST['auth']['username'] ?? '') : ($_GET['username'] ?? '');
$authEmail = $isSubmission ? ($_POST['auth']['email'] ?? '') : ($_GET['email'] ?? ''); $authEmail = $isSubmission ? ($_POST['auth']['email'] ?? '') : ($_GET['email'] ?? '');

3
src/Application.php
View file

@ -124,8 +124,7 @@ final class Application
public function disableRegistration(): bool public function disableRegistration(): bool
{ {
return $this->underLockdown() return $this->underLockdown()
|| boolval(config_get_default(false, 'Private', 'enabled')) || boolval(config_get_default(false, 'Private', 'enabled'));
|| boolval(config_get_default(false, 'Auth', 'prevent_registration'));
} }
// used in some of the user functions still, fix that // used in some of the user functions still, fix that