Merge branch 'release/5.1.0-alpha.1'

5.0.5

# Conflicts:
#	changelog.md

.deploy/heroku/.locales

@@ -15,3 +15,4 @@ el_GR
 sv_SE
 zh-hans_CN
 zh-hant_CN
+fi_FI

.env.example

@@ -5,14 +5,23 @@ APP_ENV=local
 # Set to true if you want to see debug information in error screens.
 APP_DEBUG=false
 
-# This should be your email address
+# This should be your email address.
+# If you use Docker or similar, you can set this variable from a file by using SITE_OWNER_FILE
 SITE_OWNER=mail@example.com
 
 # The encryption key for your sessions. Keep this very secure.
 # If you generate a new one existing data must be considered LOST.
-# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
+# Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
+# If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
 APP_KEY=SomeRandomStringOf32CharsExactly
 
+#
+# Firefly III will launch using this language (for new users and unauthenticated visitors)
+# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/master/resources/lang
+#
+# If text is still in English, remember that not everything may have been translated.
+DEFAULT_LANGUAGE=en_US
+
 # Change this value to your preferred time zone.
 # Example: Europe/Amsterdam
 TZ=Europe/Amsterdam
@@ -32,7 +41,9 @@ 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.
-LOG_CHANNEL=stdout
+# A rotating log option is 'daily', creates 5 files that (surprise) rotate.
+# Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
+LOG_CHANNEL=stack
 
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
@@ -42,6 +53,8 @@ APP_LOG_LEVEL=notice
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # For other database types, please see the FAQ: https://docs.firefly-iii.org/support/faq
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+# Use "mysql" for MySQL and MariaDB. Use "sqlite" for SQLite.
 DB_CONNECTION=pgsql
 DB_HOST=firefly_iii_db
 DB_PORT=5432
@@ -50,6 +63,7 @@ DB_USERNAME=firefly
 DB_PASSWORD=secret_firefly_password
 
 # PostgreSQL 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
 PGSQL_SSL_MODE=prefer
 PGSQL_SSL_ROOT_CERT=null
 PGSQL_SSL_CERT=null
@@ -61,19 +75,25 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 
 # If you set either of these to 'redis', you might want to update these settings too
+# If you use Docker or similar, you can set REDIS_HOST_FILE, REDIS_PASSWORD_FILE or
+# REDIS_PORT_FILE to set the value from a file instead of from an environment variable
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
-REDIS_DB="0" # always use quotes
+# always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
+REDIS_DB="0"
 REDIS_CACHE_DB="1"
 
 # Cookie settings. Should not be necessary to change these.
+# If you use Docker or similar, you can set COOKIE_DOMAIN_FILE to set
+# the value from a file instead of from an environment variable
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
 COOKIE_SECURE=false
 
 # If you want Firefly III to mail you, update these settings
 # For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MAIL_DRIVER=log
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
@@ -83,13 +103,20 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
 # Other mail drivers:
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MAILGUN_DOMAIN=
 MAILGUN_SECRET=
+
+
 # If you are on EU region in mailgun, use api.eu.mailgun.net, otherwise use api.mailgun.net
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 MAILGUN_ENDPOINT=api.mailgun.net
+
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
 
+
 # Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
@@ -98,6 +125,7 @@ SEND_ERROR_MESSAGE=true
 SEND_REPORT_JOURNALS=true
 
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 MAPBOX_API_KEY=
 
 # The map will default to this location:
@@ -115,20 +143,25 @@ CER_PROVIDER=ratesapi
 # set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
 # Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
 # the free API up to the point where you might as well offer nothing.
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 FIXER_API_KEY=
 
 # Firefly III has two options for user authentication. "eloquent" is the default,
 # and "ldap" for LDAP servers.
 # For full instructions on these settings please visit:
 # https://docs.firefly-iii.org/advanced-installation/authentication
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 LOGIN_PROVIDER=eloquent
 
 # LDAP connection configuration
 # OpenLDAP, FreeIPA or ActiveDirectory
+# # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 ADLDAP_CONNECTION_SCHEME=OpenLDAP
 ADLDAP_AUTO_CONNECT=true
 
 # LDAP connection settings
