diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-01-28 11:18:04 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-28 11:18:04 +0100 |
| commit | 8067a1394e3dab551e65ec8abd12e673a811bf40 (patch) | |
| tree | fd18fac68c7ca62ee50142e771f0da70a9c0925d /apps/files/index.php | |
| parent | dbb0d0407324830f4a7ff51781c535c1cb0d2a06 (diff) | |
| parent | 857b15db3739fe8fbbad4df0f10e9b48ba1f90c2 (diff) | |
| download | nextcloud-server-8067a1394e3dab551e65ec8abd12e673a811bf40.tar.gz nextcloud-server-8067a1394e3dab551e65ec8abd12e673a811bf40.zip | |
fix merge conflicts
Diffstat (limited to 'apps/files/index.php')
| -rw-r--r-- | apps/files/index.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/files/index.php b/apps/files/index.php index 8861be72283..7ac201c8732 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -76,6 +76,7 @@ $list = new OCP\Template('files', 'part.list', ''); $list->assign('files', $files, false); $list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false); $list->assign('downloadURL', OCP\Util::linkTo('files', 'download.php') . '?file=', false); +$list->assign('disableSharing', false); $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb, false); $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false); @@ -83,6 +84,9 @@ $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir $maxUploadFilesize=OCP\Util::maxUploadFilesize($dir); $permissions = OCP\PERMISSION_READ; +if (OC_Filesystem::isCreatable($dir . '/')) { + $permissions |= OCP\PERMISSION_CREATE; +} if (OC_Filesystem::isUpdatable($dir . '/')) { $permissions |= OCP\PERMISSION_UPDATE; } @@ -93,6 +97,9 @@ if (OC_Filesystem::isSharable($dir . '/')) { $permissions |= OCP\PERMISSION_SHARE; } +// information about storage capacities +$storageInfo=OC_Helper::getStorageInfo(); + $tmpl = new OCP\Template('files', 'index', 'user'); $tmpl->assign('fileList', $list->fetchPage(), false); $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); @@ -104,4 +111,5 @@ $tmpl->assign('trash', \OCP\App::isEnabled('files_trashbin')); $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); +$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']); $tmpl->printPage(); |