Skip to content

Commit 80bef5b

Browse files
committed
Fix file manager permissions
1 parent a1c6aa6 commit 80bef5b

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

app/Policies/ServerPolicy.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,22 @@ public function downloadFiles(User $user, Server $server)
173173
return $user->permissions()->server($server)->permission('download-files')->exists();
174174
}
175175

176+
/**
177+
* Check if user has permission to delete files from a server.
178+
*
179+
* @param Pterodactyl\Models\User $user
180+
* @param Pterodactyl\Models\Server $server
181+
* @return boolean
182+
*/
183+
public function deleteFiles(User $user, Server $server)
184+
{
185+
if ($this->isOwner($user, $server)) {
186+
return true;
187+
}
188+
189+
return $user->permissions()->server($server)->permission('delete-files')->exists();
190+
}
191+
176192
/**
177193
* Check if user has permission to change the default connection information.
178194
*

resources/views/server/files/list.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<div class="col-md-3 hidden-xs hidden-sm">
4141
</div>
4242
<div class="col-md-3">
43-
@can('delete-file', $server)
43+
@can('delete-files', $server)
4444
<a href="@if($folder['directory'] !== ''){{ $folder['directory'] }}/@endif{{ $folder['entry'] }}" class="delete_file"><span class="badge label-danger"><i class="fa fa-trash-o"></i></span></a>
4545
@endcan
4646
</div>
@@ -53,7 +53,7 @@
5353
<td><i class="fa fa-file-text" style="margin-left: 2px;"></i></td>
5454
<td>
5555
@if(in_array($file['extension'], $extensions))
56-
@can('edit-file', $server)
56+
@can('edit-files', $server)
5757
<a href="/server/{{ $server->uuidShort }}/files/edit/@if($file['directory'] !== ''){{ $file['directory'] }}/@endif{{ $file['entry'] }}" class="edit_file">{{ $file['entry'] }}</a>
5858
@else
5959
{{ $file['entry'] }}
@@ -69,12 +69,12 @@
6969
<div class="col-md-3 hidden-xs hidden-sm">
7070
</div>
7171
<div class="col-md-3 hidden-xs hidden-sm">
72-
@can('download-file', $server)
72+
@can('download-files', $server)
7373
<a href="/server/{{ $server->uuidShort }}/files/download/@if($file['directory'] !== ''){{ $file['directory'] }}/@endif{{ $file['entry'] }}"><span class="badge"><i class="fa fa-download"></i></span></a>
7474
@endcan
7575
</div>
7676
<div class="col-md-3">
77-
@can('delete-file', $server)
77+
@can('delete-files', $server)
7878
<a href="@if($file['directory'] !== ''){{ $file['directory'] }}/@endif{{ $file['entry'] }}" class="delete_file"><span class="badge label-danger"><i class="fa fa-trash-o"></i></span>
7979
@endcan
8080
</div>

0 commit comments

Comments
 (0)