Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 1a99a9aeda390a6d0ad6244b50b48e78c173cbf7..2bd3cc65bcda1b5ae273d9903184981805b8d33a 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -12,18 +12,33 @@ require_once('include/diaspora.php');
        
 function receive_post(&$a) {
 
-       if($a->argc != 3 || $a->argv[1] !== 'users')
+
+       $enabled = intval(get_config('system','diaspora_enabled'));
+       if(! $enabled) {
+               logger('mod-diaspora: disabled');
                http_status_exit(500);
+       }
 
-       $guid = $a->argv[2];
+       $public = false;
 
-       $r = q("SELECT * FROM `user` WHERE `guid` = '%s' LIMIT 1",
-               dbesc($guid)
-       );
-       if(! count($r))
-               http_status_exit(500);
+       if(($a->argc == 2) && ($a->argv[1] === 'public')) {
+               $public = true;
+       }
+       else {
 
-       $importer = $r[0];
+               if($a->argc != 3 || $a->argv[1] !== 'users')
+                       http_status_exit(500);
+
+               $guid = $a->argv[2];
+
+               $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 LIMIT 1",
+                       dbesc($guid)
+               );
+               if(! count($r))
+                       http_status_exit(500);
+
+               $importer = $r[0];
+       }
 
        // It is an application/x-www-form-urlencoded
 
@@ -36,36 +51,18 @@ 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);
 
+       $ret = 0;
+       if($public)
+               diaspora_dispatch_public($msg);
+       else
+               $ret = diaspora_dispatch($importer,$msg);
 
-       $parsed_xml = parse_xml_string($msg,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);
-       }
-       elseif($xmlbase->like) {
-               diaspora_like($importer,$xmlbase->like);
-       }
-       elseif($xmlbase->retraction) {
-               diaspora_retraction($importer,$xmlbase->retraction);
-       }
-       else {
-               logger('mod-diaspora: unknown message type: ' . print_r($xmlbase,true));
-       }
-
-       http_status_exit(200);
+       http_status_exit(($ret) ? $ret : 200);
        // NOTREACHED
 }