aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/features.php1
-rwxr-xr-xinclude/items.php5
2 files changed, 6 insertions, 0 deletions
diff --git a/include/features.php b/include/features.php
index 4121880a4..a6c4757cd 100644
--- a/include/features.php
+++ b/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),
),
diff --git a/include/items.php b/include/items.php
index 5f479660e..059d9fd6a 100755
--- a/include/items.php
+++ b/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);