+# You can set the following variables from a file by appending them with _FILE:
+# ADLDAP_CONTROLLERS, ADLDAP_PORT, ADLDAP_BASEDN
 ADLDAP_CONTROLLERS=
 ADLDAP_PORT=389
 ADLDAP_TIMEOUT=5
@@ -137,12 +170,15 @@ ADLDAP_FOLLOW_REFFERALS=false
 ADLDAP_USE_SSL=false
 ADLDAP_USE_TLS=false
 
+# You can set the following variables from a file by appending them with _FILE:
 ADLDAP_ADMIN_USERNAME=
 ADLDAP_ADMIN_PASSWORD=
 
+# You can set the following variables from a file by appending them with _FILE:
 ADLDAP_ACCOUNT_PREFIX=
 ADLDAP_ACCOUNT_SUFFIX=
 
+
 # LDAP authentication settings.
 ADLDAP_PASSWORD_SYNC=false
 ADLDAP_LOGIN_FALLBACK=false
@@ -151,10 +187,12 @@ ADLDAP_DISCOVER_FIELD=distinguishedname
 ADLDAP_AUTH_FIELD=distinguishedname
 
 # Will allow SSO if your server provides an AUTH_USER field.
+# You can set the following variables from a file by appending them with _FILE:
 WINDOWS_SSO_DISCOVER=samaccountname
 WINDOWS_SSO_KEY=AUTH_USER
 
 # field to sync as local username.
+# You can set the following variable from a file by appending it with _FILE:
 ADLDAP_SYNC_FIELD=userprincipalname
 
 # You can disable the X-Frame-Options header if it interferes with tools like
@@ -172,9 +210,15 @@ DISABLE_CSP_HEADER=false
 # Nobody uses this except for me on the demo site. But hey, feel free to use this if you want to.
 # Do not prepend the TRACKER_URL with http:// or https://
 # The only tracker supported is Matomo.
+# You can set the following variables from a file by appending them with _FILE:
 TRACKER_SITE_ID=
 TRACKER_URL=
 
+#
+# Firefly III could (in the future) collect telemetry on how you use Firefly III.
+# In order to allow this, change the following variable to true:
+SEND_TELEMETRY=false
+
 # You can fine tune the start-up of a Docker container by editing these environment variables.
 # Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
 # However if you know what you're doing you can significantly speed up container start times.

app/Api/V1/Controllers/Chart/CategoryController.php

@@ -90,12 +90,12 @@ class CategoryController extends Controller
         $tempData      = [];
         $spentWith     = $this->opsRepository->listExpenses($start, $end);
         $earnedWith    = $this->opsRepository->listIncome($start, $end);
-        $spentWithout  = $this->noCatRepository->listExpenses($start, $end);
-        $earnedWithout = $this->noCatRepository->listIncome($start, $end);
+        $spentWithout  = $this->noCatRepository->listExpenses($start, $end); // refactored
+        $earnedWithout = $this->noCatRepository->listIncome($start, $end); // refactored
         $categories    = [];
 
 
