summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-05-12 12:19:07 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-05-16 17:41:09 +0200
commitb6e14af861481d0b2ebf6ca752d994c5adfce866 (patch)
tree522434e1a85c90b7212a0c9ebed0174e24a11e8e /settings
parentdab3cb65cf16d78796ce8dc23fa1f72aa9846b7e (diff)
downloadnextcloud-server-b6e14af861481d0b2ebf6ca752d994c5adfce866.tar.gz
nextcloud-server-b6e14af861481d0b2ebf6ca752d994c5adfce866.zip
allow admin to enforce passwords for public link shares
Diffstat (limited to 'settings')
-rwxr-xr-xsettings/admin.php1
-rw-r--r--settings/templates/admin.php5
2 files changed, 4 insertions, 2 deletions
diff --git a/settings/admin.php b/settings/admin.php
index 49dde59ce2a..f9406246e76 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -60,6 +60,7 @@ $tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS);
$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false));
$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
+$tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired());
$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('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes'));
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 4d453b01270..d1f519a072d 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -217,9 +217,10 @@ if (!$_['internetconnectionworking']) {
<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
<label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/>
-
<div <?php ($_['allowLinks'] === 'yes') ? print_unescaped('class="indent"') : print_unescaped('class="hidden indent"');?> id="publicLinkSettings">
-
+ <input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword"
+ value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
+ <label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
<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/>