summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-06-28 16:49:25 +0200
committerThomas Mueller <thomas.mueller@tmit.eu>2013-06-28 16:49:25 +0200
commitf726de3cabfd67b6aa2ab42ad27eb2fd90e84e27 (patch)
tree9cdc67c0e34a242512823a1e1a3e006c6785e509 /apps
parent7d3490036c40a0529d4d58561c15f0c59fbf9686 (diff)
downloadnextcloud-server-f726de3cabfd67b6aa2ab42ad27eb2fd90e84e27.tar.gz
nextcloud-server-f726de3cabfd67b6aa2ab42ad27eb2fd90e84e27.zip
for now we disable public upload in case encryption is enabled
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/public.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index fa8c25fc98d..ef86013b3e7 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -147,7 +147,11 @@ if (isset($path)) {
$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
$tmpl->assign('fileTarget', basename($linkItem['file_target']));
$tmpl->assign('dirToken', $linkItem['token']);
- $tmpl->assign('allowPublicUploadEnabled', (($linkItem['permissions'] & OCP\PERMISSION_CREATE) ? true : false ));
+ $allowPublicUploadEnabled = (($linkItem['permissions'] & OCP\PERMISSION_CREATE) ? true : false );
+ if (\OCP\App::isEnabled('files_encryption')) {
+ $allowPublicUploadEnabled = false;
+ }
+ $tmpl->assign('allowPublicUploadEnabled', $allowPublicUploadEnabled);
$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));