kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix #4023

Browse Source
This commit is contained in:
James Cole
2020-11-07 17:22:11 +01:00
parent 4fa92ed5f7
commit 647c9c5eb0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Admin/HomeController.php
View File

@@ -61,11 +61,10 @@ class HomeController extends Controller
$mainTitleIcon = 'fa-hand-spock-o';
$email = auth()->user()->email;
$pref = app('preferences')->get('remote_guard_alt_email', null);
if(null !== $pref) {
if(null !== $pref && is_string($pref->data)) {
$email = $pref->data;
}
Log::debug('Email is ', [$email]);
return view('admin.index', compact('title', 'mainTitleIcon','email'));
}

2
app/Support/Authentication/RemoteUserGuard.php
View File

@@ -80,7 +80,7 @@ class RemoteUserGuard implements Guard
// store email address if present in header and not already set.
$header = config('auth.guard_email');
$emailAddress = request()->server($header) ?? null;
$emailAddress = (string) (request()->server($header) ?? null);
$preference = app('preferences')->getForUser($retrievedUser, 'remote_guard_alt_email', null);
if (null !== $emailAddress && null === $preference && $emailAddress !== $userID) {