X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=c008fb09dac3b93d887005f66c8874f576f45148;hb=0b13a7acd368c360be72340121e4af6e13c343c1;hp=8d6e81a68523e6e862661130205322eb5c5225dc;hpb=acaee626f5f23f4c1dc19c31896a0797a251b58f;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 8d6e81a685..c008fb09da 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -7,24 +7,24 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Strings;
+use Friendica\Util\Network;
 use Friendica\Core\System;
 
 function hub_return($valid, $body)
 {
 	if ($valid) {
-		header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK');
 		echo $body;
 	} else {
-		System::httpExit(404);
+		throw new \Friendica\Network\HTTPException\NotFoundException();
 	}
-	killme();
+	exit();
 }
 
 // when receiving an XML feed, always return OK
 
 function hub_post_return()
 {
-	System::httpExit(200);
+	throw new \Friendica\Network\HTTPException\OKException();
 }
 
 function pubsub_init(App $a)
@@ -33,11 +33,10 @@ function pubsub_init(App $a)
 	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
 	if ($_SERVER['REQUEST_METHOD'] === 'GET') {
-		$hub_mode      = Strings::escapeTags(trim(defaults($_GET, 'hub_mode', '')));
-		$hub_topic     = Strings::escapeTags(trim(defaults($_GET, 'hub_topic', '')));
-		$hub_challenge = Strings::escapeTags(trim(defaults($_GET, 'hub_challenge', '')));
-		$hub_lease     = Strings::escapeTags(trim(defaults($_GET, 'hub_lease_seconds', '')));
-		$hub_verify    = Strings::escapeTags(trim(defaults($_GET, 'hub_verify_token', '')));
+		$hub_mode      = Strings::escapeTags(trim($_GET['hub_mode'] ?? ''));
+		$hub_topic     = Strings::escapeTags(trim($_GET['hub_topic'] ?? ''));
+		$hub_challenge = Strings::escapeTags(trim($_GET['hub_challenge'] ?? ''));
+		$hub_verify    = Strings::escapeTags(trim($_GET['hub_verify_token'] ?? ''));
 
 		Logger::log('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
 		Logger::log('Data: ' . print_r($_GET,true), Logger::DATA);
@@ -85,7 +84,7 @@ function pubsub_init(App $a)
 
 function pubsub_post(App $a)
 {
-	$xml = file_get_contents('php://input');
+	$xml = Network::postdata();
 
 	Logger::log('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  $a->cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
 	Logger::log('Data: ' . $xml, Logger::DATA);