diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-14 21:58:08 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-14 21:58:08 +0200 |
| commit | 79d23463f82d70fc7b3aff176d0de8154720f480 (patch) | |
| tree | 47ffd297ad32989eb0e870d8314e904ca4ba257f | |
| parent | c3e16a73883c967934abfa8dd5565b862df3489c (diff) | |
| download | nextcloud-server-79d23463f82d70fc7b3aff176d0de8154720f480.tar.gz nextcloud-server-79d23463f82d70fc7b3aff176d0de8154720f480.zip | |
No admin option to enable public upload in case encryption is enabled
No upload on pubic page if public upload is disabled
| -rw-r--r-- | apps/files_sharing/public.php | 5 | ||||
| -rw-r--r-- | settings/templates/admin.php | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 695c00e5541..3f8e29345a7 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -137,6 +137,9 @@ if (isset($path)) { if (\OCP\App::isEnabled('files_encryption')) { $allowPublicUploadEnabled = false; } + if (OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') { + $allowPublicUploadEnabled = false; + } if ($linkItem['item_type'] !== 'folder') { $allowPublicUploadEnabled = false; } @@ -202,7 +205,7 @@ if (isset($path)) { $folder->assign('isCreatable', false); $folder->assign('permissions', OCP\PERMISSION_READ); $folder->assign('isPublic',true); - $folder->assign('publicUploadEnabled', true); + $folder->assign('publicUploadEnabled', 'no'); $folder->assign('files', $files); $folder->assign('uploadMaxFilesize', $maxUploadFilesize); $folder->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 9f16db0948d..6c4fddd375d 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -145,6 +145,7 @@ if (!$_['internetconnectionworking']) { <em><?php p($l->t('Allow users to share items to the public with links')); ?></em> </td> </tr> + <?php if (!\OCP\App::isEnabled('files_encryption')) { ?> <tr> <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>> <input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" @@ -153,6 +154,7 @@ if (!$_['internetconnectionworking']) { <em><?php p($l->t('Allow users to enable others to anonymously upload into their publicly shared folders')); ?></em> </td> </tr> + <?php } ?> <tr> <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>> <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" |