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

fix expire so it actually should expire stuff; and mostly the correct stuff - though it DOESN'T currently send out notifications to connections

Browse Source
This commit is contained in:
friendica 2013-08-14 05:26:17 -07:00
parent 6da4e41031
commit f287ff596c
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/items.php
View File

@ -3144,21 +3144,28 @@ function item_expire($uid,$days) {
// and just expire conversations started by others // and just expire conversations started by others
$expire_network_only = get_pconfig($uid,'expire','network_only'); $expire_network_only = get_pconfig($uid,'expire','network_only');
$sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : ""); $sql_extra = ((intval($expire_network_only)) ? " AND not (item_flags & " . intval(ITEM_WALL) . ") " : "");
$r = q("SELECT * FROM `item` $r = q("SELECT * FROM `item`
WHERE `uid` = %d WHERE `uid` = %d
AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY
AND `id` = `parent` AND `id` = `parent`
$sql_extra $sql_extra
AND `deleted` = 0", AND NOT (item_restrict & %d )
AND NOT (item_restrict & %d )
AND NOT (item_restrict & %d ) ",
intval($uid), intval($uid),
intval($days) intval($days),
intval(ITEM_DELETED),
intval(ITEM_WEBPAGE),
intval(ITEM_BUILDBLOCK)
); );
if(! count($r)) if(! $r)
return; return;
$r = fetch_post_tags($r,true);
$expire_items = get_pconfig($uid, 'expire','items'); $expire_items = get_pconfig($uid, 'expire','items');
$expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1 $expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1
@ -3175,20 +3182,19 @@ function item_expire($uid,$days) {
foreach($r as $item) { foreach($r as $item) {
// don't expire filed items // don't expire filed items
if(strpos($item['file'],'[') !== false) $terms = get_terms_oftype($item['term'],TERM_FILE);
if($terms)
continue; continue;
// Only expire posts, not photos and photo comments // Only expire posts, not photos and photo comments
if($expire_photos==0 && strlen($item['resource_id'])) if($expire_photos==0 && $item['resource_type'] === 'photo'))
continue; continue;
if($expire_starred==0 && intval($item['starred'])) if($expire_starred==0 && ($item['item_flags'] & ITEM_STARRED))
continue;
if($expire_notes==0 && $item['type']=='note')
continue;
if($expire_items==0 && $item['type']!='note')
continue; continue;
drop_item($item['id'],false); drop_item($item['id'],false);

1
mod/settings.php
View File

@ -330,7 +330,6 @@ function settings_post(&$a) {
$expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0); $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0);
$expire_notes = ((x($_POST,'expire_notes')) ? intval($_POST['expire_notes']) : 0);
$expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0); $expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
$expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0); $expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0);
$expire_network_only = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only']) : 0); $expire_network_only = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only']) : 0);