diff options
| author | Miguel Prokop <miguel.prokop@vtu.com> | 2014-11-21 13:31:56 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-11-26 13:04:20 +0100 |
| commit | b96b601017a822079dfdc656663514674a8c5e38 (patch) | |
| tree | c685209532750e323468c9fb9dfe322d931b99c3 | |
| parent | cdf37a061bb95e0695adc7b787be799570a4123c (diff) | |
| download | nextcloud-server-b96b601017a822079dfdc656663514674a8c5e38.tar.gz nextcloud-server-b96b601017a822079dfdc656663514674a8c5e38.zip | |
Consolidate if statement, and update unit test
| -rw-r--r-- | lib/private/share/helper.php | 6 | ||||
| -rw-r--r-- | tests/lib/share/helper.php | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php index 1ebcdb563a5..6bbb101db3a 100644 --- a/lib/private/share/helper.php +++ b/lib/private/share/helper.php @@ -204,10 +204,8 @@ class Helper extends \OC\Share\Constants { } else { $expires = $userExpireDate; } - } else { - if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) { - $expires = $defaultExpires; - } + } else if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) { + $expires = $defaultExpires; } return $expires; diff --git a/tests/lib/share/helper.php b/tests/lib/share/helper.php index 367507417a0..32dcb4d9d62 100644 --- a/tests/lib/share/helper.php +++ b/tests/lib/share/helper.php @@ -27,8 +27,8 @@ class Test_Share_Helper extends PHPUnit_Framework_TestCase { array(array('defaultExpireDateSet' => false), 2000000000, 2000010000, 2000010000), // no default expire date and no user defined expire date, return false array(array('defaultExpireDateSet' => false), 2000000000, null, false), - // unenforced expire data and no user defined expire date, take default expire date - array(array('defaultExpireDateSet' => true, 'expireAfterDays' => 1, 'enforceExpireDate' => false), 2000000000, null, 2000086400), + // unenforced expire data and no user defined expire date, return false (because the default is not enforced) + array(array('defaultExpireDateSet' => true, 'expireAfterDays' => 1, 'enforceExpireDate' => false), 2000000000, null, false), // enforced expire date and no user defined expire date, take default expire date array(array('defaultExpireDateSet' => true, 'expireAfterDays' => 1, 'enforceExpireDate' => true), 2000000000, null, 2000086400), // unenforced expire date and user defined date > default expire date, take users expire date @@ -49,6 +49,4 @@ class Test_Share_Helper extends PHPUnit_Framework_TestCase { $result = \OC\Share\Helper::calculateExpireDate($defaultExpireSettings, $creationTime, $userExpireDate); $this->assertSame($expected, $result); } - - } |