Merge branch 'release/5.6.11'

Bump node-fetch from 2.6.6 to 2.6.7 in /frontend

.env.example

@@ -37,9 +37,16 @@ TRUSTED_PROXIES=
 # Several other options exist. You can use 'single' for one big fat error log (not recommended).
 # Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
 # A rotating log option is 'daily', creates 5 files that (surprise) rotate.
+# A cool option is 'papertrail' for cloud logging
 # Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
 LOG_CHANNEL=stack
 
+#
+# Used when logging to papertrail:
+#
+PAPERTRAIL_HOST=
+PAPERTRAIL_PORT=
+
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
 # If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
@@ -62,6 +69,8 @@ DB_PORT=3306
 DB_DATABASE=firefly
 DB_USERNAME=firefly
 DB_PASSWORD=secret_firefly_password
+# leave empty or omit when not using a socket connection
+DB_SOCKET=
 
 # MySQL supports SSL. You can configure it here.
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
@@ -82,6 +91,9 @@ PGSQL_SSL_CERT=null
 PGSQL_SSL_KEY=null
 PGSQL_SSL_CRL_FILE=null
 
+# more PostgreSQL settings
+PGSQL_SCHEMA=public
+
 # If you're looking for performance improvements, you could install memcached or redis
 CACHE_DRIVER=file
 SESSION_DRIVER=file
@@ -170,6 +182,12 @@ MAP_DEFAULT_ZOOM=6
 # https://docs.firefly-iii.org/advanced-installation/authentication
 AUTHENTICATION_GUARD=web
 
+#
+# Your LDAP server may speak a dialect. You can choose between 'OpenLDAP' and 'ActiveDirectory'
+# Anything else defaults to 'ActiveDirectory'
+#
+LDAP_DIALECT=OpenLDAP
+
 #
 # LDAP connection settings:
 #
@@ -185,6 +203,15 @@ LDAP_PASSWORD=super_secret
 
 LDAP_AUTH_FIELD=uid
 
+#
+# If you wish to only authenticate users from a specific group, use the base DN above.
+#
+# If you require extra/special filters please use the LDAP_EXTRA_FILTER with a valid DN.
+#
+# The extra filter will only be applied after the user is authenticated.
+#
+LDAP_EXTRA_FILTER=
+
 #
 # Remote user guard settings
 #
@@ -280,6 +307,8 @@ FIREFLY_III_LAYOUT=v1
 # It won't work. It doesn't do ANYTHING. Don't believe the lies you read online. I'm not joking.
 # This configuration value WILL NOT HELP.
 #
+# Notable exception to this rule is Synology, which, according to some users, will use APP_URL to rewrite stuff.
+#
 # This variable is ONLY used in some of the emails Firefly III sends around. Nowhere else.
 # So when configuring anything WEB related this variable doesn't do anything. Nothing
 #

.github/.mergify.yml

@@ -1,7 +0,0 @@
-pull_request_rules:
-  - name: PR on main is never approved.
-    conditions:
-      - base=main
-    actions:
-      close:
-        message: Please reopen this PR on the `develop` branch. Thank you.

.github/ISSUE_TEMPLATE/bug.yml

@@ -14,8 +14,9 @@ body:
       label: I've found a bug and checked that ...
       description: Make sure that your request fulfills all of the following requirements. If one requirement cannot be satisfied, explain in detail why.
       options:
-        - label: ... the documentation does not mention anything about my problem
+        - label: ... [the documentation](https://docs.firefly-iii.org/) does not mention anything about my problem
         - label: ... there are no open or closed issues that are related to my problem
+        - label: ... it's [definitely me, not you](https://github.com/firefly-iii/firefly-iii/blob/main/.github/its_you_not_me.md)
 
   - type: textarea
     attributes:

.github/dependabot.yml

@@ -19,11 +19,3 @@ updates:
     schedule:
       interval: "weekly"
 
-  # yarn / JS updates for new frontend
-  - package-ecosystem: "npm"
-    directory: "/frontend"
-    target-branch: develop
-    versioning-strategy: increase
-    labels: ["bug"]
-    schedule:
-      interval: "weekly"

.github/its_you_not_me.md

@@ -0,0 +1,15 @@
+# It's not you, it's me
+
+Sometimes bugs reported to Firefly III are configuration and system problems on the user side.
+
+If you run into one of the following problems, there's a good chance it's not a Firefly III issue, but a configuration issue.
+
+- ⚠️ Can't connect to the database when starting Firefly III
+- ⚠️ Errors with missing app keys or encryption problems
+- ⚠️ Can't login due to 419 errors
+- ⚠️ Any 500 error when starting Firefly III
+- ⚠️ Any white page when starting Firefly III
+- ⚠️ Time-out when starting Firefly III for the first time
+- ⚠️ Firefly III does not work behind your reverse proxy
+
+If you run into an issue like this, please start a [discussion](https://github.com/firefly-iii/firefly-iii/discussions) or chat on [Gitter.im](https://gitter.im/firefly-iii/firefly-iii). There's a good chance it's not a bug but something we can fix rather quickly :+1:

.github/mergify.yml

@@ -0,0 +1,14 @@
+pull_request_rules:
+  - name: Security update by dependabot
+    conditions:
+      - author~=^dependabot(|-preview)\[bot\]$
+    actions:
+      merge:
+        method: merge
+  - name: Close all on main
+    conditions:
+      - base=main
+      - -author~=^dependabot(|-preview)\[bot\]$
+    actions:
+      close:
+        message: Please do not open PR's on the `main` branch, but on the `develop` branch only. Thank you!

.github/stale.yml

@@ -1,11 +1,11 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 7
+daysUntilStale: 14
 
 # Number of days of inactivity before a stale Issue or Pull Request is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 7
+daysUntilClose: 14
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 # - "[Status] Maybe Later"

.github/workflows/build.yml

@@ -0,0 +1,21 @@
+name: Sonarcloud CI
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.gitignore

@@ -15,4 +15,5 @@ yarn-error.log
 public/google*.html
 report.html
 composer.phar
-app.js.map
+app.js.map
+frontend-v3

.scrutinizer.yml

@@ -1,58 +0,0 @@
---- 
-build: 
-  nodes: 
-    analysis: 
-      project_setup: 
-        override: true
-      tests: 
-        override: 
-          - php-scrutinizer-run
-checks: 
-  javascript: true
-  php: 
-    align_assignments: true
-    avoid_fixme_comments: true
-    avoid_multiple_statements_on_same_line: true
-    avoid_perl_style_comments: true
-    avoid_todo_comments: true
-    duplication: false
-    encourage_single_quotes: true
-    newline_at_end_of_file: true
-    no_goto: true
-    no_long_variable_names: 
-      maximum: "20"
-    no_short_method_names: 
-      minimum: "3"
-    no_short_variable_names: 
-      minimum: "3"
-    optional_parameters_at_the_end: true
-    parameter_doc_comments: true
-    remove_extra_empty_lines: true
-    return_doc_comment_if_not_inferrable: true
-    return_doc_comments: true
-    uppercase_constants: true
-    use_self_instead_of_fqcn: true
-coding_style: 
-  php: 
-    spaces: 
-      around_operators: 
-        concatenation: true
-      other: 
-        after_type_cast: false
-filter: 
-  excluded_paths: 
-    - database/migrations/*
-    - bootstrap/*
-    - config/*
-    - docker/*
-    - public/js/lib/*
-    - public/lib/adminlte/js/*
-    - public/lib/bootstrap/js/*
-    - resources/*
-    - routes/*
-    - storage/*
-  paths: 
-    - app/*
-    - public/js/ff/*
-tools: 
-  external_code_coverage: false

.travis.yml

@@ -1,20 +0,0 @@
-language: php
-php:
-- '7.4'
-dist: xenial
-os: linux
-cache:
-  directories:
-  - "/home/travis/.config"
-  - "/home/travis/build/firefly-iii/firefly-iii/vendor"
-
-branches:
-  only:
-  - develop
-
-before_script:
-- phpenv config-rm xdebug.ini || return 0
-
-script:
-- "./.ci/phpstan.sh"
-- "./.ci/phpunit.sh"

app/Api/V1/Controllers/Models/Transaction/DestroyController.php

@@ -75,6 +75,7 @@ class DestroyController extends Controller
         $this->repository->destroyGroup($transactionGroup);
         // trigger just after destruction
         event(new DestroyedTransactionGroup($transactionGroup));
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }

app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php

@@ -54,7 +54,7 @@ class AutocompleteRequest extends FormRequest
         return [
             'types' => $array,
             'query' => $this->string('query'),
-            'date'  => $this->date('date'),
+            'date'  => $this->getCarbonDate('date'),
             'limit' => $limit,
         ];
     }

app/Api/V1/Requests/Data/DateRequest.php

@@ -45,8 +45,8 @@ class DateRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'start' => $this->date('start'),
-            'end'   => $this->date('end'),
+            'start' => $this->getCarbonDate('start'),
+            'end'   => $this->getCarbonDate('end'),
         ];
     }
 

app/Api/V1/Requests/Data/Export/ExportRequest.php

@@ -41,8 +41,8 @@ class ExportRequest extends FormRequest
     public function getAll(): array
     {
         $result     = [
-            'start' => $this->date('start') ?? Carbon::now()->subYear(),
-            'end'   => $this->date('end') ?? Carbon::now(),
+            'start' => $this->getCarbonDate('start') ?? Carbon::now()->subYear(),
+            'end'   => $this->getCarbonDate('end') ?? Carbon::now(),
             'type'  => $this->string('type'),
         ];
         $parts      = explode(',', $this->string('accounts'));

app/Api/V1/Requests/Insight/GenericRequest.php

@@ -58,8 +58,8 @@ class GenericRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'start' => $this->date('start'),
-            'end'   => $this->date('end'),
+            'start' => $this->getCarbonDate('start'),
+            'end'   => $this->getCarbonDate('end'),
         ];
     }
 
@@ -204,7 +204,7 @@ class GenericRequest extends FormRequest
      */
     public function getEnd(): Carbon
     {
-        $date = $this->date('end');
+        $date = $this->getCarbonDate('end');
         $date->endOfDay();
 
         return $date;
@@ -251,7 +251,7 @@ class GenericRequest extends FormRequest
      */
     public function getStart(): Carbon
     {
-        $date = $this->date('start');
+        $date = $this->getCarbonDate('start');
         $date->startOfDay();
 
         return $date;

app/Api/V1/Requests/Models/Account/StoreRequest.php

@@ -70,7 +70,7 @@ class StoreRequest extends FormRequest
             'account_number'          => $this->string('account_number'),
             'account_role'            => $this->string('account_role'),
             'opening_balance'         => $this->string('opening_balance'),
-            'opening_balance_date'    => $this->date('opening_balance_date'),
+            'opening_balance_date'    => $this->getCarbonDate('opening_balance_date'),
             'cc_type'                 => $this->string('credit_card_type'),
             'cc_monthly_payment_date' => $this->string('monthly_payment_date'),
             'notes'                   => $this->stringWithNewlines('notes'),
@@ -82,7 +82,7 @@ class StoreRequest extends FormRequest
 
         if ('liability' === $data['account_type_name'] || 'liabilities' === $data['account_type_name']) {
             $data['opening_balance']      = app('steam')->negative($this->string('liability_amount'));
-            $data['opening_balance_date'] = $this->date('liability_start_date');
+            $data['opening_balance_date'] = $this->getCarbonDate('liability_start_date');
             $data['account_type_name']    = $this->string('liability_type');
             $data['liability_direction']  = $this->string('liability_direction');
             $data['account_type_id']      = null;

app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php

@@ -44,8 +44,8 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'start'         => $this->date('start'),
-            'end'           => $this->date('end'),
+            'start'         => $this->getCarbonDate('start'),
+            'end'           => $this->getCarbonDate('end'),
             'amount'        => $this->string('amount'),
             'currency_id'   => $this->integer('currency_id'),
             'currency_code' => $this->string('currency_code'),

app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php

@@ -51,8 +51,8 @@ class StoreRequest extends FormRequest
         $data['account_id']         = $this->integer('account_id');
         $data['targetamount']       = $this->string('target_amount');
         $data['current_amount']     = $this->string('current_amount');
-        $data['startdate']          = $this->date('start_date');
-        $data['targetdate']         = $this->date('target_date');
+        $data['startdate']          = $this->getCarbonDate('start_date');
+        $data['targetdate']         = $this->getCarbonDate('target_date');
         $data['notes']              = $this->stringWithNewlines('notes');
         $data['object_group_id']    = $this->integer('object_group_id');
         $data['object_group_title'] = $this->string('object_group_title');

app/Api/V1/Requests/Models/Rule/UpdateRequest.php

@@ -53,6 +53,7 @@ class UpdateRequest extends FormRequest
             'strict'          => ['strict', 'boolean'],
             'stop_processing' => ['stop_processing', 'boolean'],
             'active'          => ['active', 'boolean'],
+            'order'           => ['order', 'integer'],
         ];
 
         $return   = $this->getAllData($fields);
@@ -150,6 +151,7 @@ class UpdateRequest extends FormRequest
             'strict'                     => [new IsBoolean],
             'stop_processing'            => [new IsBoolean],
             'active'                     => [new IsBoolean],
+            'order'                      => 'numeric|between:1,1337',
         ];
     }
 

app/Api/V1/Requests/Models/Tag/StoreRequest.php

@@ -47,7 +47,7 @@ class StoreRequest extends FormRequest
     {
         $data = [
             'tag'          => $this->string('tag'),
-            'date'         => $this->date('date'),
+            'date'         => $this->getCarbonDate('date'),
             'description'  => $this->string('description'),
             'has_location' => true,
         ];

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -137,7 +137,7 @@ class StoreRequest extends FormRequest
                 'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
                 'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
                 'bunq_payment_id'       => $this->clearString((string)$object['bunq_payment_id'], false),
-                'external_uri'          => $this->clearString((string)$object['external_uri'], false),
+                'external_url'          => $this->clearString((string)$object['external_url'], false),
 
                 'sepa_cc'       => $this->clearString((string)$object['sepa_cc'], false),
                 'sepa_ct_op'    => $this->clearString((string)$object['sepa_ct_op'], false),
@@ -211,7 +211,7 @@ class StoreRequest extends FormRequest
             // budget, category, bill and piggy
             'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUser],
             'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser],
-            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser],
+            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser,'nullable'],
             'transactions.*.category_name'         => 'between:1,255|nullable',
             'transactions.*.bill_id'               => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser],
             'transactions.*.bill_name'             => ['between:1,255', 'nullable', new BelongsUser],
