kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 16:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup and fixed alignments.

Browse Source
This commit is contained in:
James Cole
2024-01-01 14:43:56 +01:00
parent 1368aafe5f
commit f963ac63f1
443 changed files with 3668 additions and 3672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/ConfigurationController.php
View File

@@ -61,8 +61,8 @@ class ConfigurationController extends Controller
*/
public function index()
{
$subTitle = (string)trans('firefly.instance_configuration');
$subTitleIcon = 'fa-wrench';
$subTitle = (string)trans('firefly.instance_configuration');
$subTitleIcon = 'fa-wrench';
Log::channel('audit')->info('User visits admin config index.');

2
app/Http/Controllers/Admin/HomeController.php
View File

@@ -70,7 +70,7 @@ class HomeController extends Controller
foreach (config('firefly.admin_notifications') as $item) {
$notifications[$item] = app('fireflyconfig')->get(sprintf('notification_%s', $item), true)->data;
}
$slackUrl = app('fireflyconfig')->get('slack_webhook_url', '')->data;
$slackUrl = app('fireflyconfig')->get('slack_webhook_url', '')->data;
return view('admin.index', compact('title', 'mainTitleIcon', 'email', 'notifications', 'slackUrl'));
}

2
app/Http/Controllers/Admin/LinkController.php
View File

@@ -237,7 +237,7 @@ class LinkController extends Controller
return redirect(route('admin.links.index'));
}
$data = [
$data = [
'name' => $request->convertString('name'),
'inward' => $request->convertString('inward'),
'outward' => $request->convertString('outward'),

2
app/Http/Controllers/Admin/UpdateController.php
View File

@@ -75,7 +75,7 @@ class UpdateController extends Controller
1 => (string)trans('firefly.updates_enable_check'),
];
$channelOptions = [
$channelOptions = [
'stable' => (string)trans('firefly.update_channel_stable'),
'beta' => (string)trans('firefly.update_channel_beta'),
'alpha' => (string)trans('firefly.update_channel_alpha'),

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

@@ -133,11 +133,11 @@ class UserController extends Controller
}
session()->forget('users.edit.fromUpdate');
$subTitle = (string)trans('firefly.edit_user', ['email' => $user->email]);
$subTitleIcon = 'fa-user-o';
$currentUser = auth()->user();
$isAdmin = $this->repository->hasRole($user, 'owner');
$codes = [
$subTitle = (string)trans('firefly.edit_user', ['email' => $user->email]);
$subTitleIcon = 'fa-user-o';
$currentUser = auth()->user();
$isAdmin = $this->repository->hasRole($user, 'owner');
$codes = [
'' => (string)trans('firefly.no_block_code'),
'bounced' => (string)trans('firefly.block_code_bounced'),
'expired' => (string)trans('firefly.block_code_expired'),
@@ -164,7 +164,7 @@ class UserController extends Controller
$allowInvites = true;
}
$invitedUsers = $this->repository->getInvitedUsers();
$invitedUsers = $this->repository->getInvitedUsers();
// add meta stuff.
$users->each(
@@ -223,7 +223,7 @@ class UserController extends Controller
public function update(UserFormRequest $request, User $user)
{
app('log')->debug('Actually here');
$data = $request->getUserData();
$data = $request->getUserData();
// var_dump($data);