X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=e07b15583c8eb5c3926e5b9a811d3234e54295f4;hb=50580fd04cf7639905ff77dd8a58910c9c8c5a52;hp=99e8015f19dec8126145279d30bd0e7cc41e2775;hpb=f6faae5bb10299c81ab4ca2e94463246e47cacf7;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 99e8015f19..e07b15583c 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.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
  *
@@ -50,14 +50,14 @@ function hub_post_return()
 
 function pubsub_init(App $a)
 {
-	$nick       = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(trim(DI::args()->getArgv()[1])) : '');
-	$contact_id = ((DI::args()->getArgc() > 2) ? intval(DI::args()->getArgv()[2])       : 0 );
+	$nick       = ((DI::args()->getArgc() > 1) ? trim(DI::args()->getArgv()[1])   : '');
+	$contact_id = ((DI::args()->getArgc() > 2) ? intval(DI::args()->getArgv()[2]) : 0 );
 
-	if ($_SERVER['REQUEST_METHOD'] === 'GET') {
-		$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'] ?? ''));
+	if (DI::args()->getMethod() === App\Router::GET) {
+		$hub_mode      = trim($_GET['hub_mode']         ?? '');
+		$hub_topic     = trim($_GET['hub_topic']        ?? '');
+		$hub_challenge = trim($_GET['hub_challenge']    ?? '');
+		$hub_verify    = trim($_GET['hub_verify_token'] ?? '');
 
 		Logger::notice('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
 		Logger::debug('Data: ', ['get' => $_GET]);
@@ -107,11 +107,11 @@ function pubsub_post(App $a)
 {
 	$xml = Network::postdata();
 
-	Logger::notice('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  DI::args()->getCommand() . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
+	Logger::info('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  DI::args()->getCommand() . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
 	Logger::debug('Data: ' . $xml);
 
-	$nick       = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(trim(DI::args()->getArgv()[1])) : '');
-	$contact_id = ((DI::args()->getArgc() > 2) ? intval(DI::args()->getArgv()[2])       : 0 );
+	$nick       = ((DI::args()->getArgc() > 1) ? trim(DI::args()->getArgv()[1])   : '');
+	$contact_id = ((DI::args()->getArgc() > 2) ? intval(DI::args()->getArgv()[2]) : 0 );
 
 	$importer = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
 	if (!DBA::isResult($importer)) {
@@ -149,7 +149,7 @@ function pubsub_post(App $a)
 		hub_post_return();
 	}
 
-	Logger::notice('Import item for ' . $nick . ' from ' . $contact['nick'] . ' (' . $contact['id'] . ')');
+	Logger::info('Import item for ' . $nick . ' from ' . $contact['nick'] . ' (' . $contact['id'] . ')');
 	$feedhub = '';
 	OStatus::import($xml, $importer, $contact, $feedhub);