@@ -228,7 +228,7 @@ class StoreRequest extends FormRequest
             'transactions.*.external_id'           => 'min:1,max:255|nullable',
             'transactions.*.recurrence_id'         => 'min:1,max:255|nullable',
             'transactions.*.bunq_payment_id'       => 'min:1,max:255|nullable',
-            'transactions.*.external_uri'          => 'min:1,max:255|nullable|url',
+            'transactions.*.external_url'          => 'min:1,max:255|nullable|url',
 
             // SEPA fields:
             'transactions.*.sepa_cc'               => 'min:1,max:255|nullable',

app/Api/V1/Requests/Models/Transaction/UpdateRequest.php

@@ -113,7 +113,7 @@ class UpdateRequest extends FormRequest
             'sepa_ep',
             'sepa_ci',
             'sepa_batch_id',
-            'external_uri',
+            'external_url',
         ];
         $this->booleanFields = [
             'reconciled',
@@ -284,72 +284,76 @@ class UpdateRequest extends FormRequest
     {
         return [
             // basic fields for group:
-            'group_title'                          => 'between:1,1000',
-            'apply_rules'                          => [new IsBoolean],
+            'group_title'                           => 'between:1,1000',
+            'apply_rules'                           => [new IsBoolean],
 
             // transaction rules (in array for splits):
-            'transactions.*.type'                  => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation',
-            'transactions.*.date'                  => [new IsDateOrTime],
-            'transactions.*.order'                 => 'numeric|min:0',
+            'transactions.*.type'                   => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation',
+            'transactions.*.date'                   => [new IsDateOrTime],
+            'transactions.*.order'                  => 'numeric|min:0',
+
+            // group id:
+            'transactions.*.transaction_journal_id' => ['numeric', 'exists:transaction_journals,id', new BelongsUser],
+
 
             // currency info
-            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
-            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
-            'transactions.*.foreign_currency_id'   => 'nullable|numeric|exists:transaction_currencies,id',
-            'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.currency_id'            => 'numeric|exists:transaction_currencies,id',
+            'transactions.*.currency_code'          => 'min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_currency_id'    => 'nullable|numeric|exists:transaction_currencies,id',
+            'transactions.*.foreign_currency_code'  => 'nullable|min:3|max:3|exists:transaction_currencies,code',
 
             // amount
-            'transactions.*.amount'                => 'numeric|gt:0|max:100000000000',
-            'transactions.*.foreign_amount'        => 'nullable|numeric|gte:0',
+            'transactions.*.amount'                 => 'numeric|gt:0|max:100000000000',
+            'transactions.*.foreign_amount'         => 'nullable|numeric|gte:0',
 
             // description
-            'transactions.*.description'           => 'nullable|between:1,1000',
+            'transactions.*.description'            => 'nullable|between:1,1000',
 
             // source of transaction
-            'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser],
-            'transactions.*.source_name'           => 'between:1,255|nullable',
+            'transactions.*.source_id'              => ['numeric', 'nullable', new BelongsUser],
+            'transactions.*.source_name'            => 'between:1,255|nullable',
 
             // destination of transaction
-            'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser],
-            'transactions.*.destination_name'      => 'between:1,255|nullable',
+            'transactions.*.destination_id'         => ['numeric', 'nullable', new BelongsUser],
+            'transactions.*.destination_name'       => 'between:1,255|nullable',
 
             // budget, category, bill and piggy
-            'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUser],
-            'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser],
-            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser],
-            'transactions.*.category_name'         => 'between:1,255|nullable',
-            'transactions.*.bill_id'               => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser],
-            'transactions.*.bill_name'             => ['between:1,255', 'nullable', new BelongsUser],
+            'transactions.*.budget_id'              => ['mustExist:budgets,id', new BelongsUser],
+            'transactions.*.budget_name'            => ['between:1,255', 'nullable', new BelongsUser],
+            'transactions.*.category_id'            => ['mustExist:categories,id', new BelongsUser],
+            'transactions.*.category_name'          => 'between:1,255|nullable',
+            'transactions.*.bill_id'                => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser],
+            'transactions.*.bill_name'              => ['between:1,255', 'nullable', new BelongsUser],
 
             // other interesting fields
-            'transactions.*.reconciled'            => [new IsBoolean],
-            'transactions.*.notes'                 => 'min:1,max:50000|nullable',
-            'transactions.*.tags'                  => 'between:0,255',
+            'transactions.*.reconciled'             => [new IsBoolean],
+            'transactions.*.notes'                  => 'min:1,max:50000|nullable',
+            'transactions.*.tags'                   => 'between:0,255',
 
             // meta info fields
-            'transactions.*.internal_reference'    => 'min:1,max:255|nullable',
-            'transactions.*.external_id'           => 'min:1,max:255|nullable',
-            'transactions.*.recurrence_id'         => 'min:1,max:255|nullable',
-            'transactions.*.bunq_payment_id'       => 'min:1,max:255|nullable',
-            'transactions.*.external_uri'          => 'min:1,max:255|nullable|url',
+            'transactions.*.internal_reference'     => 'min:1,max:255|nullable',
+            'transactions.*.external_id'            => 'min:1,max:255|nullable',
+            'transactions.*.recurrence_id'          => 'min:1,max:255|nullable',
+            'transactions.*.bunq_payment_id'        => 'min:1,max:255|nullable',
+            'transactions.*.external_url'           => 'min:1,max:255|nullable|url',
 
             // SEPA fields:
-            'transactions.*.sepa_cc'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ct_op'            => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ct_id'            => 'min:1,max:255|nullable',
-            'transactions.*.sepa_db'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_country'          => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ep'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ci'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_batch_id'         => 'min:1,max:255|nullable',
+            'transactions.*.sepa_cc'                => 'min:1,max:255|nullable',
+            'transactions.*.sepa_ct_op'             => 'min:1,max:255|nullable',
+            'transactions.*.sepa_ct_id'             => 'min:1,max:255|nullable',
+            'transactions.*.sepa_db'                => 'min:1,max:255|nullable',
+            'transactions.*.sepa_country'           => 'min:1,max:255|nullable',
+            'transactions.*.sepa_ep'                => 'min:1,max:255|nullable',
+            'transactions.*.sepa_ci'                => 'min:1,max:255|nullable',
+            'transactions.*.sepa_batch_id'          => 'min:1,max:255|nullable',
 
             // dates
-            'transactions.*.interest_date'         => 'date|nullable',
-            'transactions.*.book_date'             => 'date|nullable',
-            'transactions.*.process_date'          => 'date|nullable',
-            'transactions.*.due_date'              => 'date|nullable',
-            'transactions.*.payment_date'          => 'date|nullable',
-            'transactions.*.invoice_date'          => 'date|nullable',
+            'transactions.*.interest_date'          => 'date|nullable',
+            'transactions.*.book_date'              => 'date|nullable',
+            'transactions.*.process_date'           => 'date|nullable',
+            'transactions.*.due_date'               => 'date|nullable',
+            'transactions.*.payment_date'           => 'date|nullable',
+            'transactions.*.invoice_date'           => 'date|nullable',
         ];
     }
 
@@ -375,6 +379,9 @@ class UpdateRequest extends FormRequest
                 // validate source/destination is equal, depending on the transaction journal type.
                 $this->validateEqualAccountsForUpdate($validator, $transactionGroup);
 
+                // a catch when users submit splits with no source or destination info at all.
+                $this->preventNoAccountInfo($validator,);
+
                 // validate that the currency fits the source and/or destination account.
                 // validate all account info
                 $this->validateAccountInformationUpdate($validator, $transactionGroup);

app/Api/V1/Requests/System/CronRequest.php

@@ -62,7 +62,7 @@ class CronRequest extends FormRequest
             $data['force'] = $this->boolean('force');
         }
         if ($this->has('date')) {
-            $data['date'] = $this->date('date');
+            $data['date'] = $this->getCarbonDate('date');
         }
 
         return $data;

app/Console/Commands/Correction/CorrectDatabase.php

@@ -69,6 +69,7 @@ class CorrectDatabase extends Command
             'firefly-iii:delete-empty-journals',
             'firefly-iii:delete-empty-groups',
             'firefly-iii:fix-account-types',
+            'firefly-iii:fix-ibans',
             'firefly-iii:fix-account-order',
             'firefly-iii:rename-meta-fields',
             'firefly-iii:fix-ob-currencies',

app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php

