kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 06:31:22 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
James Cole
2018-04-28 06:23:13 +02:00
parent 6f0e1c79ac
commit 13b78bdc20
218 changed files with 621 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Middleware/Authenticate.php
View File

@@ -62,7 +62,8 @@ class Authenticate
*
* @return mixed
*
* @throws \Illuminate\Auth\AuthenticationException
* @throws AuthenticationException
* @throws FireflyException
*/
public function handle($request, Closure $next, ...$guards)
{

10
app/Http/Middleware/Sandstorm.php
View File

@@ -71,7 +71,7 @@ class Sandstorm
// access the same data so we have no choice but to simply login
// the new user to the same account and just forget about Bob and Alice
// and any other differences there may be between these users.
if (1 === $count && strlen($userId) > 0) {
if (1 === $count && \strlen($userId) > 0) {
// login as first user user.
$user = $repository->first();
Auth::guard($guard)->login($user);
@@ -80,7 +80,7 @@ class Sandstorm
return $next($request);
}
if (1 === $count && 0 === strlen($userId)) {
if (1 === $count && 0 === \strlen($userId)) {
// login but indicate anonymous
$user = User::first();
Auth::guard($guard)->login($user);
@@ -89,7 +89,7 @@ class Sandstorm
return $next($request);
}
if (0 === $count && strlen($userId) > 0) {
if (0 === $count && \strlen($userId) > 0) {
// create new user.
$email = $userId . '@firefly';
/** @var User $user */
@@ -111,7 +111,7 @@ class Sandstorm
return $next($request);
}
if (0 === $count && 0 === strlen($userId)) {
if (0 === $count && 0 === \strlen($userId)) {
throw new FireflyException('The first visit to a new Firefly III administration cannot be by a guest user.');
}
@@ -121,7 +121,7 @@ class Sandstorm
}
// if in Sandstorm, user logged in, still must check if user is anon.
$userId = (string)$request->header('X-Sandstorm-User-Id');
if (strlen($userId) === 0) {
if (\strlen($userId) === 0) {
View::share('SANDSTORM_ANON', true);
return $next($request);