-        foreach ([$spentWith, $earnedWith] as $set) {
+        foreach ([$spentWith, $earnedWith, $spentWithout, $earnedWithout] as $set) {
             foreach ($set as $currency) {
                 foreach ($currency['categories'] as $category) {
                     $categories[] = $category['name'];
@@ -141,48 +141,48 @@ class CategoryController extends Controller
             }
         }
 
-        foreach ([$spentWithout, $earnedWithout] as $set) {
-            foreach ($set as $currency) {
-                $inKey        = sprintf('%d-i', $currency['currency_id']);
-                $outKey       = sprintf('%d-e', $currency['currency_id']);
-                $categories[] = (string)trans('firefly.no_category');
-                // make data arrays if not yet present.
-                $tempData[$inKey]  = $tempData[$inKey] ?? [
-                        'currency_id'             => $currency['currency_id'],
-                        'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]),
-                        'currency_code'           => $currency['currency_code'],
-                        'currency_symbol'         => $currency['currency_symbol'],
-                        'currency_decimal_places' => $currency['currency_decimal_places'],
-                        'type'                    => 'bar', // line, area or bar
-                        'yAxisID'                 => 0, // 0, 1, 2
-                        'entries'                 => [
-                            // per category:
-                            // "category" => 5,
-                        ],
-                    ];
-                $tempData[$outKey] = $tempData[$outKey] ?? [
-                        'currency_id'             => $currency['currency_id'],
-                        'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
-                        'currency_code'           => $currency['currency_code'],
-                        'currency_symbol'         => $currency['currency_symbol'],
-                        'currency_decimal_places' => $currency['currency_decimal_places'],
-                        'type'                    => 'bar', // line, area or bar
-                        'yAxisID'                 => 0, // 0, 1, 2
-                        'entries'                 => [
-                            // per category:
-                            // "category" => 5,
-                        ],
-                    ];
-                foreach ($currency['transaction_journals'] as $journal) {
-                    // is it expense or income?
-                    $letter                                  = -1 === bccomp($journal['amount'], '0') ? 'e' : 'i';
-                    $currentKey                              = sprintf('%d-%s', $currency['currency_id'], $letter);
-                    $name                                    = (string)trans('firefly.no_category');
-                    $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
-                    $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
-                }
-            }
-        }
+//        foreach ([] as $set) {
+//            foreach ($set as $currency) {
+//                $inKey        = sprintf('%d-i', $currency['currency_id']);
+//                $outKey       = sprintf('%d-e', $currency['currency_id']);
+//                $categories[] = (string)trans('firefly.no_category');
+//                // make data arrays if not yet present.
+//                $tempData[$inKey]  = $tempData[$inKey] ?? [
+//                        'currency_id'             => $currency['currency_id'],
+//                        'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]),
+//                        'currency_code'           => $currency['currency_code'],
+//                        'currency_symbol'         => $currency['currency_symbol'],
+//                        'currency_decimal_places' => $currency['currency_decimal_places'],
+//                        'type'                    => 'bar', // line, area or bar
+//                        'yAxisID'                 => 0, // 0, 1, 2
+//                        'entries'                 => [
+//                            // per category:
+//                            // "category" => 5,
+//                        ],
+//                    ];
+//                $tempData[$outKey] = $tempData[$outKey] ?? [
+//                        'currency_id'             => $currency['currency_id'],
+//                        'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
+//                        'currency_code'           => $currency['currency_code'],
+//                        'currency_symbol'         => $currency['currency_symbol'],
+//                        'currency_decimal_places' => $currency['currency_decimal_places'],
+//                        'type'                    => 'bar', // line, area or bar
+//                        'yAxisID'                 => 0, // 0, 1, 2
+//                        'entries'                 => [
+//                            // per category:
+//                            // "category" => 5,
+//                        ],
+//                    ];
+//                foreach ($currency['transaction_journals'] as $journal) {
+//                    // is it expense or income?
+//                    $letter                                  = -1 === bccomp($journal['amount'], '0') ? 'e' : 'i';
+//                    $currentKey                              = sprintf('%d-%s', $currency['currency_id'], $letter);
+//                    $name                                    = (string)trans('firefly.no_category');
+//                    $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
+//                    $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
+//                }
+//            }
+//        }
 
         // re-sort every spent array and add 0 for missing entries.
         foreach ($tempData as $index => $set) {

app/Api/V1/Controllers/CurrencyController.php

@@ -318,6 +318,10 @@ class CurrencyController extends Controller
         if ($this->repository->currencyInUse($currency)) {
             throw new FireflyException('200006: Currency in use.'); // @codeCoverageIgnore
         }
+        if ($this->repository->isFallbackCurrency($currency)) {
+            throw new FireflyException('200026: Currency is fallback.'); // @codeCoverageIgnore
+        }
+
         $this->repository->destroy($currency);
 
         return response()->json([], 204);

app/Api/V1/Requests/AttachmentStoreRequest.php

@@ -57,8 +57,8 @@ class AttachmentStoreRequest extends Request
             'filename' => $this->string('filename'),
             'title'    => $this->string('title'),
             'notes'    => $this->nlString('notes'),
-            'model'    => $this->string('model'),
-            'model_id' => $this->integer('model_id'),
+            'model'    => $this->string('attachable_type'),
+            'model_id' => $this->integer('attachable_id'),
         ];
     }
 
@@ -77,14 +77,14 @@ class AttachmentStoreRequest extends Request
                 str_replace('FireflyIII\\Models\\', '', TransactionJournal::class),
             ]
         );
