App::get_baseurl is now replaced with System::baseUrl

[friendica.git] / include / follow.php

diff --git a/include/follow.php b/include/follow.php
index 30451910772295fb824e8ac66b127b51100182e5..48e23bff627dc6341b628e4b0afccc84dce6d74c 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,11 +1,15 @@
 <?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;
+use Friendica\Core\System;
+
+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) {
        /*
@@ -27,10 +31,10 @@ function update_contact($id) {
 
        // make sure to not overwrite existing values with blank entries
        foreach ($ret AS $key => $val) {
-               if (isset($r[0][$key]) AND ($r[0][$key] != "") AND ($val == ""))
+               if (isset($r[0][$key]) && ($r[0][$key] != "") && ($val == ""))
                        $ret[$key] = $r[0][$key];
 
-               if (isset($r[0][$key]) AND ($ret[$key] != $r[0][$key]))
+               if (isset($r[0][$key]) && ($ret[$key] != $r[0][$key]))
                        $update = true;
        }
 
@@ -82,6 +86,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;
@@ -101,7 +110,7 @@ function new_contact($uid,$url,$interactive = false) {
        if ($ret['network'] === NETWORK_DFRN) {
                if ($interactive) {
                        if (strlen($a->path)) {
-                               $myaddr = bin2hex(App::get_baseurl() . '/profile/' . $a->user['nickname']);
+                               $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
                        } else {
                                $myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
                        }