summaryrefslogtreecommitdiffstats
path: root/apps/files/index.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-02-18 15:39:35 +0100
committerRobin Appelman <icewind@owncloud.com>2014-02-18 15:39:35 +0100
commitd18b9f6ea43b2a9b7bf9d2a71710edc67ec7f705 (patch)
treeb67af1d1b3eea4cae9990359a8a2710c8365c5ba /apps/files/index.php
parent92560c5b86cb88920b6e439bdf4b90f1d59e9b6c (diff)
downloadnextcloud-server-d18b9f6ea43b2a9b7bf9d2a71710edc67ec7f705.tar.gz
nextcloud-server-d18b9f6ea43b2a9b7bf9d2a71710edc67ec7f705.zip
use a FileInfo object of the directory when generting the filelist
Diffstat (limited to 'apps/files/index.php')
-rw-r--r--apps/files/index.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files/index.php b/apps/files/index.php
index dd63f29bc28..f8f1618e787 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -37,8 +37,9 @@ OCP\App::setActiveNavigationEntry('files_index');
// Load the files
$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
$dir = \OC\Files\Filesystem::normalizePath($dir);
+$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
// Redirect if directory does not exist
-if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
+if (!$dirInfo->getType() === 'dir') {
header('Location: ' . OCP\Util::getScriptName() . '');
exit();
}
@@ -92,7 +93,7 @@ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
-$permissions = \OCA\Files\Helper::getDirPermissions($dir);
+$permissions = $dirInfo->getPermissions();
if ($needUpgrade) {
OCP\Util::addscript('files', 'upgrade');