harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

also allow service classes to set post expiration. These take priority over the site default.

Browse Source
This commit is contained in:
friendica
2015-03-24 20:38:53 -07:00
parent 63b8020969
commit 022305fe83
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/expire.php
View File

@@ -41,12 +41,7 @@ function expire_run($argv, $argc){
logger('site_expire: ' . $site_expire);
if(intval($site_expire)) {
$r = q("SELECT channel_id, channel_address, channel_pageflags, channel_expire_days from channel where true");
}
else {
$r = q("SELECT channel_id, channel_address, channel_pageflags, channel_expire_days from channel where channel_expire_days != 0");
}
$r = q("SELECT channel_id, channel_address, channel_pageflags, channel_expire_days from channel where true");
if($r) {
foreach($r as $rr) {
@@ -55,16 +50,23 @@ function expire_run($argv, $argc){
if($rr['channel_pageflags'] & PAGE_SYSTEM)
continue;
if(intval($site_expire) && (intval($site_expire) < intval($rr['channel_expire_days'])) ||
// service class default (if non-zero) over-rides the site default
$service_class_expire = service_class_fetch($rr['channel_id'],'expire_days');
if(intval($service_class_expire))
$channel_expire = $service_class_expire;
else
$channel_expire = $site_expire;
if(intval($channel_expire) && (intval($channel_expire) < intval($rr['channel_expire_days'])) ||
intval($rr['channel_expire_days'] == 0)) {
$expire_days = $site_expire;
$expire_days = $channel_expire;
}
else {
$expire_days = $rr['channel_expire_days'];
}
// if the site expiration is non-zero and less than person expiration, use that
// if the site or service class expiration is non-zero and less than person expiration, use that
logger('Expire: ' . $rr['channel_address'] . ' interval: ' . $expire_days, LOGGER_DEBUG);
item_expire($rr['channel_id'], $expire_days);
}

6
include/items.php
View File

@@ -3926,15 +3926,15 @@ function item_expire($uid,$days) {
if(! intval($expire_limit))
$expire_limit = 5000;
$sql_extra = ((intval($expire_network_only)) ? " AND not (item_flags & " . intval(ITEM_WALL) . ") > 0 " : "");
$sql_extra = ((intval($expire_network_only)) ? " AND (item_flags & " . intval(ITEM_WALL) . ") = 0 " : "");
$r = q("SELECT * FROM `item`
WHERE `uid` = %d
AND `created` < %s - INTERVAL %s
AND `id` = `parent`
$sql_extra
AND NOT ( item_flags & %d )>0
AND (item_restrict = 0 ) LIMIT $expire_limit ",
AND ( item_flags & %d ) = 0
AND ( item_restrict = 0 ) LIMIT $expire_limit ",
intval($uid),
db_utcnow(), db_quoteinterval(intval($days).' DAY'),
intval(ITEM_RETAINED)