@@ -72,9 +72,7 @@ class CorrectOpeningBalanceCurrencies extends Command
         $count = 0;
         /** @var TransactionJournal $journal */
         foreach ($set as $journal) {
-            Log::debug(sprintf('Going to fix journal #%d', $journal->id));
             $count += $this->correctJournal($journal);
-            Log::debug(sprintf('Done, count is now %d', $count));
         }
 
         if ($count > 0) {
@@ -100,7 +98,6 @@ class CorrectOpeningBalanceCurrencies extends Command
      */
     private function correctJournal(TransactionJournal $journal): int
     {
-        Log::debug(sprintf('Going to correct journal #%d', $journal->id));
         // get the asset account for this opening balance:
         $account = $this->getAccount($journal);
         if (null === $account) {
@@ -110,9 +107,7 @@ class CorrectOpeningBalanceCurrencies extends Command
 
             return 0;
         }
-        Log::debug(sprintf('Found "%s" #%d "%s".', $account->accountType->type, $account->id, $account->name));
         $currency = $this->getCurrency($account);
-        Log::debug(sprintf('Found currency #%d (%s)', $currency->id, $currency->code));
 
         // update journal and all transactions:
         return $this->setCurrency($journal, $currency);
@@ -126,20 +121,14 @@ class CorrectOpeningBalanceCurrencies extends Command
     private function getAccount(TransactionJournal $journal): ?Account
     {
         $transactions = $journal->transactions()->get();
-        Log::debug(sprintf('Found %d transactions for journal #%d.', $transactions->count(), $journal->id));
         /** @var Transaction $transaction */
         foreach ($transactions as $transaction) {
-            Log::debug(sprintf('Testing transaction #%d', $transaction->id));
             /** @var Account $account */
             $account = $transaction->account()->first();
             if (null !== $account && AccountType::INITIAL_BALANCE !== $account->accountType()->first()->type) {
-                Log::debug(sprintf('Account of transaction #%d is opposite of IB account (%s).', $transaction->id, $account->accountType()->first()->type));
-
                 return $account;
             }
         }
-        Log::debug('Found no IB account in transactions of journal.');
-
         return null;
     }
 
@@ -165,10 +154,8 @@ class CorrectOpeningBalanceCurrencies extends Command
      */
     private function setCurrency(TransactionJournal $journal, TransactionCurrency $currency): int
     {
-        Log::debug('Now in setCurrency');
         $count = 0;
         if ((int)$journal->transaction_currency_id !== (int)$currency->id) {
-            Log::debug(sprintf('Currency ID of journal #%d was #%d, now set to #%d', $journal->id, $journal->transaction_currency_id, $currency->id));
             $journal->transaction_currency_id = $currency->id;
             $journal->save();
             $count = 1;
@@ -177,15 +164,11 @@ class CorrectOpeningBalanceCurrencies extends Command
         /** @var Transaction $transaction */
         foreach ($journal->transactions as $transaction) {
             if ((int)$transaction->transaction_currency_id !== (int)$currency->id) {
-                Log::debug(
-                    sprintf('Currency ID of transaction #%d was #%d, now set to #%d', $transaction->id, $transaction->transaction_currency_id, $currency->id)
-                );
                 $transaction->transaction_currency_id = $currency->id;
                 $transaction->save();
                 $count = 1;
             }
         }
-        Log::debug(sprintf('Return %d', $count));
 
         return $count;
     }

app/Console/Commands/Correction/CorrectionSkeleton.php.stub

@@ -6,6 +6,7 @@ use Illuminate\Console\Command;
 
 /**
  * Class CorrectionSkeleton
+ * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
  */
 class CorrectionSkeleton extends Command
 {

app/Console/Commands/Correction/FixIbans.php

@@ -0,0 +1,51 @@
+<?php
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands\Correction;
+
+use FireflyIII\Models\Account;
+use Illuminate\Console\Command;
+
+/**
+ * Class FixIbans
+ */
+class FixIbans extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Removes spaces from IBANs';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:fix-ibans';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        $accounts = Account::whereNotNull('iban')->get();
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $iban = $account->iban;
+            if (str_contains($iban, ' ')) {
+
+                $iban = app('steam')->filterSpaces((string)$account->iban);
+                if ('' !== $iban) {
+                    $account->iban = $iban;
+                    $account->save();
+                    $this->line(sprintf('Removed spaces from IBAN of account #%d', $account->id));
+                }
+            }
+        }
+
+        return 0;
+    }
+}

app/Console/Commands/CreateDatabase.php

@@ -63,6 +63,12 @@ class CreateDatabase extends Command
         $exists  = false;
         $checked = false; // checked for existence of DB?
         $dsn     = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST', 'localhost'), env('DB_PORT', '3306'));
+
+        if ('' !== env('DB_SOCKET', '')) {
+            $dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', env('DB_SOCKET', ''));
+        }
+        $this->info(sprintf('DSN is %s', $dsn));
+
         $options = [
             PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
             PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,

app/Console/Commands/Export/ExportData.php

@@ -154,6 +154,7 @@ class ExportData extends Command
     /**
      * @return array
      * @throws FireflyException
+     * @throws Exception
      */
     private function parseOptions(): array
     {
@@ -201,12 +202,17 @@ class ExportData extends Command
                 $error = true;
             }
         }
+        if(null === $this->option($field)) {
+            Log::info(sprintf('No date given in field "%s"', $field));
+            $error = true;
+        }
 
         if (true === $error && 'start' === $field) {
             $journal = $this->journalRepository->firstNull();
             $date    = null === $journal ? Carbon::now()->subYear() : $journal->date;
             $date->startOfDay();
         }
+
         if (true === $error && 'end' === $field) {
             $date = today(config('app.timezone'));
             $date->endOfDay();

app/Console/Commands/Integrity/ReportSkeleton.php.stub

@@ -6,6 +6,7 @@ use Illuminate\Console\Command;
 
 /**
  * Class ReportSkeleton
+ * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
  */
 class ReportSkeleton extends Command
 {

app/Console/Commands/Integrity/RestoreOAuthKeys.php

@@ -74,8 +74,16 @@ class RestoreOAuthKeys extends Command
         }
         if ($this->keysInDatabase() && !$this->keysOnDrive()) {
             Log::debug('Keys are in DB and keys are not on the drive. Restore.');
-            $this->restoreKeysFromDB();
-            $this->line('Restored OAuth keys from database.');
+            $result = $this->restoreKeysFromDB();
+            if(true === $result) {
+                $this->line('Restored OAuth keys from database.');
+
+                return;
+            }
+            Log::warning('Could not restore keys. Will create new ones.');
+            $this->generateKeys();
+            $this->storeKeysInDB();
+            $this->line('Generated and stored new keys.');
 
             return;
         }
@@ -124,8 +132,8 @@ class RestoreOAuthKeys extends Command
     /**
      *
      */
-    private function restoreKeysFromDB(): void
+    private function restoreKeysFromDB(): bool
     {
-        OAuthKeys::restoreKeysFromDB();
+        return OAuthKeys::restoreKeysFromDB();
     }
 }

app/Console/Commands/Upgrade/UpgradeDatabase.php

@@ -98,6 +98,7 @@ class UpgradeDatabase extends Command
             'firefly-iii:unify-group-accounts',
             'firefly-iii:fix-transaction-types',
             'firefly-iii:fix-frontpage-accounts',
+            'firefly-iii:fix-ibans',
 
             // two report commands
             'firefly-iii:report-empty-objects',
@@ -143,11 +144,6 @@ class UpgradeDatabase extends Command
         $result = Artisan::output();
         echo $result;
 
-        $this->line('Now installing OAuth2 keys...');
-        Artisan::call('passport:install');
-        $result = Artisan::output();
-        echo $result;
-
         $this->line('Done!');
     }
 }

app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub

@@ -5,7 +5,8 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use Illuminate\Console\Command;
 
 /**
- * Class UpgradeSkeleton
+ * Class UpgradeSkeleton.
+ * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
  */
 class UpgradeSkeleton extends Command
 {

app/Events/ActuallyLoggedIn.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * ActuallyLoggedIn.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Events;
+
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class ActuallyLoggedIn
+ */
+class ActuallyLoggedIn extends Event
+{
+    use SerializesModels;
+
+    public User $user;
+
+    /**
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}

app/Exceptions/GracefulNotFoundHandler.php

@@ -91,6 +91,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
                 return redirect(route('currencies.index'));
             case 'budgets.show':
             case 'budgets.edit':
+            case 'budgets.show.limit':
                 $request->session()->reflash();
 
                 return redirect(route('budgets.index'));

app/Exceptions/Handler.php

@@ -29,8 +29,11 @@ namespace FireflyIII\Exceptions;
 use ErrorException;
 use FireflyIII\Jobs\MailError;
 use Illuminate\Auth\AuthenticationException;
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException as LaravelValidationException;
@@ -187,4 +190,43 @@ class Handler extends ExceptionHandler
             )
         );
     }
+
+    /**
+     * Convert a validation exception into a response.
+     *
+     * @param Request                    $request
+     * @param LaravelValidationException $exception
+     *
+     * @return Application|RedirectResponse|Redirector
+     */
+    protected function invalid($request, LaravelValidationException $exception): Application|RedirectResponse|Redirector
+    {
+        // protect against open redirect when submitting invalid forms.
+        $previous = app('steam')->getSafePreviousUrl();
+        $redirect = $this->getRedirectUrl($exception);
+
+        return redirect($redirect ?? $previous)
+            ->withInput(Arr::except($request->input(), $this->dontFlash))
+            ->withErrors($exception->errors(), $request->input('_error_bag', $exception->errorBag));
+    }
+
+    /**
+     * Only return the redirectTo property from the exception if it is a valid URL. Return NULL otherwise.
+     *
+     * @param LaravelValidationException $exception
+     *
+     * @return string|null
+     */
+    private function getRedirectUrl(LaravelValidationException $exception): ?string
+    {
+        if (null === $exception->redirectTo) {
+            return null;
+        }
+        $safe         = route('index');
+        $previous     = $exception->redirectTo;
+        $previousHost = parse_url($previous, PHP_URL_HOST);
+        $safeHost     = parse_url($safe, PHP_URL_HOST);
+
+        return null !== $previousHost && $previousHost === $safeHost ? $previous : $safe;
+    }
 }

app/Factory/TransactionJournalFactory.php

@@ -342,7 +342,13 @@ class TransactionJournalFactory
         }
         if (null !== $result) {
             Log::warning(sprintf('Found a duplicate in errorIfDuplicate because hash %s is not unique!', $hash));
-            throw new DuplicateTransactionException(sprintf('Duplicate of transaction #%d.', $result->transactionJournal->transaction_group_id));
+            $journal = $result->transactionJournal()->withTrashed()->first();
+            $group   = $journal?->transactionGroup()->withTrashed()->first();
+            $groupId = $group?->id;
+            if (null === $group) {
+                $groupId = 0;
+            }
+            throw new DuplicateTransactionException(sprintf('Duplicate of transaction #%d.', $groupId));
         }
     }
 
@@ -359,19 +365,29 @@ class TransactionJournalFactory
         $this->accountValidator->setTransactionType($transactionType);
 
         // validate source account.
-        $sourceId    = $data['source_id'] ? (int)$data['source_id'] : null;
-        $sourceName  = $data['source_name'] ? (string)$data['source_name'] : null;
-        $validSource = $this->accountValidator->validateSource($sourceId, $sourceName, null);
+        $array       = [
+            'id'     => $data['source_id'] ? (int)$data['source_id'] : null,
+            'name'   => $data['source_name'] ? (string)$data['source_name'] : null,
+            'iban'   => $data['source_iban'] ? (string)$data['source_iban'] : null,
+            'number' => $data['source_number'] ? (string)$data['source_number'] : null,
+        ];
+        $validSource = $this->accountValidator->validateSource($array);
 
         // do something with result:
         if (false === $validSource) {
             throw new FireflyException(sprintf('Source: %s', $this->accountValidator->sourceError));
         }
         Log::debug('Source seems valid.');
+
         // validate destination account
-        $destinationId    = $data['destination_id'] ? (int)$data['destination_id'] : null;
-        $destinationName  = $data['destination_name'] ? (string)$data['destination_name'] : null;
-        $validDestination = $this->accountValidator->validateDestination($destinationId, $destinationName, null);
+        $array = [
+            'id'     => $data['destination_id'] ? (int)$data['destination_id'] : null,
+            'name'   => $data['destination_name'] ? (string)$data['destination_name'] : null,
+            'iban'   => $data['destination_iban'] ? (string)$data['destination_iban'] : null,
+            'number' => $data['destination_number'] ? (string)$data['destination_number'] : null,
+        ];
+
+        $validDestination = $this->accountValidator->validateDestination($array);
         // do something with result:
         if (false === $validDestination) {
             throw new FireflyException(sprintf('Destination: %s', $this->accountValidator->destError));

app/Handlers/Events/UpdatedGroupEventHandler.php

@@ -123,7 +123,6 @@ class UpdatedGroupEventHandler
         if (1 === $group->transactionJournals->count()) {
             return;
         }
-        Log::debug(sprintf('Correct inconsistent accounts in group #%d', $group->id));
         // first journal:
         /** @var TransactionJournal $first */
         $first = $group->transactionJournals()
@@ -132,6 +131,12 @@ class UpdatedGroupEventHandler
                        ->orderBy('transaction_journals.id', 'DESC')
                        ->orderBy('transaction_journals.description', 'DESC')
                        ->first();
+
+        if(null === $first) {
+            Log::warning(sprintf('Group #%d has no transaction journals.', $group->id));
+            return;
+        }
+
         $all   = $group->transactionJournals()->get()->pluck('id')->toArray();
         /** @var Account $sourceAccount */
         $sourceAccount = $first->transactions()->where('amount', '<', '0')->first()->account;

app/Handlers/Events/UserEventHandler.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Handlers\Events;
 
 use Carbon\Carbon;
 use Exception;
+use FireflyIII\Events\ActuallyLoggedIn;
 use FireflyIII\Events\DetectedNewIPAddress;
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedNewPassword;
@@ -116,9 +117,24 @@ class UserEventHandler
      */
     public function createGroupMembership(RegisteredUser $event): bool
     {
-        $user = $event->user;
+        $user        = $event->user;
+        $groupExists = true;
+        $groupTitle  = $user->email;
+        $index       = 1;
+
         // create a new group.
-        $group = UserGroup::create(['title' => $user->email]);
+        while (true === $groupExists) {
+            $groupExists = UserGroup::where('title', $groupTitle)->count() > 0;
+            if(false === $groupExists) {
+                $group = UserGroup::create(['title' => $groupTitle]);
+                break;
+            }
+            $groupTitle = sprintf('%s-%d', $user->email, $index);
+            $index++;
+            if($index > 99) {
+                throw new FireflyException('Email address can no longer be used for registrations.');
+            }
+        }
         $role  = UserRole::where('title', UserRole::OWNER)->first();
         if (null === $role) {
             throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?');
@@ -317,12 +333,11 @@ class UserEventHandler
     }
 
     /**
-     * @param Login $event
-     *
-     * @throws FireflyException
+     * @param ActuallyLoggedIn $event
      */
-    public function storeUserIPAddress(Login $event): void
+    public function storeUserIPAddress(ActuallyLoggedIn $event): void
     {
+        Log::debug('Now in storeUserIPAddress');
         /** @var User $user */
         $user = $event->user;
         /** @var array $preference */

app/Helpers/Attachments/AttachmentHelper.php

@@ -171,11 +171,14 @@ class AttachmentHelper implements AttachmentHelperInterface
         $allowedMime = config('firefly.allowedMimes');
         if (!in_array($mime, $allowedMime, true)) {
             Log::error(sprintf('Mime type %s is not allowed for API file upload.', $mime));
+            fclose($resource);
 
             return false;
         }
         // is allowed? Save the file, without encryption.
-        $this->uploadDisk->put($attachment->fileName(), $content);
+        $parts = explode('/', $attachment->fileName());
+        $file  = $parts[count($parts) - 1];
+        $this->uploadDisk->put($file, $content);
 
         // update attachment.
         $attachment->md5      = md5_file($path);

app/Helpers/Collector/Extensions/MetaCollection.php

@@ -212,6 +212,40 @@ trait MetaCollection
         return $this;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function withoutExternalUrl(): GroupCollectorInterface
+    {
+        if (false === $this->hasJoinedMetaTables) {
+            $this->hasJoinedMetaTables = true;
+            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
+        }
+        $this->query->where(function(Builder $q1) {
+            $q1->where(function(Builder $q2) {
+                $q2->where('journal_meta.name', '=', 'external_url');
+                $q2->whereNull('journal_meta.data');
+            })->orWhereNull('journal_meta.name');
+        });
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function withExternalUrl(): GroupCollectorInterface
+    {
+        if (false === $this->hasJoinedMetaTables) {
+            $this->hasJoinedMetaTables = true;
+            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
+        }
+        $this->query->where('journal_meta.name', '=', 'external_url');
+        $this->query->whereNotNull('journal_meta.data');
+
+        return $this;
+    }
+
     /**
      * @inheritDoc
      */

app/Helpers/Collector/Extensions/TimeCollection.php

@@ -119,4 +119,61 @@ trait TimeCollection
 
         return $this;
     }
+
+    public function yearIs(string $year): GroupCollectorInterface
+    {
+        $this->query->whereYear('transaction_journals.date', '=', $year);
+        return $this;
+    }
+
+    public function monthIs(string $month): GroupCollectorInterface
+    {
+        $this->query->whereMonth('transaction_journals.date', '=', $month);
+        return $this;
+
+    }
+
+    public function dayIs(string $day): GroupCollectorInterface
+    {
+        $this->query->whereDay('transaction_journals.date', '=', $day);
+        return $this;
+    }
+
+    public function yearBefore(string $year): GroupCollectorInterface
+    {
+        $this->query->whereYear('transaction_journals.date', '<=', $year);
+        return $this;
+    }
+
+    public function monthBefore(string $month): GroupCollectorInterface
+    {
+        $this->query->whereMonth('transaction_journals.date', '<=', $month);
+        return $this;
+
+    }
+
+    public function dayBefore(string $day): GroupCollectorInterface
+    {
+        $this->query->whereDay('transaction_journals.date', '<=', $day);
+        return $this;
+    }
+
+    public function yearAfter(string $year): GroupCollectorInterface
+    {
+        $this->query->whereYear('transaction_journals.date', '>=', $year);
+        return $this;
+    }
+
+    public function monthAfter(string $month): GroupCollectorInterface
+    {
+        $this->query->whereMonth('transaction_journals.date', '>=', $month);
+        return $this;
+
+    }
+
+    public function dayAfter(string $day): GroupCollectorInterface
+    {
+        $this->query->whereDay('transaction_journals.date', '>=', $day);
+        return $this;
+    }
 }

app/Helpers/Collector/GroupCollector.php

@@ -559,6 +559,15 @@ class GroupCollector implements GroupCollectorInterface
         echo '</pre>';
     }
 
+    /**
+     *
+     */
+    public function dumpQueryInLogs(): void
+    {
+        Log::debug($this->query->select($this->fields)->toSql()) ;
+        Log::debug('Bindings',$this->query->getBindings());
+    }
+
     /**
      * Convert a selected set of fields to arrays.
      *

app/Helpers/Collector/GroupCollectorInterface.php

@@ -305,6 +305,20 @@ interface GroupCollectorInterface
      */
     public function setExternalId(string $externalId): GroupCollectorInterface;
 
+    /**
+     * Transactions without an external URL
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withoutExternalUrl(): GroupCollectorInterface;
+
+    /**
+     * Transactions with an external URL
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withExternalUrl(): GroupCollectorInterface;
+
     /**
      * Limit results to a specific foreign currency.
      *
@@ -565,4 +579,15 @@ interface GroupCollectorInterface
      */
     public function withoutTags(): GroupCollectorInterface;
 
+
+    public function yearIs(string $year): GroupCollectorInterface;
+    public function monthIs(string $month): GroupCollectorInterface;
+    public function dayIs(string $day): GroupCollectorInterface;
+    public function yearBefore(string $year): GroupCollectorInterface;
+    public function monthBefore(string $month): GroupCollectorInterface;
+    public function dayBefore(string $day): GroupCollectorInterface;
+    public function yearAfter(string $year): GroupCollectorInterface;
+    public function monthAfter(string $month): GroupCollectorInterface;
+    public function dayAfter(string $day): GroupCollectorInterface;
+
 }

