Files app backend now normalizes paths before rendering templates
Before rendering breadcrumbs or the file list, the paths are now normalized. This prevents the UI to show "." breadcrumbs in case the path contains sections with "/./" Fixes #5848
This commit is contained in:
parent
c06d8bb007
commit
008c3b80d6
|
@ -10,7 +10,7 @@ OCP\JSON::checkLoggedIn();
|
|||
|
||||
// Load the files
|
||||
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
|
||||
|
||||
$dir = \OC\Files\Filesystem::normalizePath($dir);
|
||||
if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
|
||||
header("HTTP/1.0 404 Not Found");
|
||||
exit();
|
||||
|
|
|
@ -36,6 +36,7 @@ OCP\Util::addscript('files', 'filelist');
|
|||
OCP\App::setActiveNavigationEntry('files_index');
|
||||
// Load the files
|
||||
$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
|
||||
$dir = \OC\Files\Filesystem::normalizePath($dir);
|
||||
// Redirect if directory does not exist
|
||||
if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
|
||||
header('Location: ' . OCP\Util::getScriptName() . '');
|
||||
|
@ -128,7 +129,7 @@ if ($needUpgrade) {
|
|||
$tmpl = new OCP\Template('files', 'index', 'user');
|
||||
$tmpl->assign('fileList', $list->fetchPage());
|
||||
$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
|
||||
$tmpl->assign('dir', \OC\Files\Filesystem::normalizePath($dir));
|
||||
$tmpl->assign('dir', $dir);
|
||||
$tmpl->assign('isCreatable', $isCreatable);
|
||||
$tmpl->assign('permissions', $permissions);
|
||||
$tmpl->assign('files', $files);
|
||||
|
|
Loading…
Reference in New Issue