-        $model  = $this->string('model');
+        $model  = $this->string('attachable_type');
 
         return [
-            'filename' => 'required|between:1,255',
-            'title'    => 'between:1,255',
-            'notes'    => 'between:1,65000',
-            'model'    => sprintf('required|in:%s', $models),
-            'model_id' => ['required', 'numeric', new IsValidAttachmentModel($model)],
+            'filename'        => 'required|between:1,255',
+            'title'           => 'between:1,255',
+            'notes'           => 'between:1,65000',
+            'attachable_type' => sprintf('required|in:%s', $models),
+            'attachable_id'   => ['required', 'numeric', new IsValidAttachmentModel($model)],
         ];
     }
 }

app/Api/V1/Requests/AttachmentUpdateRequest.php

@@ -52,8 +52,8 @@ class AttachmentUpdateRequest extends Request
             'filename' => $this->string('filename'),
             'title'    => $this->string('title'),
             'notes'    => $this->nlString('notes'),
-            'model'    => $this->string('model'),
-            'model_id' => $this->integer('model_id'),
+            'model'    => $this->string('attachable_type'),
+            'model_id' => $this->integer('attachable_id'),
         ];
     }
 

app/Console/Commands/Correction/FixUnevenAmount.php

@@ -90,11 +90,40 @@ class FixUnevenAmount extends Command
         }
         /** @var Transaction $source */
         $source = $journal->transactions()->where('amount', '<', 0)->first();
+
+        if (null === $source) {
+            $this->error(
+                sprintf(
+                    'Journal #%d ("%s") has no source transaction. It will be deleted to maintain database consistency.', $journal->id ?? 0,
+                    $journal->description ?? ''
+                )
+            );
+            Transaction::where('transaction_journal_id', $journal->id ?? 0)->forceDelete();
+            TransactionJournal::where('id', $journal->description ?? 0)->forceDelete();
+
+            return;
+        }
+
         $amount = bcmul('-1', (string)$source->amount);
 
         // fix amount of destination:
         /** @var Transaction $destination */
-        $destination         = $journal->transactions()->where('amount', '>', 0)->first();
+        $destination = $journal->transactions()->where('amount', '>', 0)->first();
+
+        if (null === $destination) {
+            $this->error(
+                sprintf(
+                    'Journal #%d ("%s") has no destination transaction. It will be deleted to maintain database consistency.', $journal->id ?? 0,
+                    $journal->description ?? ''
+                )
+            );
+
+            Transaction::where('transaction_journal_id', $journal->id ?? 0)->forceDelete();
+            TransactionJournal::where('id', $journal->description ?? 0)->forceDelete();
+
+            return;
+        }
+
         $destination->amount = $amount;
         $destination->save();
 

app/Console/Commands/CreateDatabase.php

