Merge pull request #159 from fabrixxm/master

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 1a99a9aeda390a6d0ad6244b50b48e78c173cbf7..c3738c1431c20e28221e24ad79bdc31cf96648e3 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -15,6 +15,8 @@ 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",
@@ -36,13 +38,13 @@ function receive_post(&$a) {
 
        $msg = diaspora_decode($importer,$xml);
 
-       logger('mod-diaspora: decoded msg: ' . $msg, LOGGER_DATA);
+       logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DATA);
 
-       if(! $msg)
+       if(! is_array($msg))
                http_status_exit(500);
 
 
-       $parsed_xml = parse_xml_string($msg,false);
+       $parsed_xml = parse_xml_string($msg['message'],false);
 
        $xmlbase = $parsed_xml->post;
 
@@ -53,13 +55,13 @@ function receive_post(&$a) {
                diaspora_post($importer,$xmlbase->status_message);
        }
        elseif($xmlbase->comment) {
-               diaspora_comment($importer,$xmlbase->comment);
+               diaspora_comment($importer,$xmlbase->comment,$msg);
        }
        elseif($xmlbase->like) {
-               diaspora_like($importer,$xmlbase->like);
+               diaspora_like($importer,$xmlbase->like,$msg);
        }
        elseif($xmlbase->retraction) {
-               diaspora_retraction($importer,$xmlbase->retraction);
+               diaspora_retraction($importer,$xmlbase->retraction,$msg);
        }
        else {
                logger('mod-diaspora: unknown message type: ' . print_r($xmlbase,true));