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 f37064573bf0762a852c508b4d08b888c0abee1a..7f0ad805a7fe6343e6757b1b7af3b5ad51693517 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -21,12 +21,14 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Network\Probe;
+use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -67,7 +69,7 @@ function dfrn_request_post(App $a)
        }
 
        if (!empty($_POST['cancel'])) {
-               $a->internalRedirect();
+               DI::baseUrl()->redirect();
        }
 
        /*
@@ -193,14 +195,14 @@ function dfrn_request_post(App $a)
                                }
 
                                // (ignore reply, nothing we can do it failed)
-                               $a->internalRedirect($forward_path);
+                               DI::baseUrl()->redirect($forward_path);
                                return; // NOTREACHED
                        }
                }
 
                // invalid/bogus request
                notice(L10n::t('Unrecoverable protocol error.') . EOL);
-               $a->internalRedirect();
+               DI::baseUrl()->redirect();
                return; // NOTREACHED
        }
 
@@ -333,19 +335,19 @@ function dfrn_request_post(App $a)
                                $url = Network::isUrlValid($url);
                                if (!$url) {
                                        notice(L10n::t('Invalid profile URL.') . EOL);
-                                       $a->internalRedirect($a->cmd);
+                                       DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
 
                                if (!Network::isUrlAllowed($url)) {
                                        notice(L10n::t('Disallowed profile URL.') . EOL);
-                                       $a->internalRedirect($a->cmd);
+                                       DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
 
                                if (Network::isUrlBlocked($url)) {
                                        notice(L10n::t('Blocked domain') . EOL);
-                                       $a->internalRedirect($a->cmd);
+                                       DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
 
@@ -353,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);
-                                       $a->internalRedirect($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);
@@ -435,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"
@@ -453,10 +455,10 @@ 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 ($a->getURLPath()) {
-                                       $uri .= '/' . $a->getURLPath();
+                               if (DI::baseUrl()->getUrlPath()) {
+                                       $uri .= '/' . DI::baseUrl()->getUrlPath();
                                }
 
                                $uri = urlencode($uri);
@@ -561,7 +563,7 @@ function dfrn_request_content(App $a)
                                                'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : L10n::t('[Name Withheld]')),
                                                'source_link'  => $r[0]['url'],
                                                'source_photo' => $r[0]['photo'],
-                                               'verb'         => ACTIVITY_REQ_FRIEND,
+                                               'verb'         => Activity::REQ_FRIEND,
                                                'otype'        => 'intro'
                                        ]);
                                }
@@ -608,7 +610,7 @@ function dfrn_request_content(App $a)
                } elseif (!empty($_GET['address'])) {
                        $myaddr = $_GET['address'];
                } elseif (local_user()) {
-                       if (strlen($a->getURLPath())) {
+                       if (strlen(DI::baseUrl()->getUrlPath())) {
                                $myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
                        } else {
                                $myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);