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

change help text on other channel expiration setting to inform that there is a system limit. Ignore imported feed content that is older than expiration interval.

Browse Source
This commit is contained in:
redmatrix 2016-01-26 15:12:34 -08:00
parent 424af13891
commit 3494fddd7c
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/items.php
View File

@ -3687,6 +3687,16 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
return; return;
} }
$sys_expire = intval(get_config('system','default_expire_days'));
$chn_expire = intval($importer['channel_expire_days']);
$expire_days = $sys_expire;
if(($chn_expire != 0) && ($chn_expire < $sys_expire))
$expire_days = $chn_expire;
logger('expire_days: ' . $expire_days);
$feed = new SimplePie(); $feed = new SimplePie();
$feed->set_raw_data($xml); $feed->set_raw_data($xml);
$feed->init(); $feed->init();
@ -3790,6 +3800,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
intval($importer['channel_id']) intval($importer['channel_id'])
); );
// Update content if 'updated' changes // Update content if 'updated' changes
if($r) { if($r) {
@ -3848,6 +3859,17 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
$datarray['owner_xchan'] = $contact['xchan_hash']; $datarray['owner_xchan'] = $contact['xchan_hash'];
if(array_key_exists('created',$datarray) && $datarray['created'] != NULL_DATE && $expire_days) {
$t1 = $datarray['created'];
$t2 = datetime_convert('UTC','UTC','now - ' . $expire_days . 'days');
if($t1 < $t2) {
logger('feed content older than expiration. Ignoring.', LOGGER_DEBUG, LOG_INFO);
continue;
}
}
$r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1", $r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
dbesc($item_id), dbesc($item_id),
intval($importer['channel_id']) intval($importer['channel_id'])

3
mod/settings.php
View File

@ -917,6 +917,7 @@ function settings_content(&$a) {
$maxreq = $channel['channel_max_friend_req']; $maxreq = $channel['channel_max_friend_req'];
$expire = $channel['channel_expire_days']; $expire = $channel['channel_expire_days'];
$adult_flag = intval($channel['channel_pageflags'] & PAGE_ADULT); $adult_flag = intval($channel['channel_pageflags'] & PAGE_ADULT);
$sys_expire = get_config('system','default_expire_days');
// $unkmail = $a->user['unkmail']; // $unkmail = $a->user['unkmail'];
// $cntunkmail = $a->user['cntunkmail']; // $cntunkmail = $a->user['cntunkmail'];
@ -1050,7 +1051,7 @@ function settings_content(&$a) {
'$lbl_p2macro' => t('Advanced Privacy Settings'), '$lbl_p2macro' => t('Advanced Privacy Settings'),
'$expire' => array('expire',t('Expire other channel content after this many days'),$expire,t('0 or blank prevents expiration')), '$expire' => array('expire',t('Expire other channel content after this many days'),$expire,sprintf( t('0 or blank to use the website limit. The website expires after %d days.'),intval($sys_expire))),
'$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')),
'$permissions' => t('Default Post Permissions'), '$permissions' => t('Default Post Permissions'),
'$permdesc' => t("\x28click to open/close\x29"), '$permdesc' => t("\x28click to open/close\x29"),