]> git.mxchange.org Git - friendica.git/blobdiff - mod/dfrn_request.php
Merge pull request #8117 from annando/inbox
[friendica.git] / mod / dfrn_request.php
index f78da7fb04d70a40c5b841de3d2b82c5edf5da75..3f900cc6313269a171d1ec2e12fd36c71c35e4d0 100644 (file)
@@ -18,15 +18,18 @@ 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;
+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 +70,7 @@ function dfrn_request_post(App $a)
        }
 
        if (!empty($_POST['cancel'])) {
-               $a->internalRedirect();
+               DI::baseUrl()->redirect();
        }
 
        /*
@@ -80,7 +83,7 @@ function dfrn_request_post(App $a)
                if (local_user() && ($a->user['nickname'] == $a->argv[1]) && !empty($_POST['dfrn_url'])) {
                        $dfrn_url    = Strings::escapeTags(trim($_POST['dfrn_url']));
                        $aes_allow   = !empty($_POST['aes_allow']);
-                       $confirm_key = defaults($_POST, 'confirm_key', "");
+                       $confirm_key = $_POST['confirm_key'] ?? '';
                        $hidden      = (!empty($_POST['hidden-contact']) ? intval($_POST['hidden-contact']) : 0);
                        $contact_record = null;
                        $blocked     = 1;
@@ -169,7 +172,7 @@ function dfrn_request_post(App $a)
                                $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
                                        intval(local_user()),
                                        DBA::escape($dfrn_url),
-                                       defaults($parms, 'key', '') // Potentially missing
+                                       $parms['key'] ?? '' // Potentially missing
                                );
                                if (DBA::isResult($r)) {
                                        Group::addMember(User::getDefaultGroup(local_user(), $r[0]["network"]), $r[0]['id']);
@@ -193,14 +196,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 +336,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 +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);
-                                       $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);
@@ -423,7 +426,7 @@ function dfrn_request_post(App $a)
                                        intval($uid),
                                        intval($contact_record['id']),
                                        intval(!empty($_POST['knowyou'])),
-                                       DBA::escape(Strings::escapeTags(trim(defaults($_POST, 'dfrn-request-message', '')))),
+                                       DBA::escape(Strings::escapeTags(trim($_POST['dfrn-request-message'] ?? ''))),
                                        DBA::escape($hash),
                                        DBA::escape(DateTimeFormat::utcNow())
                                );
@@ -435,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"
@@ -453,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);
@@ -499,7 +502,7 @@ function dfrn_request_content(App $a)
 
                $dfrn_url = Strings::escapeTags(trim(hex2bin($_GET['dfrn_url'])));
                $aes_allow = !empty($_GET['aes_allow']);
-               $confirm_key = defaults($_GET, 'confirm_key', "");
+               $confirm_key = $_GET['confirm_key'] ?? '';
 
                // Checking fastlane for validity
                if (!empty($_SESSION['fastlane']) && (Strings::normaliseLink($_SESSION["fastlane"]) == Strings::normaliseLink($dfrn_url))) {
@@ -557,11 +560,11 @@ 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'],
-                                               'verb'         => ACTIVITY_REQ_FRIEND,
+                                               'verb'         => Activity::REQ_FRIEND,
                                                'otype'        => 'intro'
                                        ]);
                                }
@@ -608,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
@@ -632,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'),