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

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

Browse Source
This commit is contained in:
redmatrix 2015-06-29 22:19:44 -07:00
commit 97e8275dc2
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/features.php
View File

@ -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('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('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('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), array('suggest', t('Suggest Channels'), t('Show channel suggestions'),false),
), ),

5
include/items.php
View File

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

1
mod/connedit.php
View File

@ -668,6 +668,7 @@ function connedit_content(&$a) {
'$lbl_slider' => t('Slide to adjust your degree of friendship'), '$lbl_slider' => t('Slide to adjust your degree of friendship'),
'$lbl_rating' => t('Rating (this information is public)'), '$lbl_rating' => t('Rating (this information is public)'),
'$lbl_rating_txt' => t('Optionally explain your rating (this information is public)'), '$lbl_rating_txt' => t('Optionally explain your rating (this information is public)'),
'$connfilter' => feature_enabled(local_channel(),'connfilter'),
'$incl' => array('abook_incl',t('Only import posts with this text'), $contact['abook_incl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')), '$incl' => array('abook_incl',t('Only import posts with this text'), $contact['abook_incl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')),
'$excl' => array('abook_excl',t('Do not import posts with this text'), $contact['abook_excl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')), '$excl' => array('abook_excl',t('Do not import posts with this text'), $contact['abook_excl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')),
'$rating_text' => array('rating_text', t('Optionally explain your rating (this information is public)'),$rating_text,''), '$rating_text' => array('rating_text', t('Optionally explain your rating (this information is public)'),$rating_text,''),

5
view/tpl/abook_edit.tpl
View File

@ -50,8 +50,13 @@
{{/if}} {{/if}}
{{if $connfilter}}
{{include file="field_textarea.tpl" field=$incl}} {{include file="field_textarea.tpl" field=$incl}}
{{include file="field_textarea.tpl" field=$excl}} {{include file="field_textarea.tpl" field=$excl}}
{{else}}
<input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" />
<input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" />
{{/if}}
{{if $rating}} {{if $rating}}
<h3>{{$lbl_rating}}</h3> <h3>{{$lbl_rating}}</h3>