Merge pull request #5228 from annando/fix-5199

[friendica.git] / mod / noscrape.php

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 8702f034a26b92bba642f48f554ac8441ff50425..20936929ddd6672787d7dce4e3860f86dde557c6 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -5,6 +5,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
 
 function noscrape_init(App $a)
 {
@@ -22,30 +23,31 @@ function noscrape_init(App $a)
 
        Profile::load($a, $which, $profile);
 
+       $json_info = [
+               'addr'     => $a->profile['addr'],
+               'nick'     => $which,
+               'guid'     => $a->profile['guid'],
+               'key'      => $a->profile['pubkey'],
+               'homepage' => System::baseUrl()."/profile/{$which}",
+               'comm'     => ($a->profile['account-type'] == ACCOUNT_TYPE_COMMUNITY),
+       ];
+
        if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
                header('Content-type: application/json; charset=utf-8');
-               $json_info = array("hide" => true);
+               $json_info["hide"] = true;
                echo json_encode($json_info);
                exit;
        }
 
        $keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : '');
-       $keywords = str_replace(array('#',',',' ',',,'), array('',' ',',',','), $keywords);
+       $keywords = str_replace(['#',',',' ',',,'], ['',' ',',',','], $keywords);
        $keywords = explode(',', $keywords);
 
-       $r = dba::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $a->profile['uid']]);
+       $contactPhoto = dba::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $a->profile['uid']]);
 
-       $json_info = array(
-               'fn'       => $a->profile['name'],
-               'addr'     => $a->profile['addr'],
-               'nick'     => $which,
-               'guid'     => $a->profile['guid'],
-               'key'      => $a->profile['pubkey'],
-               'homepage' => System::baseUrl()."/profile/{$which}",
-               'comm'     => (x($a->profile, 'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
-               'photo'    => $r["photo"],
-               'tags'     => $keywords
-       );
+       $json_info['fn'] = $a->profile['name'];
+       $json_info['photo'] = $contactPhoto["photo"];
+       $json_info['tags'] = $keywords;
 
        if (is_array($a->profile) && !$a->profile['hide-friends']) {
                /// @todo What should this value tell us?
@@ -85,14 +87,14 @@ function noscrape_init(App $a)
        $json_info["last-activity"] = date("o-W", $last_active);
 
        //These are optional fields.
-       $profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about');
+       $profile_fields = ['pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about'];
        foreach ($profile_fields as $field) {
                if (!empty($a->profile[$field])) {
                        $json_info["$field"] = $a->profile[$field];
                }
        }
 
-       $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
+       $dfrn_pages = ['request', 'confirm', 'notify', 'poll'];
        foreach ($dfrn_pages as $dfrn) {
                $json_info["dfrn-{$dfrn}"] = System::baseUrl()."/dfrn_{$dfrn}/{$which}";
        }