No admin option to enable public upload in case encryption is enabled

No upload on pubic page if public upload is disabled
remotes/origin/stable6
Thomas Müller 12 years ago
parent c3e16a7388
commit 79d23463f8
  1. 5
      apps/files_sharing/public.php
  2. 2
      settings/templates/admin.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));

@ -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"

Loading…
Cancel
Save