X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=8d6e81a68523e6e862661130205322eb5c5225dc;hb=3f85ee3ef8348dd2200c7bb05be6701689a649d5;hp=edab03e3f4bed925cba660fab95e25c6eaa96cc3;hpb=a0f65ca7a1b1fbc1a2d0f823940211377fc6e13e;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index edab03e3f4..8d6e81a685 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -7,8 +7,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Strings;
-
-require_once 'include/items.php';
+use Friendica\Core\System;
 
 function hub_return($valid, $body)
 {
@@ -16,7 +15,7 @@ function hub_return($valid, $body)
 		header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK');
 		echo $body;
 	} else {
-		header($_SERVER["SERVER_PROTOCOL"] . ' 404 Not Found');
+		System::httpExit(404);
 	}
 	killme();
 }
@@ -25,21 +24,20 @@ function hub_return($valid, $body)
 
 function hub_post_return()
 {
-	header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK');
-	killme();
+	System::httpExit(200);
 }
 
 function pubsub_init(App $a)
 {
-	$nick       = (($a->argc > 1) ? Strings::removeTags(trim($a->argv[1])) : '');
+	$nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
 	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
 	if ($_SERVER['REQUEST_METHOD'] === 'GET') {
-		$hub_mode      = Strings::removeTags(trim(defaults($_GET, 'hub_mode', '')));
-		$hub_topic     = Strings::removeTags(trim(defaults($_GET, 'hub_topic', '')));
-		$hub_challenge = Strings::removeTags(trim(defaults($_GET, 'hub_challenge', '')));
-		$hub_lease     = Strings::removeTags(trim(defaults($_GET, 'hub_lease_seconds', '')));
-		$hub_verify    = Strings::removeTags(trim(defaults($_GET, 'hub_verify_token', '')));
+		$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);
 		Logger::log('Data: ' . print_r($_GET,true), Logger::DATA);
@@ -64,7 +62,7 @@ function pubsub_init(App $a)
 			hub_return(false, '');
 		}
 
-		if (!empty($hub_topic) && !link_compare($hub_topic, $contact['poll'])) {
+		if (!empty($hub_topic) && !Strings::compareLink($hub_topic, $contact['poll'])) {
 			Logger::log('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);
 			hub_return(false, '');
 		}
@@ -92,7 +90,7 @@ function pubsub_post(App $a)
 	Logger::log('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  $a->cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
 	Logger::log('Data: ' . $xml, Logger::DATA);
 
-	$nick       = (($a->argc > 1) ? Strings::removeTags(trim($a->argv[1])) : '');
+	$nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
 	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
 	$importer = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);