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:
Mario Vavti 2015-06-23 13:06:40 +02:00
commit 30ba2803e7
4 changed files with 33 additions and 7 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) {
$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);
if(! array_key_exists('xchan_hash',$contact)) {
@ -2947,6 +2965,14 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch,$queue_run=false)
return 200;
}
$allowed = get_pconfig($owner['channel_id'],'system','diaspora_allowed');
if($allowed === false)
$allowed = 1;
if(! intval($allowed)) {
return 200;
}
if($public_batch)
$dest_url = $contact['hubloc_callback'] . '/public';
else

6
include/items.php
View File

@ -423,7 +423,7 @@ function post_activity_item($arr) {
if(array_key_exists('item_private',$arr) && $arr['item_private']) {
$arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']);
$arr['body'] = trim(z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']));
if($channel) {
if($channel['channel_hash'] === $arr['author_xchan']) {
@ -2064,7 +2064,7 @@ function item_store($arr, $allow_exec = false) {
$arr['lang'] = detect_language($arr['body']);
// apply the input filter here - if it is obscured it has been filtered already
$arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']);
$arr['body'] = trim(z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']));
if(local_channel() && (! $arr['sig'])) {
$channel = get_app()->get_channel();
@ -2461,7 +2461,7 @@ function item_store_update($arr,$allow_exec = false) {
$arr['lang'] = detect_language($arr['body']);
// apply the input filter here - if it is obscured it has been filtered already
$arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']);
$arr['body'] = trim(z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']));
if(local_channel() && (! $arr['sig'])) {
$channel = get_app()->get_channel();

6
mod/item.php
View File

@ -343,8 +343,8 @@ function item_post(&$a) {
$coord = $orig_post['coord'];
$verb = $orig_post['verb'];
$app = $orig_post['app'];
$title = $_REQUEST['title'];
$body = $_REQUEST['body'];
$title = escape_tags(trim($_REQUEST['title']));
$body = trim($_REQUEST['body']);
$item_flags = $orig_post['item_flags'];
// force us to recalculate if we need to obscure this post
@ -798,7 +798,7 @@ function item_post(&$a) {
if(array_key_exists('item_private',$datarray) && $datarray['item_private']) {
$datarray['body'] = z_input_filter($datarray['uid'],$datarray['body'],$datarray['mimetype']);
$datarray['body'] = trim(z_input_filter($datarray['uid'],$datarray['body'],$datarray['mimetype']));
if($uid) {
if($channel['channel_hash'] === $datarray['author_xchan']) {

2
version.inc
View File

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