ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed login when mail activation is enabled

Browse source
This commit is contained in:
Marcin Kurczewski 2014-05-05 08:25:52 +02:00
parent 505d08bb08
commit 7784be1838
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Access.php
View file

@ -32,12 +32,14 @@ class Access
} }
} }
public static function check(Privilege $privilege) public static function check(Privilege $privilege, $user = null)
{ {
if (php_sapi_name() == 'cli') if (php_sapi_name() == 'cli')
return true; return true;
if ($user === null)
$user = Auth::getCurrentUser(); $user = Auth::getCurrentUser();
$minAccessRank = AccessRank::Nobody; $minAccessRank = AccessRank::Nobody;
$key = TextCaseConverter::convert($privilege->toString(), $key = TextCaseConverter::convert($privilege->toString(),
@ -58,22 +60,31 @@ class Access
return $user->getAccessRank()->toInteger() >= $minAccessRank; return $user->getAccessRank()->toInteger() >= $minAccessRank;
} }
public static function checkEmailConfirmation($user = null)
{
if ($user === null)
$user = Auth::getCurrentUser();
if (!$user->emailConfirmed)
return false;
return true;
}
public static function assertAuthentication() public static function assertAuthentication()
{ {
if (!Auth::isLoggedIn()) if (!Auth::isLoggedIn())
self::fail('Not logged in'); self::fail('Not logged in');
} }
public static function assert(Privilege $privilege) public static function assert(Privilege $privilege, $user = null)
{ {
if (!self::check($privilege)) if (!self::check($privilege, $user))
self::fail(); self::fail();
} }
public static function assertEmailConfirmation() public static function assertEmailConfirmation($user = null)
{ {
$user = Auth::getCurrentUser(); if (!self::checkEmailConfirmation($user))
if (!$user->emailConfirmed)
self::fail('Need e-mail address confirmation to continue'); self::fail('Need e-mail address confirmation to continue');
} }

2
src/Auth.php
View file

@ -28,7 +28,7 @@ class Auth
throw new SimpleException('You are banned'); throw new SimpleException('You are banned');
if ($config->registration->needEmailForRegistering) if ($config->registration->needEmailForRegistering)
Access::requireEmail($user); Access::assertEmailConfirmation($user);
if ($remember) if ($remember)
{ {