Merge pull request #7095 from annando/ap-connect

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 9b5bf1209e81b1c941c15bbf605f12251964af5c..e5ede6c80a3792da91512c2d95f8db61d52dd51d 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -12,10 +12,9 @@ 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();
        }
        exit();
 }
@@ -24,7 +23,7 @@ function hub_return($valid, $body)
 
 function hub_post_return()
 {
-       System::httpExit(200);
+       throw new \Friendica\Network\HTTPException\OKException();
 }
 
 function pubsub_init(App $a)
@@ -36,7 +35,6 @@ function pubsub_init(App $a)
                $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', '')));
 
                Logger::log('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);