From dd280fc13e92a463305ac33ee0885405e1113f57 Mon Sep 17 00:00:00 2001 From: Max Destors Date: Tue, 21 Oct 2025 10:30:20 +0200 Subject: [PATCH 1/6] Fix Imports --- app/Http/Controllers/ProfilesController.php | 21 +++++++++---------- .../ThemesManagementController.php | 2 +- .../Controllers/UsersManagementController.php | 4 ++-- config/app.php | 2 -- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/ProfilesController.php b/app/Http/Controllers/ProfilesController.php index f1baf535d..f7a5c60d7 100755 --- a/app/Http/Controllers/ProfilesController.php +++ b/app/Http/Controllers/ProfilesController.php @@ -10,15 +10,14 @@ use App\Models\User; use App\Notifications\SendGoodbyeEmail; use App\Traits\CaptureIpTrait; -use File; use Illuminate\Database\Eloquent\ModelNotFoundException; +use Illuminate\Filesystem\Filesystem; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Session; -use Image; +use Intervention\Image\Facades\Image; use jeremykenedy\Uuid\Uuid; -use Validator; -use View; +use Illuminate\Support\Facades\Validator; class ProfilesController extends Controller { @@ -143,7 +142,7 @@ public function update(UpdateUserProfile $request, $username) */ public function updateUserAccount(Request $request, $id) { - $currentUser = \Auth::user(); + $currentUser = Auth::user(); $user = User::findOrFail($id); $emailCheck = ($request->input('email') !== '') && ($request->input('email') !== $user->email); $ipAddress = new CaptureIpTrait(); @@ -203,7 +202,7 @@ public function updateUserAccount(Request $request, $id) */ public function updateUserPassword(UpdateUserPasswordRequest $request, $id) { - $currentUser = \Auth::user(); + $currentUser = Auth::user(); $user = User::findOrFail($id); $ipAddress = new CaptureIpTrait(); @@ -226,7 +225,7 @@ public function updateUserPassword(UpdateUserPasswordRequest $request, $id) public function upload(Request $request) { if ($request->hasFile('file')) { - $currentUser = \Auth::user(); + $currentUser = Auth::user(); $avatar = $request->file('file'); $filename = 'avatar.'.$avatar->getClientOriginalExtension(); $save_path = storage_path().'/users/id/'.$currentUser->id.'/uploads/images/avatar/'; @@ -234,7 +233,7 @@ public function upload(Request $request) $public_path = '/images/profile/'.$currentUser->id.'/avatar/'.$filename; // Make the user a folder and set permissions - File::makeDirectory($save_path, $mode = 0755, true, true); + Filesystem::makeDirectory($save_path, $mode = 0755, true, true); // Save the file to the server Image::make($avatar)->resize(300, 300)->save($save_path.$filename); @@ -270,7 +269,7 @@ public function userProfileAvatar($id, $image) */ public function deleteUserAccount(DeleteUserAccount $request, $id) { - $currentUser = \Auth::user(); + $currentUser = Auth::user(); $user = User::findOrFail($id); $ipAddress = new CaptureIpTrait(); @@ -310,7 +309,7 @@ public function deleteUserAccount(DeleteUserAccount $request, $id) /** * Send GoodBye Email Function via Notify. * - * @param array $user + * @param User $user * @param string $token * @return void */ diff --git a/app/Http/Controllers/ThemesManagementController.php b/app/Http/Controllers/ThemesManagementController.php index 7e549a4da..268633781 100755 --- a/app/Http/Controllers/ThemesManagementController.php +++ b/app/Http/Controllers/ThemesManagementController.php @@ -5,7 +5,7 @@ use App\Models\Theme; use App\Models\User; use Illuminate\Http\Request; -use Validator; +use Illuminate\Support\Facades\Validator; class ThemesManagementController extends Controller { diff --git a/app/Http/Controllers/UsersManagementController.php b/app/Http/Controllers/UsersManagementController.php index 0f3f244f0..224995a8f 100755 --- a/app/Http/Controllers/UsersManagementController.php +++ b/app/Http/Controllers/UsersManagementController.php @@ -6,11 +6,11 @@ use App\Models\Role; use App\Models\User; use App\Traits\CaptureIpTrait; -use Auth; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; -use Validator; +use Illuminate\Support\Facades\Validator; class UsersManagementController extends Controller { diff --git a/config/app.php b/config/app.php index 42bf97c39..c634b7a79 100755 --- a/config/app.php +++ b/config/app.php @@ -4,7 +4,6 @@ use App\Providers\MacroServiceProvider; use Creativeorange\Gravatar\Facades\Gravatar; use Illuminate\Support\Facades\Facade; -use Illuminate\Support\Facades\Input; use Illuminate\Support\Facades\Redis; use Intervention\Image\Facades\Image; use jeremykenedy\Uuid\Uuid; @@ -220,7 +219,6 @@ 'aliases' => Facade::defaultAliases()->merge([ 'Redis' => Redis::class, 'Socialite' => Socialite::class, - 'Input' => Input::class, 'Gravatar' => Gravatar::class, 'Image' => Image::class, 'Uuid' => Uuid::class, From 5aeb7f0c7b8a5b0e9483f0796e8572e87255ea0d Mon Sep 17 00:00:00 2001 From: Max Destors Date: Tue, 21 Oct 2025 10:30:58 +0200 Subject: [PATCH 2/6] composer.json minimum-stability stable --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4b9d1a32b..1780773b5 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "jeremykenedy/laravel-email-database-log": "^12.0", "jeremykenedy/laravel-exception-notifier": "^4.1", "jeremykenedy/laravel-https": "^2.0", - "jeremykenedy/laravel-logger": "^10.0", + "jeremykenedy/laravel-logger": "^11.0", "jeremykenedy/laravel-phpinfo": "^1.3", "jeremykenedy/laravel-roles": "^11.5", "jeremykenedy/laravel2step": "^4.0", @@ -101,6 +101,6 @@ "pestphp/pest-plugin": true } }, - "minimum-stability": "dev", + "minimum-stability": "stable", "prefer-stable": true } From 59ed6f79327c322d11fc1116c3569b73f0deb270 Mon Sep 17 00:00:00 2001 From: Max Destors Date: Tue, 21 Oct 2025 10:31:21 +0200 Subject: [PATCH 3/6] fix profile form --- resources/views/profiles/edit.blade.php | 36 +++++++++---------- .../views/scripts/form-modal-script.blade.php | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/resources/views/profiles/edit.blade.php b/resources/views/profiles/edit.blade.php index 7efd85855..abf76ec49 100755 --- a/resources/views/profiles/edit.blade.php +++ b/resources/views/profiles/edit.blade.php @@ -55,7 +55,7 @@ - {{ html()->model($user->profile) }} + @php( html()->model($user->profile) ) {{ html()->form('POST', route('profile.update', $user->name)) ->id('user_profile_form') ->class('form-horizontal') @@ -161,11 +161,11 @@ {{ html()->form()->close() }} - {{ html()->endModel() }} + @php( html()->endModel() )
- {{ html()->model($user) }} + @php( html()->model($user) ) {{ html()->form('POST', action([App\Http\Controllers\ProfilesController::class, 'updateUserAccount'], $user->id)) ->id('user_basics_form') ->open() }} @@ -265,7 +265,7 @@
{{ html()->form()->close() }} - {{ html()->endModel() }} + @php( html()->endModel() ) {{ html()->form()->close() }} - {{ html()->endModel() }} + @php( html()->endModel() ) @@ -357,7 +357,7 @@
- {{ html()->model($user) }} + @php( html()->model($user) ) {{ html()->form('POST', action([App\Http\Controllers\ProfilesController::class, 'deleteUserAccount'], $user->id)) ->open() }} @@ -374,19 +374,19 @@
{{ html()->button('' . trans('profile.deleteAccountBtn')) - ->class('btn btn-block btn-danger') - ->id('delete_account_trigger') - ->disabled() - ->type('button') - ->attribute('data-toggle', 'modal') - ->attribute('data-submit', trans('profile.deleteAccountBtnConfirm')) - ->attribute('data-target', '#confirmForm') - ->attribute('data-modalClass', 'modal-danger') - ->attribute('data-title', trans('profile.deleteAccountConfirmTitle')) - ->attribute('data-message', trans('profile.deleteAccountConfirmMsg')) }} + ->class('btn btn-block btn-danger') + ->id('delete_account_trigger') + ->disabled() + ->type('button') + ->attribute('data-toggle', 'modal') + ->attribute('data-submit', trans('profile.deleteAccountBtnConfirm')) + ->attribute('data-target', '#confirmForm') + ->attribute('data-modalClass', 'modal-danger') + ->attribute('data-title', trans('profile.deleteAccountConfirmTitle')) + ->attribute('data-message', trans('profile.deleteAccountConfirmMsg')) }} {{ html()->form()->close() }} - {{ html()->endModel() }} + @php( html()->endModel() )
diff --git a/resources/views/scripts/form-modal-script.blade.php b/resources/views/scripts/form-modal-script.blade.php index cdfa6353e..e58a5b044 100755 --- a/resources/views/scripts/form-modal-script.blade.php +++ b/resources/views/scripts/form-modal-script.blade.php @@ -1,5 +1,5 @@ \ No newline at end of file From f6bbe1df230c4d2d70b71bd86c980c97a12cb9f6 Mon Sep 17 00:00:00 2001 From: Max Destors Date: Tue, 21 Oct 2025 10:31:56 +0200 Subject: [PATCH 4/6] Fix missing file in logger activity --- .../vendor/pagination/bootstrap-4.blade.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 resources/views/vendor/pagination/bootstrap-4.blade.php diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php new file mode 100644 index 000000000..3f984557b --- /dev/null +++ b/resources/views/vendor/pagination/bootstrap-4.blade.php @@ -0,0 +1,36 @@ +@if ($paginator->hasPages()) +
    + {{-- Previous Page Link --}} + @if ($paginator->onFirstPage()) +
  • «
    • + @else +
    • + @endif + + {{-- Pagination Elements --}} + @foreach ($elements as $element) + {{-- "Three Dots" Separator --}} + @if (is_string($element)) +
  • {{ $element }}
    • + @endif + + {{-- Array Of Links --}} + @if (is_array($element)) + @foreach ($element as $page => $url) + @if ($page == $paginator->currentPage()) +
  • {{ $page }}
    • + @else +
  • {{ $page }}
    • + @endif + @endforeach + @endif + @endforeach + + {{-- Next Page Link --}} + @if ($paginator->hasMorePages()) +
    • + @else +
  • »
    • + @endif +
+@endif From 51fa9a6ee3953b10614a5fb43bd744c4e8546d4b Mon Sep 17 00:00:00 2001 From: Max Destors Date: Tue, 21 Oct 2025 10:54:37 +0200 Subject: [PATCH 5/6] style ci --- app/Http/Controllers/ProfilesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ProfilesController.php b/app/Http/Controllers/ProfilesController.php index f7a5c60d7..6c6ef7138 100755 --- a/app/Http/Controllers/ProfilesController.php +++ b/app/Http/Controllers/ProfilesController.php @@ -15,9 +15,9 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; +use Illuminate\Support\Facades\Validator; use Intervention\Image\Facades\Image; use jeremykenedy\Uuid\Uuid; -use Illuminate\Support\Facades\Validator; class ProfilesController extends Controller { From 9c787d9ac85e3b02706f951e766465663371afac Mon Sep 17 00:00:00 2001 From: Max Destors Date: Tue, 21 Oct 2025 11:15:44 +0200 Subject: [PATCH 6/6] fix spatie links --- README.md | 2 +- app/Http/Controllers/ProfilesController.php | 4 ++-- resources/views/profiles/show.blade.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a2aab66cb..efb62c26c 100755 --- a/README.md +++ b/README.md @@ -389,7 +389,7 @@ php artisan vendor:publish --tag=laravel-email-database-log-migration - Use Laravel HTML Facade with [Laravel Collective](https://laravelcollective.com/): ``` - {!! html()->link(route('social.redirect', ['provider' => 'twitch']), 'Twitch', array('class' => 'btn btn-lg btn-primary btn-block twitch')) !!} + {!! html()->a(route('social.redirect', ['provider' => 'twitch']), 'Twitch', array('class' => 'btn btn-lg btn-primary btn-block twitch')) !!} ``` ### Other API keys diff --git a/app/Http/Controllers/ProfilesController.php b/app/Http/Controllers/ProfilesController.php index 6c6ef7138..70b5c9339 100755 --- a/app/Http/Controllers/ProfilesController.php +++ b/app/Http/Controllers/ProfilesController.php @@ -11,9 +11,9 @@ use App\Notifications\SendGoodbyeEmail; use App\Traits\CaptureIpTrait; use Illuminate\Database\Eloquent\ModelNotFoundException; -use Illuminate\Filesystem\Filesystem; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Validator; use Intervention\Image\Facades\Image; @@ -233,7 +233,7 @@ public function upload(Request $request) $public_path = '/images/profile/'.$currentUser->id.'/avatar/'.$filename; // Make the user a folder and set permissions - Filesystem::makeDirectory($save_path, $mode = 0755, true, true); + File::makeDirectory($save_path, $mode = 0755, true, true); // Save the file to the server Image::make($avatar)->resize(300, 300)->save($save_path.$filename); diff --git a/resources/views/profiles/show.blade.php b/resources/views/profiles/show.blade.php index f6dcbf048..51a2121cf 100755 --- a/resources/views/profiles/show.blade.php +++ b/resources/views/profiles/show.blade.php @@ -100,7 +100,7 @@ {{ trans('profile.showProfileTwitterUsername') }}
- {!! html()->link('https://twitter.com/'.$user->profile->twitter_username, $user->profile->twitter_username, array('class' => 'twitter-link', 'target' => '_blank')) !!} + {!! html()->a('https://twitter.com/'.$user->profile->twitter_username, $user->profile->twitter_username, array('class' => 'twitter-link', 'target' => '_blank')) !!}
@endif @@ -109,7 +109,7 @@ {{ trans('profile.showProfileGitHubUsername') }}
- {!! html()->link('https://github.com/'.$user->profile->github_username, $user->profile->github_username, array('class' => 'github-link', 'target' => '_blank')) !!} + {!! html()->a('https://github.com/'.$user->profile->github_username, $user->profile->github_username, array('class' => 'github-link', 'target' => '_blank')) !!}
@endif @endif