diff --git a/app/Api/V1/Controllers/System/ConfigurationController.php b/app/Api/V1/Controllers/System/ConfigurationController.php index 443e014f33..4c58441e75 100644 --- a/app/Api/V1/Controllers/System/ConfigurationController.php +++ b/app/Api/V1/Controllers/System/ConfigurationController.php @@ -31,7 +31,7 @@ use FireflyIII\Enums\WebhookResponse; use FireflyIII\Enums\WebhookTrigger; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Support\Binder\EitherConfigKey; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Log; use Illuminate\Validation\ValidationException; @@ -128,7 +128,7 @@ final class ConfigurationController extends Controller $data = $request->getAll(); $shortName = str_replace('configuration.', '', $name); - FireflyConfig::set($shortName, $data['value']); + AppConfiguration::set($shortName, $data['value']); // get updated config: $newConfig = $this->getDynamicConfiguration(); @@ -148,17 +148,17 @@ final class ConfigurationController extends Controller */ private function getDynamicConfiguration(): array { - $isDemoSite = FireflyConfig::get('is_demo_site', false); - $updateCheck = FireflyConfig::get('permission_update_check', -1); - $singleUser = FireflyConfig::get('single_user_mode', true); - $lastCheck = FireflyConfig::get('last_update_check', 1); - $enableExchangeRates = FireflyConfig::get('enable_exchange_rates', config('cer.enabled')); - $useRunningBalance = FireflyConfig::get('use_running_balance', true); - $enableExternalMap = FireflyConfig::get('enable_external_map', false); - $enableExternalRates = FireflyConfig::get('enable_external_rates', false); - $allowWebhooks = FireflyConfig::get('allow_webhooks', false); - $enableBatchProcessing = FireflyConfig::get('enable_batch_processing', false); - $validUrlProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols')); + $isDemoSite = AppConfiguration::get('is_demo_site', false); + $updateCheck = AppConfiguration::get('permission_update_check', -1); + $singleUser = AppConfiguration::get('single_user_mode', true); + $lastCheck = AppConfiguration::get('last_update_check', 1); + $enableExchangeRates = AppConfiguration::get('enable_exchange_rates', config('cer.enabled')); + $useRunningBalance = AppConfiguration::get('use_running_balance', true); + $enableExternalMap = AppConfiguration::get('enable_external_map', false); + $enableExternalRates = AppConfiguration::get('enable_external_rates', false); + $allowWebhooks = AppConfiguration::get('allow_webhooks', false); + $enableBatchProcessing = AppConfiguration::get('enable_batch_processing', false); + $validUrlProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols')); return [ 'is_demo_site' => $isDemoSite?->data, diff --git a/app/Api/V1/Controllers/System/CronController.php b/app/Api/V1/Controllers/System/CronController.php index fcbad108ae..2acd2803c5 100644 --- a/app/Api/V1/Controllers/System/CronController.php +++ b/app/Api/V1/Controllers/System/CronController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\System; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\System\CronRequest; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Http\Controllers\CronRunner; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Log; @@ -51,7 +51,7 @@ final class CronController extends Controller $return = []; $return['recurring_transactions'] = $this->runRecurring($config['force'], $config['date']); $return['auto_budgets'] = $this->runAutoBudget($config['force'], $config['date']); - if (true === FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data) { + if (true === AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data) { $return['exchange_rates'] = $this->exchangeRatesCronJob($config['force'], $config['date']); } $return['bill_notifications'] = $this->billWarningCronJob($config['force'], $config['date']); diff --git a/app/Api/V1/Controllers/Webhook/AttemptController.php b/app/Api/V1/Controllers/Webhook/AttemptController.php index 89e0b21e7a..3e4c6a2d20 100644 --- a/app/Api/V1/Controllers/Webhook/AttemptController.php +++ b/app/Api/V1/Controllers/Webhook/AttemptController.php @@ -30,7 +30,7 @@ use FireflyIII\Models\Webhook; use FireflyIII\Models\WebhookAttempt; use FireflyIII\Models\WebhookMessage; use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Transformers\WebhookAttemptTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; @@ -71,7 +71,7 @@ final class AttemptController extends Controller if ($message->webhook_id !== $webhook->id) { throw new FireflyException('200040: Webhook and webhook message are no match'); } - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning(sprintf( 'User lists webhook attempts of webhook #%d and message #%d, but webhooks are DISABLED.', $webhook->id, @@ -119,7 +119,7 @@ final class AttemptController extends Controller throw new FireflyException('200041: Webhook message and webhook attempt are no match'); } - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning(sprintf( 'User views single webhook attempt #%d of webhook #%d and message #%d, but webhooks are DISABLED', $attempt->id, diff --git a/app/Api/V1/Controllers/Webhook/DestroyController.php b/app/Api/V1/Controllers/Webhook/DestroyController.php index 8da81638f5..25855845b5 100644 --- a/app/Api/V1/Controllers/Webhook/DestroyController.php +++ b/app/Api/V1/Controllers/Webhook/DestroyController.php @@ -30,7 +30,7 @@ use FireflyIII\Models\Webhook; use FireflyIII\Models\WebhookAttempt; use FireflyIII\Models\WebhookMessage; use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Log; @@ -62,7 +62,7 @@ final class DestroyController extends Controller */ public function destroy(Webhook $webhook): JsonResponse { - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning(sprintf('User tries to destroy webhook #%d. but webhooks are DISABLED.', $webhook->id)); throw new NotFoundHttpException('Webhooks are not enabled.'); @@ -92,7 +92,7 @@ final class DestroyController extends Controller throw new FireflyException('200041: Webhook message and webhook attempt are no match'); } - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning(sprintf( 'User tries to destroy webhook #%d, message #%d, attempt #%d, but webhooks are DISABLED.', $webhook->id, @@ -125,7 +125,7 @@ final class DestroyController extends Controller throw new FireflyException('200040: Webhook and webhook message are no match'); } - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning(sprintf('User tries to destroy webhook #%d, message #%d, but webhooks are DISABLED.', $webhook->id, $message->id)); throw new NotFoundHttpException('Webhooks are not enabled.'); diff --git a/app/Api/V1/Controllers/Webhook/MessageController.php b/app/Api/V1/Controllers/Webhook/MessageController.php index e6915d865f..5208666a70 100644 --- a/app/Api/V1/Controllers/Webhook/MessageController.php +++ b/app/Api/V1/Controllers/Webhook/MessageController.php @@ -29,7 +29,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Webhook; use FireflyIII\Models\WebhookMessage; use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Transformers\WebhookMessageTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; @@ -65,7 +65,7 @@ final class MessageController extends Controller */ public function index(Webhook $webhook): JsonResponse { - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning(sprintf('User tries to view messages of webhook #%d, but webhooks are DISABLED.', $webhook->id)); throw new NotFoundHttpException('Webhooks are not enabled.'); @@ -105,7 +105,7 @@ final class MessageController extends Controller if ($message->webhook_id !== $webhook->id) { throw new FireflyException('200040: Webhook and webhook message are no match'); } - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning(sprintf('User tries to view message #%d of webhook #%d, but webhooks are DISABLED.', $message->id, $webhook->id)); throw new NotFoundHttpException('Webhooks are not enabled.'); diff --git a/app/Api/V1/Controllers/Webhook/ShowController.php b/app/Api/V1/Controllers/Webhook/ShowController.php index 91a2e161eb..4c44f7e753 100644 --- a/app/Api/V1/Controllers/Webhook/ShowController.php +++ b/app/Api/V1/Controllers/Webhook/ShowController.php @@ -31,7 +31,7 @@ use FireflyIII\Generator\Webhook\MessageGeneratorInterface; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\Webhook; use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment; use FireflyIII\Transformers\WebhookTransformer; use FireflyIII\User; @@ -72,7 +72,7 @@ final class ShowController extends Controller */ public function index(): JsonResponse { - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->info('User tries to view all webhooks, but webhooks are DISABLED.'); throw new NotFoundHttpException('Webhooks are not enabled.'); @@ -114,7 +114,7 @@ final class ShowController extends Controller */ public function show(Webhook $webhook): JsonResponse { - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->info(sprintf('User tries to view webhook #%d, but webhooks are DISABLED.', $webhook->id)); throw new NotFoundHttpException('Webhooks are not enabled.'); @@ -146,7 +146,7 @@ final class ShowController extends Controller */ public function triggerTransaction(Webhook $webhook, TransactionGroup $group): JsonResponse { - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->info(sprintf( 'User tries to trigger webhook #%d on transaction group #%d, but webhooks are DISABLED.', $webhook->id, diff --git a/app/Api/V1/Controllers/Webhook/StoreController.php b/app/Api/V1/Controllers/Webhook/StoreController.php index d20b8df057..25a334f807 100644 --- a/app/Api/V1/Controllers/Webhook/StoreController.php +++ b/app/Api/V1/Controllers/Webhook/StoreController.php @@ -27,7 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Webhook; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Models\Webhook\CreateRequest; use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment; use FireflyIII\Transformers\WebhookTransformer; use FireflyIII\User; @@ -63,7 +63,7 @@ final class StoreController extends Controller public function store(CreateRequest $request): JsonResponse { $data = $request->getData(); - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->info('User tries to store new webhook, but webhooks are DISABLED.', $data); throw new NotFoundHttpException('Webhooks are not enabled.'); diff --git a/app/Api/V1/Controllers/Webhook/SubmitController.php b/app/Api/V1/Controllers/Webhook/SubmitController.php index e5117ac2a8..b36aaee53d 100644 --- a/app/Api/V1/Controllers/Webhook/SubmitController.php +++ b/app/Api/V1/Controllers/Webhook/SubmitController.php @@ -28,7 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Jobs\SendWebhookMessage; use FireflyIII\Models\Webhook; use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Log; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -57,7 +57,7 @@ final class SubmitController extends Controller */ public function submit(Webhook $webhook): JsonResponse { - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->info(sprintf('User tries to submit webhook #%d, but webhooks are DISABLED.', $webhook->id)); throw new NotFoundHttpException('Webhooks are not enabled.'); diff --git a/app/Api/V1/Controllers/Webhook/UpdateController.php b/app/Api/V1/Controllers/Webhook/UpdateController.php index ce69fa7742..b2c8efbfeb 100644 --- a/app/Api/V1/Controllers/Webhook/UpdateController.php +++ b/app/Api/V1/Controllers/Webhook/UpdateController.php @@ -28,7 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Models\Webhook\UpdateRequest; use FireflyIII\Models\Webhook; use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment; use FireflyIII\Transformers\WebhookTransformer; use FireflyIII\User; @@ -62,7 +62,7 @@ final class UpdateController extends Controller public function update(Webhook $webhook, UpdateRequest $request): JsonResponse { $data = $request->getData(); - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->info(sprintf('User tries to update webhook #%d, but webhooks are DISABLED.', $webhook->id), $data); throw new NotFoundHttpException('Webhooks are not enabled.'); diff --git a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php index 3287c2b678..314031af88 100644 --- a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php @@ -30,7 +30,7 @@ use FireflyIII\Rules\IsBoolean; use FireflyIII\Rules\IsDateOrTime; use FireflyIII\Rules\IsValidPositiveAmount; use FireflyIII\Rules\IsValidZeroOrMoreAmount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\NullArrayObject; use FireflyIII\Support\Request\AppendsLocationData; use FireflyIII\Support\Request\ChecksLogin; @@ -81,7 +81,7 @@ class StoreRequest extends FormRequest public function rules(): array { Log::debug('Collect rules of TransactionStoreRequest'); - $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; + $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; $locationRules = Location::requestRules([]); return [ diff --git a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php index d8efbfc330..03eeeb4879 100644 --- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php @@ -31,7 +31,7 @@ use FireflyIII\Rules\IsBoolean; use FireflyIII\Rules\IsDateOrTime; use FireflyIII\Rules\IsValidPositiveAmount; use FireflyIII\Rules\IsValidZeroOrMoreAmount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Request\ChecksLogin; use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Validation\GroupValidation; @@ -141,7 +141,7 @@ class UpdateRequest extends FormRequest public function rules(): array { Log::debug(sprintf('Now in %s', __METHOD__)); - $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; + $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; return [ // basic fields for group: diff --git a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php index 909d5071eb..a4aa6ef879 100644 --- a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php @@ -28,7 +28,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Webhook; use FireflyIII\Rules\IsBoolean; use FireflyIII\Rules\Webhook\IsValidWebhookUrl; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Request\ChecksLogin; use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Support\Request\ValidatesWebhooks; @@ -72,7 +72,7 @@ class CreateRequest extends FormRequest $triggers = implode(',', array_values(Webhook::getTriggers())); $responses = implode(',', array_values(Webhook::getResponses())); $deliveries = implode(',', array_values(Webhook::getDeliveries())); - $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; + $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; return [ 'title' => ['required', 'min:1', 'max:255', 'uniqueObjectForUser:webhooks,title'], diff --git a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php index c06a822fd5..0feed24a0d 100644 --- a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php @@ -28,7 +28,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Webhook; use FireflyIII\Rules\IsBoolean; use FireflyIII\Rules\Webhook\IsValidWebhookUrl; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Request\ChecksLogin; use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Support\Request\ValidatesWebhooks; @@ -73,7 +73,7 @@ class UpdateRequest extends FormRequest $triggers = implode(',', array_values(Webhook::getTriggers())); $responses = implode(',', array_values(Webhook::getResponses())); $deliveries = implode(',', array_values(Webhook::getDeliveries())); - $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; + $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; /** @var Webhook $webhook */ $webhook = $this->route()->parameter('webhook'); diff --git a/app/Console/Commands/Correction/ConvertsDatesToUTC.php b/app/Console/Commands/Correction/ConvertsDatesToUTC.php index b3f37c2536..4fabf8cc3a 100644 --- a/app/Console/Commands/Correction/ConvertsDatesToUTC.php +++ b/app/Console/Commands/Correction/ConvertsDatesToUTC.php @@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Correction; use Carbon\Carbon; use FireflyIII\Console\Commands\ShowsFriendlyMessages; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\QueryException; @@ -58,7 +58,7 @@ class ConvertsDatesToUTC extends Command $this->ConvertModeltoUTC($model, $fields); } // tell the system we are now in UTC mode. - FireflyConfig::set('utc', true); + AppConfiguration::set('utc', true); return Command::SUCCESS; } diff --git a/app/Console/Commands/Correction/CorrectsPrimaryCurrencyAmounts.php b/app/Console/Commands/Correction/CorrectsPrimaryCurrencyAmounts.php index 21466c9cda..e635dc9961 100644 --- a/app/Console/Commands/Correction/CorrectsPrimaryCurrencyAmounts.php +++ b/app/Console/Commands/Correction/CorrectsPrimaryCurrencyAmounts.php @@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Correction; use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Services\Internal\Recalculate\PrimaryAmountRecalculationService; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; @@ -43,7 +43,7 @@ class CorrectsPrimaryCurrencyAmounts extends Command */ public function handle(): int { - if (false === FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data) { + if (false === AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data) { $this->friendlyInfo('This command will not run because currency exchange rates are disabled.'); return 0; diff --git a/app/Console/Commands/Correction/CorrectsTimezoneInformation.php b/app/Console/Commands/Correction/CorrectsTimezoneInformation.php index a14e6ee98f..d35b4b50d4 100644 --- a/app/Console/Commands/Correction/CorrectsTimezoneInformation.php +++ b/app/Console/Commands/Correction/CorrectsTimezoneInformation.php @@ -36,7 +36,7 @@ use FireflyIII\Models\PiggyBankRepetition; use FireflyIII\Models\Recurrence; use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Database\QueryException; use Illuminate\Support\Facades\Log; @@ -71,7 +71,7 @@ class CorrectsTimezoneInformation extends Command $this->addTimezoneToModel($model, $fields); } // not yet in UTC mode - FireflyConfig::set('utc', false); + AppConfiguration::set('utc', false); } private function addTimezoneToModel(string $model, array $fields): void diff --git a/app/Console/Commands/Correction/CorrectsUnevenAmount.php b/app/Console/Commands/Correction/CorrectsUnevenAmount.php index a85f634441..5bbdf0845b 100644 --- a/app/Console/Commands/Correction/CorrectsUnevenAmount.php +++ b/app/Console/Commands/Correction/CorrectsUnevenAmount.php @@ -30,7 +30,7 @@ use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Steam; use FireflyIII\Support\Models\AccountBalanceCalculator; use Illuminate\Console\Command; @@ -61,7 +61,7 @@ class CorrectsUnevenAmount extends Command $this->fixUnevenAmounts(); $this->matchCurrencies(); - if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { + if (true === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { $this->friendlyInfo('Will recalculate transaction running balance columns. This may take a LONG time. Please be patient.'); AccountBalanceCalculator::recalculateAll(false); $this->friendlyInfo('Done recalculating transaction running balance columns.'); diff --git a/app/Console/Commands/SendTestEmail.php b/app/Console/Commands/SendTestEmail.php index 6d67c6a2c2..c40d50371e 100644 --- a/app/Console/Commands/SendTestEmail.php +++ b/app/Console/Commands/SendTestEmail.php @@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands; use FireflyIII\Events\Test\OwnerTestsNotificationChannel; use FireflyIII\Notifications\Notifiables\OwnerNotifiable; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; class SendTestEmail extends Command @@ -63,7 +63,7 @@ class SendTestEmail extends Command } /** @var int $lastNotification */ - $lastNotification = FireflyConfig::get('last_test_notification', 123)->data; + $lastNotification = AppConfiguration::get('last_test_notification', 123)->data; if ((time() - $lastNotification) < 120) { $this->friendlyError((string) trans('firefly.test_rate_limited')); @@ -72,7 +72,7 @@ class SendTestEmail extends Command $owner = new OwnerNotifiable(); event(new OwnerTestsNotificationChannel('email', $owner)); - FireflyConfig::set('last_test_notification', time()); + AppConfiguration::set('last_test_notification', time()); return Command::SUCCESS; } diff --git a/app/Console/Commands/System/RecalculatesRunningBalance.php b/app/Console/Commands/System/RecalculatesRunningBalance.php index d7d94223b6..3a35cf91ae 100644 --- a/app/Console/Commands/System/RecalculatesRunningBalance.php +++ b/app/Console/Commands/System/RecalculatesRunningBalance.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\System; use FireflyIII\Console\Commands\ShowsFriendlyMessages; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Models\AccountBalanceCalculator; use Illuminate\Console\Command; @@ -52,7 +52,7 @@ class RecalculatesRunningBalance extends Command */ public function handle(): int { - if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { + if (true === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.'); $this->correctBalanceAmounts($this->option('force')); $this->friendlyInfo('Done recalculating account balances.'); diff --git a/app/Console/Commands/System/SetsLatestVersion.php b/app/Console/Commands/System/SetsLatestVersion.php index 823f69fec6..cce25ac7de 100644 --- a/app/Console/Commands/System/SetsLatestVersion.php +++ b/app/Console/Commands/System/SetsLatestVersion.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\System; use FireflyIII\Console\Commands\ShowsFriendlyMessages; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; class SetsLatestVersion extends Command @@ -46,7 +46,7 @@ class SetsLatestVersion extends Command return 0; } - FireflyConfig::set('ff3_build_time', (int) config('firefly.build_time')); + AppConfiguration::set('ff3_build_time', (int) config('firefly.build_time')); $this->friendlyInfo('Updated version.'); return 0; diff --git a/app/Console/Commands/System/VerifySecurityAlerts.php b/app/Console/Commands/System/VerifySecurityAlerts.php index 9ee03478a9..daf99b9b77 100644 --- a/app/Console/Commands/System/VerifySecurityAlerts.php +++ b/app/Console/Commands/System/VerifySecurityAlerts.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\System; use FireflyIII\Console\Commands\ShowsFriendlyMessages; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Database\QueryException; use Illuminate\Support\Facades\Log; @@ -108,8 +108,8 @@ class VerifySecurityAlerts extends Command private function removeOldAdvisory(): void { try { - FireflyConfig::delete('upgrade_security_message'); - FireflyConfig::delete('upgrade_security_level'); + AppConfiguration::delete('upgrade_security_message'); + AppConfiguration::delete('upgrade_security_level'); } catch (QueryException $e) { Log::debug(sprintf('Could not delete old security advisory, but thats OK: %s', $e->getMessage())); } @@ -118,8 +118,8 @@ class VerifySecurityAlerts extends Command private function saveSecurityAdvisory(array $array): void { try { - FireflyConfig::set('upgrade_security_message', $array['message']); - FireflyConfig::set('upgrade_security_level', $array['level']); + AppConfiguration::set('upgrade_security_message', $array['message']); + AppConfiguration::set('upgrade_security_level', $array['level']); } catch (QueryException $e) { Log::debug(sprintf('Could not save new security advisory, but thats OK: %s', $e->getMessage())); } diff --git a/app/Console/Commands/Tools/ChecksForUpdates.php b/app/Console/Commands/Tools/ChecksForUpdates.php index f9382fef71..1d8121a26f 100644 --- a/app/Console/Commands/Tools/ChecksForUpdates.php +++ b/app/Console/Commands/Tools/ChecksForUpdates.php @@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Tools; use Carbon\Carbon; use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Services\FireflyIIIOrg\Update\UpdateRequestInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; class ChecksForUpdates extends Command @@ -57,7 +57,7 @@ class ChecksForUpdates extends Command $version = config('firefly.version'); $this->friendlyLine(sprintf('You are running version "%s", built on %s', $version, $build->format('Y-m-d H:i'))); - $permission = FireflyConfig::get('permission_update_check', -1)->data; + $permission = AppConfiguration::get('permission_update_check', -1)->data; if (1 !== $permission && false === $this->option('force')) { $this->friendlyWarning('Checking for updates is disabled. To overrule, use --force.'); diff --git a/app/Console/Commands/Tools/Cron.php b/app/Console/Commands/Tools/Cron.php index 8cd28f04ac..15d15832bf 100644 --- a/app/Console/Commands/Tools/Cron.php +++ b/app/Console/Commands/Tools/Cron.php @@ -33,7 +33,7 @@ use FireflyIII\Support\Cronjobs\ExchangeRatesCronjob; use FireflyIII\Support\Cronjobs\RecurringCronjob; use FireflyIII\Support\Cronjobs\UpdateCheckCronjob; use FireflyIII\Support\Cronjobs\WebhookCronjob; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; use InvalidArgumentException; @@ -74,7 +74,7 @@ class Cron extends Command $force = (bool) $this->option('force'); // Fire exchange rates cron job. - if (true === FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data && ($doAll || $this->option('download-cer'))) { + if (true === AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data && ($doAll || $this->option('download-cer'))) { try { $this->exchangeRatesCronJob($force, $date); } catch (FireflyException $e) { diff --git a/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php b/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php index 5327de98d5..65e0ee96df 100644 --- a/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php +++ b/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php @@ -28,7 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Database\QueryException; use Illuminate\Support\Facades\Log; @@ -115,14 +115,14 @@ class AddsTransactionIdentifiers extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } /** diff --git a/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php b/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php index f0e74af9da..9ae22a900c 100644 --- a/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php +++ b/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php @@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Preference; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Support\Facades\Crypt; @@ -145,7 +145,7 @@ class RemovesDatabaseDecryption extends Command $this->friendlyPositive(sprintf('Decrypted the data in table "%s".', $table)); // mark as decrypted: $configName = sprintf('is_decrypted_%s', $table); - FireflyConfig::set($configName, true); + AppConfiguration::set($configName, true); } private function isDecrypted(string $table): bool @@ -154,7 +154,7 @@ class RemovesDatabaseDecryption extends Command $configVar = null; try { - $configVar = FireflyConfig::get($configName, false); + $configVar = AppConfiguration::get($configName, false); } catch (FireflyException $e) { Log::error($e->getMessage()); } diff --git a/app/Console/Commands/Upgrade/RepairsAccountBalances.php b/app/Console/Commands/Upgrade/RepairsAccountBalances.php index 9ed16a14c1..2c024cad75 100644 --- a/app/Console/Commands/Upgrade/RepairsAccountBalances.php +++ b/app/Console/Commands/Upgrade/RepairsAccountBalances.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Console\Commands\ShowsFriendlyMessages; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Models\AccountBalanceCalculator; use Illuminate\Console\Command; @@ -45,7 +45,7 @@ class RepairsAccountBalances extends Command return 0; } - if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { + if (true === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.'); $this->markAsExecuted(); $this->correctBalanceAmounts(); @@ -65,13 +65,13 @@ class RepairsAccountBalances extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } } diff --git a/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php b/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php index 7af47de7fc..3c5b0f4f5e 100644 --- a/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php +++ b/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php @@ -34,7 +34,7 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Support\Facades\Amount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\User; use Illuminate\Console\Command; @@ -75,14 +75,14 @@ class UpgradesAccountCurrencies extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } /** diff --git a/app/Console/Commands/Upgrade/UpgradesAccountMetaData.php b/app/Console/Commands/Upgrade/UpgradesAccountMetaData.php index d07703b5ae..b35d480e88 100644 --- a/app/Console/Commands/Upgrade/UpgradesAccountMetaData.php +++ b/app/Console/Commands/Upgrade/UpgradesAccountMetaData.php @@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\AccountMeta; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; class UpgradesAccountMetaData extends Command @@ -83,13 +83,13 @@ class UpgradesAccountMetaData extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } } diff --git a/app/Console/Commands/Upgrade/UpgradesAttachments.php b/app/Console/Commands/Upgrade/UpgradesAttachments.php index 538f62f23b..b62d7a38c0 100644 --- a/app/Console/Commands/Upgrade/UpgradesAttachments.php +++ b/app/Console/Commands/Upgrade/UpgradesAttachments.php @@ -28,7 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Attachment; use FireflyIII\Models\Note; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; @@ -93,13 +93,13 @@ class UpgradesAttachments extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } } diff --git a/app/Console/Commands/Upgrade/UpgradesBillsToRules.php b/app/Console/Commands/Upgrade/UpgradesBillsToRules.php index a1513ad4bf..bd18021dd2 100644 --- a/app/Console/Commands/Upgrade/UpgradesBillsToRules.php +++ b/app/Console/Commands/Upgrade/UpgradesBillsToRules.php @@ -33,7 +33,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Console\Command; @@ -86,14 +86,14 @@ class UpgradesBillsToRules extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } private function migrateBill(RuleGroup $ruleGroup, Bill $bill, Preference $language): void diff --git a/app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php b/app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php index f6960350fb..1b131553b9 100644 --- a/app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php +++ b/app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php @@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Models\BudgetLimit; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; @@ -140,14 +140,14 @@ class UpgradesBudgetLimitPeriods extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } private function theresNoLimit(): void diff --git a/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php b/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php index e9bf49b176..166bdb2cf4 100644 --- a/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php +++ b/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php @@ -29,7 +29,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Support\Facades\Amount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\User; use Illuminate\Console\Command; @@ -89,13 +89,13 @@ class UpgradesBudgetLimits extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } } diff --git a/app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php b/app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php index be85e4cdd1..ffba93fd6d 100644 --- a/app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php +++ b/app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php @@ -29,7 +29,7 @@ use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Collection; @@ -82,13 +82,13 @@ class UpgradesCreditCardLiabilities extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } } diff --git a/app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php b/app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php index cf1455e389..9ebb20ab85 100644 --- a/app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php +++ b/app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php @@ -30,7 +30,7 @@ use FireflyIII\Models\Preference; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\UserGroup; use FireflyIII\Support\Facades\Amount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\User; use Illuminate\Console\Command; use Illuminate\Support\Collection; @@ -85,14 +85,14 @@ class UpgradesCurrencyPreferences extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } private function runUpgrade(): void diff --git a/app/Console/Commands/Upgrade/UpgradesDatabase.php b/app/Console/Commands/Upgrade/UpgradesDatabase.php index c81956ac81..4ad2e9ec23 100644 --- a/app/Console/Commands/Upgrade/UpgradesDatabase.php +++ b/app/Console/Commands/Upgrade/UpgradesDatabase.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Console\Commands\ShowsFriendlyMessages; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; use Safe\Exceptions\InfoException; @@ -87,7 +87,7 @@ class UpgradesDatabase extends Command $this->call($command, $args); } // index will set FF3 version. - FireflyConfig::set('ff3_build_time', (int) config('firefly.build_time')); + AppConfiguration::set('ff3_build_time', (int) config('firefly.build_time')); return 0; } diff --git a/app/Console/Commands/Upgrade/UpgradesJournalMetaData.php b/app/Console/Commands/Upgrade/UpgradesJournalMetaData.php index ff0d9bc184..3f830bcf36 100644 --- a/app/Console/Commands/Upgrade/UpgradesJournalMetaData.php +++ b/app/Console/Commands/Upgrade/UpgradesJournalMetaData.php @@ -29,7 +29,7 @@ use FireflyIII\Models\Budget; use FireflyIII\Models\Category; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; @@ -98,21 +98,21 @@ class UpgradesJournalMetaData extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar->data; } private function isMigrated(): bool { - $configVar = FireflyConfig::get(UpgradesToGroups::CONFIG_NAME, false); + $configVar = AppConfiguration::get(UpgradesToGroups::CONFIG_NAME, false); return (bool) $configVar->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } private function migrateAll(): void diff --git a/app/Console/Commands/Upgrade/UpgradesJournalNotes.php b/app/Console/Commands/Upgrade/UpgradesJournalNotes.php index 7d043c9ef2..e3132be9c8 100644 --- a/app/Console/Commands/Upgrade/UpgradesJournalNotes.php +++ b/app/Console/Commands/Upgrade/UpgradesJournalNotes.php @@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Models\Note; use FireflyIII\Models\TransactionJournalMeta; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; @@ -87,13 +87,13 @@ class UpgradesJournalNotes extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } } diff --git a/app/Console/Commands/Upgrade/UpgradesLiabilities.php b/app/Console/Commands/Upgrade/UpgradesLiabilities.php index 56cab26b41..bd4431af8f 100644 --- a/app/Console/Commands/Upgrade/UpgradesLiabilities.php +++ b/app/Console/Commands/Upgrade/UpgradesLiabilities.php @@ -31,7 +31,7 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Services\Internal\Support\CreditRecalculateService; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\User; use Illuminate\Console\Command; @@ -93,14 +93,14 @@ class UpgradesLiabilities extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } private function upgradeForUser(User $user): void diff --git a/app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php b/app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php index 8518b165f6..3aef1d4bee 100644 --- a/app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php +++ b/app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php @@ -33,7 +33,7 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService; use FireflyIII\Services\Internal\Support\CreditRecalculateService; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\User; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; @@ -132,14 +132,14 @@ class UpgradesLiabilitiesEight extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } private function reverseOpeningBalance(Account $account): void diff --git a/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php b/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php index a6deb2b485..7e2d385682 100644 --- a/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php +++ b/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php @@ -29,7 +29,7 @@ use FireflyIII\Models\PiggyBank; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Support\Facades\Amount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; @@ -65,14 +65,14 @@ class UpgradesMultiPiggyBanks extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } private function upgradePiggyBank(PiggyBank $piggyBank): void diff --git a/app/Console/Commands/Upgrade/UpgradesPrimaryCurrencyAmounts.php b/app/Console/Commands/Upgrade/UpgradesPrimaryCurrencyAmounts.php index ff8ed340d6..5d927e7a07 100644 --- a/app/Console/Commands/Upgrade/UpgradesPrimaryCurrencyAmounts.php +++ b/app/Console/Commands/Upgrade/UpgradesPrimaryCurrencyAmounts.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Console\Commands\ShowsFriendlyMessages; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Facades\Artisan; @@ -59,13 +59,13 @@ class UpgradesPrimaryCurrencyAmounts extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } } diff --git a/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php b/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php index 9ab53d5b14..3c1b67b325 100644 --- a/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php +++ b/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php @@ -28,7 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Models\Recurrence; use FireflyIII\Models\RecurrenceMeta; use FireflyIII\Models\RecurrenceTransactionMeta; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use function Safe\json_encode; @@ -66,14 +66,14 @@ class UpgradesRecurrenceMetaData extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } private function migrateEntry(RecurrenceMeta $meta): int diff --git a/app/Console/Commands/Upgrade/UpgradesRuleActions.php b/app/Console/Commands/Upgrade/UpgradesRuleActions.php index 78ef237238..38d55c2156 100644 --- a/app/Console/Commands/Upgrade/UpgradesRuleActions.php +++ b/app/Console/Commands/Upgrade/UpgradesRuleActions.php @@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Models\RuleAction; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; class UpgradesRuleActions extends Command @@ -63,14 +63,14 @@ class UpgradesRuleActions extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } private function replaceEqualSign(): void diff --git a/app/Console/Commands/Upgrade/UpgradesTagLocations.php b/app/Console/Commands/Upgrade/UpgradesTagLocations.php index 3590268f95..9845827939 100644 --- a/app/Console/Commands/Upgrade/UpgradesTagLocations.php +++ b/app/Console/Commands/Upgrade/UpgradesTagLocations.php @@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Models\Location; use FireflyIII\Models\Tag; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; class UpgradesTagLocations extends Command @@ -63,14 +63,14 @@ class UpgradesTagLocations extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } private function migrateLocationDetails(Tag $tag): void diff --git a/app/Console/Commands/Upgrade/UpgradesToGroups.php b/app/Console/Commands/Upgrade/UpgradesToGroups.php index a04dfd35ee..1cb86fa1fd 100644 --- a/app/Console/Commands/Upgrade/UpgradesToGroups.php +++ b/app/Console/Commands/Upgrade/UpgradesToGroups.php @@ -35,7 +35,7 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Services\Internal\Destroy\JournalDestroyService; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; @@ -260,7 +260,7 @@ class UpgradesToGroups extends Command private function isMigrated(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } @@ -355,7 +355,7 @@ class UpgradesToGroups extends Command private function markAsMigrated(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } /** diff --git a/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php b/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php index b299859ae3..b340f8c5c4 100644 --- a/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php +++ b/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php @@ -32,7 +32,7 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; @@ -333,7 +333,7 @@ class UpgradesTransferCurrencies extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } @@ -375,7 +375,7 @@ class UpgradesTransferCurrencies extends Command private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } /** diff --git a/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php b/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php index 77dfe0d503..e9729aa84a 100644 --- a/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php +++ b/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php @@ -34,7 +34,7 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; class UpgradesVariousCurrencyInformation extends Command @@ -149,7 +149,7 @@ class UpgradesVariousCurrencyInformation extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } @@ -166,7 +166,7 @@ class UpgradesVariousCurrencyInformation extends Command private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } /** diff --git a/app/Console/Commands/Upgrade/UpgradesWebhooks.php b/app/Console/Commands/Upgrade/UpgradesWebhooks.php index 6515800b6b..865b510524 100644 --- a/app/Console/Commands/Upgrade/UpgradesWebhooks.php +++ b/app/Console/Commands/Upgrade/UpgradesWebhooks.php @@ -32,7 +32,7 @@ use FireflyIII\Models\Webhook; use FireflyIII\Models\WebhookDelivery as WebhookDeliveryModel; use FireflyIII\Models\WebhookResponse as WebhookResponseModel; use FireflyIII\Models\WebhookTrigger as WebhookTriggerModel; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Console\Command; class UpgradesWebhooks extends Command @@ -64,14 +64,14 @@ class UpgradesWebhooks extends Command private function isExecuted(): bool { - $configVar = FireflyConfig::get(self::CONFIG_NAME, false); + $configVar = AppConfiguration::get(self::CONFIG_NAME, false); return (bool) $configVar?->data; } private function markAsExecuted(): void { - FireflyConfig::set(self::CONFIG_NAME, true); + AppConfiguration::set(self::CONFIG_NAME, true); } private function upgradeWebhook(Webhook $webhook): void diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index af9733b305..c46da2f90e 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -49,7 +49,7 @@ use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface; use FireflyIII\Services\Internal\Destroy\JournalDestroyService; use FireflyIII\Services\Internal\Support\JournalServiceTrait; use FireflyIII\Support\Facades\Amount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\NullArrayObject; use FireflyIII\User; use FireflyIII\Validation\AccountValidator; @@ -252,7 +252,7 @@ class TransactionJournalFactory $carbon->setTimezone(config('app.timezone')); // 2024-11-19, overrule timezone with UTC and store it as UTC. - if (true === FireflyConfig::get('utc', false)->data) { + if (true === AppConfiguration::get('utc', false)->data) { $carbon->setTimezone('UTC'); } diff --git a/app/Helpers/Update/UpdateTrait.php b/app/Helpers/Update/UpdateTrait.php index 58dd6ac0bd..817c62759e 100644 --- a/app/Helpers/Update/UpdateTrait.php +++ b/app/Helpers/Update/UpdateTrait.php @@ -27,7 +27,7 @@ namespace FireflyIII\Helpers\Update; use Carbon\Carbon; use FireflyIII\Services\FireflyIIIOrg\Update\UpdateRequestInterface; use FireflyIII\Services\FireflyIIIOrg\Update\UpdateResponse; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Support\Facades\Log; /** @@ -46,7 +46,7 @@ trait UpdateTrait /** @var UpdateRequestInterface $checker */ $checker = app(UpdateRequestInterface::class); - $channelConfig = FireflyConfig::get('update_channel', 'stable'); + $channelConfig = AppConfiguration::get('update_channel', 'stable'); $channel = (string) $channelConfig->data; $build = Carbon::createFromTimestamp(config('firefly.build_time'), config('app.timezone')); $version = config('firefly.version'); diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php index a5dec3fb7c..37562b1dd2 100644 --- a/app/Http/Controllers/Admin/ConfigurationController.php +++ b/app/Http/Controllers/Admin/ConfigurationController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Admin; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Middleware\IsDemoUser; use FireflyIII\Http\Requests\ConfigurationRequest; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; @@ -68,17 +68,17 @@ final class ConfigurationController extends Controller // all available configuration and their default value in case // they don't exist yet. - $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; - $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; + $singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; + $isDemoSite = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; $siteOwner = config('firefly.site_owner'); - $enableExchangeRates = FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data; - $useRunningBalance = FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data; - $enableExternalMap = FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data; - $enableExternalRates = FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data; - $allowWebhooks = FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data; - $enableBatchProcessing = FireflyConfig::get('enable_batch_processing', false)->data; - $validUrlProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; + $enableExchangeRates = AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data; + $useRunningBalance = AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data; + $enableExternalMap = AppConfiguration::get('enable_external_map', config('firefly.enable_external_map'))->data; + $enableExternalRates = AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data; + $allowWebhooks = AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data; + $enableBatchProcessing = AppConfiguration::get('enable_batch_processing', false)->data; + $validUrlProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; return view('settings.configuration.index', [ 'subTitle' => $subTitle, @@ -107,18 +107,18 @@ final class ConfigurationController extends Controller Log::channel('audit')->info('User updates global configuration.', $data); // store config values - FireflyConfig::set('single_user_mode', $data['single_user_mode']); + AppConfiguration::set('single_user_mode', $data['single_user_mode']); - FireflyConfig::set('enable_exchange_rates', $data['enable_exchange_rates']); - FireflyConfig::set('use_running_balance', $data['use_running_balance']); + AppConfiguration::set('enable_exchange_rates', $data['enable_exchange_rates']); + AppConfiguration::set('use_running_balance', $data['use_running_balance']); - FireflyConfig::set('enable_external_map', $data['enable_external_map']); - FireflyConfig::set('enable_external_rates', $data['enable_external_rates']); - FireflyConfig::set('allow_webhooks', $data['allow_webhooks']); - FireflyConfig::set('enable_batch_processing', $data['enable_batch_processing']); + AppConfiguration::set('enable_external_map', $data['enable_external_map']); + AppConfiguration::set('enable_external_rates', $data['enable_external_rates']); + AppConfiguration::set('allow_webhooks', $data['allow_webhooks']); + AppConfiguration::set('enable_batch_processing', $data['enable_batch_processing']); - FireflyConfig::set('valid_url_protocols', $data['valid_url_protocols']); - FireflyConfig::set('is_demo_site', $data['is_demo_site']); + AppConfiguration::set('valid_url_protocols', $data['valid_url_protocols']); + AppConfiguration::set('is_demo_site', $data['is_demo_site']); // flash message session()->flash('success', (string) trans('firefly.configuration_updated')); diff --git a/app/Http/Controllers/Admin/NotificationController.php b/app/Http/Controllers/Admin/NotificationController.php index 94b8241487..c00996b531 100644 --- a/app/Http/Controllers/Admin/NotificationController.php +++ b/app/Http/Controllers/Admin/NotificationController.php @@ -28,7 +28,7 @@ use FireflyIII\Events\Test\OwnerTestsNotificationChannel; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\NotificationRequest; use FireflyIII\Notifications\Notifiables\OwnerNotifiable; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; @@ -45,14 +45,14 @@ final class NotificationController extends Controller $subTitleIcon = 'envelope-o'; // notification settings: - $slackUrl = FireflyConfig::getEncrypted('slack_webhook_url', '')->data; - $pushoverAppToken = FireflyConfig::getEncrypted('pushover_app_token', '')->data; - $pushoverUserToken = FireflyConfig::getEncrypted('pushover_user_token', '')->data; - $ntfyServer = FireflyConfig::getEncrypted('ntfy_server', 'https://ntfy.sh')->data; - $ntfyTopic = FireflyConfig::getEncrypted('ntfy_topic', '')->data; - $ntfyAuth = FireflyConfig::get('ntfy_auth', false)->data; - $ntfyUser = FireflyConfig::getEncrypted('ntfy_user', '')->data; - $ntfyPass = FireflyConfig::getEncrypted('ntfy_pass', '')->data; + $slackUrl = AppConfiguration::getEncrypted('slack_webhook_url', '')->data; + $pushoverAppToken = AppConfiguration::getEncrypted('pushover_app_token', '')->data; + $pushoverUserToken = AppConfiguration::getEncrypted('pushover_user_token', '')->data; + $ntfyServer = AppConfiguration::getEncrypted('ntfy_server', 'https://ntfy.sh')->data; + $ntfyTopic = AppConfiguration::getEncrypted('ntfy_topic', '')->data; + $ntfyAuth = AppConfiguration::get('ntfy_auth', false)->data; + $ntfyUser = AppConfiguration::getEncrypted('ntfy_user', '')->data; + $ntfyPass = AppConfiguration::getEncrypted('ntfy_pass', '')->data; $channels = config('notifications.channels'); $forcedAvailability = []; @@ -60,7 +60,7 @@ final class NotificationController extends Controller $notifications = []; foreach (config('notifications.notifications.owner') as $key => $info) { if (true === $info['enabled']) { - $notifications[$key] = FireflyConfig::get(sprintf('notification_%s', $key), true)->data; + $notifications[$key] = AppConfiguration::get(sprintf('notification_%s', $key), true)->data; } } @@ -97,19 +97,19 @@ final class NotificationController extends Controller foreach (config('notifications.notifications.owner') as $key => $info) { if (array_key_exists($key, $all)) { - FireflyConfig::set(sprintf('notification_%s', $key), $all[$key]); + AppConfiguration::set(sprintf('notification_%s', $key), $all[$key]); } } $variables = ['slack_webhook_url', 'pushover_app_token', 'pushover_user_token', 'ntfy_server', 'ntfy_topic', 'ntfy_user', 'ntfy_pass']; foreach ($variables as $variable) { if ('' === $all[$variable]) { - FireflyConfig::delete($variable); + AppConfiguration::delete($variable); } if ('' !== $all[$variable]) { - FireflyConfig::setEncrypted($variable, $all[$variable]); + AppConfiguration::setEncrypted($variable, $all[$variable]); } } - FireflyConfig::set('ntfy_auth', $all['ntfy_auth'] ?? false); + AppConfiguration::set('ntfy_auth', $all['ntfy_auth'] ?? false); session()->flash('success', (string) trans('firefly.notification_settings_saved')); @@ -125,7 +125,7 @@ final class NotificationController extends Controller } /** @var int $lastNotification */ - $lastNotification = FireflyConfig::get('last_test_notification', 123)->data; + $lastNotification = AppConfiguration::get('last_test_notification', 123)->data; if ((time() - $lastNotification) < 120) { session()->flash('error', (string) trans('firefly.test_rate_limited')); @@ -150,7 +150,7 @@ final class NotificationController extends Controller event(new OwnerTestsNotificationChannel($channel, $owner)); session()->flash('success', (string) trans('firefly.notification_test_executed', ['channel' => $channel])); } - FireflyConfig::set('last_test_notification', time()); + AppConfiguration::set('last_test_notification', time()); return redirect(route('settings.notification.index')); } diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php index 583bccfa29..65f6375b5e 100644 --- a/app/Http/Controllers/Admin/UpdateController.php +++ b/app/Http/Controllers/Admin/UpdateController.php @@ -27,7 +27,7 @@ use Carbon\Carbon; use FireflyIII\Helpers\Update\UpdateTrait; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Middleware\IsDemoUser; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; @@ -64,8 +64,8 @@ final class UpdateController extends Controller { $subTitle = (string) trans('firefly.update_check_title'); $subTitleIcon = 'fa-star'; - $permission = FireflyConfig::get('permission_update_check', -1); - $channel = FireflyConfig::get('update_channel', 'stable'); + $permission = AppConfiguration::get('permission_update_check', -1); + $channel = AppConfiguration::get('update_channel', 'stable'); $selected = $permission->data; $channelSelected = $channel->data; $options = [ @@ -99,9 +99,9 @@ final class UpdateController extends Controller $channel = $request->get('update_channel'); $channel = in_array($channel, ['stable', 'beta', 'alpha'], true) ? $channel : 'stable'; - FireflyConfig::set('permission_update_check', $checkForUpdates); - FireflyConfig::set('last_update_check', Carbon::now()->getTimestamp()); - FireflyConfig::set('update_channel', $channel); + AppConfiguration::set('permission_update_check', $checkForUpdates); + AppConfiguration::set('last_update_check', Carbon::now()->getTimestamp()); + AppConfiguration::set('update_channel', $channel); session()->flash('success', (string) trans('firefly.configuration_updated')); return redirect(route('settings.update-check')); diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 036f241a66..601fa62333 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -31,7 +31,7 @@ use FireflyIII\Http\Requests\InviteUserFormRequest; use FireflyIII\Http\Requests\UserFormRequest; use FireflyIII\Models\InvitedUser; use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Contracts\View\Factory; @@ -167,7 +167,7 @@ final class UserController extends Controller $subTitle = (string) trans('firefly.user_administration'); $subTitleIcon = 'fa-users'; $users = $this->repository->all(); - $singleUserMode = (bool) FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; + $singleUserMode = (bool) AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $allowInvites = false; if (!$this->externalIdentity && $singleUserMode) { // also registration enabled. diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 82e9c0741f..566c1e35be 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Auth; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\User; use Illuminate\Contracts\View\Factory; use Illuminate\Foundation\Auth\SendsPasswordResetEmails; @@ -122,7 +122,7 @@ final class ForgotPasswordController extends Controller } // is allowed to? - $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; + $singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $userCount = User::count(); $allowRegistration = true; $pageTitle = (string) trans('firefly.forgot_pw_page_title'); diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index d654448167..627af1d3ed 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -30,7 +30,7 @@ use FireflyIII\Events\Security\User\UserSuccessfullyLoggedIn; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Providers\RouteServiceProvider; use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Steam; use FireflyIII\User; use Illuminate\Contracts\View\Factory; @@ -199,7 +199,7 @@ final class LoginController extends Controller } // is allowed to register, etc. - $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; + $singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $allowRegistration = true; $allowReset = true; if (true === $singleUserMode && $count > 0) { diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index a1c96608d8..fcec5665ab 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -28,7 +28,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Notifications\Notifiables\OwnerNotifiable; use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Http\Controllers\CreateStuff; use FireflyIII\User; use Illuminate\Contracts\View\Factory; @@ -113,7 +113,7 @@ final class RegisterController extends Controller */ public function showInviteForm(Request $request, string $code): Factory|\Illuminate\Contracts\View\View { - $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; + $isDemoSite = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; $pageTitle = (string) trans('firefly.register_page_title'); $repository = app(UserRepositoryInterface::class); $allowRegistration = $this->allowedToRegister(); @@ -147,7 +147,7 @@ final class RegisterController extends Controller */ public function showRegistrationForm(?Request $request = null): Factory|\Illuminate\Contracts\View\View { - $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; + $isDemoSite = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; $pageTitle = (string) trans('firefly.register_page_title'); $allowRegistration = $this->allowedToRegister(); @@ -171,7 +171,7 @@ final class RegisterController extends Controller $allowRegistration = true; try { - $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; + $singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; } catch (ContainerExceptionInterface|NotFoundExceptionInterface) { $singleUserMode = true; } diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 259abceeb2..2bcad44ac9 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -25,7 +25,7 @@ namespace FireflyIII\Http\Controllers\Auth; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\User; use Illuminate\Contracts\View\Factory; use Illuminate\Foundation\Auth\ResetsPasswords; @@ -124,7 +124,7 @@ final class ResetPasswordController extends Controller } // is allowed to register? - $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; + $singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $userCount = User::count(); $allowRegistration = true; $pageTitle = (string) trans('firefly.reset_pw_page_title'); diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 6f5b8db551..5673b9ee19 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers; use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Support\Facades\Amount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Steam; use FireflyIII\Support\Http\Controllers\RequestInformation; @@ -72,7 +72,7 @@ abstract class Controller extends BaseController public function __construct() { // is site a demo site? - $isDemoSiteConfig = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site', false)); + $isDemoSiteConfig = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site', false)); $isDemoSite = (bool) $isDemoSiteConfig->data; View::share('IS_DEMO_SITE', $isDemoSite); View::share('DEMO_USERNAME', config('firefly.demo_username')); @@ -91,7 +91,7 @@ abstract class Controller extends BaseController // is webhooks enabled? View::share( 'featuringWebhooks', - true === config('firefly.feature_flags.webhooks') && true === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data + true === config('firefly.feature_flags.webhooks') && true === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data ); // share custom auth guard info. diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 2a7938ae64..8434c36503 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -34,7 +34,7 @@ use FireflyIII\Models\PeriodStatistic; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Support\Facades\Amount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Steam; use FireflyIII\Support\Http\Controllers\GetConfigurationData; @@ -118,7 +118,7 @@ final class DebugController extends Controller // also do some recalculations. Artisan::call('correction:recalculates-liabilities'); - if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { + if (true === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { AccountBalanceCalculator::recalculateAll(false); } @@ -292,7 +292,7 @@ final class DebugController extends Controller { $userGuard = config('auth.defaults.guard'); - $config = FireflyConfig::get('last_rt_job', 0); + $config = AppConfiguration::get('last_rt_job', 0); $lastTime = (int) $config->data; $lastCronjob = 'never'; $lastCronjobAgo = 'never'; diff --git a/app/Http/Controllers/ExchangeRates/IndexController.php b/app/Http/Controllers/ExchangeRates/IndexController.php index 4b79d66b5d..8e46598105 100644 --- a/app/Http/Controllers/ExchangeRates/IndexController.php +++ b/app/Http/Controllers/ExchangeRates/IndexController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\ExchangeRates; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\TransactionCurrency; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\View\View; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -46,7 +46,7 @@ final class IndexController extends Controller return $next($request); }); - if (false === FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data) { + if (false === AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data) { throw new NotFoundHttpException(); } } diff --git a/app/Http/Controllers/Profile/OAuthController.php b/app/Http/Controllers/Profile/OAuthController.php index d9bcd7eb95..d7818919be 100644 --- a/app/Http/Controllers/Profile/OAuthController.php +++ b/app/Http/Controllers/Profile/OAuthController.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Profile; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\Validation\Factory as ValidationFactory; use Illuminate\Contracts\View\Factory; use Illuminate\Http\JsonResponse; @@ -167,7 +167,7 @@ final class OAuthController extends Controller public function storeClient(Request $request): JsonResponse { - $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; + $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; $this->validation->make($request->only(['name', 'redirect_uris', 'confidential']), [ 'name' => ['required', 'string', 'max:255'], 'redirect_uris' => ['required', sprintf('url:%s', $validProtocols)], @@ -199,7 +199,7 @@ final class OAuthController extends Controller public function updateClient(Request $request, string $clientId): Client|Response { $client = auth()->user()->oauthApps()->where('revoked', false)->find($clientId); - $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; + $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; if (null === $client) { return new Response('', 404); } diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index 832909f84e..a456384fd7 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -27,7 +27,7 @@ namespace FireflyIII\Http\Controllers\System; use Exception; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Http\Controllers\GetConfigurationData; use Illuminate\Contracts\View\Factory; @@ -76,8 +76,8 @@ final class InstallController extends Controller app('view')->share('FF_VERSION', config('firefly.version')); // index will set FF3 version. - FireflyConfig::set('ff3_version', (string) config('firefly.version')); - FireflyConfig::set('ff3_build_time', (int) config('firefly.build_time')); + AppConfiguration::set('ff3_version', (string) config('firefly.version')); + AppConfiguration::set('ff3_build_time', (int) config('firefly.build_time')); return view('install.index'); } diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php index 3677d3403a..49131a46c0 100644 --- a/app/Http/Controllers/Transaction/CreateController.php +++ b/app/Http/Controllers/Transaction/CreateController.php @@ -29,7 +29,7 @@ use FireflyIII\Models\TransactionGroup; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; use FireflyIII\Services\Internal\Update\GroupCloneService; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; @@ -136,7 +136,7 @@ final class CreateController extends Controller $optionalFields['external_url'] ??= false; $optionalFields['location'] ??= false; $optionalFields['location'] = $optionalFields['location'] - && true === FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data; + && true === AppConfiguration::get('enable_external_map', config('firefly.enable_external_map'))->data; // map info: $longitude = config('firefly.default_location.longitude'); diff --git a/app/Http/Controllers/Transaction/EditController.php b/app/Http/Controllers/Transaction/EditController.php index cd25e11202..1ce11526f5 100644 --- a/app/Http/Controllers/Transaction/EditController.php +++ b/app/Http/Controllers/Transaction/EditController.php @@ -29,7 +29,7 @@ use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\JsonResponse; @@ -116,7 +116,7 @@ final class EditController extends Controller $optionalFields['external_url'] ??= false; $optionalFields['location'] ??= false; $optionalFields['location'] = true === $optionalFields['location'] - && true === FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data; + && true === AppConfiguration::get('enable_external_map', config('firefly.enable_external_map'))->data; // map info voor v2: $longitude = config('firefly.default_location.longitude'); diff --git a/app/Http/Controllers/Webhooks/CreateController.php b/app/Http/Controllers/Webhooks/CreateController.php index 1859a4ae61..38a4a04214 100644 --- a/app/Http/Controllers/Webhooks/CreateController.php +++ b/app/Http/Controllers/Webhooks/CreateController.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Webhooks; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\View\Factory; use Illuminate\Support\Facades\Log; use Illuminate\View\View; @@ -58,7 +58,7 @@ final class CreateController extends Controller */ public function index(): Factory|\Illuminate\Contracts\View\View { - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning('User visits webhook create page, but webhooks are DISABLED.'); throw new NotFoundHttpException('Webhooks are not enabled.'); diff --git a/app/Http/Controllers/Webhooks/DeleteController.php b/app/Http/Controllers/Webhooks/DeleteController.php index e3b5931a9b..0e88533f5d 100644 --- a/app/Http/Controllers/Webhooks/DeleteController.php +++ b/app/Http/Controllers/Webhooks/DeleteController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Webhooks; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Webhook; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; use Illuminate\Support\Facades\Log; @@ -57,7 +57,7 @@ final class DeleteController extends Controller public function index(Webhook $webhook): Factory|View { - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning('User visits webhook delete page, but webhooks are DISABLED.'); throw new NotFoundHttpException('Webhooks are not enabled.'); diff --git a/app/Http/Controllers/Webhooks/EditController.php b/app/Http/Controllers/Webhooks/EditController.php index aa2de85122..3153242742 100644 --- a/app/Http/Controllers/Webhooks/EditController.php +++ b/app/Http/Controllers/Webhooks/EditController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Webhooks; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Webhook; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; use Illuminate\Support\Facades\Log; @@ -56,7 +56,7 @@ final class EditController extends Controller public function index(Webhook $webhook): Factory|View { - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning('User visits webhook edit page, but webhooks are DISABLED.'); throw new NotFoundHttpException('Webhooks are not enabled.'); diff --git a/app/Http/Controllers/Webhooks/IndexController.php b/app/Http/Controllers/Webhooks/IndexController.php index e84a5daffe..c897d4d017 100644 --- a/app/Http/Controllers/Webhooks/IndexController.php +++ b/app/Http/Controllers/Webhooks/IndexController.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Webhooks; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\View\Factory; use Illuminate\Support\Facades\Log; use Illuminate\View\View; @@ -54,7 +54,7 @@ final class IndexController extends Controller */ public function index(): Factory|\Illuminate\Contracts\View\View { - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning('User visits webhook index page, but webhooks are DISABLED.'); throw new NotFoundHttpException('Webhooks are not enabled.'); diff --git a/app/Http/Controllers/Webhooks/ShowController.php b/app/Http/Controllers/Webhooks/ShowController.php index 30f71d79c7..d313d71b0f 100644 --- a/app/Http/Controllers/Webhooks/ShowController.php +++ b/app/Http/Controllers/Webhooks/ShowController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Webhooks; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Webhook; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; use Illuminate\Support\Facades\Log; @@ -56,7 +56,7 @@ final class ShowController extends Controller public function index(Webhook $webhook): Factory|View { - if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::channel('audit')->warning(sprintf('User visits webhook #%d page, but webhooks are DISABLED.', $webhook->id)); throw new NotFoundHttpException('Webhooks are not enabled.'); diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 94b2f34789..3913a5017d 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -27,7 +27,7 @@ use Carbon\Carbon; use Closure; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\Facades\Amount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Navigation; use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Steam; @@ -73,9 +73,9 @@ class Range app('view')->share('listLength', $pref); // share security message: - if (FireflyConfig::has('upgrade_security_message') && FireflyConfig::has('upgrade_security_level')) { - app('view')->share('upgrade_security_message', FireflyConfig::get('upgrade_security_message')->data); - app('view')->share('upgrade_security_level', FireflyConfig::get('upgrade_security_level')->data); + if (AppConfiguration::hasSetting('upgrade_security_message') && AppConfiguration::hasSetting('upgrade_security_level')) { + app('view')->share('upgrade_security_message', AppConfiguration::get('upgrade_security_message')->data); + app('view')->share('upgrade_security_level', AppConfiguration::get('upgrade_security_level')->data); } } diff --git a/app/Http/Requests/NotificationRequest.php b/app/Http/Requests/NotificationRequest.php index ce77110bc7..a8ac43b9aa 100644 --- a/app/Http/Requests/NotificationRequest.php +++ b/app/Http/Requests/NotificationRequest.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; use FireflyIII\Rules\Admin\IsValidSlackOrDiscordUrl; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Request\ChecksLogin; use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; @@ -66,7 +66,7 @@ class NotificationRequest extends FormRequest */ public function rules(): array { - $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; + $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; $rules = [ 'slack_webhook_url' => ['nullable', sprintf('url:%s', $validProtocols), 'min:1', new IsValidSlackOrDiscordUrl()], 'ntfy_server' => ['nullable', sprintf('url:%s', $validProtocols), 'min:1'], diff --git a/app/Http/Requests/PreferencesRequest.php b/app/Http/Requests/PreferencesRequest.php index ca83f805f0..30d4c95004 100644 --- a/app/Http/Requests/PreferencesRequest.php +++ b/app/Http/Requests/PreferencesRequest.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; use FireflyIII\Rules\Admin\IsValidSlackOrDiscordUrl; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Request\ChecksLogin; use Illuminate\Foundation\Http\FormRequest; @@ -40,7 +40,7 @@ class PreferencesRequest extends FormRequest */ public function rules(): array { - $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; + $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; $rules = [ 'slack_webhook_url' => ['nullable', sprintf('url:%s', $validProtocols), 'min:1', new IsValidSlackOrDiscordUrl()], 'ntfy_server' => ['nullable', sprintf('url:%s', $validProtocols), 'min:1'], diff --git a/app/Listeners/Model/TransactionGroup/ProcessesNewTransactionGroup.php b/app/Listeners/Model/TransactionGroup/ProcessesNewTransactionGroup.php index a4be0d6eb6..744b60d39f 100644 --- a/app/Listeners/Model/TransactionGroup/ProcessesNewTransactionGroup.php +++ b/app/Listeners/Model/TransactionGroup/ProcessesNewTransactionGroup.php @@ -28,7 +28,7 @@ use FireflyIII\Enums\WebhookTrigger; use FireflyIII\Events\Model\TransactionGroup\CreatedSingleTransactionGroup; use FireflyIII\Events\Model\TransactionGroup\UserRequestedBatchProcessing; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Support\Facades\Log; @@ -40,7 +40,7 @@ class ProcessesNewTransactionGroup implements ShouldQueue { Log::debug(sprintf('Running event handler for %s', get_class($event))); - $setting = FireflyConfig::get('enable_batch_processing', false)->data; + $setting = AppConfiguration::get('enable_batch_processing', false)->data; if (true === $event->flags->batchSubmission && true === $setting) { Log::debug('Will do nothing for event because it is part of a batch.'); diff --git a/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php b/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php index 4889e96132..79bde091cf 100644 --- a/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php +++ b/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php @@ -18,7 +18,7 @@ use FireflyIII\Models\TransactionJournalMeta; use FireflyIII\Repositories\PeriodStatistic\PeriodStatisticRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Services\Internal\Support\CreditRecalculateService; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Models\AccountBalanceCalculator; use FireflyIII\TransactionRules\Engine\RuleEngineInterface; use Illuminate\Support\Collection; @@ -68,7 +68,7 @@ trait SupportsGroupProcessingTrait protected function recalculateRunningBalance(TransactionGroupEventObjects $objects): void { Log::debug('Now in recalculateRunningBalance'); - if (false === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { + if (false === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { Log::debug('Running balance is disabled.'); return; diff --git a/app/Listeners/Model/Webhook/SendsWebhookMessages.php b/app/Listeners/Model/Webhook/SendsWebhookMessages.php index 8aab29be9d..ebe3d9590c 100644 --- a/app/Listeners/Model/Webhook/SendsWebhookMessages.php +++ b/app/Listeners/Model/Webhook/SendsWebhookMessages.php @@ -27,7 +27,7 @@ namespace FireflyIII\Listeners\Model\Webhook; use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending; use FireflyIII\Jobs\SendWebhookMessage; use FireflyIII\Models\WebhookMessage; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Support\Facades\Log; @@ -36,7 +36,7 @@ class SendsWebhookMessages implements ShouldQueue public function handle(WebhookMessagesRequestSending $event): void { Log::debug(sprintf('Now in %s for %s', __METHOD__, get_class($event))); - if (false === config('firefly.feature_flags.webhooks') || false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { + if (false === config('firefly.feature_flags.webhooks') || false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) { Log::debug('Webhook event handler is disabled, do not run sendWebhookMessages().'); return; diff --git a/app/Listeners/Security/System/ChecksForNewVersion.php b/app/Listeners/Security/System/ChecksForNewVersion.php index ad453f6899..cd3df28c54 100644 --- a/app/Listeners/Security/System/ChecksForNewVersion.php +++ b/app/Listeners/Security/System/ChecksForNewVersion.php @@ -30,7 +30,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Update\UpdateTrait; use FireflyIII\Models\Configuration; use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Support\Facades\Log; use Psr\Container\ContainerExceptionInterface; @@ -45,7 +45,7 @@ class ChecksForNewVersion implements ShouldQueue Log::debug(sprintf('Now in %s', __METHOD__)); // should not check for updates: - $permission = FireflyConfig::get('permission_update_check', -1); + $permission = AppConfiguration::get('permission_update_check', -1); $value = (int) $permission->data; if (1 !== $value) { Log::debug('Update check is not enabled.'); @@ -64,7 +64,7 @@ class ChecksForNewVersion implements ShouldQueue } /** @var Configuration $lastCheckTime */ - $lastCheckTime = FireflyConfig::get('last_update_check', Carbon::now()->getTimestamp()); + $lastCheckTime = AppConfiguration::get('last_update_check', Carbon::now()->getTimestamp()); $now = Carbon::now()->getTimestamp(); $diff = $now - $lastCheckTime->data; Log::debug(sprintf('Last check time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff)); @@ -97,7 +97,7 @@ class ChecksForNewVersion implements ShouldQueue } session()->flash($level, $message); - FireflyConfig::set('last_update_check', Carbon::now()->getTimestamp()); + AppConfiguration::set('last_update_check', Carbon::now()->getTimestamp()); } /** @@ -117,7 +117,7 @@ class ChecksForNewVersion implements ShouldQueue } /** @var Configuration $lastCheckTime */ - $lastCheckTime = FireflyConfig::get('last_update_warning', Carbon::now()->getTimestamp()); + $lastCheckTime = AppConfiguration::get('last_update_warning', Carbon::now()->getTimestamp()); $now = Carbon::now()->getTimestamp(); $diff = $now - $lastCheckTime->data; Log::debug(sprintf('Last warning time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff)); @@ -133,6 +133,6 @@ class ChecksForNewVersion implements ShouldQueue Log::debug('Have warned about a new version in four weeks!'); session()->flash('info', (string) trans('firefly.disabled_but_check')); - FireflyConfig::set('last_update_warning', Carbon::now()->getTimestamp()); + AppConfiguration::set('last_update_warning', Carbon::now()->getTimestamp()); } } diff --git a/app/Listeners/Security/System/HandlesNewUserRegistration.php b/app/Listeners/Security/System/HandlesNewUserRegistration.php index 68e9d49c16..4a951c94e3 100644 --- a/app/Listeners/Security/System/HandlesNewUserRegistration.php +++ b/app/Listeners/Security/System/HandlesNewUserRegistration.php @@ -36,7 +36,7 @@ use FireflyIII\Notifications\Notifiables\OwnerNotifiable; use FireflyIII\Notifications\NotificationSender; use FireflyIII\Notifications\User\UserRegistration as UserRegistrationNotification; use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\User; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Support\Facades\Log; @@ -112,7 +112,7 @@ class HandlesNewUserRegistration implements ShouldQueue private function sendAdminRegistrationNotification(User $user, OwnerNotifiable $owner): void { - $sendMail = (bool) FireflyConfig::get('notification_admin_new_reg', true)->data; + $sendMail = (bool) AppConfiguration::get('notification_admin_new_reg', true)->data; if (!$sendMail) { return; } @@ -121,7 +121,7 @@ class HandlesNewUserRegistration implements ShouldQueue private function sendRegistrationMail(User $user): void { - $sendMail = (bool) FireflyConfig::get('notification_user_new_reg', true)->data; + $sendMail = (bool) AppConfiguration::get('notification_user_new_reg', true)->data; if (!$sendMail) { return; } diff --git a/app/Listeners/Security/System/NotifiesAboutNewInvitation.php b/app/Listeners/Security/System/NotifiesAboutNewInvitation.php index e6932d1e9e..8701ed87ee 100644 --- a/app/Listeners/Security/System/NotifiesAboutNewInvitation.php +++ b/app/Listeners/Security/System/NotifiesAboutNewInvitation.php @@ -32,7 +32,7 @@ use FireflyIII\Models\InvitedUser; use FireflyIII\Notifications\Admin\UserInvitation; use FireflyIII\Notifications\Notifiables\OwnerNotifiable; use FireflyIII\Notifications\NotificationSender; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Mail; @@ -47,7 +47,7 @@ class NotifiesAboutNewInvitation implements ShouldQueue private function sendInvitationNotification(InvitedUser $invitee): void { - $sendMail = FireflyConfig::get('notification_invite_created', true)->data; + $sendMail = AppConfiguration::get('notification_invite_created', true)->data; if (false === $sendMail) { return; } diff --git a/app/Listeners/Security/System/NotifiesOwnerAboutNewVersion.php b/app/Listeners/Security/System/NotifiesOwnerAboutNewVersion.php index 9dc4799e45..b7e3e53f0c 100644 --- a/app/Listeners/Security/System/NotifiesOwnerAboutNewVersion.php +++ b/app/Listeners/Security/System/NotifiesOwnerAboutNewVersion.php @@ -28,14 +28,14 @@ use FireflyIII\Events\Security\System\SystemFoundNewVersionOnline; use FireflyIII\Notifications\Admin\VersionCheckResult; use FireflyIII\Notifications\Notifiables\OwnerNotifiable; use FireflyIII\Notifications\NotificationSender; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\Queue\ShouldQueue; class NotifiesOwnerAboutNewVersion implements ShouldQueue { public function handle(SystemFoundNewVersionOnline $event): void { - $sendMail = FireflyConfig::get('notification_new_version', true)->data; + $sendMail = AppConfiguration::get('notification_new_version', true)->data; if (false === $sendMail) { return; } diff --git a/app/Notifications/Admin/UnknownUserLoginAttempt.php b/app/Notifications/Admin/UnknownUserLoginAttempt.php index e0c4eb4230..dc5a67ef19 100644 --- a/app/Notifications/Admin/UnknownUserLoginAttempt.php +++ b/app/Notifications/Admin/UnknownUserLoginAttempt.php @@ -26,7 +26,7 @@ namespace FireflyIII\Notifications\Admin; use FireflyIII\Notifications\Notifiables\OwnerNotifiable; use FireflyIII\Notifications\ReturnsAvailableChannels; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Steam; use Illuminate\Bus\Queueable; use Illuminate\Notifications\Messages\MailMessage; @@ -119,7 +119,7 @@ class UnknownUserLoginAttempt extends Notification public function via(OwnerNotifiable $notifiable): array { $channels = ReturnsAvailableChannels::returnChannels('owner'); - $isDemoSite = FireflyConfig::get('is_demo_site', false)->data; + $isDemoSite = AppConfiguration::get('is_demo_site', false)->data; if (true === $isDemoSite) { return array_diff($channels, ['mail']); } diff --git a/app/Notifications/Notifiables/OwnerNotifiable.php b/app/Notifications/Notifiables/OwnerNotifiable.php index 04161c5f5e..d34e1af2cb 100644 --- a/app/Notifications/Notifiables/OwnerNotifiable.php +++ b/app/Notifications/Notifiables/OwnerNotifiable.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Notifications\Notifiables; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Notifications\Notification; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; @@ -59,15 +59,15 @@ class OwnerNotifiable public function routeNotificationForPushover(): PushoverReceiver { Log::debug('Return settings for routeNotificationForPushover'); - $pushoverAppToken = (string) FireflyConfig::getEncrypted('pushover_app_token', '')->data; - $pushoverUserToken = (string) FireflyConfig::getEncrypted('pushover_user_token', '')->data; + $pushoverAppToken = (string) AppConfiguration::getEncrypted('pushover_app_token', '')->data; + $pushoverUserToken = (string) AppConfiguration::getEncrypted('pushover_user_token', '')->data; return PushoverReceiver::withUserKey($pushoverUserToken)->withApplicationToken($pushoverAppToken); } public function routeNotificationForSlack(): string { - $res = FireflyConfig::getEncrypted('slack_webhook_url', '')->data; + $res = AppConfiguration::getEncrypted('slack_webhook_url', '')->data; if (is_array($res)) { $res = ''; } diff --git a/app/Notifications/ReturnsAvailableChannels.php b/app/Notifications/ReturnsAvailableChannels.php index e6a9306df3..69b811dbd2 100644 --- a/app/Notifications/ReturnsAvailableChannels.php +++ b/app/Notifications/ReturnsAvailableChannels.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Notifications; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Notifications\UrlValidator; use FireflyIII\User; @@ -53,7 +53,7 @@ class ReturnsAvailableChannels { $channels = ['mail']; if (true === config('notifications.channels.slack.enabled', false)) { - $slackUrl = FireflyConfig::getEncrypted('slack_webhook_url', '')->data; + $slackUrl = AppConfiguration::getEncrypted('slack_webhook_url', '')->data; if (UrlValidator::isValidWebhookURL($slackUrl)) { $channels[] = 'slack'; } @@ -72,8 +72,8 @@ class ReturnsAvailableChannels // pushover if (true === config('notifications.channels.pushover.enabled', false)) { - $pushoverAppToken = (string) FireflyConfig::getEncrypted('pushover_app_token', '')->data; - $pushoverUserToken = (string) FireflyConfig::getEncrypted('pushover_user_token', '')->data; + $pushoverAppToken = (string) AppConfiguration::getEncrypted('pushover_app_token', '')->data; + $pushoverUserToken = (string) AppConfiguration::getEncrypted('pushover_user_token', '')->data; if ('' === $pushoverAppToken || '' === $pushoverUserToken) { Log::warning('[b] No Pushover token, channel is disabled.'); } diff --git a/app/Notifications/ReturnsSettings.php b/app/Notifications/ReturnsSettings.php index d4b5707beb..d473b666ea 100644 --- a/app/Notifications/ReturnsSettings.php +++ b/app/Notifications/ReturnsSettings.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Notifications; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Support\Facades\Log; @@ -54,11 +54,11 @@ class ReturnsSettings Log::debug(sprintf('Auth is %s, user = "%s"', var_export($settings['ntfy_auth'], true), $settings['ntfy_user'])); } if ('owner' === $type) { - $settings['ntfy_server'] = FireflyConfig::getEncrypted('ntfy_server', 'https://ntfy.sh')->data; - $settings['ntfy_topic'] = FireflyConfig::getEncrypted('ntfy_topic', '')->data; - $settings['ntfy_auth'] = FireflyConfig::get('ntfy_auth', false)->data; - $settings['ntfy_user'] = FireflyConfig::getEncrypted('ntfy_user', '')->data; - $settings['ntfy_pass'] = FireflyConfig::getEncrypted('ntfy_pass', '')->data; + $settings['ntfy_server'] = AppConfiguration::getEncrypted('ntfy_server', 'https://ntfy.sh')->data; + $settings['ntfy_topic'] = AppConfiguration::getEncrypted('ntfy_topic', '')->data; + $settings['ntfy_auth'] = AppConfiguration::get('ntfy_auth', false)->data; + $settings['ntfy_user'] = AppConfiguration::getEncrypted('ntfy_user', '')->data; + $settings['ntfy_pass'] = AppConfiguration::getEncrypted('ntfy_pass', '')->data; Log::debug(sprintf('Auth is %s, user = "%s"', var_export($settings['ntfy_auth'], true), $settings['ntfy_user'])); } diff --git a/app/Notifications/Security/UserFailedLoginAttempt.php b/app/Notifications/Security/UserFailedLoginAttempt.php index 5b31840009..87945b8446 100644 --- a/app/Notifications/Security/UserFailedLoginAttempt.php +++ b/app/Notifications/Security/UserFailedLoginAttempt.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Notifications\Security; use FireflyIII\Notifications\ReturnsAvailableChannels; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Steam; use FireflyIII\User; use Illuminate\Bus\Queueable; @@ -114,7 +114,7 @@ class UserFailedLoginAttempt extends Notification public function via(User $notifiable): array { $channels = ReturnsAvailableChannels::returnChannels('user', $notifiable); - $isDemoSite = FireflyConfig::get('is_demo_site', false)->data; + $isDemoSite = AppConfiguration::get('is_demo_site', false)->data; if (true === $isDemoSite) { return array_diff($channels, ['mail']); } diff --git a/app/Notifications/Test/OwnerTestNotificationEmail.php b/app/Notifications/Test/OwnerTestNotificationEmail.php index 12e61426a5..610035e6a5 100644 --- a/app/Notifications/Test/OwnerTestNotificationEmail.php +++ b/app/Notifications/Test/OwnerTestNotificationEmail.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Notifications\Test; use FireflyIII\Notifications\Notifiables\OwnerNotifiable; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Bus\Queueable; use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Notification; @@ -64,7 +64,7 @@ class OwnerTestNotificationEmail extends Notification */ public function via(OwnerNotifiable $notifiable): array { - $isDemoSite = FireflyConfig::get('is_demo_site', false)->data; + $isDemoSite = AppConfiguration::get('is_demo_site', false)->data; if (true === $isDemoSite) { return []; } diff --git a/app/Notifications/Test/UserTestNotificationEmail.php b/app/Notifications/Test/UserTestNotificationEmail.php index cf33638bb1..3831363d28 100644 --- a/app/Notifications/Test/UserTestNotificationEmail.php +++ b/app/Notifications/Test/UserTestNotificationEmail.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Notifications\Test; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\User; use Illuminate\Bus\Queueable; use Illuminate\Notifications\Messages\MailMessage; @@ -61,7 +61,7 @@ class UserTestNotificationEmail extends Notification */ public function via(User $notifiable): array { - $isDemoSite = FireflyConfig::get('is_demo_site', false)->data; + $isDemoSite = AppConfiguration::get('is_demo_site', false)->data; if (true === $isDemoSite) { return []; } diff --git a/app/Notifications/User/NewAccessToken.php b/app/Notifications/User/NewAccessToken.php index f9d49ad636..a07b32bb9d 100644 --- a/app/Notifications/User/NewAccessToken.php +++ b/app/Notifications/User/NewAccessToken.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Notifications\User; use FireflyIII\Notifications\ReturnsAvailableChannels; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Steam; use FireflyIII\User; use Illuminate\Bus\Queueable; @@ -92,7 +92,7 @@ class NewAccessToken extends Notification public function via(User $notifiable): array { $channels = ReturnsAvailableChannels::returnChannels('user', $notifiable); - $isDemoSite = FireflyConfig::get('is_demo_site', false)->data; + $isDemoSite = AppConfiguration::get('is_demo_site', false)->data; if (true === $isDemoSite) { return array_diff($channels, ['mail']); } diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index c87979066f..c50503ea52 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -62,7 +62,7 @@ use FireflyIII\Services\Webhook\WebhookSenderInterface; use FireflyIII\Support\Amount; use FireflyIII\Support\Balance; use FireflyIII\Support\ExpandedForm; -use FireflyIII\Support\FireflyConfig; +use FireflyIII\Support\AppConfiguration; use FireflyIII\Support\Form\AccountForm; use FireflyIII\Support\Form\CurrencyForm; use FireflyIII\Support\Form\PiggyBankForm; @@ -106,7 +106,7 @@ class FireflyServiceProvider extends ServiceProvider { $this->app->bind('preferences', static fn (): Preferences => new Preferences()); - $this->app->bind('fireflyconfig', static fn (): FireflyConfig => new FireflyConfig()); + $this->app->bind('appconfiguration', static fn (): AppConfiguration => new AppConfiguration()); $this->app->bind('navigation', static fn (): Navigation => new Navigation()); $this->app->bind('amount', static fn (): Amount => new Amount()); diff --git a/app/Rules/Webhook/IsValidWebhookUrl.php b/app/Rules/Webhook/IsValidWebhookUrl.php index e6af5dda27..4508c51e7a 100644 --- a/app/Rules/Webhook/IsValidWebhookUrl.php +++ b/app/Rules/Webhook/IsValidWebhookUrl.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace FireflyIII\Rules\Webhook; use Closure; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Support\Facades\Log; use Symfony\Component\HttpFoundation\IpUtils; @@ -43,7 +43,7 @@ class IsValidWebhookUrl implements ValidationRule Log::error(sprintf('The resolved IP address "%s" is invalid.', $resolved)); $fail('validation.no_reserved_ip')->translate(); } - $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; + $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data; $parts = explode(',', $validProtocols); $valid = false; foreach ($parts as $part) { diff --git a/app/Services/Internal/Recalculate/PrimaryAmountRecalculationService.php b/app/Services/Internal/Recalculate/PrimaryAmountRecalculationService.php index 84a041896e..9958ce4780 100644 --- a/app/Services/Internal/Recalculate/PrimaryAmountRecalculationService.php +++ b/app/Services/Internal/Recalculate/PrimaryAmountRecalculationService.php @@ -42,7 +42,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface; use FireflyIII\Support\Facades\Amount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Http\Api\ExchangeRateConverter; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Query\Builder; @@ -62,7 +62,7 @@ class PrimaryAmountRecalculationService public function recalculate(): void { - if (false === FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data) { + if (false === AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data) { return; } diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index 87a2d74af2..ffecbcf10c 100644 --- a/app/Services/Internal/Update/JournalUpdateService.php +++ b/app/Services/Internal/Update/JournalUpdateService.php @@ -45,7 +45,7 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; use FireflyIII\Services\Internal\Support\JournalServiceTrait; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Steam; use FireflyIII\Support\NullArrayObject; @@ -634,7 +634,7 @@ class JournalUpdateService $value->setTimezone(config('app.timezone')); // 2024-11-22, overrule timezone with UTC and store it as UTC. - if (true === FireflyConfig::get('utc', false)->data) { + if (true === AppConfiguration::get('utc', false)->data) { $value->setTimezone('UTC'); } diff --git a/app/Support/Amount.php b/app/Support/Amount.php index e9127b913b..82e4c63ff8 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -28,7 +28,7 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\UserGroup; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Steam; use FireflyIII\Support\Singleton\PreferencesSingleton; @@ -120,7 +120,7 @@ class Amount if (null === $pref) { $res = true === Preferences::get('convert_to_primary', false)->data - && true === FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data; + && true === AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data; $instance->setPreference('convert_to_primary_no_user', $res); return $res; @@ -133,7 +133,7 @@ class Amount if (null === $pref) { $res = true === Preferences::getForUser($user, 'convert_to_primary', false)->data - && true === FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data; + && true === AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data; $instance->setPreference($key, $res); return $res; diff --git a/app/Support/FireflyConfig.php b/app/Support/AppConfiguration.php similarity index 97% rename from app/Support/FireflyConfig.php rename to app/Support/AppConfiguration.php index bb88c7e468..efcacddb34 100644 --- a/app/Support/FireflyConfig.php +++ b/app/Support/AppConfiguration.php @@ -1,7 +1,7 @@ set($name, $default); } - public function has(string $name): bool + public function hasSetting(string $name): bool { return 1 === Configuration::query()->where('name', $name)->count(); } diff --git a/app/Support/Cronjobs/AutoBudgetCronjob.php b/app/Support/Cronjobs/AutoBudgetCronjob.php index 000291eb38..67e81a7502 100644 --- a/app/Support/Cronjobs/AutoBudgetCronjob.php +++ b/app/Support/Cronjobs/AutoBudgetCronjob.php @@ -27,7 +27,7 @@ namespace FireflyIII\Support\Cronjobs; use Carbon\Carbon; use FireflyIII\Jobs\CreateAutoBudgetLimits; use FireflyIII\Models\Configuration; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; @@ -39,7 +39,7 @@ class AutoBudgetCronjob extends AbstractCronjob public function fire(): void { /** @var Configuration $config */ - $config = FireflyConfig::get('last_ab_job', 0); + $config = AppConfiguration::get('last_ab_job', 0); $lastTime = (int) $config->data; $diff = now(config('app.timezone'))->getTimestamp() - $lastTime; $diffForHumans = now(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); @@ -81,7 +81,7 @@ class AutoBudgetCronjob extends AbstractCronjob $this->jobSucceeded = true; $this->message = 'Auto-budget cron job fired successfully.'; - FireflyConfig::set('last_ab_job', (int) $this->date->format('U')); + AppConfiguration::set('last_ab_job', (int) $this->date->format('U')); Log::info('Done with auto budget cron job task.'); } } diff --git a/app/Support/Cronjobs/BillWarningCronjob.php b/app/Support/Cronjobs/BillWarningCronjob.php index 6afaaebeaa..b2e1c22a18 100644 --- a/app/Support/Cronjobs/BillWarningCronjob.php +++ b/app/Support/Cronjobs/BillWarningCronjob.php @@ -28,7 +28,7 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Jobs\WarnAboutBills; use FireflyIII\Models\Configuration; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; @@ -45,7 +45,7 @@ class BillWarningCronjob extends AbstractCronjob Log::debug(sprintf('Now in %s', __METHOD__)); /** @var Configuration $config */ - $config = FireflyConfig::get('last_bw_job', 0); + $config = AppConfiguration::get('last_bw_job', 0); $lastTime = (int) $config->data; $diff = now(config('app.timezone'))->getTimestamp() - $lastTime; $diffForHumans = now(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); @@ -94,7 +94,7 @@ class BillWarningCronjob extends AbstractCronjob $this->jobSucceeded = true; $this->message = 'Bill notification cron job fired successfully.'; - FireflyConfig::set('last_bw_job', (int) $this->date->format('U')); + AppConfiguration::set('last_bw_job', (int) $this->date->format('U')); Log::info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int) $this->date->format('U'))); Log::info('Done with bill notification cron job task.'); } diff --git a/app/Support/Cronjobs/ExchangeRatesCronjob.php b/app/Support/Cronjobs/ExchangeRatesCronjob.php index 52bcde3ebb..887e45d65c 100644 --- a/app/Support/Cronjobs/ExchangeRatesCronjob.php +++ b/app/Support/Cronjobs/ExchangeRatesCronjob.php @@ -27,7 +27,7 @@ namespace FireflyIII\Support\Cronjobs; use Carbon\Carbon; use FireflyIII\Jobs\DownloadExchangeRates; use FireflyIII\Models\Configuration; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; @@ -39,7 +39,7 @@ class ExchangeRatesCronjob extends AbstractCronjob public function fire(): void { /** @var Configuration $config */ - $config = FireflyConfig::get('last_cer_job', 0); + $config = AppConfiguration::get('last_cer_job', 0); $lastTime = (int) $config->data; $diff = now(config('app.timezone'))->getTimestamp() - $lastTime; $diffForHumans = now(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); @@ -82,7 +82,7 @@ class ExchangeRatesCronjob extends AbstractCronjob $this->jobSucceeded = true; $this->message = 'Exchange rates cron job fired successfully.'; - FireflyConfig::set('last_cer_job', (int) $this->date->format('U')); + AppConfiguration::set('last_cer_job', (int) $this->date->format('U')); Log::info('Done with exchange rates job task.'); } } diff --git a/app/Support/Cronjobs/RecurringCronjob.php b/app/Support/Cronjobs/RecurringCronjob.php index 4b235f7820..a3d8c1b6c0 100644 --- a/app/Support/Cronjobs/RecurringCronjob.php +++ b/app/Support/Cronjobs/RecurringCronjob.php @@ -28,7 +28,7 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Jobs\CreateRecurringTransactions; use FireflyIII\Models\Configuration; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; @@ -45,7 +45,7 @@ class RecurringCronjob extends AbstractCronjob Log::debug(sprintf('Now in %s', __METHOD__)); /** @var Configuration $config */ - $config = FireflyConfig::get('last_rt_job', 0); + $config = AppConfiguration::get('last_rt_job', 0); $lastTime = (int) $config->data; $diff = now(config('app.timezone'))->getTimestamp() - $lastTime; $diffForHumans = now(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); @@ -91,7 +91,7 @@ class RecurringCronjob extends AbstractCronjob $this->jobSucceeded = true; $this->message = 'Recurring transactions cron job fired successfully.'; - FireflyConfig::set('last_rt_job', (int) $this->date->format('U')); + AppConfiguration::set('last_rt_job', (int) $this->date->format('U')); Log::info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int) $this->date->format('U'))); Log::info('Done with recurring cron job task.'); } diff --git a/app/Support/Cronjobs/UpdateCheckCronjob.php b/app/Support/Cronjobs/UpdateCheckCronjob.php index 38f9d36618..b670e86021 100644 --- a/app/Support/Cronjobs/UpdateCheckCronjob.php +++ b/app/Support/Cronjobs/UpdateCheckCronjob.php @@ -27,7 +27,7 @@ namespace FireflyIII\Support\Cronjobs; use Carbon\Carbon; use FireflyIII\Helpers\Update\UpdateTrait; use FireflyIII\Models\Configuration; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Support\Facades\Log; use Override; @@ -41,7 +41,7 @@ class UpdateCheckCronjob extends AbstractCronjob Log::debug('Now in checkForUpdates()'); // should not check for updates: - $permission = FireflyConfig::get('permission_update_check', -1); + $permission = AppConfiguration::get('permission_update_check', -1); $value = (int) $permission->data; if (1 !== $value) { Log::debug('Update check is not enabled.'); @@ -56,7 +56,7 @@ class UpdateCheckCronjob extends AbstractCronjob // TODO this is duplicate. /** @var Configuration $lastCheckTime */ - $lastCheckTime = FireflyConfig::get('last_update_check', Carbon::now()->getTimestamp()); + $lastCheckTime = AppConfiguration::get('last_update_check', Carbon::now()->getTimestamp()); $now = Carbon::now()->getTimestamp(); $diff = $now - $lastCheckTime->data; Log::debug(sprintf('Last check time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff)); diff --git a/app/Support/Cronjobs/WebhookCronjob.php b/app/Support/Cronjobs/WebhookCronjob.php index 9cd31e495a..d9b0b33888 100644 --- a/app/Support/Cronjobs/WebhookCronjob.php +++ b/app/Support/Cronjobs/WebhookCronjob.php @@ -28,7 +28,7 @@ use Carbon\Carbon; use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Configuration; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; @@ -45,7 +45,7 @@ class WebhookCronjob extends AbstractCronjob Log::debug(sprintf('Now in %s', __METHOD__)); /** @var Configuration $config */ - $config = FireflyConfig::get('last_webhook_job', 0); + $config = AppConfiguration::get('last_webhook_job', 0); $lastTime = (int) $config->data; $diff = now(config('app.timezone'))->getTimestamp() - $lastTime; $diffForHumans = now(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); @@ -91,7 +91,7 @@ class WebhookCronjob extends AbstractCronjob $this->jobSucceeded = true; $this->message = 'Send webhook messages cron job fired successfully.'; - FireflyConfig::set('last_webhook_job', (int) $this->date->format('U')); + AppConfiguration::set('last_webhook_job', (int) $this->date->format('U')); Log::info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int) $this->date->format('U'))); Log::info('Done with webhook cron job task.'); } diff --git a/app/Support/Facades/FireflyConfig.php b/app/Support/Facades/AppConfiguration.php similarity index 91% rename from app/Support/Facades/FireflyConfig.php rename to app/Support/Facades/AppConfiguration.php index 3db565a466..6db4356bc8 100644 --- a/app/Support/Facades/FireflyConfig.php +++ b/app/Support/Facades/AppConfiguration.php @@ -1,7 +1,7 @@ data || $this->ignoreSettings; + return false !== AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data || $this->ignoreSettings; } /** diff --git a/app/Support/Http/Controllers/GetConfigurationData.php b/app/Support/Http/Controllers/GetConfigurationData.php index d8c7111a72..eda2c9c2b0 100644 --- a/app/Support/Http/Controllers/GetConfigurationData.php +++ b/app/Support/Http/Controllers/GetConfigurationData.php @@ -26,7 +26,7 @@ namespace FireflyIII\Support\Http\Controllers; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Navigation; use Illuminate\Support\Facades\Log; @@ -212,7 +212,7 @@ trait GetConfigurationData protected function verifyRecurringCronJob(): void { - $config = FireflyConfig::get('last_rt_job', 0); + $config = AppConfiguration::get('last_rt_job', 0); $lastTime = (int) $config?->data; $now = Carbon::now()->getTimestamp(); Log::debug(sprintf('verifyRecurringCronJob: last time is %d ("%s"), now is %d', $lastTime, $config?->data, $now)); diff --git a/app/Support/Models/AccountBalanceCalculator.php b/app/Support/Models/AccountBalanceCalculator.php index 6b5a2c1606..423480ecc0 100644 --- a/app/Support/Models/AccountBalanceCalculator.php +++ b/app/Support/Models/AccountBalanceCalculator.php @@ -27,7 +27,7 @@ namespace FireflyIII\Support\Models; use Carbon\Carbon; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Steam; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; @@ -192,7 +192,7 @@ class AccountBalanceCalculator public static function recalculateForJournal(TransactionJournal $transactionJournal): void { - if (false === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { + if (false === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) { return; } Log::debug(__METHOD__); diff --git a/app/Support/System/GeneratesInstallationId.php b/app/Support/System/GeneratesInstallationId.php index 79b972ef22..8d56dd2563 100644 --- a/app/Support/System/GeneratesInstallationId.php +++ b/app/Support/System/GeneratesInstallationId.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Support\System; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Support\Facades\Log; use Ramsey\Uuid\Uuid; @@ -37,7 +37,7 @@ trait GeneratesInstallationId protected function generateInstallationId(): void { try { - $config = FireflyConfig::get('installation_id'); + $config = AppConfiguration::get('installation_id'); } catch (FireflyException) { Log::info('Could not create or generate installation ID. Do not continue.'); @@ -53,7 +53,7 @@ trait GeneratesInstallationId $uuid4 = Uuid::uuid4(); $uniqueId = (string) $uuid4; Log::info(sprintf('Created Firefly III installation ID %s', $uniqueId)); - FireflyConfig::set('installation_id', $uniqueId); + AppConfiguration::set('installation_id', $uniqueId); } } } diff --git a/app/Support/System/IsOldVersion.php b/app/Support/System/IsOldVersion.php index 2ebbc68e29..62fa481059 100644 --- a/app/Support/System/IsOldVersion.php +++ b/app/Support/System/IsOldVersion.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Support\System; use Carbon\Carbon; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Support\Facades\Log; trait IsOldVersion @@ -69,7 +69,7 @@ trait IsOldVersion { // version compare thing. $configBuildTime = (int) config('firefly.build_time'); - $dbBuildTime = (int) FireflyConfig::getFresh('ff3_build_time', 123)->data; + $dbBuildTime = (int) AppConfiguration::getFresh('ff3_build_time', 123)->data; $configTime = Carbon::createFromTimestamp($configBuildTime, config('app.timezone')); $dbTime = Carbon::createFromTimestamp($dbBuildTime, config('app.timezone')); if ($dbBuildTime < $configBuildTime) { diff --git a/app/Support/System/OAuthKeys.php b/app/Support/System/OAuthKeys.php index 22ca659ec8..c3cae47966 100644 --- a/app/Support/System/OAuthKeys.php +++ b/app/Support/System/OAuthKeys.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Support\System; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Crypt; @@ -78,15 +78,15 @@ class OAuthKeys $privateKey = ''; $publicKey = ''; // better check if keys are in the database: - $hasPrivate = FireflyConfig::has(self::PRIVATE_KEY); - $hasPublic = FireflyConfig::has(self::PUBLIC_KEY); + $hasPrivate = AppConfiguration::hasSetting(self::PRIVATE_KEY); + $hasPublic = AppConfiguration::hasSetting(self::PUBLIC_KEY); Log::debug(sprintf('keysInDatabase: hasPrivate:%s, hasPublic:%s', var_export($hasPrivate, true), var_export($hasPublic, true))); if ($hasPrivate && $hasPublic) { try { - $privateKey = trim((string) FireflyConfig::get(self::PRIVATE_KEY)?->data); - $publicKey = trim((string) FireflyConfig::get(self::PUBLIC_KEY)?->data); + $privateKey = trim((string) AppConfiguration::get(self::PRIVATE_KEY)?->data); + $publicKey = trim((string) AppConfiguration::get(self::PUBLIC_KEY)?->data); } catch (ContainerExceptionInterface|FireflyException|NotFoundExceptionInterface $e) { Log::error(sprintf('Could not validate keysInDatabase(): %s', $e->getMessage())); Log::error($e->getTraceAsString()); @@ -119,8 +119,8 @@ class OAuthKeys public static function restoreKeysFromDB(): bool { Log::debug('restoreKeysFromDB()'); - $privateKey = (string) FireflyConfig::get(self::PRIVATE_KEY)?->data; - $publicKey = (string) FireflyConfig::get(self::PUBLIC_KEY)?->data; + $privateKey = (string) AppConfiguration::get(self::PRIVATE_KEY)?->data; + $publicKey = (string) AppConfiguration::get(self::PUBLIC_KEY)?->data; if ('' === $privateKey) { Log::warning('Private key is not in the database.'); @@ -137,8 +137,8 @@ class OAuthKeys Log::error($e->getMessage()); // delete config vars from DB: - FireflyConfig::delete(self::PRIVATE_KEY); - FireflyConfig::delete(self::PUBLIC_KEY); + AppConfiguration::delete(self::PRIVATE_KEY); + AppConfiguration::delete(self::PUBLIC_KEY); Log::debug('Done with generateKeysFromDB(), return FALSE'); return false; @@ -167,8 +167,8 @@ class OAuthKeys $public = Passport::keyPath('oauth-public.key'); $privateContent = file_get_contents($private); $publicContent = file_get_contents($public); - FireflyConfig::set(self::PRIVATE_KEY, Crypt::encrypt($privateContent)); - FireflyConfig::set(self::PUBLIC_KEY, Crypt::encrypt($publicContent)); + AppConfiguration::set(self::PRIVATE_KEY, Crypt::encrypt($privateContent)); + AppConfiguration::set(self::PUBLIC_KEY, Crypt::encrypt($publicContent)); Log::debug(sprintf( 'Will store the content of file "%s" as "%s" in the database (hash: %s)', diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index 82fd9ecf04..efb8085e3c 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -28,7 +28,7 @@ use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Support\Facades\Amount; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Steam; use FireflyIII\Support\Search\OperatorQuerySearch; use Illuminate\Support\Collection; @@ -400,6 +400,6 @@ class General extends AbstractExtension private function fireflyIIIConfig(): TwigFunction { - return new TwigFunction('fireflyiiiconfig', static fn (string $string, mixed $default): mixed => FireflyConfig::get($string, $default)->data); + return new TwigFunction('fireflyiiiconfig', static fn (string $string, mixed $default): mixed => AppConfiguration::get($string, $default)->data); } } diff --git a/app/User.php b/app/User.php index 3fde323914..7110e3408d 100644 --- a/app/User.php +++ b/app/User.php @@ -54,7 +54,7 @@ use FireflyIII\Models\UserRole; use FireflyIII\Models\Webhook; use FireflyIII\Notifications\Admin\UserRegistration; use FireflyIII\Notifications\Admin\VersionCheckResult; -use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\AppConfiguration; use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Models\ReturnsIntegerIdTrait; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -354,7 +354,7 @@ class User extends Authenticatable implements OAuthenticatable public function routeNotificationForSlack(Notification $notification): ?string { // this check does not validate if the user is owner, Should be done by notification itself. - $res = FireflyConfig::getEncrypted('slack_webhook_url', '')->data; + $res = AppConfiguration::getEncrypted('slack_webhook_url', '')->data; if (is_array($res)) { $res = ''; }