mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Merge pull request #6685 from nebulade/patch-2
Also pick email address from apache filtered headers
This commit is contained in:
commit
f33f9c797b
@ -82,7 +82,7 @@ class RemoteUserGuard implements Guard
|
|||||||
$header = config('auth.guard_email');
|
$header = config('auth.guard_email');
|
||||||
|
|
||||||
if (null !== $header) {
|
if (null !== $header) {
|
||||||
$emailAddress = (string) (request()->server($header) ?? null);
|
$emailAddress = (string) (request()->server($header) ?? apache_request_headers()[$header] ?? null);
|
||||||
$preference = app('preferences')->getForUser($retrievedUser, 'remote_guard_alt_email');
|
$preference = app('preferences')->getForUser($retrievedUser, 'remote_guard_alt_email');
|
||||||
|
|
||||||
if ('' !== $emailAddress && null === $preference && $emailAddress !== $userID) {
|
if ('' !== $emailAddress && null === $preference && $emailAddress !== $userID) {
|
||||||
|
Loading…
Reference in New Issue
Block a user