Merge github.com:tobiasd/friendika

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 43f8c7bbcd36b05b23fb306def746c7e47b7a3c9..b50774933d349f2ac6e7d038a5c6dda9b65036ea 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -9,13 +9,14 @@ 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')
                http_status_exit(500);
 
+       logger('receive: raw input: ' . file_get_contents('php://input'), LOGGER_DATA);
+
        $guid = $a->argv[2];
 
        $r = q("SELECT * FROM `user` WHERE `guid` = '%s' LIMIT 1",
@@ -26,6 +27,8 @@ function receive_post(&$a) {
 
        $importer = $r[0];
 
+       // It is an application/x-www-form-urlencoded
+
        $xml = urldecode($_POST['xml']);
 
        logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
@@ -34,59 +37,34 @@ function receive_post(&$a) {
                http_status_exit(500);
 
        $msg = diaspora_decode($importer,$xml);
-       if(! $msg)
-               http_status_exit(500);
 
+       logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DATA);
 
-       $parsed_xml = parse_xml_string($msg,false);
-
-       $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
-
-       if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
-               if(! $xmlbase->request) {
-                       logger('mod-diaspora: Ignoring this author.');
-                       http_status_exit(202);
-                       // NOTREACHED
-               }
-       }
+       if(! is_array($msg))
+               http_status_exit(500);
 
-       require_once('include/items.php');
 
-       $contact = ((count($r)) ? $r[0] : null);
+       $parsed_xml = parse_xml_string($msg['message'],false);
 
-       logger('diaspora msg: ' . $msg, LOGGER_DATA); 
+       $xmlbase = $parsed_xml->post;
 
        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,$msg);
        }
        elseif($xmlbase->like) {
-               diaspora_like($importer,$contact,$xmlbase->like);
+               diaspora_like($importer,$xmlbase->like,$msg);
        }
        elseif($xmlbase->retraction) {
-               diaspora_retraction($importer,$contact,$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));