app/Helpers/Help/Help.php

@@ -88,7 +88,7 @@ class Help implements HelpInterface
             $content    = trim($res->getBody()->getContents());
         } catch (Exception $e) { // @phpstan-ignore-line
             Log::info($e->getMessage());
-            Log::info($e->getTraceAsString());
+            //Log::info($e->getTraceAsString());
         }
 
         Log::debug(sprintf('Status code is %d', $statusCode));

app/Helpers/Report/NetWorth.php

@@ -79,7 +79,7 @@ class NetWorth implements NetWorthInterface
 
         $netWorth = [];
         $result   = [];
-        Log::debug(sprintf('Now in getNetWorthByCurrency(%s)', $date->format('Y-m-d')));
+        //Log::debug(sprintf('Now in getNetWorthByCurrency(%s)', $date->format('Y-m-d')));
 
         // get default currency
         $default = app('amount')->getDefaultCurrencyByUser($this->user);
@@ -90,16 +90,16 @@ class NetWorth implements NetWorthInterface
         // get the preferred currency for this account
         /** @var Account $account */
         foreach ($accounts as $account) {
-            Log::debug(sprintf('Now at account #%d: "%s"', $account->id, $account->name));
+            //Log::debug(sprintf('Now at account #%d: "%s"', $account->id, $account->name));
             $currencyId = (int)$this->accountRepository->getMetaValue($account, 'currency_id');
             $currencyId = 0 === $currencyId ? $default->id : $currencyId;
 
-            Log::debug(sprintf('Currency ID is #%d', $currencyId));
+            //Log::debug(sprintf('Currency ID is #%d', $currencyId));
 
             // balance in array:
             $balance = $balances[$account->id] ?? '0';
 
-            Log::debug(sprintf('Balance is %s', $balance));
+            //Log::debug(sprintf('Balance is %s', $balance));
 
             // always subtract virtual balance.
             $virtualBalance = (string)$account->virtual_balance;
@@ -107,14 +107,14 @@ class NetWorth implements NetWorthInterface
                 $balance = bcsub($balance, $virtualBalance);
             }
 
-            Log::debug(sprintf('Balance corrected to %s because of virtual balance (%s)', $balance, $virtualBalance));
+            //Log::debug(sprintf('Balance corrected to %s because of virtual balance (%s)', $balance, $virtualBalance));
 
             if (!array_key_exists($currencyId, $netWorth)) {
                 $netWorth[$currencyId] = '0';
             }
             $netWorth[$currencyId] = bcadd($balance, $netWorth[$currencyId]);
 
-            Log::debug(sprintf('Total net worth for currency #%d is %s', $currencyId, $netWorth[$currencyId]));
+            //Log::debug(sprintf('Total net worth for currency #%d is %s', $currencyId, $netWorth[$currencyId]));
         }
         ksort($netWorth);
 

app/Helpers/Report/PopupReport.php

@@ -209,10 +209,10 @@ class PopupReport implements PopupReportInterface
         $collector = app(GroupCollectorInterface::class);
 
         // set report accounts + the request accounts:
-        $set = $attributes['accounts'] ?? new Collection;
-        $set->push($account);
+        //$set = $attributes['accounts'] ?? new Collection;
+        //$set->push($account);
 
-        $collector->setBothAccounts($set)
+        $collector->setDestinationAccounts(new Collection([$account]))
                   ->setRange($attributes['startDate'], $attributes['endDate'])
                   ->withAccountInformation()
                   ->withBudgetInformation()
@@ -222,7 +222,6 @@ class PopupReport implements PopupReportInterface
         if (null !== $currency) {
             $collector->setCurrency($currency);
         }
-
         return $collector->getExtractedJournals();
     }
 

app/Helpers/Webhook/Sha3SignatureGenerator.php

@@ -38,9 +38,16 @@ class Sha3SignatureGenerator implements SignatureGeneratorInterface
 
     /**
      * @inheritDoc
+     * @throws FireflyException
      */
     public function generate(WebhookMessage $message): string
     {
+        // webhook is deleted
+        if (null === $message->webhook) {
+            throw new FireflyException('Part of a deleted webhook.');
+        }
+
+
         try {
             $json = json_encode($message->message, JSON_THROW_ON_ERROR);
         } catch (JsonException $e) {
@@ -48,7 +55,7 @@ class Sha3SignatureGenerator implements SignatureGeneratorInterface
             Log::error(sprintf('JSON value: %s', $message->message));
             Log::error($e->getMessage());
             Log::error($e->getTraceAsString());
-            throw new FireflyException('Could not generate JSON for SHA3 hash.', $e);
+            throw new FireflyException('Could not generate JSON for SHA3 hash.', 0, $e);
         }
 
         // signature v1 is generated using the following structure:

app/Http/Controllers/Account/EditController.php

@@ -122,7 +122,7 @@ class EditController extends Controller
         }
         $request->session()->forget('accounts.edit.fromUpdate');
 
-        $openingBalanceAmount = app('steam')->positive((string)$repository->getOpeningBalanceAmount($account));
+        $openingBalanceAmount = (string)$repository->getOpeningBalanceAmount($account);
         if ('0' === $openingBalanceAmount) {
             $openingBalanceAmount = '';
         }
@@ -143,9 +143,9 @@ class EditController extends Controller
             'BIC'                     => $repository->getMetaValue($account, 'BIC'),
             'opening_balance_date'    => $openingBalanceDate,
             'liability_type_id'       => $account->account_type_id,
-            'opening_balance'         => $openingBalanceAmount,
+            'opening_balance'         => number_format((float)$openingBalanceAmount, $currency->decimal_places,'.',''),
             'liability_direction'     => $this->repository->getMetaValue($account, 'liability_direction'),
-            'virtual_balance'         => $account->virtual_balance,
+            'virtual_balance'         => number_format((float)$account->virtual_balance, $currency->decimal_places,'.',''),
             'currency_id'             => $currency->id,
             'include_net_worth'       => $includeNetWorth,
             'interest'                => $repository->getMetaValue($account, 'interest'),
@@ -153,6 +153,9 @@ class EditController extends Controller
             'notes'                   => $this->repository->getNoteText($account),
             'active'                  => $hasOldInput ? (bool)$request->old('active') : $account->active,
         ];
+        if('' === $openingBalanceAmount) {
+            $preFilled['opening_balance'] = '';
+        }
 
         $request->session()->flash('preFilled', $preFilled);
 

app/Http/Controllers/Account/IndexController.php

@@ -101,13 +101,15 @@ class IndexController extends Controller
 
         $accounts->each(
             function (Account $account) use ($activities, $startBalances, $endBalances) {
-                $account->lastActivityDate  = $this->isInArray($activities, $account->id);
+                $account->lastActivityDate  = $this->isInArrayDate($activities, $account->id);
                 $account->startBalance      = $this->isInArray($startBalances, $account->id);
                 $account->endBalance        = $this->isInArray($endBalances, $account->id);
                 $account->difference        = bcsub($account->endBalance, $account->startBalance);
                 $account->interest          = number_format((float)$this->repository->getMetaValue($account, 'interest'), 4, '.', '');
                 $account->interestPeriod    = (string)trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period')));
                 $account->accountTypeString = (string)trans(sprintf('firefly.account_type_%s', $account->accountType->type));
+                $account->current_debt      = '0';
+                $account->iban              = implode(' ', str_split((string)$account->iban, 4));
             }
         );
 
@@ -162,7 +164,7 @@ class IndexController extends Controller
         $accounts->each(
             function (Account $account) use ($activities, $startBalances, $endBalances) {
                 // See reference nr. 68
-                $account->lastActivityDate    = $this->isInArray($activities, $account->id);
+                $account->lastActivityDate    = $this->isInArrayDate($activities, $account->id);
                 $account->startBalance        = $this->isInArray($startBalances, $account->id);
                 $account->endBalance          = $this->isInArray($endBalances, $account->id);
                 $account->difference          = bcsub($account->endBalance, $account->startBalance);
@@ -174,6 +176,7 @@ class IndexController extends Controller
                 $account->location            = $this->repository->getLocation($account);
                 $account->liability_direction = $this->repository->getMetaValue($account, 'liability_direction');
                 $account->current_debt        = $this->repository->getMetaValue($account, 'current_debt') ?? '-';
+                $account->iban              = implode(' ', str_split((string)$account->iban, 4));
             }
         );
         // make paginator:

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -92,9 +92,12 @@ class ForgotPasswordController extends Controller
         // We will send the password reset link to this user. Once we have attempted
         // to send the link, we will examine the response then see the message we
         // need to show to the user. Finally, we'll send out a proper response.
-        $this->broker()->sendResetLink($request->only('email'));
+        $result = $this->broker()->sendResetLink($request->only('email'));
+        if('passwords.throttled' === $result) {
+            Log::error(sprintf('Cowardly refuse to send a password reset message to user #%d because the reset button has been throttled.', $user->id));
+        }
 
-        // always send the same response:
+        // always send the same response to the user:
         $response = trans('firefly.forgot_password_response');
 
         return back()->with('status', trans($response));

app/Http/Controllers/Auth/LoginController.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers\Auth;
 use Adldap;
 use Cookie;
 use DB;
+use FireflyIII\Events\ActuallyLoggedIn;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Providers\RouteServiceProvider;
@@ -86,7 +87,7 @@ class LoginController extends Controller
      */
     public function login(Request $request)
     {
-        Log::channel('audit')->info(sprintf('User is trying to login using "%s"', $request->get('email')));
+        Log::channel('audit')->info(sprintf('User is trying to login using "%s"', $request->get($this->username())));
         Log::info('User is trying to login.');
 
         $guard = config('auth.defaults.guard');
@@ -119,6 +120,10 @@ class LoginController extends Controller
 
             // if you just logged in, it can't be that you have a valid 2FA cookie.
 
+            // send a custom login event because laravel will also fire a login event if a "remember me"-cookie
+            // restores the event.
+            event(new ActuallyLoggedIn($this->guard()->user()));
+
             return $this->sendLoginResponse($request);
         }
         Log::warning('Login attempt failed.');

