IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-24 16:10:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clarify + warning

Browse Source
This commit is contained in:
James Cole 2020-08-28 22:03:27 +02:00
parent 798c73394d
commit 2a02e8a790
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@ -143,6 +143,7 @@ SPARKPOST_SECRET=
# Firefly III can send you the following messages
SEND_REGISTRATION_MAIL=true
SEND_ERROR_MESSAGE=true
SEND_LOGIN_NEW_IP_WARNING=true
# These messages contain (sensitive) transaction information:
SEND_REPORT_JOURNALS=true

2
app/Handlers/Events/UserEventHandler.php
View File

@ -168,7 +168,7 @@ class UserEventHandler
$preference = array_values($preference);
app('preferences')->setForUser($user, 'login_ip_history', $preference);
if (false === $inArray) {
if (false === $inArray && true === config('firefly.warn_new_ip')) {
event(new DetectedNewIPAddress($user, $ip));
}

17
config/firefly.php
View File

@ -101,7 +101,10 @@ return [
'maxUploadSize' => 1073741824, // 1 GB
'send_error_message' => env('SEND_ERROR_MESSAGE', true),
'site_owner' => env('SITE_OWNER', ''),
// send emails?
'send_registration_mail' => env('SEND_REGISTRATION_MAIL', true),
'warn_new_ip' => env('SEND_LOGIN_NEW_IP_WARNING', true),
'demo_username' => env('DEMO_USERNAME', ''),
'demo_password' => env('DEMO_PASSWORD', ''),
'fixer_api_key' => env('FIXER_API_KEY', ''),
@ -450,14 +453,14 @@ return [
'search' => [
'operators' => [
'user_action' => ['alias' => false, 'needs_context' => true,],
'description_starts' => ['alias' => false, 'needs_context' => true,],
'description_ends' => ['alias' => false, 'needs_context' => true,],
'description_contains' => ['alias' => false, 'needs_context' => true,],
'description_is' => ['alias' => false, 'needs_context' => true,],
'user_action' => ['alias' => false, 'needs_context' => true,],
'description_starts' => ['alias' => false, 'needs_context' => true,],
'description_ends' => ['alias' => false, 'needs_context' => true,],
'description_contains' => ['alias' => false, 'needs_context' => true,],
'description_is' => ['alias' => false, 'needs_context' => true,],
'currency_is' => ['alias' => false, 'needs_context' => true,],
'foreign_currency_is' => ['alias' => false, 'needs_context' => true,],
'currency_is' => ['alias' => false, 'needs_context' => true,],
'foreign_currency_is' => ['alias' => false, 'needs_context' => true,],
'has_attachments' => ['alias' => false, 'needs_context' => false,],
'has_no_category' => ['alias' => false, 'needs_context' => false,],

2
resources/lang/en_US/email.php
View File

@ -35,7 +35,7 @@ return [
// new IP
'login_from_new_ip' => 'You logged in from an unknown IP address.',
'new_ip_body' => 'You logged in from a new, unknown IP address:',
'new_ip_body' => 'You logged in from a new, unknown IP address. If you never logged in from the IP address below, or it has been more than six months, Firefly III will warn you.',
'new_ip_warning' => 'If you didn\'t login, of if you have no idea what this is about, verify your password security, change it, and log out all other sessions. To do this, go to your profile page. Of course you have 2FA enabled already, right? Stay safe!',
// access token created