Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced

[friendica.git] / include / follow.php

diff --git a/include/follow.php b/include/follow.php
index 8d80538e0c924856c51c0547511d4e4769f750aa..cdeac6db2a5bbe97861ad13a3cde5a5bf612fb42 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,11 +1,14 @@
 <?php
-require_once("include/Scrape.php");
-require_once("include/socgraph.php");
-require_once('include/group.php');
-require_once('include/salmon.php');
-require_once('include/ostatus.php');
-require_once("include/Photo.php");
-require_once('include/diaspora.php');
+
+use Friendica\App;
+
+require_once 'include/probe.php';
+require_once 'include/socgraph.php';
+require_once 'include/group.php';
+require_once 'include/salmon.php';
+require_once 'include/ostatus.php';
+require_once 'include/Photo.php';
+require_once 'include/diaspora.php';
 
 function update_contact($id) {
        /*
@@ -82,6 +85,11 @@ function new_contact($uid,$url,$interactive = false) {
                return $result;
        }
 
+       if (blocked_url($url)) {
+               $result['message'] = t('Blocked domain');
+               return $result;
+       }
+
        if (! $url) {
                $result['message'] = t('Connect URL missing.');
                return $result;
@@ -110,12 +118,10 @@ function new_contact($uid,$url,$interactive = false) {
 
                        // NOTREACHED
                }
-       } else {
-               if (get_config('system','dfrn_only')) {
-                       $result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
-                       $result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
-                       return $result;
-               }
+       } elseif (get_config('system','dfrn_only')) {
+               $result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
+               $result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
+               return $result;
        }
 
        // This extra param just confuses things, remove it