for now we disable public upload in case encryption is enabled

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 65d3b8fe032ee17327b6853c0905ecb3fd6677ea..02666c93698a5b2900d68c3fde5d1e534aadbb9f 100644 (file)
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -140,7 +140,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));