aboutsummaryrefslogtreecommitdiffstats
path: root/core/js/config.php
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2014-06-06 19:24:15 +0200
committerBjörn Schießle <schiessle@owncloud.com>2014-06-06 19:24:15 +0200
commit3da47db33cd9a676a1f5b51a8c8ed1abe617ce3e (patch)
treefb349c85f68d736aed93ff9bf9167199879aa1bb /core/js/config.php
parentdfe6bd61bf315693dd447cda0f66d5a4c23128f1 (diff)
parent9c00f5ddb61507f7bd02a79e2a62339b45b20c0b (diff)
downloadnextcloud-server-3da47db33cd9a676a1f5b51a8c8ed1abe617ce3e.tar.gz
nextcloud-server-3da47db33cd9a676a1f5b51a8c8ed1abe617ce3e.zip
Merge pull request #8927 from owncloud/expire_only_link_shares
only expire link shares
Diffstat (limited to 'core/js/config.php')
-rw-r--r--core/js/config.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/js/config.php b/core/js/config.php
index 80b1b6d242d..2f423111bda 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -25,11 +25,13 @@ foreach(OC_App::getEnabledApps() as $app) {
$apps_paths[$app] = OC_App::getAppWebPath($app);
}
-$defaultExpireDateEnabled = \OCP\Config::getAppValue('core', 'shareapi_default_expire_date', 'no');
+$value = \OCP\Config::getAppValue('core', 'shareapi_default_expire_date', 'no');
+$defaultExpireDateEnabled = ($value === 'yes') ? true :false;
$defaultExpireDate = $enforceDefaultExpireDate = null;
-if ($defaultExpireDateEnabled === 'yes') {
- $defaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7');
- $enforceDefaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+if ($defaultExpireDateEnabled) {
+ $defaultExpireDate = (int)\OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7');
+ $value = \OCP\Config::getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+ $enforceDefaultExpireDate = ($value === 'yes') ? true : false;
}
$array = array(