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

discovered a couple of loose ends in the per-member enable diaspora setting

Browse Source
This commit is contained in:
redmatrix 2015-06-22 15:03:47 -07:00
parent 0ad71b3efa
commit 0d8fcbe48d
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/diaspora.php
View File

@ -2371,6 +2371,24 @@ function diaspora_profile($importer,$xml,$msg) {
function diaspora_share($owner,$contact) { function diaspora_share($owner,$contact) {
$a = get_app(); $a = get_app();
$enabled = intval(get_config('system','diaspora_enabled'));
if(! $enabled) {
logger('diaspora_share: disabled');
return;
}
$allowed = get_pconfig($owner['channel_id'],'system','diaspora_allowed');
if($allowed === false)
$allowed = 1;
if(! intval($allowed)) {
logger('diaspora_share: disallowed for channel ' . $importer['channel_name']);
return;
}
$myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); $myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
if(! array_key_exists('xchan_hash',$contact)) { if(! array_key_exists('xchan_hash',$contact)) {
@ -2947,6 +2965,14 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch,$queue_run=false)
return 200; return 200;
} }
$allowed = get_pconfig($owner['channel_id'],'system','diaspora_allowed');
if($allowed === false)
$allowed = 1;
if(! intval($allowed)) {
return 200;
}
if($public_batch) if($public_batch)
$dest_url = $contact['hubloc_callback'] . '/public'; $dest_url = $contact['hubloc_callback'] . '/public';
else else

2
version.inc
View File

@ -1 +1 @@
2015-06-21.1070 2015-06-22.1071