kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

Clean up config.

Browse Source
This commit is contained in:
James Cole
2020-03-20 17:31:54 +01:00
parent 7b216543fa
commit 5a7152ceec
11 changed files with 327 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
config/debugbar.php
View File

@@ -99,7 +99,7 @@ return [
| in the Messages tab.
|
*/
'error_handler' => true,
'error_handler' => true,
/*
|--------------------------------------------------------------------------
@@ -110,7 +110,7 @@ return [
| Extension, without the server-side code. It uses Debugbar collectors instead.
|
*/
'clockwork' => false,
'clockwork' => false,
/*
|--------------------------------------------------------------------------
@@ -156,20 +156,21 @@ return [
*/
'options' => [
'auth' => [
'auth' => [
'show_name' => true, // Also show the users name/email in the debugbar
],
'db' => [
'with_params' => true, // Render SQL with the parameters substituted
'backtrace' => true, // Use a backtrace to find the origin of the query in your files.
'timeline' => false, // Add the queries to the timeline
'explain' => [ // Show EXPLAIN output on queries
'enabled' => false,
'types' => ['SELECT'], // // workaround ['SELECT'] only. https://github.com/barryvdh/laravel-debugbar/issues/888 ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+
'db' => [
'with_params' => true, // Render SQL with the parameters substituted
'backtrace' => true, // Use a backtrace to find the origin of the query in your files.
'timeline' => false, // Add the queries to the timeline
'explain' => [ // Show EXPLAIN output on queries
'enabled' => false,
'types' => ['SELECT'],
// // workaround ['SELECT'] only. https://github.com/barryvdh/laravel-debugbar/issues/888 ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+
],
'hints' => true, // Show hints for common mistakes
'hints' => true, // Show hints for common mistakes
],
'mail' => [
'mail' => [
'full_log' => false,
],
'views' => [
@@ -178,7 +179,7 @@ return [
'route' => [
'label' => true, // show complete route on bar
],
'logs' => [
'logs' => [
'file' => null,
],
'cache' => [
@@ -197,7 +198,7 @@ return [
|
*/
'inject' => true,
'inject' => true,
/*
|--------------------------------------------------------------------------

6
config/filesystems.php
View File

@@ -66,17 +66,17 @@ return [
*/
'disks' => [
'local' => [
'local' => [
'driver' => 'local',
'root' => storage_path('app'),
],
// local storage configuration for upload and export:
'upload' => [
'upload' => [
'driver' => 'local',
'root' => storage_path('upload'),
],
'export' => [
'export' => [
'driver' => 'local',
'root' => storage_path('export'),
],

14
config/google2fa.php
View File

@@ -51,17 +51,17 @@ return [
* 2FA verified session var
*/
'session_var' => 'google2fa',
'session_var' => 'google2fa',
/*
* One Time Password request input name
*/
'otp_input' => 'one_time_password',
'otp_input' => 'one_time_password',
/*
* One Time Password Window
*/
'window' => 1,
'window' => 1,
/*
* Forbid user to reuse One Time Passwords.
@@ -71,24 +71,24 @@ return [
/*
* User's table column for google2fa secret
*/
'otp_secret_column' => 'mfa_secret',
'otp_secret_column' => 'mfa_secret',
/*
* One Time Password View
*/
'view' => 'auth.mfa',
'view' => 'auth.mfa',
/*
* One Time Password error message
*/
'error_messages' => [
'error_messages' => [
'wrong_otp' => "The 'One Time Password' typed was wrong.",
],
/*
* Throw exceptions or just fire events?
*/
'throw_exceptions' => true,
'throw_exceptions' => true,
'store_in_cookie' => true,

12
config/ide-helper.php
View File

@@ -31,8 +31,8 @@ return [
|
*/
'filename' => '_ide_helper',
'format' => 'php',
'filename' => '_ide_helper',
'format' => 'php',
'meta_filename' => '.phpstorm.meta.php',
@@ -140,7 +140,7 @@ return [
|
*/
'interfaces' => [
'interfaces' => [
],
@@ -170,7 +170,7 @@ return [
| ),
|
*/
'custom_db_types' => [
'custom_db_types' => [
],
@@ -208,7 +208,7 @@ return [
| Cast the given "real type" to the given "type".
|
*/
'type_overrides' => [
'type_overrides' => [
'integer' => 'int',
'boolean' => 'bool',
],
@@ -222,6 +222,6 @@ return [
| magic methods and properties.
|
*/
'include_class_docblocks' => false,
'include_class_docblocks' => false,
];

72
config/intro.php
View File

@@ -27,7 +27,7 @@ declare(strict_types=1);
return [
// index
'index' => [
'index' => [
'intro' => [],
'accounts-chart' => ['element' => '#accounts-chart'],
'box_out_holder' => ['element' => '#box_out_holder'],
@@ -37,40 +37,40 @@ return [
'outro' => [],
],
// accounts: create
'accounts_create' => [
'accounts_create' => [
'iban' => ['element' => '#ffInput_iban'],
],
// transactions: create
'transactions_create_withdrawal' => [
'source' => ['element' => 'input[name="source[]"]'],
'destination' => ['element' => 'input[name="destination[]"]'],
'more_meta' => ['element' => 'input[name="category[]"]'],
'split_add' => ['element' => '.split_add_btn'],
'transactions_create_withdrawal' => [
'source' => ['element' => 'input[name="source[]"]'],
'destination' => ['element' => 'input[name="destination[]"]'],
'more_meta' => ['element' => 'input[name="category[]"]'],
'split_add' => ['element' => '.split_add_btn'],
],
'transactions_create_deposit' => [
'source' => ['element' => 'input[name="source[]"]'],
'destination' => ['element' => 'input[name="destination[]"]'],
'more_meta' => ['element' => 'input[name="category[]"]'],
'split_add' => ['element' => '.split_add_btn'],
'transactions_create_deposit' => [
'source' => ['element' => 'input[name="source[]"]'],
'destination' => ['element' => 'input[name="destination[]"]'],
'more_meta' => ['element' => 'input[name="category[]"]'],
'split_add' => ['element' => '.split_add_btn'],
],
'transactions_create_transfer' => [
'source' => ['element' => 'input[name="source[]"]'],
'destination' => ['element' => 'input[name="destination[]"]'],
'more_meta' => ['element' => 'input[name="category[]"]'],
'split_add' => ['element' => '.split_add_btn'],
'transactions_create_transfer' => [
'source' => ['element' => 'input[name="source[]"]'],
'destination' => ['element' => 'input[name="destination[]"]'],
'more_meta' => ['element' => 'input[name="category[]"]'],
'split_add' => ['element' => '.split_add_btn'],
],
// extra text for asset account creation.
'accounts_create_asset' => [
'accounts_create_asset' => [
'opening_balance' => ['element' => '#ffInput_opening_balance'],
'currency' => ['element' => '#ffInput_currency_id'],
'virtual' => ['element' => '#ffInput_virtual_balance'],
],
// budgets: index
'budgets_index' => [
'budgets_index' => [
'intro' => [],
'set_budget' => ['element' => '#availableBar'],
'see_expenses_bar' => ['element' => '#spentBar'],
@@ -81,61 +81,61 @@ return [
],
// reports: index, default report, audit, budget, cat, tag
'reports_index' => [
'reports_index' => [
'intro' => [],
'inputReportType' => ['element' => '#inputReportType'],
'inputAccountsSelect' => ['element' => '#inputAccountsSelect'],
'inputDateRange' => ['element' => '#inputDateRange'],
'extra-options-box' => ['element' => '#extra-options-box', 'position' => 'top'],
],
'reports_report_default' => [
'reports_report_default' => [
'intro' => [],
],
'reports_report_audit' => [
'reports_report_audit' => [
'intro' => [],
'optionsBox' => ['element' => '#optionsBox'],
],
'reports_report_category' => [
'reports_report_category' => [
'intro' => [],
'pieCharts' => ['element' => '#pieCharts'],
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
],
'reports_report_tag' => [
'reports_report_tag' => [
'intro' => [],
'pieCharts' => ['element' => '#pieCharts'],
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
],
'reports_report_budget' => [
'reports_report_budget' => [
'intro' => [],
'pieCharts' => ['element' => '#pieCharts'],
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
],
// piggies: index, create, show
'piggy-banks_index' => [
'piggy-banks_index' => [
'saved' => ['element' => '.piggySaved'],
'button' => ['element' => '.piggyBar'],
'accountStatus' => ['element' => '#accountStatus', 'position' => 'top'],
],
'piggy-banks_create' => [
'piggy-banks_create' => [
'name' => ['element' => '#ffInput_name'],
'date' => ['element' => '#ffInput_targetdate'],
],
'piggy-banks_show' => [
'piggy-banks_show' => [
'piggyChart' => ['element' => '#piggyChart'],
'piggyDetails' => ['element' => '#piggyDetails'],
'piggyEvents' => ['element' => '#piggyEvents'],
],
// bills: index, create, show
'bills_index' => [
'bills_index' => [
'rules' => ['element' => '.rules'],
'paid_in_period' => ['element' => '.paid_in_period'],
'expected_in_period' => ['element' => '.expected_in_period'],
],
'bills_create' => [
'bills_create' => [
'intro' => [],
'name' => ['element' => '#name_holder'],
//'match' => ['element' => '#match_holder'],
@@ -143,14 +143,14 @@ return [
'repeat_freq_holder' => ['element' => '#repeat_freq_holder'],
'skip_holder' => ['element' => '#skip_holder'],
],
'bills_show' => [
'bills_show' => [
'billInfo' => ['element' => '#billInfo'],
'billButtons' => ['element' => '#billButtons'],
'billChart' => ['element' => '#billChart', 'position' => 'top'],
],
// rules: index, create-rule, edit-rule
'rules_index' => [
'rules_index' => [
'intro' => [],
'new_rule_group' => ['element' => '#new_rule_group'],
'new_rule' => ['element' => '.new_rule'],
@@ -159,23 +159,23 @@ return [
'rule-triggers' => ['element' => '.rule-triggers'],
'outro' => [],
],
'rules_create' => [
'rules_create' => [
'mandatory' => ['element' => '#mandatory'],
'ruletriggerholder' => ['element' => '.rule-trigger-box'],
'test_rule_triggers' => ['element' => '.test_rule_triggers'],
'actions' => ['element' => '.rule-action-box', 'position' => 'top'],
],
// preferences: index
'preferences_index' => [
'preferences_index' => [
'tabs' => ['element' => '.nav-tabs'],
],
// currencies: index, create
'currencies_index' => [
'currencies_index' => [
'intro' => [],
'default' => ['element' => '#default-currency'],
'buttons' => ['element' => '.buttons'],
],
'currencies_create' => [
'currencies_create' => [
'code' => ['element' => '#ffInput_code'],
],
];

48
config/ldap_auth.php
View File

@@ -22,6 +22,28 @@
declare(strict_types=1);
use Adldap\Laravel\Events\Authenticated;
use Adldap\Laravel\Events\AuthenticatedModelTrashed;
use Adldap\Laravel\Events\AuthenticatedWithWindows;
use Adldap\Laravel\Events\Authenticating;
use Adldap\Laravel\Events\AuthenticationFailed;
use Adldap\Laravel\Events\AuthenticationRejected;
use Adldap\Laravel\Events\AuthenticationSuccessful;
use Adldap\Laravel\Events\DiscoveredWithCredentials;
use Adldap\Laravel\Events\Importing;
use Adldap\Laravel\Events\Synchronized;
use Adldap\Laravel\Events\Synchronizing;
use Adldap\Laravel\Listeners\LogAuthenticated;
use Adldap\Laravel\Listeners\LogAuthentication;
use Adldap\Laravel\Listeners\LogAuthenticationFailure;
use Adldap\Laravel\Listeners\LogAuthenticationRejection;
use Adldap\Laravel\Listeners\LogAuthenticationSuccess;
use Adldap\Laravel\Listeners\LogDiscovery;
use Adldap\Laravel\Listeners\LogImport;
use Adldap\Laravel\Listeners\LogSynchronized;
use Adldap\Laravel\Listeners\LogSynchronizing;
use Adldap\Laravel\Listeners\LogTrashedModel;
use Adldap\Laravel\Listeners\LogWindowsAuth;
use Adldap\Laravel\Scopes\UidScope;
use Adldap\Laravel\Scopes\UpnScope;
@@ -169,8 +191,8 @@ return [
'ldap' => [
'locate_users_by' => envNonEmpty('ADLDAP_DISCOVER_FIELD', 'userprincipalname'),
'bind_users_by' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'),
'locate_users_by' => envNonEmpty('ADLDAP_DISCOVER_FIELD', 'userprincipalname'),
'bind_users_by' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'),
],
@@ -330,17 +352,17 @@ return [
'enabled' => true,
'events' => [
\Adldap\Laravel\Events\Importing::class => \Adldap\Laravel\Listeners\LogImport::class,
\Adldap\Laravel\Events\Synchronized::class => \Adldap\Laravel\Listeners\LogSynchronized::class,
\Adldap\Laravel\Events\Synchronizing::class => \Adldap\Laravel\Listeners\LogSynchronizing::class,
\Adldap\Laravel\Events\Authenticated::class => \Adldap\Laravel\Listeners\LogAuthenticated::class,
\Adldap\Laravel\Events\Authenticating::class => \Adldap\Laravel\Listeners\LogAuthentication::class,
\Adldap\Laravel\Events\AuthenticationFailed::class => \Adldap\Laravel\Listeners\LogAuthenticationFailure::class,
\Adldap\Laravel\Events\AuthenticationRejected::class => \Adldap\Laravel\Listeners\LogAuthenticationRejection::class,
\Adldap\Laravel\Events\AuthenticationSuccessful::class => \Adldap\Laravel\Listeners\LogAuthenticationSuccess::class,
\Adldap\Laravel\Events\DiscoveredWithCredentials::class => \Adldap\Laravel\Listeners\LogDiscovery::class,
\Adldap\Laravel\Events\AuthenticatedWithWindows::class => \Adldap\Laravel\Listeners\LogWindowsAuth::class,
\Adldap\Laravel\Events\AuthenticatedModelTrashed::class => \Adldap\Laravel\Listeners\LogTrashedModel::class,
Importing::class => LogImport::class,
Synchronized::class => LogSynchronized::class,
Synchronizing::class => LogSynchronizing::class,
Authenticated::class => LogAuthenticated::class,
Authenticating::class => LogAuthentication::class,
AuthenticationFailed::class => LogAuthenticationFailure::class,
AuthenticationRejected::class => LogAuthenticationRejection::class,
AuthenticationSuccessful::class => LogAuthenticationSuccess::class,
DiscoveredWithCredentials::class => LogDiscovery::class,
AuthenticatedWithWindows::class => LogWindowsAuth::class,
AuthenticatedModelTrashed::class => LogTrashedModel::class,
],
],

14
config/logging.php
View File

@@ -52,39 +52,39 @@ return [
*/
'channels' => [
'stack' => [
'stack' => [
'driver' => 'stack',
'channels' => ['daily', 'stdout'],
],
'single' => [
'single' => [
'driver' => 'single',
'path' => storage_path('logs/laravel.log'),
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
],
'stdout' => [
'stdout' => [
'driver' => 'single',
'path' => 'php://stdout',
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
],
'docker_out' => [
'docker_out' => [
'driver' => 'single',
'path' => 'php://stdout',
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
],
'daily' => [
'daily' => [
'driver' => 'daily',
'path' => storage_path('logs/ff3-' . PHP_SAPI . '.log'),
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
'days' => 7,
],
'audit' => [
'audit' => [
'driver' => 'daily',
'path' => storage_path('logs/ff3-audit.log'),
'tap' => [AuditLogger::class],
'level' => 'info',
'days' => 90,
],
'dailytest' => [
'dailytest' => [
'driver' => 'daily',
'path' => storage_path('logs/test-ff3-' . PHP_SAPI . '.log'),
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),

4
config/twigbridge.php
View File

@@ -113,7 +113,7 @@ return [
| `Twig\Extension\DebugExtension` is enabled automatically if twig.debug is TRUE.
|
*/
'enabled' => [
'enabled' => [
Facades::class,
Filters::class,
Functions::class,
@@ -276,7 +276,7 @@ return [
| </code>
|
*/
'filters' => [
'filters' => [
'get' => 'data_get',
],
],