tobias/friendica
1
0
Fork 0
Code Pull requests Activity

system support for complete blocking

Browse source
This commit is contained in:
friendica 2013-04-28 21:02:53 -07:00
parent 2883c8bbc4
commit 1d358fe6de
1 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
include/conversation.php
View file

@ -377,6 +377,18 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$page_writeable = false; $page_writeable = false;
$live_update_div = ''; $live_update_div = '';
$arr_blocked = null;
if(local_user()) {
$str_blocked = get_pconfig(local_user(),'system','blocked');
if($str_blocked) {
$arr_blocked = explode(',',$str_blocked);
for($x = 0; $x < count($arr_blocked); $x ++)
$arr_blocked[$x] = trim($arr_blocked[$x]);
}
}
$previewing = (($preview) ? ' preview ' : ''); $previewing = (($preview) ? ' preview ' : '');
if($mode === 'network') { if($mode === 'network') {
@ -493,6 +505,19 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$tpl = 'search_item.tpl'; $tpl = 'search_item.tpl';
foreach($items as $item) { foreach($items as $item) {
if($arr_blocked) {
$blocked = false;
foreach($arr_blocked as $b) {
if($b && link_compare($item['author-link'],$b)) {
$blocked = true;
break;
}
}
if($blocked)
continue;
}
$threadsid++; $threadsid++;
$comment = ''; $comment = '';
@ -691,6 +716,21 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$threads = array(); $threads = array();
foreach($items as $item) { foreach($items as $item) {
if($arr_blocked) {
$blocked = false;
foreach($arr_blocked as $b) {
if($b && link_compare($item['author-link'],$b)) {
$blocked = true;
break;
}
}
if($blocked)
continue;
}
// Can we put this after the visibility check? // Can we put this after the visibility check?
like_puller($a,$item,$alike,'like'); like_puller($a,$item,$alike,'like');
like_puller($a,$item,$dlike,'dislike'); like_puller($a,$item,$dlike,'dislike');