Skip to content

Commit 4f3629f

Browse files
committed
Fixes issue with special characters in URL for file manager
closes pterodactyl#21
1 parent 776af7d commit 4f3629f

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

app/Repositories/Daemon/FileRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function returnDirectoryListing($directory)
143143
throw new Exception('A valid directory must be specified in order to list its contents.');
144144
}
145145

146-
$res = $this->client->request('GET', '/server/directory/' . $directory, [
146+
$res = $this->client->request('GET', '/server/directory/' . rawurlencode($directory), [
147147
'headers' => $this->headers
148148
]);
149149

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<div>
3030
<input type="hidden" name="file" value="{{ $file }}" />
3131
{!! csrf_field() !!}
32-
<button class="btn btn-primary btn-sm" id="save_file">{{ trans('strings.save') }}</button>
33-
<button class="btn btn-default btn-sm" onclick="window.location='/server/{{ $server->uuidShort }}/files?dir={{ urlencode($directory) }}';return false;">{{ trans('server.files.back') }}</button>
32+
<button class="btn btn-primary btn-sm" id="save_file" type="submit">{{ trans('strings.save') }}</button>
33+
<a href="/server/{{ $server->uuidShort }}/files?dir={{ rawurlencode($directory) }}"><button class="btn btn-default btn-sm">{{ trans('server.files.back') }}</button></a>
3434
</div>
3535
</div>
3636
@endcan

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@if (isset($directory['show']) && $directory['show'] === true)
2323
<tr>
2424
<td><i class="fa fa-folder-open" style="margin-left: 0.859px;"></i></td>
25-
<td><a href="/server/{{ $server->uuidShort }}/files?dir={{ $directory['link'] }}" class="load_new">&larr; {{ $directory['link_show'] }}</a></a></td>
25+
<td><a href="/server/{{ $server->uuidShort }}/files?dir={{ rawurlencode($directory['link']) }}" class="load_new">&larr; {{ $directory['link_show'] }}</a></a></td>
2626
<td></td>
2727
<td></td>
2828
<td></td>
@@ -31,7 +31,7 @@
3131
@foreach ($folders as $folder)
3232
<tr>
3333
<td><i class="fa fa-folder-open" style="margin-left: 0.859px;"></i></td>
34-
<td><a href="/server/{{ $server->uuidShort }}/files?dir=/@if($folder['directory'] !== ''){{ $folder['directory'] }}/@endif{{ $folder['entry'] }}" class="load_new">{{ $folder['entry'] }}</a></td>
34+
<td><a href="/server/{{ $server->uuidShort }}/files?dir=/@if($folder['directory'] !== ''){{ rawurlencode($folder['directory']) }}/@endif{{ rawurlencode($folder['entry']) }}" class="load_new">{{ $folder['entry'] }}</a></td>
3535
<td>{{ $folder['size'] }}</td>
3636
<td>{{ date('m/d/y H:i:s', $folder['date']) }}</td>
3737
<td style="text-align:center;">
@@ -41,7 +41,7 @@
4141
</div>
4242
<div class="col-md-3">
4343
@can('delete-files', $server)
44-
<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>
44+
<a href="@if($folder['directory'] !== ''){{ rawurlencode($folder['directory']) }}/@endif{{ rawurlencode($folder['entry']) }}" class="delete_file"><span class="badge label-danger"><i class="fa fa-trash-o"></i></span></a>
4545
@endcan
4646
</div>
4747
</div>
@@ -54,7 +54,7 @@
5454
<td>
5555
@if(in_array($file['extension'], $extensions))
5656
@can('edit-files', $server)
57-
<a href="/server/{{ $server->uuidShort }}/files/edit/@if($file['directory'] !== ''){{ $file['directory'] }}/@endif{{ $file['entry'] }}" class="edit_file">{{ $file['entry'] }}</a>
57+
<a href="/server/{{ $server->uuidShort }}/files/edit/@if($file['directory'] !== ''){{ rawurlencode($file['directory']) }}/@endif{{ rawurlencode($file['entry']) }}" class="edit_file">{{ $file['entry'] }}</a>
5858
@else
5959
{{ $file['entry'] }}
6060
@endcan
@@ -70,12 +70,12 @@
7070
</div>
7171
<div class="col-md-3 hidden-xs hidden-sm">
7272
@can('download-files', $server)
73-
<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>
73+
<a href="/server/{{ $server->uuidShort }}/files/download/@if($file['directory'] !== ''){{ rawurlencode($file['directory']) }}/@endif{{ rawurlencode($file['entry']) }}"><span class="badge"><i class="fa fa-download"></i></span></a>
7474
@endcan
7575
</div>
7676
<div class="col-md-3">
7777
@can('delete-files', $server)
78-
<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>
78+
<a href="@if($file['directory'] !== ''){{ rawurlencode($file['directory']) }}/@endif{{ rawurlencode($file['entry']) }}" class="delete_file"><span class="badge label-danger"><i class="fa fa-trash-o"></i></span>
7979
@endcan
8080
</div>
8181
</div>

0 commit comments

Comments
 (0)