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

log all possible return conditions from check_item_source(), use consistent xchan

Browse Source
This commit is contained in:
zotlabs 2018-05-05 01:43:14 -07:00
parent c6e65ec6da
commit c41c04cf11
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
include/items.php
View File

@ -3032,36 +3032,51 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
* @param array $item * @param array $item
*/ */
function check_item_source($uid, $item) { function check_item_source($uid, $item) {
$xchan = (($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']);
$r = q("select * from source where src_channel_id = %d and ( src_xchan = '%s' or src_xchan = '*' ) limit 1", $r = q("select * from source where src_channel_id = %d and ( src_xchan = '%s' or src_xchan = '*' ) limit 1",
intval($uid), intval($uid),
dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']) dbesc($xchan)
); );
if(! $r) if(! $r) {
logger('source: no source record for this channel and source', LOGGER_DEBUG);
return false; return false;
}
$x = q("select abook_their_perms, abook_feed from abook where abook_channel = %d and abook_xchan = '%s' limit 1", $x = q("select abook_feed from abook where abook_channel = %d and abook_xchan = '%s' limit 1",
intval($uid), intval($uid),
dbesc($item['owner_xchan']) dbesc($xchan)
); );
if(! $x) if(! $x) {
logger('source: not connected to this channel.');
return false; return false;
}
if(! get_abconfig($uid,$item['owner_xchan'],'their_perms','republish')) if(! get_abconfig($uid,$xchan,'their_perms','republish')) {
logger('source: no republish permission');
return false; return false;
}
if($item['item_private'] && (! intval($x[0]['abook_feed']))) if($item['item_private'] && (! intval($x[0]['abook_feed']))) {
logger('source: item is private');
return false; return false;
}
if($r[0]['src_channel_xchan'] === $item['owner_xchan']) if($r[0]['src_channel_xchan'] === $xchan) {
logger('source: cannot source yourself');
return false; return false;
}
// since we now have connection filters with more features, the source filter is redundant and can probably go away // since we now have connection filters with more features, the source filter is redundant and can probably go away
if(! $r[0]['src_patt']) if(! $r[0]['src_patt']) {
logger('source: success');
return true; return true;
}
require_once('include/html2plain.php'); require_once('include/html2plain.php');
@ -3077,17 +3092,25 @@ function check_item_source($uid, $item) {
if(! $w) if(! $w)
continue; continue;
if(substr($w,0,1) === '#' && $tags) { if(substr($w,0,1) === '#' && $tags) {
foreach($tags as $t) foreach($tags as $t) {
if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($w,1)) || (substr($w,1) === '*'))) if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($w,1)) || (substr($w,1) === '*'))) {
logger('source: tag filter success');
return true; return true;
} }
elseif((strpos($w,'/') === 0) && preg_match($w,$text)) }
}
elseif((strpos($w,'/') === 0) && preg_match($w,$text)) {
logger('source: preg filter success');
return true; return true;
elseif(stristr($text,$w) !== false) }
elseif(stristr($text,$w) !== false) {
logger('source: text filter success');
return true; return true;
} }
} }
}
logger('source: filter fail');
return false; return false;
} }