Merge pull request #7932 from MrPetovan/bug/fatal-errors

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index cd2f21dd67904907cc73646688442e1e14c4498f..c008fb09dac3b93d887005f66c8874f576f45148 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -7,26 +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;
 
-require_once 'include/items.php';
-
 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)
@@ -35,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);
@@ -87,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);