Merge branch 'master' of https://github.com/redmatrix/redmatrix

include/features.php

@@ -71,6 +71,7 @@ function get_features() {
 			array('personal_tab',   t('Network Personal Tab'),		t('Enable tab to display only Network posts that you\'ve interacted on'),false),
 			array('new_tab',   		t('Network New Tab'),			t('Enable tab to display all new Network activity'),false),
 			array('affinity',       t('Affinity Tool'),			    t('Filter stream activity by depth of relationships'),false),
+			array('connfilter',     t('Connection Filtering'),      t('Filter incoming posts from connections based on keywords/content')),
 			array('suggest',    	t('Suggest Channels'),			t('Show channel suggestions'),false),
 		),
 

include/items.php

@@ -3319,12 +3319,17 @@ function post_is_importable($item,$abook) {
 
 	if(! $abook)
 		return true;
+
+	if(($abook['abook_channel']) && (! feature_enabled($abook['abook_channel'],'connfilter')))
+		return true;
+
 	if(! $item)
 		return false;
 
 	if((! $abook['abook_incl']) && (! $abook['abook_excl']))
 		return true;
 
+
 	require_once('include/html2plain.php');
 	$text = prepare_text($item['body'],$item['mimetype']);
 	$text = html2plain($text);