app/Http/Controllers/Budget/AvailableBudgetController.php

@@ -36,6 +36,7 @@ use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 use Log;
+use ValueError;
 
 /**
  *
@@ -244,7 +245,14 @@ class AvailableBudgetController extends Controller
 
             return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
         }
-        if (bccomp($amount, '0') <= 0) {
+        try {
+            if (bccomp($amount, '0') <= 0) {
+                session()->flash('error', trans('firefly.invalid_amount'));
+
+                return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
+            }
+        } catch (ValueError $e) {
+            Log::error(sprintf('Value "%s" is not a number: %s', $amount, $e->getMessage()));
             session()->flash('error', trans('firefly.invalid_amount'));
 
             return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -181,7 +181,7 @@ class BudgetLimitController extends Controller
             return response()->json($array);
         }
 
-        return response()->json([]);
+        return redirect(route('budgets.index'));
     }
 
     /**

app/Http/Controllers/Budget/EditController.php

@@ -102,7 +102,8 @@ class EditController extends Controller
             'auto_budget_currency_id' => $hasOldInput ? (int)$request->old('auto_budget_currency_id') : $currency->id,
         ];
         if ($autoBudget) {
-            $preFilled['auto_budget_amount'] = $hasOldInput ? $request->old('auto_budget_amount') : $autoBudget->amount;
+            $amount                          = $hasOldInput ? $request->old('auto_budget_amount') : $autoBudget->amount;
+            $preFilled['auto_budget_amount'] = number_format((float)$amount, $autoBudget->transactionCurrency->decimal_places, '.', '');
         }
 
         // put previous url in session if not redirect from store (not "return_to_edit").

app/Http/Controllers/Controller.php

@@ -89,7 +89,7 @@ abstract class Controller extends BaseController
         app('view')->share('FF_IS_BETA', $isBeta);
 
         $this->middleware(
-            function ($request, $next) {
+            function ($request, $next): mixed {
                 $locale = app('steam')->getLocale();
                 // translations for specific strings:
                 $this->monthFormat       = (string)trans('config.month', [], $locale);

app/Http/Controllers/CurrencyController.php

@@ -29,6 +29,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -210,10 +211,9 @@ class CurrencyController extends Controller
      * @param Request             $request
      * @param TransactionCurrency $currency
      *
-     * @return RedirectResponse|Redirector
      * @throws FireflyException
      */
-    public function disableCurrency(Request $request)
+    public function disableCurrency(Request $request): JsonResponse
     {
         $currencyId = (int)$request->get('id');
         if ($currencyId > 0) {
@@ -228,8 +228,7 @@ class CurrencyController extends Controller
 
                     $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => e(config('firefly.site_owner'))]));
                     Log::channel('audit')->info(sprintf('Tried to disable currency %s but is not site owner.', $currency->code));
-
-                    return redirect(route('currencies.index'));
+                    return response()->json([]);
 
                 }
 
@@ -240,8 +239,7 @@ class CurrencyController extends Controller
 
                     $request->session()->flash('error', $message);
                     Log::channel('audit')->info(sprintf('Tried to disable currency %s but is in use.', $currency->code));
-
-                    return redirect(route('currencies.index'));
+                    return response()->json([]);
                 }
 
                 $this->repository->disable($currency);
@@ -267,7 +265,7 @@ class CurrencyController extends Controller
             }
         }
 
