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

Deduplicate expiration date check into a method.

This commit is contained in:
Andreas Fischer 2013-09-23 22:56:15 +02:00 committed by Morris Jobke
parent 779b87d46a
commit fa56aec4b8
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/public/share.php
View File

@ -345,16 +345,9 @@ class Share {
\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', token=' . $token, \OC_Log::ERROR);
}
$row = $result->fetchRow();
if (!empty($row['expiration'])) {
$now = new \DateTime();
$expirationDate = new \DateTime($row['expiration'], new \DateTimeZone('UTC'));
if ($now > $expirationDate) {
self::unshareItem($row);
return false;
}
if (self::expireItem($row)) {
return false;
}
return $row;
}
@ -833,6 +826,23 @@ class Share {
return false;
}
/**
* Checks whether a share has expired, calls unshareItem() if yes.
* @param array $item Share data (usually database row)
* @return bool True if item was expired, false otherwise.
*/
protected static function expireItem(array $item) {
if (!empty($item['expiration'])) {
$now = new \DateTime();
$expirationDate = new \DateTime($item['expiration'], new \DateTimeZone('UTC'));
if ($now > $expirationDate) {
self::unshareItem($item);
return true;
}
}
return false;
}
/**
* Unshares a share given a share data array
* @param array $item Share data (usually database row)
@ -1208,12 +1218,8 @@ class Share {
}
}
}
if (isset($row['expiration'])) {
$time = new \DateTime();
if ($row['expiration'] < date('Y-m-d H:i', $time->format('U') - $time->getOffset())) {
self::unshareItem($row);
continue;
}
if (self::expireItem($row)) {
continue;
}
// Check if resharing is allowed, if not remove share permission
if (isset($row['permissions']) && !self::isResharingAllowed()) {