Merge pull request #10644 from annando/issue-10640

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 14cb7465b116caff80e00a9e7d48114e291d9525..9b73ff85e23a11c72da30c3eca8b504b4a565f0b 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -50,8 +50,8 @@ function hub_post_return()
 
 function pubsub_init(App $a)
 {
-       $nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
-       $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
+       $nick       = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(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'] ?? ''));
@@ -110,8 +110,8 @@ function pubsub_post(App $a)
        Logger::log('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  DI::args()->getCommand() . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
        Logger::log('Data: ' . $xml, Logger::DATA);
 
-       $nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
-       $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
+       $nick       = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(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)) {