summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
Diffstat (limited to 'settings')
-rwxr-xr-xsettings/admin.php3
-rw-r--r--settings/templates/admin.php10
2 files changed, 12 insertions, 1 deletions
diff --git a/settings/admin.php b/settings/admin.php
index f945e56b8c2..10e239204f2 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -38,9 +38,10 @@ if (OC_Request::serverProtocol() === 'https') {
$connectedHTTPS = false;
}
$tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS);
-$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false));
+$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false));
$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
+$tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
$tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
$tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
$tmpl->assign('forms', array());
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d638a26c3fa..057d527db73 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -145,6 +145,16 @@ 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"
+ value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
+ <label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
+ <em><?php p($l->t('Allow users to enable others to 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"