X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Freceive.php;h=95a51016757da46217f277e4b641799c43b1ec2c;hb=41fe07e12821a25e3ad8279abc5344b8bbe011ab;hp=2bd3cc65bcda1b5ae273d9903184981805b8d33a;hpb=43d5876e8b35d53a0bef5248c5d63e5bc209dbbf;p=friendica.git diff --git a/mod/receive.php b/mod/receive.php index 2bd3cc65bc..95a5101675 100644 --- a/mod/receive.php +++ b/mod/receive.php @@ -9,7 +9,7 @@ require_once('include/salmon.php'); require_once('include/crypto.php'); require_once('include/diaspora.php'); - + function receive_post(&$a) { @@ -31,7 +31,7 @@ function receive_post(&$a) { $guid = $a->argv[2]; - $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 LIMIT 1", + $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($guid) ); if(! count($r)) @@ -42,6 +42,8 @@ function receive_post(&$a) { // It is an application/x-www-form-urlencoded + logger('mod-diaspora: receiving post', LOGGER_DEBUG); + $xml = urldecode($_POST['xml']); logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA); @@ -49,13 +51,19 @@ function receive_post(&$a) { if(! $xml) http_status_exit(500); + logger('mod-diaspora: message is okay', LOGGER_DEBUG); + $msg = diaspora_decode($importer,$xml); + logger('mod-diaspora: decoded', LOGGER_DEBUG); + logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DATA); if(! is_array($msg)) http_status_exit(500); + logger('mod-diaspora: dispatching', LOGGER_DEBUG); + $ret = 0; if($public) diaspora_dispatch_public($msg);