clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3598 from annando/1707-expiration 

Check general expiration time at item storing as well
This commit is contained in:
Tobias Diekershoff 2017-07-23 10:26:58 +02:00 committed by GitHub
parent dd0a1cf586 8d66909ba5
commit 2148a2bdb0
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/items.php
View File

@ -7,6 +7,7 @@
use Friendica\App;
use Friendica\ParseUrl;
use Friendica\Util\Lock;
use Friendica\Core\Config;
require_once 'include/bbcode.php';
require_once 'include/oembed.php';
@ -564,11 +565,16 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
$arr['type'] = 'remote';
}
// check for create date and expire time
$uid = intval($arr['uid']);
$r = q("SELECT expire FROM user WHERE uid = %d", intval($uid));
if (dbm::is_result($r)) {
$expire_interval = $r[0]['expire'];
// check for create date and expire time
$expire_interval = Config::get('system', 'dbclean-expire-days', 0);
$r = dba::select('user', array('expire'), array('uid' => $uid), array("limit" => 1));
if (dbm::is_result($r) && ($r['expire'] > 0) && ($r['expire'] < $expire_interval)) {
$expire_interval = $r['expire'];
}
if ($expire_interval > 0) {
$expire_date = datetime_convert('UTC', 'UTC', '- '.$expire_interval.' days');
$created_date = datetime_convert('UTC', 'UTC', $arr['created']);
@ -577,7 +583,6 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
return 0;
}
}
}
/*
* Do we already have this item?