diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-04-04 11:04:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 11:04:21 +0200 |
| commit | efb21a948e586d2080e179ce6b4b271132561ad7 (patch) | |
| tree | c63d1d2cbb5b16abd65da5c683ddcf7c4ed2d34b /lib/private/Template | |
| parent | 0d69b52fde739776242fdc0780c0e90d7faefa23 (diff) | |
| parent | 5e7197e49fa6eacb329386aa65e89a4f5d0c2014 (diff) | |
| download | nextcloud-server-efb21a948e586d2080e179ce6b4b271132561ad7.tar.gz nextcloud-server-efb21a948e586d2080e179ce6b4b271132561ad7.zip | |
Merge pull request #4093 from nextcloud/endorse-password-protection
Endorse password protection
Diffstat (limited to 'lib/private/Template')
| -rw-r--r-- | lib/private/Template/JSConfigHelper.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index ca45bbee9c6..4fc21680211 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -112,6 +112,9 @@ class JSConfigHelper { $apps_paths[$app] = \OC_App::getAppWebPath($app); } + + $enableLinkPasswordByDefault = $this->config->getAppValue('core', 'shareapi_enable_link_password_by_default', 'no'); + $enableLinkPasswordByDefault = ($enableLinkPasswordByDefault === 'yes') ? true : false; $defaultExpireDateEnabled = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes'; $defaultExpireDate = $enforceDefaultExpireDate = null; if ($defaultExpireDateEnabled) { @@ -217,6 +220,7 @@ class JSConfigHelper { 'defaultExpireDate' => $defaultExpireDate, 'defaultExpireDateEnforced' => $enforceDefaultExpireDate, 'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(), + 'enableLinkPasswordByDefault' => $enableLinkPasswordByDefault, 'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(), 'resharingAllowed' => \OCP\Share::isResharingAllowed(), 'remoteShareAllowed' => $outgoingServer2serverShareEnabled, |