Merge pull request #161 from tobiasd/master

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index e2c110202adc8dcb020d0d44029dfe3f1a7b02e7..b50774933d349f2ac6e7d038a5c6dda9b65036ea 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -9,12 +9,13 @@ require_once('include/salmon.php');
 require_once('include/crypto.php');
 require_once('include/diaspora.php');
 
-
        
 function receive_post(&$a) {
 
        if($a->argc != 3 || $a->argv[1] !== 'users')
-               receive_return(500);
+               http_status_exit(500);
+
+       logger('receive: raw input: ' . file_get_contents('php://input'), LOGGER_DATA);
 
        $guid = $a->argv[2];
 
@@ -22,64 +23,54 @@ function receive_post(&$a) {
                dbesc($guid)
        );
        if(! count($r))
-               receive_return(500);
+               http_status_exit(500);
 
        $importer = $r[0];
 
-       $xml = $_POST['xml'];
+       // It is an application/x-www-form-urlencoded
+
+       $xml = urldecode($_POST['xml']);
 
        logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
 
        if(! $xml)
-               receive_return(500);
+               http_status_exit(500);
 
        $msg = diaspora_decode($importer,$xml);
-       if(! $msg)
-               receive_return(500);
-
-       // 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.
-
-       if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
-               logger('mod-diaspora: Ignoring this author.');
-               receive_return(202);
-               // NOTREACHED
-       }
-
-       require_once('include/items.php');
 
-       // Placeholder for hub discovery. We shouldn't find any hubs
-       // since we supplied the fake feed header - and it doesn't have any.
+       logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DATA);
 
-       $hub = '';
+       if(! is_array($msg))
+               http_status_exit(500);
 
-       /**
-        *
-        * anti-spam measure: consume_feed will accept a follow activity from 
-        * this person (and nothing else) if there is no existing contact record.
-        *
-        */
-
-       $contact_rec = ((count($r)) ? $r[0] : null);
-
-
-       receive_return(200);
 
+       $parsed_xml = parse_xml_string($msg['message'],false);
 
+       $xmlbase = $parsed_xml->post;
 
+       if($xmlbase->request) {
+               diaspora_request($importer,$xmlbase->request);
+       }
+       elseif($xmlbase->status_message) {
+               diaspora_post($importer,$xmlbase->status_message);
+       }
+       elseif($xmlbase->comment) {
+               diaspora_comment($importer,$xmlbase->comment,$msg);
+       }
+       elseif($xmlbase->like) {
+               diaspora_like($importer,$xmlbase->like,$msg);
+       }
+       elseif($xmlbase->retraction) {
+               diaspora_retraction($importer,$xmlbase->retraction,$msg);
+       }
+       elseif($xmlbase->photo) {
+               diaspora_photo($importer,$xmlbase->photo,$msg);
+       }
+       else {
+               logger('mod-diaspora: unknown message type: ' . print_r($xmlbase,true));
+       }
 
+       http_status_exit(200);
+       // NOTREACHED
 }