Version 4.7.6
This commit is contained in:
1 parent
8ba7d43898
commit
7b7404e741
1085 files changed
+30590
-7837
No files matched your search
+20
-8
@@ -148,8 +148,8 @@ class _Login
|
||||
foreach ( static::methods() as $k => $method )
|
||||
{
|
||||
if (
|
||||
$this->type === static::LOGIN_FRONT
|
||||
or $this->type === static::LOGIN_UCP
|
||||
( $this->type === static::LOGIN_FRONT and $method->front )
|
||||
or ( $this->type === static::LOGIN_UCP and $method->front )
|
||||
or ( $this->type === static::LOGIN_ACP and $method->acp )
|
||||
or ( $this->type === static::LOGIN_REGISTRATION_FORM and $method->register )
|
||||
or ( $this->type === static::LOGIN_REAUTHENTICATE and $method->canProcess( $this->reauthenticateAs ) and !( $method instanceof \IPS\Login\LoginAbstract ) )
|
||||
@@ -605,19 +605,31 @@ class _Login
|
||||
{
|
||||
if ( static::$_registrationType === NULL )
|
||||
{
|
||||
static::$_registrationType = \IPS\Settings::i()->allow_reg;
|
||||
|
||||
if ( static::$_registrationType == 1 )
|
||||
/* If registrations are enabled */
|
||||
if ( \IPS\Settings::i()->allow_reg )
|
||||
{
|
||||
static::$_registrationType = \IPS\Settings::i()->quick_register ? 'normal' : 'full';
|
||||
switch( \IPS\Settings::i()->allow_reg )
|
||||
{
|
||||
// just kept this here for legacy reasons, even if we have an upgrade step to change this now
|
||||
case 1 :
|
||||
case 'full':
|
||||
static::$_registrationType ='full';
|
||||
break;
|
||||
default:
|
||||
return \IPS\Settings::i()->allow_reg;
|
||||
}
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
static::$_registrationType = 'disabled';
|
||||
}
|
||||
|
||||
if ( \in_array( static::$_registrationType, array( 'normal', 'full' ) ) and !\IPS\Login\Handler::findMethod( 'IPS\Login\Handler\Standard' ) )
|
||||
{
|
||||
static::$_registrationType = 'disabled';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return static::$_registrationType;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user