Merge pull request #8117 from annando/inbox

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index f7c9d9aafc1d97ce12252f66d254ecf729142c2c..3f900cc6313269a171d1ec2e12fd36c71c35e4d0 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -18,6 +18,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
+use Friendica\Core\Search;
 use Friendica\Core\System;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
@@ -335,19 +336,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 +356,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 +438,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,10 +456,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);
@@ -559,7 +560,7 @@ function dfrn_request_content(App $a)
                                                'to_name'      => $r[0]['username'],
                                                'to_email'     => $r[0]['email'],
                                                'uid'          => $r[0]['uid'],
-                                               'link'         => System::baseUrl() . '/notifications/intros',
+                                               'link'         => DI::baseUrl() . '/notifications/intros',
                                                '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'],
@@ -610,17 +611,17 @@ function dfrn_request_content(App $a)
                } elseif (!empty($_GET['address'])) {
                        $myaddr = $_GET['address'];
                } elseif (local_user()) {
-                       if (strlen($a->getURLPath())) {
-                               $myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
+                       if (strlen(DI::baseUrl()->getUrlPath())) {
+                               $myaddr = DI::baseUrl() . '/profile/' . $a->user['nickname'];
                        } else {
-                               $myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+                               $myaddr = $a->user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
                        }
                } else {
                        // last, try a zrl
                        $myaddr = Profile::getMyURL();
                }
 
-               $target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+               $target_addr = $a->profile['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
 
                /* The auto_request form only has the profile address
                 * because nobody is going to read the comments and
@@ -634,7 +635,7 @@ function dfrn_request_content(App $a)
 
                $page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:");
 
-               $invite_desc = L10n::t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica site and join us today</a>.', get_server() . '/servers');
+               $invite_desc = L10n::t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica site and join us today</a>.', Search::getGlobalDirectory() . '/servers');
 
                $o = Renderer::replaceMacros($tpl, [
                        '$header' => L10n::t('Friend/Connection Request'),