Remove deprecated App::cmd - replace with DI::args()->getCommand()

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 24548c027ac4cdf54d9c773f059e5ebd2a195196..7f0ad805a7fe6343e6757b1b7af3b5ad51693517 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -335,19 +335,19 @@ function dfrn_request_post(App $a)
                                $url = Network::isUrlValid($url);
                                if (!$url) {
                                        notice(L10n::t('Invalid profile URL.') . EOL);
-                                       DI::baseUrl()->redirect($a->cmd);
+                                       DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
 
                                if (!Network::isUrlAllowed($url)) {
                                        notice(L10n::t('Disallowed profile URL.') . EOL);
-                                       DI::baseUrl()->redirect($a->cmd);
+                                       DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
 
                                if (Network::isUrlBlocked($url)) {
                                        notice(L10n::t('Blocked domain') . EOL);
-                                       DI::baseUrl()->redirect($a->cmd);
+                                       DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
 
@@ -355,7 +355,7 @@ function dfrn_request_post(App $a)
 
                                if (!count($parms)) {
                                        notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
-                                       DI::baseUrl()->redirect($a->cmd);
+                                       DI::baseUrl()->redirect(DI::args()->getCommand());
                                } else {
                                        if (empty($parms['fn'])) {
                                                notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
@@ -437,7 +437,7 @@ function dfrn_request_post(App $a)
                        }
 
                        // "Homecoming" - send the requestor back to their site to record the introduction.
-                       $dfrn_url = bin2hex($a->getBaseURL() . '/profile/' . $nickname);
+                       $dfrn_url = bin2hex(DI::baseUrl()->get() . '/profile/' . $nickname);
                        $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
 
                        System::externalRedirect($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
@@ -455,7 +455,7 @@ function dfrn_request_post(App $a)
                        // Diaspora needs the uri in the format user@domain.tld
                        // Diaspora will support the remote subscription in a future version
                        if ($network == Protocol::DIASPORA) {
-                               $uri = $nickname . '@' . $a->getHostName();
+                               $uri = $nickname . '@' . DI::baseUrl()->getHostname();
 
                                if (DI::baseUrl()->getUrlPath()) {
                                        $uri .= '/' . DI::baseUrl()->getUrlPath();