diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-19 17:06:04 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-19 17:06:04 +0100 |
| commit | 857b22c61be8f78581f41ac155efeff34ed335cd (patch) | |
| tree | 381c0564f571ecfcf11b9153735976912261b4c8 /lib/private | |
| parent | 3765af4edf6662b29881f0b430e4080301c1b2fc (diff) | |
| parent | dd3307dd19bb2b61b194ba7962035a6ceae64249 (diff) | |
| download | nextcloud-server-857b22c61be8f78581f41ac155efeff34ed335cd.tar.gz nextcloud-server-857b22c61be8f78581f41ac155efeff34ed335cd.zip | |
Merge pull request #15025 from rullzer/ocs_respect_enforced_date
Ocs respect enforced date
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/share/share.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 974ebf41f93..dff3af56f40 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -1097,9 +1097,17 @@ class Share extends \OC\Share\Constants { */ public static function setExpirationDate($itemType, $itemSource, $date, $shareTime = null) { $user = \OC_User::getUser(); + $l = \OC::$server->getL10N('lib'); if ($date == '') { - $date = null; + if (\OCP\Util::isDefaultExpireDateEnforced()) { + $warning = 'Cannot clear expiration date. Shares are required to have an expiration date.'; + $warning_t = $l->t('Cannot clear expiration date. Shares are required to have an expiration date.'); + \OCP\Util::writeLog('OCP\Share', $warning, \OCP\Util::WARN); + throw new \Exception($warning_t); + } else { + $date = null; + } } else { $date = self::validateExpireDate($date, $shareTime, $itemType, $itemSource); } |