From af76716775f0f16755fa3369b6336feded291f70 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 9 Feb 2015 14:26:49 +0100 Subject: Now added enabled element This change allows for more generic parsing for the capabilities. --- apps/files_sharing/lib/capabilities.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'apps/files_sharing/lib') diff --git a/apps/files_sharing/lib/capabilities.php b/apps/files_sharing/lib/capabilities.php index 95ee810bc9f..21822b18503 100644 --- a/apps/files_sharing/lib/capabilities.php +++ b/apps/files_sharing/lib/capabilities.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ - + namespace OCA\Files_Sharing; use \OCP\IConfig; @@ -43,14 +43,14 @@ class Capabilities { public function getCaps() { $res = array(); - $public = false; - if ($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') { - $public = array(); + $public = array(); + $public['enabled'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes'; + if ($public['enabled']) { $public['password_enforced'] = ($this->config->getAppValue('core', 'shareapi_enforce_links_password', 'yes') === 'yes'); - $public['expire_date'] = false; - if ($this->config->getAppValue('core', 'shareapi_default_expire_date', 'yes') === 'yes') { - $public['expire_date'] = array(); + $public['expire_date'] = array(); + $public['expire_date']['enabled'] = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'yes') === 'yes'; + if ($public['expire_date']['enabled']) { $public['expire_date']['days'] = $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7'); $public['expire_date']['enforce'] = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'yes') === 'yes'; } -- cgit v1.2.3