X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Freceive.php;h=95a51016757da46217f277e4b641799c43b1ec2c;hb=c0406918ece1a48bb7ce3def21ce53f8b34c2307;hp=950bf0bd388e80ed20fd69541bd46b7e5765c99e;hpb=8aa25523721303b6883e1a793f20997f8a33ec0a;p=friendica.git

diff --git a/mod/receive.php b/mod/receive.php
old mode 100755
new mode 100644
index 950bf0bd38..95a5101675
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -9,9 +9,16 @@ require_once('include/salmon.php');
 require_once('include/crypto.php');
 require_once('include/diaspora.php');
 
-	
+
 function receive_post(&$a) {
 
+
+	$enabled = intval(get_config('system','diaspora_enabled'));
+	if(! $enabled) {
+		logger('mod-diaspora: disabled');
+		http_status_exit(500);
+	}
+
 	$public = false;
 
 	if(($a->argc == 2) && ($a->argv[1] === 'public')) {
@@ -24,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))
@@ -35,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);
@@ -42,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);