X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Freceive.php;h=4991ac47e81811b473597398a4c129df2c00b330;hb=fd8df4c4d6688e5ffd6bc78e14062aa064102715;hp=19c16396718decd69aca67d02611a67996dad145;hpb=bdf42473a0341f291cd256323d122aa80bb0cb0b;p=friendica.git

diff --git a/mod/receive.php b/mod/receive.php
index 19c1639671..4991ac47e8 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -9,24 +9,41 @@ 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')
+
+	$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 AND `account_removed` = 0 LIMIT 1",
+			dbesc($guid)
+		);
+		if(! count($r))
+			http_status_exit(500);
+
+		$importer = $r[0];
+	}
 
 	// 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);
@@ -34,38 +51,27 @@ function receive_post(&$a) {
 	if(! $xml)
 		http_status_exit(500);
 
-	$msg = diaspora_decode($importer,$xml);
+	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);
 
-	$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);
-	}
-	else {
-		logger('mod-diaspora: unknown message type: ' . print_r($xmlbase,true));
+	$ret = 0;
+	if($public) {
+		diaspora::dispatch_public($msg);
+	} else {
+		$ret = diaspora::dispatch($importer,$msg);
 	}
 
-	http_status_exit(200);
+	http_status_exit(($ret) ? $ret : 200);
 	// NOTREACHED
 }