X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Freceive.php;h=2bd3cc65bcda1b5ae273d9903184981805b8d33a;hb=a12600587709b10cfdb674f6f428290e221ac6f3;hp=34128518b55014e287f3f5fc9b4f398b8625af8a;hpb=d49895a8a10442e1a585732e94230ac51e92396d;p=friendica.git

diff --git a/mod/receive.php b/mod/receive.php
index 34128518b5..2bd3cc65bc 100644
--- 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 {
+
+		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];
+		$importer = $r[0];
+	}
 
 	// It is an application/x-www-form-urlencoded
 
@@ -41,9 +56,13 @@ function receive_post(&$a) {
 	if(! is_array($msg))
 		http_status_exit(500);
 
-	diaspora_dispatch($importer,$msg);
+	$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
 }