kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Auto commit for release 'develop' on 2024-02-22

Browse Source
This commit is contained in:
github-actions
2024-02-22 01:29:01 +01:00
parent 356b217692
commit 89ce2838d5
147 changed files with 636 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -128,11 +128,11 @@ class ForgotPasswordController extends Controller
private function validateHost(): void
{
$configuredHost = parse_url((string)config('app.url'), PHP_URL_HOST);
if(false === $configuredHost || null === $configuredHost) {
if (false === $configuredHost || null === $configuredHost) {
throw new FireflyException('Please set a valid and correct Firefly III URL in the APP_URL environment variable.');
}
$host = request()->host();
if($configuredHost !== $host) {
if ($configuredHost !== $host) {
throw new FireflyException('The Host-header does not match the host in the APP_URL environment variable. Please make sure these match. See also: https://bit.ly/FF3-host-header');
}
}

2
app/Http/Controllers/Export/IndexController.php
View File

@@ -66,7 +66,7 @@ class IndexController extends Controller
*/
public function export(): LaravelResponse|RedirectResponse
{
if(auth()->user()->hasRole('demo')) {
if (auth()->user()->hasRole('demo')) {
session()->flash('info', (string) trans('firefly.demo_user_export'));
return redirect(route('export.index'));

4
app/Http/Controllers/Report/TagController.php
View File

@@ -387,7 +387,7 @@ class TagController extends Controller
/** @var array $tag */
foreach ($currency['tags'] as $tag) {
$tagId = $tag['id'];
if(!array_key_exists($tagId, $report)) {
if (!array_key_exists($tagId, $report)) {
continue;
}
foreach ($tag['transaction_journals'] as $journal) {
@@ -425,7 +425,7 @@ class TagController extends Controller
/** @var array $tag */
foreach ($currency['tags'] as $tag) {
$tagId = $tag['id'];
if(!array_key_exists($tagId, $report)) {
if (!array_key_exists($tagId, $report)) {
continue;
}
foreach ($tag['transaction_journals'] as $journal) {

2
app/Http/Controllers/Rule/SelectController.php
View File

@@ -140,7 +140,7 @@ class SelectController extends Controller
$trigger = new RuleTrigger();
$trigger->trigger_type = $textTrigger['type'];
$trigger->trigger_value = $textTrigger['value'];
if(false === $needsContext) {
if (false === $needsContext) {
$trigger->trigger_value = 'true';
}
$trigger->stop_processing = $textTrigger['stop_processing'];

2
app/Http/Controllers/Webhooks/CreateController.php
View File

@@ -59,7 +59,7 @@ class CreateController extends Controller
*/
public function index()
{
if(false === config('firefly.allow_webhooks')) {
if (false === config('firefly.allow_webhooks')) {
Log::channel('audit')->warning('User visits webhook create page, but webhooks are DISABLED.');
throw new NotFoundHttpException('Webhooks are not enabled.');

2
app/Http/Controllers/Webhooks/DeleteController.php
View File

@@ -63,7 +63,7 @@ class DeleteController extends Controller
*/
public function index(Webhook $webhook)
{
if(false === config('firefly.allow_webhooks')) {
if (false === config('firefly.allow_webhooks')) {
Log::channel('audit')->warning('User visits webhook delete page, but webhooks are DISABLED.');
throw new NotFoundHttpException('Webhooks are not enabled.');

2
app/Http/Controllers/Webhooks/EditController.php
View File

@@ -62,7 +62,7 @@ class EditController extends Controller
*/
public function index(Webhook $webhook)
{
if(false === config('firefly.allow_webhooks')) {
if (false === config('firefly.allow_webhooks')) {
Log::channel('audit')->warning('User visits webhook edit page, but webhooks are DISABLED.');
throw new NotFoundHttpException('Webhooks are not enabled.');

2
app/Http/Controllers/Webhooks/IndexController.php
View File

@@ -55,7 +55,7 @@ class IndexController extends Controller
*/
public function index()
{
if(false === config('firefly.allow_webhooks')) {
if (false === config('firefly.allow_webhooks')) {
Log::channel('audit')->warning('User visits webhook index page, but webhooks are DISABLED.');
throw new NotFoundHttpException('Webhooks are not enabled.');

2
app/Http/Controllers/Webhooks/ShowController.php
View File

@@ -62,7 +62,7 @@ class ShowController extends Controller
*/
public function index(Webhook $webhook)
{
if(false === config('firefly.allow_webhooks')) {
if (false === config('firefly.allow_webhooks')) {
Log::channel('audit')->warning(sprintf('User visits webhook #%d page, but webhooks are DISABLED.', $webhook->id));
throw new NotFoundHttpException('Webhooks are not enabled.');