-        return redirect(route('currencies.index'));
+        return response()->json([]);
     }
 
     /**

app/Http/Controllers/DebugController.php

@@ -144,6 +144,15 @@ class DebugController extends Controller
         $bcscale              = bcscale();
         $layout               = env('FIREFLY_III_LAYOUT');
         $tz                   = env('TZ');
+        $buildNr              = '(unknown)';
+        $buildDate            = '(unknown)';
+
+        if (file_exists('/var/www/counter-main.txt')) {
+            $buildNr = trim(file_get_contents('/var/www/counter-main.txt'));
+        }
+        if (file_exists('/var/www/build-date-main.txt')) {
+            $buildDate = trim(file_get_contents('/var/www/build-date-main.txt'));
+        }
 
         // expected + found DB version:
         $expectedDBversion = config('firefly.db_version');
@@ -206,6 +215,8 @@ class DebugController extends Controller
                 'drivers',
                 'currentDriver',
                 'loginProvider',
+                'buildNr',
+                'buildDate',
                 'bcscale',
                 'layout',
                 'userAgent',

app/Http/Controllers/HomeController.php

@@ -102,6 +102,9 @@ class HomeController extends Controller
      */
     public function index(AccountRepositoryInterface $repository): mixed
     {
+        if ('v3' === config('firefly.layout')) {
+            die('Please set your layout to "v1".');
+        }
         $types = config('firefly.accountTypesByIdentifier.asset');
         $count = $repository->count($types);
         Log::channel('audit')->info('User visits homepage.');

app/Http/Controllers/Json/ReconcileController.php

@@ -83,14 +83,18 @@ class ReconcileController extends Controller
      *
      * @return JsonResponse
      */
-    public function overview(Request $request, Account $account, Carbon $start, Carbon $end): JsonResponse
+    public function overview(Request $request, Account $account = null, Carbon $start = null, Carbon $end = null): JsonResponse
     {
         $startBalance    = $request->get('startBalance');
         $endBalance      = $request->get('endBalance');
         $accountCurrency = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
         $amount          = '0';
         $clearedAmount   = '0';
+        $route           = '';
 
+        if (null === $start && null === $end) {
+            throw new FireflyException('Invalid dates submitted.');
+        }
         if ($end->lt($start)) {
             [$start, $end] = [$end, $start];
         }
@@ -220,8 +224,11 @@ class ReconcileController extends Controller
      * @throws FireflyException
      * @throws JsonException
      */
-    public function transactions(Account $account, Carbon $start, Carbon $end)
+    public function transactions(Account $account, Carbon $start = null, Carbon $end = null)
     {
+        if (null === $start || null === $end) {
+            throw new FireflyException('Invalid dates submitted.');
+        }
         if ($end->lt($start)) {
             [$end, $start] = [$start, $end];
         }

app/Http/Controllers/PiggyBank/EditController.php

@@ -28,6 +28,7 @@ use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\PiggyBankUpdateRequest;
 use FireflyIII\Models\PiggyBank;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
@@ -41,6 +42,7 @@ class EditController extends Controller
 {
     private AttachmentHelperInterface    $attachments;
     private PiggyBankRepositoryInterface $piggyRepos;
+    private AccountRepositoryInterface   $accountRepository;
 
     /**
      * PiggyBankController constructor.
@@ -58,7 +60,7 @@ class EditController extends Controller
 
                 $this->attachments = app(AttachmentHelperInterface::class);
                 $this->piggyRepos  = app(PiggyBankRepositoryInterface::class);
-
+                $this->accountRepository = app(AccountRepositoryInterface::class);
                 return $next($request);
             }
         );
@@ -81,10 +83,11 @@ class EditController extends Controller
         // Flash some data to fill the form.
         $targetDate = $piggyBank->targetdate?->format('Y-m-d');
         $startDate  = $piggyBank->startdate?->format('Y-m-d');
+        $currency = $this->accountRepository->getAccountCurrency($piggyBank->account);
 
         $preFilled = ['name'         => $piggyBank->name,
                       'account_id'   => $piggyBank->account_id,
-                      'targetamount' => $piggyBank->targetamount,
+                      'targetamount' => number_format((float)$piggyBank->targetamount, $currency->decimal_places,'.',''),
                       'targetdate'   => $targetDate,
                       'startdate'    => $startDate,
                       'object_group' => $piggyBank->objectGroups->first() ? $piggyBank->objectGroups->first()->title : '',

app/Http/Controllers/Popup/ReportController.php

@@ -59,7 +59,6 @@ class ReportController extends Controller
             'category-entry' => $this->categoryEntry($attributes),
             'budget-entry' => $this->budgetEntry($attributes),
         };
-
         return response()->json(['html' => $html]);
     }
 }

app/Http/Controllers/PreferencesController.php

@@ -214,7 +214,7 @@ class PreferencesController extends Controller
             'internal_reference' => array_key_exists('internal_reference', $setOptions),
             'notes'              => array_key_exists('notes', $setOptions),
             'attachments'        => array_key_exists('attachments', $setOptions),
-            'external_uri'       => array_key_exists('external_uri', $setOptions),
+            'external_url'       => array_key_exists('external_url', $setOptions),
             'location'           => array_key_exists('location', $setOptions),
             'links'              => array_key_exists('links', $setOptions),
         ];

app/Http/Controllers/Report/CategoryController.php

@@ -648,10 +648,9 @@ class CategoryController extends Controller
      * @param Carbon     $start
      * @param Carbon     $end
      *
-     * @return mixed|string
-     * @throws JsonException
+     * @return string
      */
-    public function operations(Collection $accounts, Carbon $start, Carbon $end)
+    public function operations(Collection $accounts, Carbon $start, Carbon $end): string
     {
         // chart properties for cache:
         $cache = new CacheProperties;
@@ -673,7 +672,7 @@ class CategoryController extends Controller
 
 
         try {
-            $result = prefixView('reports.partials.categories', compact('report'))->render();
+            $result = (string)prefixView('reports.partials.categories', compact('report'))->render();
             $cache->store($result);
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));

app/Http/Controllers/Rule/CreateController.php

@@ -34,6 +34,7 @@ use FireflyIII\Support\Http\Controllers\ModelInformation;
 use FireflyIII\Support\Http\Controllers\RuleManagement;
 use FireflyIII\Support\Search\SearchInterface;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
@@ -237,15 +238,17 @@ class CreateController extends Controller
     /**
      * @param Rule $rule
      *
-     * @return RedirectResponse
+     * @return JsonResponse
      */
-    public function duplicate(Rule $rule): RedirectResponse
+    public function duplicate(Request $request): JsonResponse
     {
-        $newRule = $this->ruleRepos->duplicate($rule);
+        $ruleId = (int)$request->get('id');
+        $rule   = $this->ruleRepos->find($ruleId);
+        if (null !== $rule) {
+            $this->ruleRepos->duplicate($rule);
+        }
 
-        session()->flash('success', trans('firefly.duplicated_rule', ['title' => $rule->title, 'newTitle' => $newRule->title]));
-
-        return redirect(route('rules.index'));
+        return new JsonResponse(['OK']);
     }
 
     /**

app/Http/Controllers/RuleGroup/EditController.php

@@ -28,6 +28,7 @@ use FireflyIII\Http\Requests\RuleGroupFormRequest;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
@@ -62,24 +63,38 @@ class EditController extends Controller
     }
 
     /**
-     * Move a rule group down.
+     * Move a rule group in either direction.
      *
-     * @param RuleGroup $ruleGroup
+     * @param Request $request
      *
-     * @return RedirectResponse|Redirector
+     * @return JsonResponse
      */
-    public function down(RuleGroup $ruleGroup)
+    public function moveGroup(Request $request): JsonResponse
     {
-        $maxOrder = $this->repository->maxOrder();
-        $order    = (int)$ruleGroup->order;
-        if ($order < $maxOrder) {
-            $newOrder = $order + 1;
-            $this->repository->setOrder($ruleGroup, $newOrder);
+        $groupId = (int)$request->get('id');
+        $ruleGroup= $this->repository->find($groupId);
+        if(null !== $ruleGroup) {
+            $direction = $request->get('direction');
+            if('down' === $direction) {
+                $maxOrder = $this->repository->maxOrder();
+                $order    = (int)$ruleGroup->order;
+                if ($order < $maxOrder) {
+                    $newOrder = $order + 1;
+                    $this->repository->setOrder($ruleGroup, $newOrder);
+                }
+            }
+            if('up' === $direction) {
+                $order = (int)$ruleGroup->order;
+                if ($order > 1) {
+                    $newOrder = $order - 1;
+                    $this->repository->setOrder($ruleGroup, $newOrder);
+                }
+            }
         }
-
-        return redirect(route('rules.index'));
+        return new JsonResponse(['OK']);
     }
 
+
     /**
      * Edit a rule group.
      *
@@ -106,25 +121,6 @@ class EditController extends Controller
         return prefixView('rules.rule-group.edit', compact('ruleGroup', 'subTitle'));
     }
 
-    /**
-     * Move the rule group up.
-     *
-     * @param RuleGroup $ruleGroup
-     *
-     * @return RedirectResponse|Redirector
-     *
-     */
-    public function up(RuleGroup $ruleGroup)
-    {
-        $order = (int)$ruleGroup->order;
-        if ($order > 1) {
-            $newOrder = $order - 1;
-            $this->repository->setOrder($ruleGroup, $newOrder);
-        }
-
-        return redirect(route('rules.index'));
-    }
-
     /**
      * Update the rule group.
      *

app/Http/Controllers/System/HealthcheckController.php

@@ -0,0 +1,44 @@
+<?php
+/*
+ * HealthcheckController.php
+ * Copyright (c) 2021 https://github.com/ajgon
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\System;
+
+use FireflyIII\Http\Controllers\Controller;
+use Illuminate\Http\Response;
+
+/**
+ * Class HealthcheckController.
+ */
+class HealthcheckController extends Controller
+{
+    /**
+     * Sends 'OK' info when app is alive
+     *
+     * @return Response
+     */
+    public function check(): Response
+    {
+        return response('OK', 200);
+    }
+
+}
+

app/Http/Controllers/System/InstallController.php

@@ -109,6 +109,7 @@ class InstallController extends Controller
             'firefly-iii:unify-group-accounts'         => [],
             'firefly-iii:fix-transaction-types'        => [],
             'firefly-iii:fix-frontpage-accounts'       => [],
+            'firefly-iii:fix-ibans'                    => [],
 
             // final command to set latest version in DB
             'firefly-iii:set-latest-version'           => ['--james-is-cool' => true],

app/Http/Controllers/Transaction/ConvertController.php

@@ -336,8 +336,8 @@ class ConvertController extends Controller
         $sourceName       = '' === $sourceName ? null : (string)$sourceName;
         $destinationId    = '' === $destinationId || null === $destinationId ? null : (int)$destinationId;
         $destinationName  = '' === $destinationName ? null : (string)$destinationName;
-        $validSource      = $validator->validateSource($sourceId, $sourceName, null);
-        $validDestination = $validator->validateDestination($destinationId, $destinationName, null);
+        $validSource      = $validator->validateSource(['id' => $sourceId, 'name' => $sourceName,]);
+        $validDestination = $validator->validateDestination(['id' => $destinationId, 'name' => $destinationName,]);
 
         if (false === $validSource) {
             throw new FireflyException(sprintf(trans('firefly.convert_invalid_source'), $journal->id));

app/Http/Controllers/Transaction/CreateController.php

@@ -26,7 +26,6 @@ namespace FireflyIII\Http\Controllers\Transaction;
 use FireflyIII\Events\StoredTransactionGroup;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
 use FireflyIII\Services\Internal\Update\GroupCloneService;
@@ -109,9 +108,9 @@ class CreateController extends Controller
         $sourceId      = (int)request()->get('source');
         $destinationId = (int)request()->get('destination');
 
-        /** @var AccountRepositoryInterface $repository */
-        $repository           = app(AccountRepositoryInterface::class);
-        $cash                 = $repository->getCashAccount();
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository    = app(AccountRepositoryInterface::class);
+        $cash                 = $accountRepository->getCashAccount();
         $preFilled            = session()->has('preFilled') ? session('preFilled') : [];
         $subTitle             = (string)trans(sprintf('breadcrumbs.create_%s', strtolower((string)$objectType)));
         $subTitleIcon         = 'fa-plus';
@@ -119,10 +118,10 @@ class CreateController extends Controller
         $allowedOpposingTypes = config('firefly.allowed_opposing_types');
         $accountToTypes       = config('firefly.account_to_transaction');
         $defaultCurrency      = app('amount')->getDefaultCurrency();
-        $previousUri          = $this->rememberPreviousUri('transactions.create.uri');
-        $parts                = parse_url($previousUri);
+        $previousUrl          = $this->rememberPreviousUri('transactions.create.uri');
+        $parts                = parse_url($previousUrl);
         $search               = sprintf('?%s', $parts['query'] ?? '');
-        $previousUri          = str_replace($search, '', $previousUri);
+        $previousUrl          = str_replace($search, '', $previousUrl);
 
         session()->put('preFilled', $preFilled);
 
@@ -134,7 +133,7 @@ class CreateController extends Controller
                 'objectType',
                 'subTitle',
                 'defaultCurrency',
-                'previousUri',
+                'previousUrl',
                 'optionalFields',
                 'preFilled',
                 'allowedOpposingTypes',

app/Http/Controllers/Transaction/DeleteController.php

@@ -84,7 +84,7 @@ class DeleteController extends Controller
         }
         $objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
         $subTitle   = (string)trans('firefly.delete_' . $objectType, ['description' => $group->title ?? $journal->description]);
-        $previous   = URL::previous(route('index'));
+        $previous   = app('steam')->getSafePreviousUrl(route('index'));
         // put previous url in session
         Log::debug('Will try to remember previous URI');
         $this->rememberPreviousUri('transactions.delete.uri');

app/Http/Controllers/Transaction/EditController.php

@@ -80,16 +80,16 @@ class EditController extends Controller
 
         $defaultCurrency = app('amount')->getDefaultCurrency();
         $cash            = $repository->getCashAccount();
-        $previousUri     = $this->rememberPreviousUri('transactions.edit.uri');
-        $parts           = parse_url($previousUri);
+        $previousUrl     = $this->rememberPreviousUri('transactions.edit.uri');
+        $parts           = parse_url($previousUrl);
         $search          = sprintf('?%s', $parts['query'] ?? '');
-        $previousUri     = str_replace($search, '', $previousUri);
+        $previousUrl     = str_replace($search, '', $previousUrl);
 
         return prefixView(
             'transactions.edit',
             compact(
                 'cash', 'allowedSourceDests', 'expectedSourceTypes', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency',
-                'previousUri'
+                'previousUrl'
             )
         );
     }

app/Http/Controllers/Transaction/LinkController.php

@@ -30,6 +30,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 use Log;
@@ -157,10 +158,11 @@ class LinkController extends Controller
      *
      * @return RedirectResponse|Redirector
      */
-    public function switchLink(TransactionJournalLink $link)
+    public function switchLink(Request $request)
     {
-        $this->repository->switchLink($link);
+        $linkId = (int)$request->get('id');
+        $this->repository->switchLinkById($linkId);
 
-        return redirect(URL::previous());
+        return redirect(app('steam')->getSafePreviousUrl());
     }
 }

app/Http/Controllers/Transaction/MassController.php

@@ -146,7 +146,7 @@ class MassController extends Controller
 
         // reverse amounts
         foreach ($journals as $index => $journal) {
-            $journals[$index]['amount']         = app('steam')->positive($journal['amount']);
+            $journals[$index]['amount']         = number_format((float) app('steam')->positive($journal['amount']), $journal['currency_decimal_places'],'.','');
             $journals[$index]['foreign_amount'] = null === $journal['foreign_amount'] ?
                 null : app('steam')->positive($journal['foreign_amount']);
         }

app/Http/Middleware/SecureHeaders.php

@@ -57,7 +57,7 @@ class SecureHeaders
             "style-src 'unsafe-inline' 'self'",
             "base-uri 'self'",
             "font-src 'self' data:",
-            "connect-src 'self'",
+            sprintf("connect-src 'self' %s", $trackingScriptSrc),
             sprintf("img-src data: 'strict-dynamic' 'self' *.tile.openstreetmap.org %s", $trackingScriptSrc),
             "manifest-src 'self'",
         ];
@@ -94,7 +94,6 @@ class SecureHeaders
         $response->header('X-XSS-Protection', '1; mode=block');
         $response->header('X-Content-Type-Options', 'nosniff');
         $response->header('Referrer-Policy', 'no-referrer');
-        $response->header('X-Download-Options', 'noopen');
         $response->header('X-Permitted-Cross-Domain-Policies', 'none');
         $response->header('X-Robots-Tag', 'none');
         $response->header('Feature-Policy', implode('; ', $featurePolicies));
@@ -103,7 +102,7 @@ class SecureHeaders
     }
 
     /**
-     * Return part of a CSP header allowing scripts from Google.
+     * Return part of a CSP header allowing scripts from Matomo.
      *
      * @return string
      */

app/Http/Middleware/StartFireflySession.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Middleware;
 use Illuminate\Contracts\Session\Session;
 use Illuminate\Http\Request;
 use Illuminate\Session\Middleware\StartSession;
+use Log;
 
 /**
  * Class StartFireflySession.
@@ -41,21 +42,15 @@ class StartFireflySession extends StartSession
      */
     protected function storeCurrentUrl(Request $request, $session): void
     {
-        $uri          = $request->fullUrl();
-        $isScriptPage = strpos($uri, 'jscript');
-        $isDeletePage = strpos($uri, 'delete');
-        $isLoginPage  = strpos($uri, '/login');
-        $isJsonPage   = strpos($uri, '/json') || strpos($uri, 'serviceworker');
-        $isView       = strpos($uri, '/attachments/view');
+        $url     = $request->fullUrl();
+        $safeUrl = app('steam')->getSafeUrl($url, route('index'));
 
-        // also stop remembering "delete" URL's.
-        if (false === $isScriptPage && false === $isDeletePage
-            && false === $isLoginPage
-            && false === $isJsonPage
-            && false === $isView
-            && 'GET' === $request->method()
-            && !$request->ajax()) {
-            $session->setPreviousUrl($uri);
+        if ($url !== $safeUrl) {
+            return;
+        }
+
+        if ('GET' === $request->method() && !$request->ajax()) {
+            $session->setPreviousUrl($safeUrl);
         }
     }
 }

app/Http/Middleware/TrustProxies.php

@@ -32,9 +32,6 @@ use Illuminate\Contracts\Config\Repository;
  */
 class TrustProxies extends Middleware
 {
-    /** @var int The headers to check. */
-    //protected $headers = Request::HEADER_X_FORWARDED_ALL;
-
     /**
      * TrustProxies constructor.
      *
@@ -42,11 +39,7 @@ class TrustProxies extends Middleware
      */
     public function __construct(Repository $config)
     {
-        $trustedProxies = (string)config('firefly.trusted_proxies');
-        $this->proxies  = explode(',', $trustedProxies);
-        if ('**' === $trustedProxies) {
-            $this->proxies = '**';
-        }
+        $this->proxies = (string)config('firefly.trusted_proxies');
         parent::__construct($config);
     }
 }

app/Http/Requests/AccountFormRequest.php

@@ -55,7 +55,7 @@ class AccountFormRequest extends FormRequest
             'account_number'          => $this->string('account_number'),
             'account_role'            => $this->string('account_role'),
             'opening_balance'         => $this->string('opening_balance'),
-            'opening_balance_date'    => $this->date('opening_balance_date'),
+            'opening_balance_date'    => $this->getCarbonDate('opening_balance_date'),
             'cc_type'                 => $this->string('cc_type'),
             'cc_monthly_payment_date' => $this->string('cc_monthly_payment_date'),
             'notes'                   => $this->stringWithNewlines('notes'),

app/Http/Requests/BillStoreRequest.php

@@ -46,7 +46,7 @@ class BillStoreRequest extends FormRequest
             'currency_id'        => $this->integer('transaction_currency_id'),
             'currency_code'      => '',
             'amount_max'         => $this->string('amount_max'),
-            'date'               => $this->date('date'),
+            'date'               => $this->getCarbonDate('date'),
             'repeat_freq'        => $this->string('repeat_freq'),
             'skip'               => $this->integer('skip'),
             'notes'              => $this->stringWithNewlines('notes'),
@@ -69,7 +69,7 @@ class BillStoreRequest extends FormRequest
             'transaction_currency_id' => 'required|exists:transaction_currencies,id',
             'date'                    => 'required|date',
             'repeat_freq'             => 'required|in:weekly,monthly,quarterly,half-year,yearly',
-            'skip'                    => 'required|between:0,31',
+            'skip'                    => 'required|integer|gte:0|lte:31',
             'active'                  => 'boolean',
         ];
     }

app/Http/Requests/BillUpdateRequest.php

@@ -47,7 +47,7 @@ class BillUpdateRequest extends FormRequest
             'currency_id'        => $this->integer('transaction_currency_id'),
             'currency_code'      => '',
             'amount_max'         => $this->string('amount_max'),
-            'date'               => $this->date('date'),
+            'date'               => $this->getCarbonDate('date'),
             'repeat_freq'        => $this->string('repeat_freq'),
             'skip'               => $this->integer('skip'),
             'notes'              => $this->stringWithNewlines('notes'),
@@ -73,7 +73,7 @@ class BillUpdateRequest extends FormRequest
             'transaction_currency_id' => 'required|exists:transaction_currencies,id',
             'date'                    => 'required|date',
             'repeat_freq'             => 'required|in:weekly,monthly,quarterly,half-year,yearly',
-            'skip'                    => 'required|between:0,31',
+            'skip'                    => 'required|integer|gte:0|lte:31',
             'active'                  => 'boolean',
         ];
     }

app/Http/Requests/BudgetFormStoreRequest.php

