X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Freceive.php;h=95a51016757da46217f277e4b641799c43b1ec2c;hb=4798675e6e303f55b1f66eb36908dbb311e248d6;hp=46b1f2745684e6cb513a192d2a480cd1ab351fde;hpb=44918e27367d00d3625daaf751a05b166ecd2fc1;p=friendica.git

diff --git a/mod/receive.php b/mod/receive.php
index 46b1f27456..95a5101675 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -10,97 +10,67 @@ 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);
-
-	$guid = $a->argv[2];
 
-	$r = q("SELECT * FROM `user` WHERE `guid` = '%s' LIMIT 1",
-		dbesc($guid)
-	);
-	if(! count($r))
+	$enabled = intval(get_config('system','diaspora_enabled'));
+	if(! $enabled) {
+		logger('mod-diaspora: disabled');
 		http_status_exit(500);
+	}
 
-	$importer = $r[0];
-
-	// I really don't know why we need urldecode - PHP should be doing this for us.
-	// It is an application/x-www-form-urlencoded
-
-	$xml = urldecode($_POST['xml']);
+	$public = false;
 
-	logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
+	if(($a->argc == 2) && ($a->argv[1] === 'public')) {
+		$public = true;
+	}
+	else {
 
-	if(! $xml)
-		http_status_exit(500);
+		if($a->argc != 3 || $a->argv[1] !== 'users')
+			http_status_exit(500);
 
-	$msg = diaspora_decode($importer,$xml);
+		$guid = $a->argv[2];
 
-	logger('mod-diaspora: decoded msg: ' . $msg, LOGGER_DATA);
+		$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);
 
-	if(! $msg)
-		http_status_exit(500);
+		$importer = $r[0];
+	}
 
+	// It is an application/x-www-form-urlencoded
 
-	$parsed_xml = parse_xml_string($msg,false);
+	logger('mod-diaspora: receiving post', LOGGER_DEBUG);
 
-	$xmlbase = $parsed_xml->post;
+	$xml = urldecode($_POST['xml']);
 
-	// If we reached this point, the message is good. 
-	// Now let's figure out if the author is allowed to send us stuff.
+	logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
 
-	$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.');
-	}	
+	if(! $xml)
+		http_status_exit(500);
 
-	// 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
-	// or a retraction of same.
+	logger('mod-diaspora: message is okay', LOGGER_DEBUG);
 
+	$msg = diaspora_decode($importer,$xml);
 
-	$allow_blocked = (($xmlbase->request || ($xmlbase->retraction && $xmlbase->retraction->type == 'Person')) ? true : false);
+	logger('mod-diaspora: decoded', LOGGER_DEBUG);
 
-	if((count($r)) 
-		&& (($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']) || ($r[0]['readonly'])) 
-		&& (! $allow_blocked)) {
-			logger('mod-diaspora: Ignoring this author.');
-			http_status_exit(202);
-			// NOTREACHED
-	}
+	logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DATA);
 
-	require_once('include/items.php');
+	if(! is_array($msg))
+		http_status_exit(500);
 
-	$contact = ((count($r)) ? $r[0] : null);
+	logger('mod-diaspora: dispatching', LOGGER_DEBUG);
 
-	if($xmlbase->request) {
-		diaspora_request($importer,$contact,$xmlbase->request);
-	}
-	elseif($xmlbase->status_message) {
-		diaspora_post($importer,$contact,$xmlbase->status_message);
-	}
-	elseif($xmlbase->comment) {
-		diaspora_comment($importer,$contact,$xmlbase->comment);
-	}
-	elseif($xmlbase->like) {
-		diaspora_like($importer,$contact,$xmlbase->like);
-	}
-	elseif($xmlbase->retraction) {
-		diaspora_retraction($importer,$contact,$xmlbase->retraction);
-	}
-	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
 }