fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update SettingsController

Browse source
This commit is contained in:
Daniel Supernault 2019-08-23 13:03:43 -06:00
parent c176f8cc11
commit 0f0b3c2d05
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/SettingsController.php
View file

@ -95,7 +95,6 @@ class SettingsController extends Controller
$user = Auth::user(); $user = Auth::user();
abort_if(!config('pixelfed.account_deletion'), 403); abort_if(!config('pixelfed.account_deletion'), 403);
abort_if($user->is_admin, 403); abort_if($user->is_admin, 403);
abort_if($user->created_at->gt(now()->subHours(12)), 403);
return view('settings.remove.temporary'); return view('settings.remove.temporary');
} }
@ -105,7 +104,6 @@ class SettingsController extends Controller
$user = Auth::user(); $user = Auth::user();
abort_if(!config('pixelfed.account_deletion'), 403); abort_if(!config('pixelfed.account_deletion'), 403);
abort_if($user->is_admin, 403); abort_if($user->is_admin, 403);
abort_if($user->created_at->gt(now()->subHours(12)), 403);
$profile = $user->profile; $profile = $user->profile;
$user->status = 'disabled'; $user->status = 'disabled';
$profile->status = 'disabled'; $profile->status = 'disabled';
@ -120,7 +118,6 @@ class SettingsController extends Controller
{ {
$user = Auth::user(); $user = Auth::user();
abort_if($user->is_admin, 403); abort_if($user->is_admin, 403);
abort_if($user->created_at->gt(now()->subDays(7)), 403);
return view('settings.remove.permanent'); return view('settings.remove.permanent');
} }
@ -132,7 +129,6 @@ class SettingsController extends Controller
$user = Auth::user(); $user = Auth::user();
abort_if(!config('pixelfed.account_deletion'), 403); abort_if(!config('pixelfed.account_deletion'), 403);
abort_if($user->is_admin, 403); abort_if($user->is_admin, 403);
abort_if($user->created_at->gt(now()->subDays(7)), 403);
$profile = $user->profile; $profile = $user->profile;
$ts = Carbon::now()->addMonth(); $ts = Carbon::now()->addMonth();
$user->status = 'delete'; $user->status = 'delete';

4
resources/views/settings/security.blade.php
View file

@ -27,7 +27,7 @@
@include('settings.security.device-panel') @include('settings.security.device-panel')
@if(config('pixelfed.account_deletion') && !$user->is_admin && $user->created_at->lt(now()->subHours(12))) @if(config('pixelfed.account_deletion') && !$user->is_admin)
<h4 class="font-weight-bold pt-3">Danger Zone</h4> <h4 class="font-weight-bold pt-3">Danger Zone</h4>
<div class="mb-4 border rounded border-danger"> <div class="mb-4 border rounded border-danger">
<ul class="list-group mb-0 pb-0"> <ul class="list-group mb-0 pb-0">
@ -40,7 +40,6 @@
<a class="btn btn-outline-danger font-weight-bold py-1" href="{{route('settings.remove.temporary')}}">Disable</a> <a class="btn btn-outline-danger font-weight-bold py-1" href="{{route('settings.remove.temporary')}}">Disable</a>
</div> </div>
</li> </li>
@if(!$user->is_admin && $user->created_at->lt(now()->subDays(7)) )
<li class="list-group-item border-left-0 border-right-0 py-3 d-flex justify-content-between"> <li class="list-group-item border-left-0 border-right-0 py-3 d-flex justify-content-between">
<div> <div>
<p class="font-weight-bold mb-1">Delete this Account</p> <p class="font-weight-bold mb-1">Delete this Account</p>
@ -50,7 +49,6 @@
<a class="btn btn-outline-danger font-weight-bold py-1" href="{{route('settings.remove.permanent')}}">Delete</a> <a class="btn btn-outline-danger font-weight-bold py-1" href="{{route('settings.remove.permanent')}}">Delete</a>
</div> </div>
</li> </li>
@endif
</ul> </ul>
</div> </div>
@endif @endif