dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Decode the filename when rendering it to the screen; closes #2101

Browse Source
This commit is contained in:
Dane Everitt 2020-06-13 09:49:32 -07:00
parent 050fe307f0
commit b30d7429f3
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/scripts/components/server/files/FileManagerBreadcrumbs.tsx
View File

@ -25,10 +25,10 @@ export default ({ withinFileEditor, isNewFile }: Props) => {
.filter(directory => !!directory) .filter(directory => !!directory)
.map((directory, index, dirs) => { .map((directory, index, dirs) => {
if (!withinFileEditor && index === dirs.length - 1) { if (!withinFileEditor && index === dirs.length - 1) {
return { name: directory }; return { name: decodeURIComponent(directory) };
} }
return { name: directory, path: `/${dirs.slice(0, index + 1).join('/')}` }; return { name: decodeURIComponent(directory), path: `/${dirs.slice(0, index + 1).join('/')}` };
}); });
return ( return (
@ -57,7 +57,7 @@ export default ({ withinFileEditor, isNewFile }: Props) => {
} }
{file && {file &&
<React.Fragment> <React.Fragment>
<span className={'px-1 text-neutral-300'}>{file}</span> <span className={'px-1 text-neutral-300'}>{decodeURIComponent(file)}</span>
</React.Fragment> </React.Fragment>
} }
</div> </div>

7
resources/scripts/components/server/files/NewDirectoryButton.tsx
View File

@ -70,7 +70,12 @@ export default () => {
/> />
<p className={'text-xs mt-2 text-neutral-400'}> <p className={'text-xs mt-2 text-neutral-400'}>
<span className={'text-neutral-200'}>This directory will be created as</span> <span className={'text-neutral-200'}>This directory will be created as</span>
&nbsp;/home/container/<span className={'text-cyan-200'}>{join(directory, values.directoryName).replace(/^(\.\.\/|\/)+/, '')}</span> &nbsp;/home/container/
<span className={'text-cyan-200'}>
{decodeURIComponent(
join(directory, values.directoryName).replace(/^(\.\.\/|\/)+/, ''),
)}
</span>
</p> </p>
<div className={'flex justify-end'}> <div className={'flex justify-end'}>
<button className={'btn btn-sm btn-primary mt-8'}> <button className={'btn btn-sm btn-primary mt-8'}>

2
resources/scripts/state/server/files.ts
View File

@ -48,7 +48,7 @@ const files: ServerFileStore = {
}), }),
setDirectory: action((state, payload) => { setDirectory: action((state, payload) => {
state.directory = cleanDirectoryPath(payload) state.directory = cleanDirectoryPath(payload);
}), }),
}; };