@@ -54,10 +54,12 @@ class CreateDatabase extends Command
     public function handle()
     {
         if ('mysql' !== env('DB_CONNECTION')) {
-            $this->info('This command currently applies to MySQL connections only.');
+            $this->info(sprintf('CreateDB does not apply to "%s", skipped.', env('DB_CONNECTION')));
+
+            return 0;
         }
         // try to set up a raw connection:
-        $dsn     = sprintf('mysql:host=%s;charset=utf8mb4', env('DB_HOST'));
+        $dsn     = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST', 'localhost'), env('DB_PORT', '3306'));
         $options = [
             PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
             PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,

app/Console/Commands/SetLatestVersion.php

@@ -32,7 +32,7 @@ class SetLatestVersion extends Command
      *
      * @var string
      */
-    protected $description = 'Command description';
+    protected $description = 'Set latest version in DB.';
     /**
      * The name and signature of the console command.
      *

app/Events/AdminRequestedTestMessage.php

@@ -2,7 +2,7 @@
 
 /**
  * AdminRequestedTestMessage.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Events/Event.php

@@ -2,7 +2,7 @@
 
 /**
  * Event.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Events/RegisteredUser.php

@@ -2,7 +2,7 @@
 
 /**
  * RegisteredUser.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Events/RequestedNewPassword.php

@@ -2,7 +2,7 @@
 
 /**
  * RequestedNewPassword.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Events/RequestedReportOnJournals.php

@@ -2,7 +2,7 @@
 
 /**
  * RequestedReportOnJournals.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Events/RequestedVersionCheckStatus.php

@@ -2,7 +2,7 @@
 
 /**
  * RequestedVersionCheckStatus.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Events/StoredTransactionGroup.php

@@ -2,7 +2,7 @@
 
 /**
  * StoredTransactionGroup.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Events/UpdatedTransactionGroup.php

@@ -2,7 +2,7 @@
 
 /**
  * UpdatedTransactionGroup.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Events/UserChangedEmail.php

@@ -2,7 +2,7 @@
 
 /**
  * UserChangedEmail.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Exceptions/DuplicateTransactionException.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * DuplicateTransactionException.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Exceptions/FireflyException.php

@@ -2,7 +2,7 @@
 
 /**
  * FireflyException.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Exceptions/GracefulNotFoundHandler.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * GracefulNotFoundHandler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -85,6 +85,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
                 return redirect(route('currencies.index'));
                 break;
             case 'budgets.show':
+            case 'budgets.edit':
                 $request->session()->reflash();
 
                 return redirect(route('budgets.index'));

app/Exceptions/Handler.php

@@ -2,7 +2,7 @@
 
 /**
  * Handler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Exceptions/NotImplementedException.php

@@ -2,7 +2,7 @@
 
 /**
  * NotImplementedException.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Exceptions/ValidationException.php

@@ -2,7 +2,7 @@
 
 /**
  * ValidationException.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ChartJsGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -32,6 +32,7 @@ class ChartJsGenerator implements GeneratorInterface
 {
     /**
      * Constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -118,7 +119,10 @@ class ChartJsGenerator implements GeneratorInterface
     public function multiSet(array $data): array
     {
         reset($data);
-        $first  = current($data);
+        $first = current($data);
+        if (!is_array($first)) {
+            return [];
+        }
         $labels = is_array($first['entries']) ? array_keys($first['entries']) : [];
 
         $chartData = [
@@ -186,7 +190,7 @@ class ChartJsGenerator implements GeneratorInterface
             $chartData['datasets'][0]['data'][]            = (float)app('steam')->positive((string)$value);
             $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
 
-            $chartData['labels'][]                         = $key;
+            $chartData['labels'][] = $key;
             ++$index;
         }
 

app/Generator/Chart/Basic/GeneratorInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * GeneratorInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Account/MonthReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MonthReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Account/MultiYearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MultiYearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Account/YearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * YearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MonthReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Audit/MultiYearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MultiYearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Audit/YearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * YearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MonthReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Budget/MultiYearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MultiYearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Budget/YearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * YearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Category/MonthReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MonthReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Category/MultiYearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MultiYearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Category/YearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * YearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/ReportGeneratorFactory.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportGeneratorFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/ReportGeneratorInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportGeneratorInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Standard/MonthReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MonthReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Standard/MultiYearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MultiYearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Standard/YearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * YearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Tag/MonthReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MonthReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Tag/MultiYearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * MultiYearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Generator/Report/Tag/YearReportGenerator.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * YearReportGenerator.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Handlers/Events/APIEventHandler.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * APIEventHandler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Handlers/Events/AdminEventHandler.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AdminEventHandler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Handlers/Events/AutomationHandler.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AutomationHandler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Handlers/Events/StoredGroupEventHandler.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * StoredGroupEventHandler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Handlers/Events/UpdatedGroupEventHandler.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * UpdatedGroupEventHandler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Handlers/Events/UserEventHandler.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * UserEventHandler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Handlers/Events/VersionCheckEventHandler.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * VersionCheckEventHandler.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Events;
 
 
+use Carbon\Carbon;
 use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Update\UpdateTrait;
@@ -55,7 +56,6 @@ class VersionCheckEventHandler
         $value      = (int)$permission->data;
         if (1 !== $value) {
             Log::info('Update check is not enabled.');
-
             return;
         }
 
@@ -65,7 +65,6 @@ class VersionCheckEventHandler
         $user = $event->user;
         if (!$repository->hasRole($user, 'owner')) {
             Log::debug('User is not admin, done.');
-
             return;
         }
 
@@ -76,26 +75,13 @@ class VersionCheckEventHandler
         Log::debug(sprintf('Last check time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
         if ($diff < 604800) {
             Log::debug(sprintf('Checked for updates less than a week ago (on %s).', date('Y-m-d H:i:s', $lastCheckTime->data)));
-
             return;
         }
         // last check time was more than a week ago.
         Log::debug('Have not checked for a new version in a week!');
-        try {
-            $latestRelease = $this->getLatestRelease();
-        } catch (FireflyException $e) {
-            Log::error($e);
-            session()->flash('error', (string)trans('firefly.update_check_error'));
+        $release      = $this->getLatestRelease();
 
-            // softfail.
-            return;
-        }
-        $versionCheck  = $this->versionCheck($latestRelease);
-        $resultString  = $this->parseResult($versionCheck, $latestRelease);
-        if (0 !== $versionCheck && '' !== $resultString) {
-            // flash info
-            session()->flash('info', $resultString);
-        }
+        session()->flash($release['level'], $release['message']);
         app('fireflyconfig')->set('last_update_check', time());
     }
 }

app/Helpers/Attachments/AttachmentHelper.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AttachmentHelper.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Attachments/AttachmentHelperInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AttachmentHelperInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Collector/GroupCollector.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * GroupCollector.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Collector/GroupCollectorInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * GroupCollectorInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Fiscal/FiscalHelper.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * FiscalHelper.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Fiscal/FiscalHelperInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * FiscalHelperInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Help/Help.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Help.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Help/HelpInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * HelpInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Report/NetWorth.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * NetWorth.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Report/NetWorthInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * NetWorthInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Report/PopupReport.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * PopupReport.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Report/PopupReportInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * PopupReportInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Report/ReportHelper.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportHelper.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Report/ReportHelperInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportHelperInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Helpers/Update/UpdateTrait.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * UpdateTrait.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Update;
 
-use Carbon\Carbon;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Services\FireflyIIIOrg\Update\UpdateRequestInterface;
 use Log;
 
@@ -35,10 +33,11 @@ use Log;
 trait UpdateTrait
 {
     /**
-     * Get object for the latest release from GitHub.
+     * Returns an array with info on the next release, if any.
+     * 'message' => 'A new version is available.
+     * 'level' => 'info' / 'success' / 'error'
      *
      * @return array
-     * @throws FireflyException
      */
     public function getLatestRelease(): array
     {
@@ -47,81 +46,6 @@ trait UpdateTrait
         $checker = app(UpdateRequestInterface::class);
         $channel = app('fireflyconfig')->get('update_channel', 'stable')->data;
 
-        return $checker->getVersion($channel);
-    }
-
-    /**
-     * Parses the version check result in a human readable sentence.
-     *
-     * @param int   $versionCheck
-     * @param array $information
-     *
-     * @return string
-     */
-    public function parseResult(int $versionCheck, array $information): string
-    {
-        Log::debug(sprintf('Now in parseResult(%d)', $versionCheck));
-        $current   = (string)config('firefly.version');
-        $return    = '';
-        $triggered = false;
-        if (-1 === $versionCheck) {
-            $triggered         = true;
-            $monthAndDayFormat = (string)trans('config.month_and_day');
-            $carbon            = Carbon::createFromFormat('Y-m-d', $information['date']);
-            $return            = (string)trans(
-                'firefly.update_new_version_alert',
-                [
-                    'your_version' => $current,
-                    'new_version'  => $information['version'],
-                    'date'         => $carbon->formatLocalized($monthAndDayFormat),
-                ]
-            );
-            // append warning if beta or alpha.
-            $isBeta = $information['is_beta'] ?? false;
-            if (true === $isBeta) {
-                $return = sprintf('%s %s', $return, trans('firefly.update_version_beta'));
-            }
-
-            $isAlpha = $information['is_alpha'] ?? false;
-            if (true === $isAlpha) {
-                $return = sprintf('%s %s', $return, trans('firefly.update_version_alpha'));
-            }
-        }
-
-        if (0 === $versionCheck) {
-            $triggered = true;
-            Log::debug('User is running current version.');
-            // you are running the current version!
-            $return = (string)trans('firefly.update_current_version_alert', ['version' => $current]);
-        }
-        if (1 === $versionCheck) {
-            $triggered = true;
-            Log::debug('User is running NEWER version.');
-            // you are running a newer version!
-            $return = (string)trans('firefly.update_newer_version_alert', ['your_version' => $current, 'new_version' => $information['version']]);
-        }
-        if (false === $triggered) {
-            Log::debug('No option was triggered.');
-            $return = (string)trans('firefly.update_check_error');
-        }
-
-        return $return;
-    }
-
-    /**
-     * Compare version and store result.
-     *
-     * @param array $information
-     *
-     * @return int
-     */
-    public function versionCheck(array $information): int
-    {
-        Log::debug('Now in versionCheck()');
-        $current = (string)config('firefly.version');
-        $check   = version_compare($current, $information['version']);
-        Log::debug(sprintf('Comparing %s with %s, result is %s', $current, $information['version'], $check), $information);
-
-        return $check;
+        return $checker->getUpdateInformation($channel);
     }
 }

app/Http/Controllers/Account/CreateController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Account/DeleteController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Account/EditController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * EditController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Account/IndexController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * IndexController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Account/ReconcileController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ReconcileController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Account/ShowController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ShowController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Admin/ConfigurationController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ConfigurationController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Admin/HomeController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * HomeController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Admin/LinkController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * LinkController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Admin/UpdateController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * UpdateController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -23,14 +23,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Update\UpdateTrait;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Http\Middleware\IsSandStormUser;
-use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Log;
 
 /**
  * Class HomeController.
@@ -110,46 +108,12 @@ class UpdateController extends Controller
     /**
      * Does a manual update check.
      */
-    public function updateCheck(): JsonResponse
+    public function updateCheck(): RedirectResponse
     {
-        $success       = true;
-        $latestRelease = '1.0';
-        $resultString  = '';
-        $versionCheck  = -2;
-        $channel       = app('fireflyconfig')->get('update_channel', 'stable')->data;
+        $release      = $this->getLatestRelease();
 
-        try {
-            $latestRelease = $this->getLatestRelease();
-        } catch (FireflyException $e) {
-            Log::error($e->getMessage());
-            $success = false;
-        }
+        session()->flash($release['level'], $release['message']);
 
-        // if error, tell the user.
-        if (false === $success) {
-            $resultString = (string)trans('firefly.update_check_error');
-            session()->flash('error', $resultString);
-        }
-
-        // if not, compare and tell the user.
-        if (true === $success) {
-            $versionCheck = $this->versionCheck($latestRelease);
-            $resultString = $this->parseResult($versionCheck, $latestRelease);
-        }
-
-        Log::debug(sprintf('Result string is: "%s"', $resultString));
-
-        if (0 !== $versionCheck && '' !== $resultString) {
-            // flash info
-            session()->flash('info', $resultString);
-        }
-        app('fireflyconfig')->set('last_update_check', time());
-
-        return response()->json(
-            [
-                'result'  => $resultString,
-                'channel' => $channel,
-            ]
-        );
+        return redirect(route('admin.update-check'));
     }
 }

app/Http/Controllers/Admin/UserController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * UserController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/AttachmentController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AttachmentController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Auth/ConfirmPasswordController.php

@@ -3,7 +3,7 @@
 
 /**
  * ConfirmPasswordController.php
- * Copyright (c) 2020 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ForgotPasswordController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Auth/LoginController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * LoginController.php
- * Copyright (c) 2020 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Auth/RegisterController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RegisterController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ResetPasswordController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Auth/TwoFactorController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * TwoFactorController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/BillController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * BillController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Budget/AvailableBudgetController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AvailableBudgetController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetLimitController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -179,7 +179,7 @@ class BudgetLimitController extends Controller
             return response()->json($array);
         }
 
-        return redirect(route('budgets.index'));
+        return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
     }
 
     /**

app/Http/Controllers/Budget/CreateController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Budget/DeleteController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Budget/EditController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * EditController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Budget/IndexController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * IndexController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Budget/ShowController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ShowController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Category/CreateController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Category/DeleteController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Category/EditController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * EditController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Category/IndexController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * IndexController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Category/NoCategoryController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * NoCategoryController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Http/Controllers/Category/ShowController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ShowController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *