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-09 19:39:21 -07:00
parent 03357481f7 9592f7f3e6
commit eb6a1f8387
6 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/diaspora.php
View File

@@ -64,6 +64,15 @@ function diaspora_dispatch($importer,$msg) {
return;
}
$allowed = get_pconfig($importer['channel_id'],'system','diaspora_allowed');
if($allowed === false)
$allowed = 1;
if(! intval($allowed)) {
logger('mod-diaspora: disallowed for channel ' . $importer['channel_name']);
return;
}
// php doesn't like dashes in variable names
$msg['message'] = str_replace(
@@ -169,6 +178,16 @@ function diaspora_process_outbound($arr) {
*/
$allowed = get_pconfig($arr['channel']['channel_id'],'system','diaspora_allowed');
if($allowed === false)
$allowed = 1;
if(! intval($allowed)) {
logger('mod-diaspora: disallowed for channel ' . $arr['channel']['channel_name']);
return;
}
if($arr['location'])
return;