summaryrefslogtreecommitdiffstats
path: root/lib/private/share
diff options
context:
space:
mode:
authorMiguel Prokop <miguel.prokop@vtu.com>2014-11-21 11:01:39 +0100
committerMiguel Prokop <miguel.prokop@vtu.com>2014-11-21 11:01:39 +0100
commit1d4d308a6c0bb5b13d0dd172cf1eb3622f3e1ee6 (patch)
treecc8784330496ac0e60e0639f96a77f5216b019e2 /lib/private/share
parentf8421958b3d06379c9dbfec49a16cf072dff7591 (diff)
downloadnextcloud-server-1d4d308a6c0bb5b13d0dd172cf1eb3622f3e1ee6.tar.gz
nextcloud-server-1d4d308a6c0bb5b13d0dd172cf1eb3622f3e1ee6.zip
fix calculation of expiration date if there is a default expiration date set (but not forced) and the user does not want the link to expire.
Diffstat (limited to 'lib/private/share')
-rw-r--r--lib/private/share/helper.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
index 2418535c9d5..1ebcdb563a5 100644
--- a/lib/private/share/helper.php
+++ b/lib/private/share/helper.php
@@ -189,20 +189,25 @@ class Helper extends \OC\Share\Constants {
public static function calculateExpireDate($defaultExpireSettings, $creationTime, $userExpireDate = null) {
$expires = false;
+ $defaultExpires = null;
if (!empty($defaultExpireSettings['defaultExpireDateSet'])) {
- $expires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
+ $defaultExpires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
}
if (isset($userExpireDate)) {
// if the admin decided to enforce the default expire date then we only take
// the user defined expire date of it is before the default expire date
- if ($expires && !empty($defaultExpireSettings['enforceExpireDate'])) {
- $expires = min($userExpireDate, $expires);
+ if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+ $expires = min($userExpireDate, $defaultExpires);
} else {
$expires = $userExpireDate;
}
+ } else {
+ if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+ $expires = $defaultExpires;
+ }
}
return $expires;