mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Now added enabled element 

This change allows for more generic parsing for the capabilities.
This commit is contained in:
Roeland Jago Douma 2015-02-09 14:26:49 +01:00
parent 0bf1152a51
commit af76716775
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files_sharing/lib/capabilities.php
View File

@ -43,14 +43,14 @@ class Capabilities {
public function getCaps() { public function getCaps() {
$res = array(); $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['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']['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'; $public['expire_date']['enforce'] = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'yes') === 'yes';
} }

8
apps/files_sharing/tests/capabilities.php
View File

@ -53,7 +53,8 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
array('core', 'shareapi_allow_links', 'yes', 'no'), array('core', 'shareapi_allow_links', 'yes', 'no'),
); );
$result = $this->getResults($map); $result = $this->getResults($map);
$this->assertFalse($result['public']); $this->assertInternalType('array', $result['public']);
$this->assertFalse($result['public']['enabled']);
} }
/** /**
@ -65,6 +66,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
); );
$result = $this->getResults($map); $result = $this->getResults($map);
$this->assertInternalType('array', $result['public']); $this->assertInternalType('array', $result['public']);
$this->assertTrue($result['public']['enabled']);
} }
/** /**
@ -103,7 +105,8 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
); );
$result = $this->getResults($map); $result = $this->getResults($map);
$this->assertArrayHasKey('expire_date', $result['public']); $this->assertArrayHasKey('expire_date', $result['public']);
$this->assertFalse($result['public']['expire_date']); $this->assertInternalType('array', $result['public']['expire_date']);
$this->assertFalse($result['public']['expire_date']['enabled']);
} }
/** /**
@ -119,6 +122,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
$result = $this->getResults($map); $result = $this->getResults($map);
$this->assertArrayHasKey('expire_date', $result['public']); $this->assertArrayHasKey('expire_date', $result['public']);
$this->assertInternalType('array', $result['public']['expire_date']); $this->assertInternalType('array', $result['public']['expire_date']);
$this->assertTrue($result['public']['expire_date']['enabled']);
$this->assertArrayHasKey('days', $result['public']['expire_date']); $this->assertArrayHasKey('days', $result['public']['expire_date']);
$this->assertFalse($result['public']['expire_date']['enforce']); $this->assertFalse($result['public']['expire_date']['enforce']);
} }