Merge pull request #11761 from tobiasd/20220722-zh-cn

[friendica.git] / mod / pubsubhubbub.php

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index 2cc2394c19c42ad5ef8cf37fb4e35aa78df9c784..5dda9ee0af966fc9a97da01049317d8d594fb889 100644 (file)
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,15 +21,12 @@
 
 use Friendica\App;
 use Friendica\Core\Logger;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\PushSubscriber;
 use Friendica\Util\Strings;
 
-function post_var($name) {
-       return !empty($_POST[$name]) ? Strings::escapeTags(trim($_POST[$name])) : '';
-}
-
 function pubsubhubbub_init(App $a) {
        // PuSH subscription must be considered "public" so just block it
        // if public access isn't enabled.
@@ -47,12 +44,12 @@ function pubsubhubbub_init(App $a) {
        // [hub_secret] => af11...
        // [hub_topic] => http://friendica.local/dfrn_poll/sazius
 
-       if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-               $hub_mode = post_var('hub_mode');
-               $hub_callback = post_var('hub_callback');
-               $hub_verify_token = post_var('hub_verify_token');
-               $hub_secret = post_var('hub_secret');
-               $hub_topic = post_var('hub_topic');
+       if (DI::args()->getMethod() === App\Router::POST) {
+               $hub_mode         = $_POST['hub_mode']         ?? '';
+               $hub_callback     = $_POST['hub_callback']     ?? '';
+               $hub_verify_token = $_POST['hub_verify_token'] ?? '';
+               $hub_secret       = $_POST['hub_secret']       ?? '';
+               $hub_topic        = $_POST['hub_topic']        ?? '';
 
                // check for valid hub_mode
                if ($hub_mode === 'subscribe') {
@@ -146,5 +143,5 @@ function pubsubhubbub_init(App $a) {
 
                throw new \Friendica\Network\HTTPException\AcceptedException();
        }
-       exit();
+       System::exit();
 }