kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 21:23:36 +00:00
Code Issues Projects Releases Wiki Activity

Autoformat lol

Browse Source
This commit is contained in:
James Cole
2026-01-23 15:09:50 +01:00
parent ae1347c550
commit 8f15a32bd6
1071 changed files with 21111 additions and 21687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Api/V1/Requests/System/UserUpdateRequest.php
View File

@@ -24,11 +24,11 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\System;
use Illuminate\Contracts\Validation\Validator;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use FireflyIII\User;
use Illuminate\Contracts\Validation\Validator;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Log;
@@ -62,7 +62,7 @@ class UserUpdateRequest extends FormRequest
'email' => $this->convertString('email'),
'blocked' => $blocked,
'blocked_code' => $this->convertString('blocked_code'),
'role' => $this->convertString('role'),
'role' => $this->convertString('role')
];
}
@@ -78,7 +78,7 @@ class UserUpdateRequest extends FormRequest
'email' => sprintf('email|unique:users,email,%d', $user->id),
'blocked' => [new IsBoolean()],
'blocked_code' => 'in:email_changed',
'role' => 'in:owner,demo,',
'role' => 'in:owner,demo,'
];
}
@@ -89,15 +89,13 @@ class UserUpdateRequest extends FormRequest
{
/** @var null|User $current */
$current = $this->route()->parameter('user');
$validator->after(
static function (Validator $validator) use ($current): void {
$isAdmin = auth()->user()->hasRole('owner');
// not admin, and not own user?
if (auth()->check() && false === $isAdmin && $current?->id !== auth()->user()->id) {
$validator->errors()->add('email', (string) trans('validation.invalid_selection'));
}
$validator->after(static function (Validator $validator) use ($current): void {
$isAdmin = auth()->user()->hasRole('owner');
// not admin, and not own user?
if (auth()->check() && false === $isAdmin && $current?->id !== auth()->user()->id) {
$validator->errors()->add('email', (string) trans('validation.invalid_selection'));
}
);
});
if ($validator->fails()) {
Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
}