kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 14:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Http/Controllers/Admin/UserController.php
View File

@@ -69,9 +69,7 @@ class UserController extends Controller
}
/**
* @param User $user
*
* @return Application|Factory|RedirectResponse|Redirector|View
* @return Application|Factory|Redirector|RedirectResponse|View
*/
public function delete(User $user)
{
@@ -86,31 +84,26 @@ class UserController extends Controller
return view('admin.users.delete', compact('user', 'subTitle'));
}
/**
* @param InvitedUser $invitedUser
*
* @return JsonResponse
*/
public function deleteInvite(InvitedUser $invitedUser): JsonResponse
{
app('log')->debug('Will now delete invitation');
if ($invitedUser->redeemed) {
app('log')->debug('Is already redeemed.');
session()->flash('error', trans('firefly.invite_is_already_redeemed', ['address' => $invitedUser->email]));
return response()->json(['success' => false]);
}
app('log')->debug('Delete!');
session()->flash('success', trans('firefly.invite_is_deleted', ['address' => $invitedUser->email]));
$this->repository->deleteInvite($invitedUser);
return response()->json(['success' => true]);
}
/**
* Destroy a user.
*
* @param User $user
*
* @return RedirectResponse|Redirector
* @return Redirector|RedirectResponse
*/
public function destroy(User $user)
{
@@ -128,8 +121,6 @@ class UserController extends Controller
/**
* Edit user form.
*
* @param User $user
*
* @return Factory|View
*/
public function edit(User $user)
@@ -162,6 +153,7 @@ class UserController extends Controller
* Show index of user manager.
*
* @return Factory|View
*
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
@@ -190,11 +182,6 @@ class UserController extends Controller
return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users', 'allowInvites', 'invitedUsers'));
}
/**
* @param InviteUserFormRequest $request
*
* @return RedirectResponse
*/
public function invite(InviteUserFormRequest $request): RedirectResponse
{
$address = (string)$request->get('invited_user');
@@ -210,8 +197,6 @@ class UserController extends Controller
/**
* Show single user.
*
* @param User $user
*
* @return Factory|View
*/
public function show(User $user)
@@ -238,17 +223,14 @@ class UserController extends Controller
/**
* Update single user.
*
* @param UserFormRequest $request
* @param User $user
*
* @return $this|RedirectResponse|Redirector
* @return $this|Redirector|RedirectResponse
*/
public function update(UserFormRequest $request, User $user)
{
app('log')->debug('Actually here');
$data = $request->getUserData();
//var_dump($data);
// var_dump($data);
// update password
if (array_key_exists('password', $data) && '' !== $data['password']) {