@@ -63,7 +63,7 @@ class BudgetFormStoreRequest extends FormRequest
         return [
             'name'                    => 'required|between:1,100|uniqueObjectForUser:budgets,name',
             'active'                  => 'numeric|between:0,1',
-            'auto_budget_type'        => 'numeric|between:0,2',
+            'auto_budget_type'        => 'numeric|integer|gte:0|lte:2',
             'auto_budget_currency_id' => 'exists:transaction_currencies,id',
             'auto_budget_amount'      => 'min:0|max:1000000000|required_if:auto_budget_type,1|required_if:auto_budget_type,2',
             'auto_budget_period'      => 'in:daily,weekly,monthly,quarterly,half_year,yearly',

app/Http/Requests/BudgetFormUpdateRequest.php

@@ -73,7 +73,7 @@ class BudgetFormUpdateRequest extends FormRequest
         return [
             'name'                    => $nameRule,
             'active'                  => 'numeric|between:0,1',
-            'auto_budget_type'        => 'numeric|between:0,2',
+            'auto_budget_type'        => 'numeric|integer|gte:0|lte:31',
             'auto_budget_currency_id' => 'exists:transaction_currencies,id',
             'auto_budget_amount'      => 'min:0|max:1000000000|required_if:auto_budget_type,1|required_if:auto_budget_type,2',
             'auto_budget_period'      => 'in:daily,weekly,monthly,quarterly,half_year,yearly',

app/Http/Requests/PiggyBankStoreRequest.php

@@ -42,10 +42,10 @@ class PiggyBankStoreRequest extends FormRequest
     {
         return [
             'name'               => $this->string('name'),
-            'startdate'          => $this->date('startdate'),
+            'startdate'          => $this->getCarbonDate('startdate'),
             'account_id'         => $this->integer('account_id'),
             'targetamount'       => $this->string('targetamount'),
-            'targetdate'         => $this->date('targetdate'),
+            'targetdate'         => $this->getCarbonDate('targetdate'),
             'notes'              => $this->stringWithNewlines('notes'),
             'object_group_title' => $this->string('object_group'),
         ];

app/Http/Requests/PiggyBankUpdateRequest.php

@@ -43,10 +43,10 @@ class PiggyBankUpdateRequest extends FormRequest
     {
         return [
             'name'               => $this->string('name'),
-            'startdate'          => $this->date('startdate'),
+            'startdate'          => $this->getCarbonDate('startdate'),
             'account_id'         => $this->integer('account_id'),
             'targetamount'       => $this->string('targetamount'),
-            'targetdate'         => $this->date('targetdate'),
+            'targetdate'         => $this->getCarbonDate('targetdate'),
             'notes'              => $this->stringWithNewlines('notes'),
             'object_group_title' => $this->string('object_group'),
         ];

app/Http/Requests/ReconciliationStoreRequest.php

@@ -48,8 +48,8 @@ class ReconciliationStoreRequest extends FormRequest
             $transactions = [];
         }
         $data = [
-            'start'         => $this->date('start'),
-            'end'           => $this->date('end'),
+            'start'         => $this->getCarbonDate('start'),
+            'end'           => $this->getCarbonDate('end'),
             'start_balance' => $this->string('startBalance'),
             'end_balance'   => $this->string('endBalance'),
             'difference'    => $this->string('difference'),

app/Http/Requests/RecurrenceFormRequest.php

@@ -59,8 +59,8 @@ class RecurrenceFormRequest extends FormRequest
                 'type'              => $this->string('transaction_type'),
                 'title'             => $this->string('title'),
                 'description'       => $this->string('recurring_description'),
-                'first_date'        => $this->date('first_date'),
-                'repeat_until'      => $this->date('repeat_until'),
+                'first_date'        => $this->getCarbonDate('first_date'),
+                'repeat_until'      => $this->getCarbonDate('repeat_until'),
                 'nr_of_repetitions' => $this->integer('repetitions'),
                 'apply_rules'       => $this->boolean('apply_rules'),
                 'active'            => $this->boolean('active'),
@@ -192,7 +192,7 @@ class RecurrenceFormRequest extends FormRequest
             'title'                   => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
             'first_date'              => 'required|date|after:' . $today->format('Y-m-d'),
             'repetition_type'         => ['required', new ValidRecurrenceRepetitionValue, new ValidRecurrenceRepetitionType, 'between:1,20'],
-            'skip'                    => 'required|numeric|between:0,31',
+            'skip'                    => 'required|numeric|integer|gte:0|lte:31',
 
             // optional for recurrence:
             'recurring_description'   => 'between:0,65000',
@@ -295,7 +295,7 @@ class RecurrenceFormRequest extends FormRequest
      */
     public function validateAccountInformation(Validator $validator): void
     {
-        Log::debug('Now in validateAccountInformation()');
+        Log::debug('Now in validateAccountInformation (RecurrenceFormRequest)()');
         /** @var AccountValidator $accountValidator */
         $accountValidator = app(AccountValidator::class);
         $data             = $validator->getData();
@@ -326,7 +326,7 @@ class RecurrenceFormRequest extends FormRequest
                 break;
         }
         // validate source account.
-        $validSource = $accountValidator->validateSource($sourceId, null, null);
+        $validSource = $accountValidator->validateSource(['id' => $sourceId,]);
 
         // do something with result:
         if (false === $validSource) {
@@ -338,7 +338,7 @@ class RecurrenceFormRequest extends FormRequest
         }
 
         // validate destination account
-        $validDestination = $accountValidator->validateDestination($destinationId, null, null);
+        $validDestination = $accountValidator->validateDestination(['id' => $destinationId,]);
         // do something with result:
         if (false === $validDestination) {
             $message = (string)trans('validation.generic_invalid_destination');

app/Http/Requests/ReportFormRequest.php

@@ -147,18 +147,24 @@ class ReportFormRequest extends FormRequest
         $range = $this->get('daterange');
         $parts = explode(' - ', (string)$range);
         if (2 === count($parts)) {
-            try {
-                $date = new Carbon($parts[1]);
-
-            } catch (Exception $e) {
-                $error = sprintf('"%s" is not a valid date range: %s', $range, $e->getMessage());
-                Log::error($error);
-                throw new FireflyException($error, 0, $e);
-
+            $string = $parts[1];
+            // validate as date
+            // if regex for YYYY-MM-DD:
+            $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
+            if (preg_match($pattern, $string)) {
+                try {
+                    $date = new Carbon($parts[1]);
+                } catch (Exception $e) {
+                    $error = sprintf('"%s" is not a valid date range: %s', $range, $e->getMessage());
+                    Log::error($error);
+                    throw new FireflyException($error, 0, $e);
+                }
+                return $date;
             }
-
+            $error = sprintf('"%s" is not a valid date range: %s', $range, 'invalid format :(');
+            Log::error($error);
+            throw new FireflyException($error, 0);
         }
-
         return $date;
     }
 
@@ -175,15 +181,23 @@ class ReportFormRequest extends FormRequest
         $range = $this->get('daterange');
         $parts = explode(' - ', (string)$range);
         if (2 === count($parts)) {
-            try {
-                $date = new Carbon($parts[0]);
-
-            } catch (Exception $e) {
-                $error = sprintf('"%s" is not a valid date range: %s', $range, $e->getMessage());
-                Log::error($error);
-                throw new FireflyException($error, 0, $e);
-
+            $string = $parts[0];
+            // validate as date
+            // if regex for YYYY-MM-DD:
+            $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
+            if (preg_match($pattern, $string)) {
+                try {
+                    $date = new Carbon($parts[1]);
+                } catch (Exception $e) {
+                    $error = sprintf('"%s" is not a valid date range: %s', $range, $e->getMessage());
+                    Log::error($error);
+                    throw new FireflyException($error, 0, $e);
+                }
+                return $date;
             }
+            $error = sprintf('"%s" is not a valid date range: %s', $range, 'invalid format :(');
+            Log::error($error);
+            throw new FireflyException($error, 0);
         }
 
         return $date;

app/Http/Requests/TagFormRequest.php

@@ -45,7 +45,7 @@ class TagFormRequest extends FormRequest
     {
         $data = [
             'tag'         => $this->string('tag'),
-            'date'        => $this->date('date'),
+            'date'        => $this->getCarbonDate('date'),
             'description' => $this->string('description'),
         ];
 

app/Jobs/CreateRecurringTransactions.php

@@ -431,7 +431,7 @@ class CreateRecurringTransactions implements ShouldQueue
                 'user'                  => $recurrence->user_id,
                 'currency_id'           => (int)$transaction->transaction_currency_id,
                 'currency_code'         => null,
-                'description'           => $recurrence->recurrenceTransactions()->first()->description,
+                'description'           => $transactions->first()->description,
                 'amount'                => $transaction->amount,
                 'budget_id'             => $this->repository->getBudget($transaction),
                 'budget_name'           => null,
@@ -452,7 +452,7 @@ class CreateRecurringTransactions implements ShouldQueue
                 'tags'                  => $this->repository->getTags($transaction),
                 'piggy_bank_id'         => $this->repository->getPiggyBank($transaction),
                 'piggy_bank_name'       => null,
-                'bill_id'               => null,
+                'bill_id'               => $this->repository->getBillId($transaction),
                 'bill_name'             => null,
                 'recurrence_total'      => $total,
                 'recurrence_count'      => $count,

app/Jobs/MailError.php

@@ -68,13 +68,13 @@ class MailError extends Job implements ShouldQueue
      */
     public function handle()
     {
-        $email            = config('firefly.site_owner');
+        $email            = (string) config('firefly.site_owner');
         $args             = $this->exception;
         $args['loggedIn'] = $this->userData['id'] > 0;
         $args['user']     = $this->userData;
         $args['ip']       = $this->ipAddress;
         $args['token']    = config('firefly.ipinfo_token');
-        if ($this->attempts() < 3) {
+        if ($this->attempts() < 3 && strlen($email) > 0) {
             try {
                 Mail::send(
                     ['emails.error-html', 'emails.error-text'],

app/Jobs/SendWebhookMessage.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Jobs;
 
+use Log;
 use FireflyIII\Models\WebhookMessage;
 use FireflyIII\Services\Webhook\WebhookSenderInterface;
 use Illuminate\Bus\Queueable;
@@ -58,6 +59,7 @@ class SendWebhookMessage implements ShouldQueue
      */
     public function handle(): void
     {
+        Log::debug(sprintf('Now handling webhook message #%d', $this->message->id));
         // send job!
         $sender = app(WebhookSenderInterface::class);
         $sender->setMessage($this->message);

app/Ldap/AttributeHandler.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Ldap;
 
 use FireflyIII\User as DatabaseUser;
-use LdapRecord\Models\OpenLDAP\User as LdapUser;
+use LdapRecord\Models\Entry;
 
 /**
  * Class AttributeHandler
@@ -33,12 +33,12 @@ use LdapRecord\Models\OpenLDAP\User as LdapUser;
 class AttributeHandler
 {
     /**
-     * @param LdapUser     $ldap
+     * @param Entry        $ldapUser
      * @param DatabaseUser $database
      */
-    public function handle(LdapUser $ldap, DatabaseUser $database)
+    public function handle(Entry $ldapUser, DatabaseUser $database)
     {
-        $database->email = $ldap->getFirstAttribute('mail');
+        $database->email = $ldapUser->getFirstAttribute('mail');
         $database->save();
     }
 }

app/Ldap/Rules/UserDefinedRule.php

@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * UserDefinedRule.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Ldap\Rules;
+
+use LdapRecord\Laravel\Auth\Rule;
+use LdapRecord\Models\Attributes\DistinguishedName;
+use LdapRecord\Query\ObjectNotFoundException;
+use Log;
+
+/**
+ * Class UserDefinedRule
+ */
+class UserDefinedRule extends Rule
+{
+    /**
+     * Check if the rule passes validation.
+     *
+     * @return bool
+     * @throws ObjectNotFoundException
+     */
+    public function isValid()
+    {
+        $extraFilter = config('ldap.extra_filter');
+        Log::debug(sprintf('UserDefinedRule with extra filter "%s"', $extraFilter));
+
+        if (empty($extraFilter)) {
+            Log::debug('Extra filter is empty, return true.');
+
+            return true;
+        }
+        Log::debug('Extra filter is not empty, continue.');
+
+        // group class:
+        // use ;
+        $openLDAP        = class_exists(\LdapRecord\Models\OpenLDAP\Group::class) ? \LdapRecord\Models\OpenLDAP\Group::class : '';
+        $activeDirectory = class_exists(\LdapRecord\Models\ActiveDirectory\Group::class) ? \LdapRecord\Models\ActiveDirectory\Group::class : '';
+        $groupClass      = config('ldap.dialect') === 'OpenLDAP' ? $openLDAP : $activeDirectory;
+
+        Log::debug(sprintf('Will use dialect group class "%s"', $groupClass));
+
+
+        // We've been given an invalid group filter. We will assume the
+        // developer is using some group ANR attribute, and attempt
+        // to check the user's membership with the resulting group.
+        if (!DistinguishedName::isValid($extraFilter)) {
+            Log::debug('UserDefinedRule: Is not valid DN');
+
+            return $this->user->groups()->recursive()->exists($groupClass::findByAnrOrFail($extraFilter));
+        }
+
+        $head = strtolower(DistinguishedName::make($extraFilter)->head());
+        Log::debug(sprintf('UserDefinedRule: Head is "%s"', $head));
+        // If the head of the DN we've been given is an OU, we will assume
+        // the developer is looking to filter users based on hierarchy.
+        // Otherwise, we'll attempt locating a group by the given
+        // group filter and checking the users group membership.
+        if ('ou' === $head) {
+            Log::debug('UserDefinedRule: Will return if user is a descendant of.');
+
+            return $this->user->isDescendantOf($extraFilter);
+        }
+        Log::debug('UserDefinedRule: Will return if user exists in group.');
+
+        return $this->user->groups()->recursive()->exists($groupClass::findOrFail($extraFilter));
+    }
+}

app/Ldap/Scopes/UserDefinedScope.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * UserDefinedScope.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Ldap\Scopes;
+
+use LdapRecord\Models\Model;
+use LdapRecord\Models\Scope;
+use LdapRecord\Query\Model\Builder;
+use Log;
+
+
+/**
+ * Class UserDefinedScope
+ */
+class UserDefinedScope implements Scope
+{
+    /**
+     * Apply the scope to the given query.
+     *
+     * @param Builder $query
+     * @param Model   $model
+     *
+     * @return void
+     */
+    public function apply(Builder $query, Model $model)
+    {
+    }
+}

app/Providers/EventServiceProvider.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Providers;
 
 use Exception;
+use FireflyIII\Events\ActuallyLoggedIn;
 use FireflyIII\Events\AdminRequestedTestMessage;
 use FireflyIII\Events\DestroyedTransactionGroup;
 use FireflyIII\Events\DetectedNewIPAddress;
@@ -74,6 +75,8 @@ class EventServiceProvider extends ServiceProvider
             Login::class                        => [
                 'FireflyIII\Handlers\Events\UserEventHandler@checkSingleUserIsAdmin',
                 'FireflyIII\Handlers\Events\UserEventHandler@demoUserBackToEnglish',
+            ],
+            ActuallyLoggedIn::class => [
                 'FireflyIII\Handlers\Events\UserEventHandler@storeUserIPAddress',
             ],
             DetectedNewIPAddress::class         => [

app/Repositories/Account/AccountRepository.php

@@ -494,10 +494,8 @@ class AccountRepository implements AccountRepositoryInterface
     public function getOpeningBalanceGroup(Account $account): ?TransactionGroup
     {
         $journal = $this->getOpeningBalance($account);
-        $group   = null;
-        $group   = $journal?->transactionGroup;
 
-        return $group;
+        return $journal?->transactionGroup;
     }
 
     /**
@@ -637,11 +635,9 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function oldestJournalDate(Account $account): ?Carbon
     {
-        $result  = null;
         $journal = $this->oldestJournal($account);
-        $result  = $journal?->date;
 
-        return $result;
+        return $journal?->date;
     }
 
     /**

app/Repositories/Bill/BillRepository.php

@@ -251,7 +251,7 @@ class BillRepository implements BillRepositoryInterface
                 $journalIds = $set->pluck('id')->toArray();
                 $amount     = (string)Transaction::whereIn('transaction_journal_id', $journalIds)->where('amount', '<', 0)->sum('amount');
                 $sum        = bcadd($sum, $amount);
-                Log::debug(sprintf('Total > 0, so add to sum %f, which becomes %f', $amount, $sum));
+                //Log::debug(sprintf('Total > 0, so add to sum %f, which becomes %f', $amount, $sum));
             }
         }
 
@@ -281,7 +281,7 @@ class BillRepository implements BillRepositoryInterface
                 $amount              = (string)Transaction::whereIn('transaction_journal_id', $journalIds)->where('amount', '<', 0)->sum('amount');
                 $return[$currencyId] = $return[$currencyId] ?? '0';
                 $return[$currencyId] = bcadd($amount, $return[$currencyId]);
-                Log::debug(sprintf('Total > 0, so add to sum %f, which becomes %f (currency %d)', $amount, $return[$currencyId], $currencyId));
+                //Log::debug(sprintf('Total > 0, so add to sum %f, which becomes %f (currency %d)', $amount, $return[$currencyId], $currencyId));
             }
         }
 
@@ -302,18 +302,18 @@ class BillRepository implements BillRepositoryInterface
         $sum   = '0';
         /** @var Bill $bill */
         foreach ($bills as $bill) {
-            Log::debug(sprintf('Now at bill #%d (%s)', $bill->id, $bill->name));
+            //Log::debug(sprintf('Now at bill #%d (%s)', $bill->id, $bill->name));
             $dates = $this->getPayDatesInRange($bill, $start, $end);
             $count = $bill->transactionJournals()->after($start)->before($end)->count();
             $total = $dates->count() - $count;
 
-            Log::debug(sprintf('Dates = %d, journalCount = %d, total = %d', $dates->count(), $count, $total));
+            //Log::debug(sprintf('Dates = %d, journalCount = %d, total = %d', $dates->count(), $count, $total));
 
             if ($total > 0) {
                 $average = bcdiv(bcadd($bill->amount_max, $bill->amount_min), '2');
                 $multi   = bcmul($average, (string)$total);
                 $sum     = bcadd($sum, $multi);
-                Log::debug(sprintf('Total > 0, so add to sum %f, which becomes %f', $multi, $sum));
+                //Log::debug(sprintf('Total > 0, so add to sum %f, which becomes %f', $multi, $sum));
             }
         }
 
@@ -334,20 +334,20 @@ class BillRepository implements BillRepositoryInterface
         $return = [];
         /** @var Bill $bill */
         foreach ($bills as $bill) {
-            Log::debug(sprintf('Now at bill #%d (%s)', $bill->id, $bill->name));
+            //Log::debug(sprintf('Now at bill #%d (%s)', $bill->id, $bill->name));
             $dates      = $this->getPayDatesInRange($bill, $start, $end);
             $count      = $bill->transactionJournals()->after($start)->before($end)->count();
             $total      = $dates->count() - $count;
             $currencyId = (int)$bill->transaction_currency_id;
 
-            Log::debug(sprintf('Dates = %d, journalCount = %d, total = %d', $dates->count(), $count, $total));
+            //Log::debug(sprintf('Dates = %d, journalCount = %d, total = %d', $dates->count(), $count, $total));
 
             if ($total > 0) {
                 $average             = bcdiv(bcadd($bill->amount_max, $bill->amount_min), '2');
                 $multi               = bcmul($average, (string)$total);
                 $return[$currencyId] = $return[$currencyId] ?? '0';
                 $return[$currencyId] = bcadd($return[$currencyId], $multi);
-                Log::debug(sprintf('Total > 0, so add to sum %f, which becomes %f (for currency %d)', $multi, $return[$currencyId], $currencyId));
+                //Log::debug(sprintf('Total > 0, so add to sum %f, which becomes %f (for currency %d)', $multi, $return[$currencyId], $currencyId));
             }
         }
 
@@ -481,7 +481,7 @@ class BillRepository implements BillRepositoryInterface
         //Log::debug(sprintf('First currentstart is %s', $currentStart->format('Y-m-d')));
 
         while ($currentStart <= $end) {
-            Log::debug(sprintf('Currentstart is now %s.', $currentStart->format('Y-m-d')));
+            //Log::debug(sprintf('Currentstart is now %s.', $currentStart->format('Y-m-d')));
             $nextExpectedMatch = $this->nextDateMatch($bill, $currentStart);
             //Log::debug(sprintf('Next Date match after %s is %s', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d')));
             if ($nextExpectedMatch > $end) {// If nextExpectedMatch is after end, we continue

app/Repositories/Category/OperationsRepository.php

@@ -35,8 +35,7 @@ use Illuminate\Support\Collection;
  */
 class OperationsRepository implements OperationsRepositoryInterface
 {
-    /** @var User */
-    private $user;
+    private User $user;
 
     /**
      * This method returns a list of all the withdrawal transaction journals (as arrays) set in that period
@@ -340,4 +339,136 @@ class OperationsRepository implements OperationsRepositoryInterface
     {
         return $this->user->categories()->get();
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function listTransferredIn(Carbon $start, Carbon $end, Collection $accounts, ?Collection $categories = null): array
+    {
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setUser($this->user)->setRange($start, $end)->setTypes([TransactionType::TRANSFER])
+                  ->setDestinationAccounts($accounts)->excludeSourceAccounts($accounts);
+        if (null !== $categories && $categories->count() > 0) {
+            $collector->setCategories($categories);
+        }
+        if (null === $categories || (null !== $categories && 0 === $categories->count())) {
+            $collector->setCategories($this->getCategories());
+        }
+        $collector->withCategoryInformation()->withAccountInformation()->withBudgetInformation();
+        $journals = $collector->getExtractedJournals();
+        $array    = [];
+
+        foreach ($journals as $journal) {
+            $currencyId   = (int)$journal['currency_id'];
+            $categoryId   = (int)$journal['category_id'];
+            $categoryName = (string)$journal['category_name'];
+
+            // catch "no category" entries.
+            if (0 === $categoryId) {
+                continue;
+            }
+
+            // info about the currency:
+            $array[$currencyId] = $array[$currencyId] ?? [
+                    'categories'              => [],
+                    'currency_id'             => $currencyId,
+                    'currency_name'           => $journal['currency_name'],
+                    'currency_symbol'         => $journal['currency_symbol'],
+                    'currency_code'           => $journal['currency_code'],
+                    'currency_decimal_places' => $journal['currency_decimal_places'],
+                ];
+
+            // info about the categories:
+            $array[$currencyId]['categories'][$categoryId] = $array[$currencyId]['categories'][$categoryId] ?? [
+                    'id'                   => $categoryId,
+                    'name'                 => $categoryName,
+                    'transaction_journals' => [],
+                ];
+
+            // add journal to array:
+            // only a subset of the fields.
+            $journalId                                                                         = (int)$journal['transaction_journal_id'];
+            $array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [
+                'amount'                   => app('steam')->positive($journal['amount']),
+                'date'                     => $journal['date'],
+                'source_account_id'        => $journal['source_account_id'],
+                'category_name'              => $journal['category_name'],
+                'source_account_name'      => $journal['source_account_name'],
+                'destination_account_id'   => $journal['destination_account_id'],
+                'destination_account_name' => $journal['destination_account_name'],
+                'description'              => $journal['description'],
+                'transaction_group_id'     => $journal['transaction_group_id'],
+            ];
+
+        }
+
+        return $array;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function listTransferredOut(Carbon $start, Carbon $end, Collection $accounts, ?Collection $categories = null): array
+    {
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setUser($this->user)->setRange($start, $end)->setTypes([TransactionType::TRANSFER])
+                  ->setSourceAccounts($accounts)->excludeDestinationAccounts($accounts);
+        if (null !== $categories && $categories->count() > 0) {
+            $collector->setCategories($categories);
+        }
+        if (null === $categories || (null !== $categories && 0 === $categories->count())) {
+            $collector->setCategories($this->getCategories());
+        }
+        $collector->withCategoryInformation()->withAccountInformation()->withBudgetInformation();
+        $journals = $collector->getExtractedJournals();
+        $array    = [];
+
+        foreach ($journals as $journal) {
+            $currencyId   = (int)$journal['currency_id'];
+            $categoryId   = (int)$journal['category_id'];
+            $categoryName = (string)$journal['category_name'];
+
+            // catch "no category" entries.
+            if (0 === $categoryId) {
+                continue;
+            }
+
+            // info about the currency:
+            $array[$currencyId] = $array[$currencyId] ?? [
+                    'categories'              => [],
+                    'currency_id'             => $currencyId,
+                    'currency_name'           => $journal['currency_name'],
+                    'currency_symbol'         => $journal['currency_symbol'],
+                    'currency_code'           => $journal['currency_code'],
+                    'currency_decimal_places' => $journal['currency_decimal_places'],
+                ];
+
+            // info about the categories:
+            $array[$currencyId]['categories'][$categoryId] = $array[$currencyId]['categories'][$categoryId] ?? [
+                    'id'                   => $categoryId,
+                    'name'                 => $categoryName,
+                    'transaction_journals' => [],
+                ];
+
+            // add journal to array:
+            // only a subset of the fields.
+            $journalId                                                                         = (int)$journal['transaction_journal_id'];
+            $array[$currencyId]['categories'][$categoryId]['transaction_journals'][$journalId] = [
+                'amount'                   => app('steam')->negative($journal['amount']),
+                'date'                     => $journal['date'],
+                'source_account_id'        => $journal['source_account_id'],
+                'category_name'              => $journal['category_name'],
+                'source_account_name'      => $journal['source_account_name'],
+                'destination_account_id'   => $journal['destination_account_id'],
+                'destination_account_name' => $journal['destination_account_name'],
+                'description'              => $journal['description'],
+                'transaction_group_id'     => $journal['transaction_group_id'],
+            ];
+
+        }
+
+        return $array;
+    }
 }

app/Repositories/Category/OperationsRepositoryInterface.php

@@ -47,6 +47,36 @@ interface OperationsRepositoryInterface
      */
     public function listExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $categories = null): array;
 
+    /**
+     * This method returns a list of all the transfer transaction journals (as arrays) set in that period
+     * which have the specified category set to them, transferred INTO the listed accounts.
+     * It excludes any transfers between the listed accounts.
+     * It's grouped per currency, with as few details in the array as possible. Amounts are always negative.
+     *
+     * @param Carbon          $start
+     * @param Carbon          $end
+     * @param Collection $accounts
+     * @param Collection|null $categories
+     *
+     * @return array
+     */
+    public function listTransferredIn(Carbon $start, Carbon $end, Collection $accounts, ?Collection $categories = null): array;
+
+    /**
+     * This method returns a list of all the transfer transaction journals (as arrays) set in that period
+     * which have the specified category set to them, transferred FROM the listed accounts.
+     * It excludes any transfers between the listed accounts.
+     * It's grouped per currency, with as few details in the array as possible. Amounts are always negative.
+     *
+     * @param Carbon          $start
+     * @param Carbon          $end
+     * @param Collection $accounts
+     * @param Collection|null $categories
+     *
+     * @return array
+     */
+    public function listTransferredOut(Carbon $start, Carbon $end, Collection $accounts, ?Collection $categories = null): array;
+
     /**
      * This method returns a list of all the deposit transaction journals (as arrays) set in that period
      * which have the specified category set to them. It's grouped per currency, with as few details in the array