X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FInbox.php;h=2cc273b139910c647a141b42bcf484fcdcd58fee;hb=3940e804e3ee4ac921e109f62a73fac2becaa611;hp=3b845074d25218367e118ccbb8c53502cfae6792;hpb=616c4a89bd9fde2be3bf398bcd0cc777f617a5fe;p=friendica.git

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index 3b845074d2..2cc273b139 100644
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -2,13 +2,17 @@
 /**
  * @file src/Module/Inbox.php
  */
+
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Protocol\ActivityPub;
+use Friendica\Core\Config;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Util\HTTPSignature;
+use Friendica\Util\Network;
 
 /**
  * ActivityPub Inbox
@@ -19,29 +23,28 @@ class Inbox extends BaseModule
 	{
 		$a = self::getApp();
 
-		$postdata = file_get_contents('php://input');
+		$postdata = Network::postdata();
 
 		if (empty($postdata)) {
-			System::httpExit(400);
+			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
 
-// Enable for test purposes
-
-		if (HTTPSignature::getSigner($postdata, $_SERVER)) {
-			$filename = 'signed-activitypub';
-		} else {
-			$filename = 'failed-activitypub';
+		if (Config::get('debug', 'ap_inbox_log')) {
+			if (HTTPSignature::getSigner($postdata, $_SERVER)) {
+				$filename = 'signed-activitypub';
+			} else {
+				$filename = 'failed-activitypub';
+			}
+			$tempfile = tempnam(get_temppath(), $filename);
+			file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+			Logger::log('Incoming message stored under ' . $tempfile);
 		}
 
-		$tempfile = tempnam(get_temppath(), $filename);
-		file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
-
-		logger('Incoming message stored under ' . $tempfile);
-
+		// @TODO: Replace with parameter from router
 		if (!empty($a->argv[1])) {
 			$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
 			if (!DBA::isResult($user)) {
-				System::httpExit(404);
+				throw new \Friendica\Network\HTTPException\NotFoundException();
 			}
 			$uid = $user['uid'];
 		} else {
@@ -50,6 +53,6 @@ class Inbox extends BaseModule
 
 		ActivityPub\Receiver::processInbox($postdata, $_SERVER, $uid);
 
-		System::httpExit(202);
+		throw new \Friendica\Network\HTTPException\AcceptedException();
 	}
 }