Merge pull request #10498 from MrPetovan/bug/10477-frio-csp-error-event-edit

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index ed8e3aa5fee881bd470d308be901fa3adb613809..ac74d217bc4d816f09a952d0180d417d93bf7afa 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -118,18 +118,13 @@ function follow_content(App $a)
                $contact['url'] = $contact['addr'];
        }
 
-       if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) {
-               $request = $contact['request'];
-               $tpl = Renderer::getMarkupTemplate('dfrn_request.tpl');
-       } else {
-               if (!empty($_REQUEST['auto'])) {
-                       follow_process($a, $contact['url']);
-               }
-       
-               $request = DI::baseUrl() . '/follow';
-               $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
+       if (!empty($_REQUEST['auto'])) {
+               follow_process($a, $contact['url']);
        }
 
+       $request = DI::baseUrl() . '/follow';
+       $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
+
        $owner = User::getOwnerDataById($uid);
        if (empty($owner)) {
                notice(DI::l10n()->t('Permission denied.'));
@@ -139,9 +134,6 @@ function follow_content(App $a)
 
        $myaddr = $owner['url'];
 
-       // Makes the connection request for friendica contacts easier
-       $_SESSION['fastlane'] = $contact['url'];
-
        $o = Renderer::replaceMacros($tpl, [
                '$header'        => DI::l10n()->t('Connect/Follow'),
                '$pls_answer'    => DI::l10n()->t('Please answer the following:'),
@@ -182,10 +174,6 @@ function follow_process(App $a, string $url)
 {
        $return_path = 'follow?url=' . urlencode($url);
 
-       // Makes the connection request for friendica contacts easier
-       // This is just a precaution if maybe this page is called somewhere directly via POST
-       $_SESSION['fastlane'] = $url;
-
        $result = Contact::createFromProbe($a->user, $url, true);
 
        if ($result['success'] == false) {