Improved notification messages

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index d10d7031d6e203507817288afed647e69a47ecc6..31c0634dcf0e7639ec15c466850c541115a95169 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Strings;
@@ -33,10 +34,10 @@ function pubsub_init(App $a)
        $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
        if ($_SERVER['REQUEST_METHOD'] === 'GET') {
-               $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_verify    = Strings::escapeTags(trim(defaults($_GET, 'hub_verify_token', '')));
+               $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'] ?? ''));
 
                Logger::log('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
                Logger::log('Data: ' . print_r($_GET,true), Logger::DATA);
@@ -86,7 +87,7 @@ function pubsub_post(App $a)
 {
        $xml = Network::postdata();
 
-       Logger::log('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  $a->cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
+       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])) : '');