diff options
author | Marvin Borner | 2018-05-23 22:23:28 +0200 |
---|---|---|
committer | Marvin Borner | 2018-05-23 22:23:28 +0200 |
commit | b66a61addb6c8e66cb26fcf74b532d68891267e4 (patch) | |
tree | 05e9449ff25bdc98f68105f41923ccb9f6ef5095 /main/app/sprinkles/account/src/ServicesProvider | |
parent | 1d4ef435177a5f9b6d1a289800d933e49be0c550 (diff) |
Refactored code, many fixes and improvements in chat backend+frontend
Diffstat (limited to 'main/app/sprinkles/account/src/ServicesProvider')
-rw-r--r-- | main/app/sprinkles/account/src/ServicesProvider/ServicesProvider.php | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/main/app/sprinkles/account/src/ServicesProvider/ServicesProvider.php b/main/app/sprinkles/account/src/ServicesProvider/ServicesProvider.php index 4c3ab15..5c1bf20 100644 --- a/main/app/sprinkles/account/src/ServicesProvider/ServicesProvider.php +++ b/main/app/sprinkles/account/src/ServicesProvider/ServicesProvider.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Account\ServicesProvider; use Birke\Rememberme\Authenticator as RememberMe; @@ -40,8 +41,7 @@ class ServicesProvider * * @param Container $container A DI container implementing ArrayAccess and container-interop. */ - public function register($container) - { + public function register($container) { /** * Extend the asset manager service to see assets for the current user's theme. */ @@ -192,11 +192,11 @@ class ServicesProvider $container['authLogger'] = function ($c) { $logger = new Logger('auth'); - $logFile = $c->get('locator')->findResource('log://userfrosting.log', true, true); + $logFile = $c->get('locator')->findResource('log://userfrosting.log', TRUE, TRUE); $handler = new StreamHandler($logFile); - $formatter = new MixedFormatter(null, null, true); + $formatter = new MixedFormatter(NULL, NULL, TRUE); $handler->setFormatter($formatter); $logger->pushHandler($handler); @@ -219,7 +219,7 @@ class ServicesProvider * @return bool returns true no matter what. */ 'always' => function () { - return true; + return TRUE; }, /** @@ -240,10 +240,10 @@ class ServicesProvider */ 'equals_num' => function ($val1, $val2) { if (!is_numeric($val1)) { - return false; + return FALSE; } if (!is_numeric($val2)) { - return false; + return FALSE; } return ($val1 == $val2); @@ -258,9 +258,9 @@ class ServicesProvider */ 'has_role' => function ($user_id, $role_id) { return Capsule::table('role_users') - ->where('user_id', $user_id) - ->where('role_id', $role_id) - ->count() > 0; + ->where('user_id', $user_id) + ->where('role_id', $role_id) + ->count() > 0; }, /** @@ -347,14 +347,14 @@ class ServicesProvider * This method is invoked when a user attempts to perform certain public actions when they are already logged in. * * @todo Forward to user's landing page or last visited page - * @param \Psr\Http\Message\ServerRequestInterface $request - * @param \Psr\Http\Message\ResponseInterface $response + * @param \Psr\Http\Message\ServerRequestInterface $request + * @param \Psr\Http\Message\ResponseInterface $response * @param array $args * @return \Psr\Http\Message\ResponseInterface */ return function (Request $request, Response $response, array $args) use ($c) { $redirect = $c->router->pathFor('dashboard'); - + return $response->withRedirect($redirect, 302); }; }; @@ -367,8 +367,8 @@ class ServicesProvider * This method is invoked when a user completes the login process. * * Returns a callback that handles setting the `UF-Redirect` header after a successful login. - * @param \Psr\Http\Message\ServerRequestInterface $request - * @param \Psr\Http\Message\ResponseInterface $response + * @param \Psr\Http\Message\ServerRequestInterface $request + * @param \Psr\Http\Message\ResponseInterface $response * @param array $args * @return \Psr\Http\Message\ResponseInterface */ @@ -376,7 +376,7 @@ class ServicesProvider // Backwards compatibility for the deprecated determineRedirectOnLogin service if ($c->has('determineRedirectOnLogin')) { $determineRedirectOnLogin = $c->determineRedirectOnLogin; - + return $determineRedirectOnLogin($response)->withStatus(200); } |