update for ES thx Albert

[friendica.git] / mod / noscrape.php

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 83ab71ce15884f90cb423172f638eab0e6dba000..4b2ce73a39e89849d562a8e6c89c143bd412a345 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -1,5 +1,8 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+
 function noscrape_init(App $a) {
 
        if($a->argc > 1)
@@ -15,7 +18,7 @@ function noscrape_init(App $a) {
 
        profile_load($a,$which,$profile);
 
-       if (!$a->profile['net-publish'] OR $a->profile['hidewall']) {
+       if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
                header('Content-type: application/json; charset=utf-8');
                $json_info = array("hide" => true);
                echo json_encode($json_info);
@@ -34,13 +37,13 @@ function noscrape_init(App $a) {
                'addr'     => $a->profile['addr'],
                'nick'     => $which,
                'key'      => $a->profile['pubkey'],
-               'homepage' => App::get_baseurl()."/profile/{$which}",
+               'homepage' => System::baseUrl()."/profile/{$which}",
                'comm'     => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
                'photo'    => $r[0]["photo"],
                'tags'     => $keywords
        );
 
-       if (is_array($a->profile) AND !$a->profile['hide-friends']) {
+       if (is_array($a->profile) && !$a->profile['hide-friends']) {
                $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
                        intval($a->profile['uid']));
                if (dbm::is_result($r)) {
@@ -69,7 +72,7 @@ function noscrape_init(App $a) {
 
        $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
        foreach ($dfrn_pages as $dfrn) {
-               $json_info["dfrn-{$dfrn}"] = App::get_baseurl()."/dfrn_{$dfrn}/{$which}";
+               $json_info["dfrn-{$dfrn}"] = System::baseUrl()."/dfrn_{$dfrn}/{$which}";
        }
 
        //Output all the JSON!