aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/receive.php45
1 files changed, 5 insertions, 40 deletions
diff --git a/mod/receive.php b/mod/receive.php
index 46b1f2745..1a99a9aed 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -9,7 +9,6 @@ require_once('include/salmon.php');
require_once('include/crypto.php');
require_once('include/diaspora.php');
-
function receive_post(&$a) {
@@ -26,7 +25,6 @@ function receive_post(&$a) {
$importer = $r[0];
- // I really don't know why we need urldecode - PHP should be doing this for us.
// It is an application/x-www-form-urlencoded
$xml = urldecode($_POST['xml']);
@@ -48,53 +46,20 @@ function receive_post(&$a) {
$xmlbase = $parsed_xml->post;
- // If we reached this point, the message is good.
- // Now let's figure out if the author is allowed to send us stuff.
-
- $r = q("SELECT * FROM `contact` WHERE `network` = 'dspr' AND ( `url` = '%s' OR `alias` = '%s')
- AND `uid` = %d LIMIT 1",
- dbesc($author_link),
- dbesc($author_link),
- intval($importer['uid'])
- );
- if(! count($r)) {
- logger('mod-diaspora: Author unknown to us.');
- }
-
- // is this a follower? Or have we ignored the person?
- // If so we can not accept this post.
- // However we will accept a sharing e.g. friend request
- // or a retraction of same.
-
-
- $allow_blocked = (($xmlbase->request || ($xmlbase->retraction && $xmlbase->retraction->type == 'Person')) ? true : false);
-
- if((count($r))
- && (($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']) || ($r[0]['readonly']))
- && (! $allow_blocked)) {
- logger('mod-diaspora: Ignoring this author.');
- http_status_exit(202);
- // NOTREACHED
- }
-
- require_once('include/items.php');
-
- $contact = ((count($r)) ? $r[0] : null);
-
if($xmlbase->request) {
- diaspora_request($importer,$contact,$xmlbase->request);
+ diaspora_request($importer,$xmlbase->request);
}
elseif($xmlbase->status_message) {
- diaspora_post($importer,$contact,$xmlbase->status_message);
+ diaspora_post($importer,$xmlbase->status_message);
}
elseif($xmlbase->comment) {
- diaspora_comment($importer,$contact,$xmlbase->comment);
+ diaspora_comment($importer,$xmlbase->comment);
}
elseif($xmlbase->like) {
- diaspora_like($importer,$contact,$xmlbase->like);
+ diaspora_like($importer,$xmlbase->like);
}
elseif($xmlbase->retraction) {
- diaspora_retraction($importer,$contact,$xmlbase->retraction);
+ diaspora_retraction($importer,$xmlbase->retraction);
}
else {
logger('mod-diaspora: unknown message type: ' . print_r($xmlbase,true));