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

diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index 350fc7fa5f6512bac59c5d6996018ad935c7aec5..0be38c3b96f6749fd04deded1595e95079fd26aa 100644 (file)
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -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();

diff --git a/apps/files/index.php b/apps/files/index.php
index f0f95b3bac8c3d427c60f09899fcbb5c78fb2e98..9ae378d7a1d64a6cbfeda06008f625261fcc3a51 100644 (file)
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -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);