in case the encryption app is enabled we cannot yet allow anonymous upload

diff --git a/apps/files/index.php b/apps/files/index.php
index 892f75a3513e74c815a2a2d7cae9903e6b2cf818..2f0053915090d43146e4d49a7d739d36dd013c71 100644 (file)
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -121,6 +121,10 @@ if ($needUpgrade) {
        // information about storage capacities
        $storageInfo=OC_Helper::getStorageInfo();
        $maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
+       $publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
+       if (OC_App::isEnabled('files_encryption')) {
+               $publicUploadEnabled = 'no';
+       }
 
        OCP\Util::addscript('files', 'fileactions');
        OCP\Util::addscript('files', 'files');
@@ -138,6 +142,6 @@ if ($needUpgrade) {
        $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
        $tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
        $tmpl->assign('isPublic', false);
-       $tmpl->assign('publicUploadEnabled', \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
+       $tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
        $tmpl->printPage();
 }