More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / mod / noscrape.php

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 51bd7234cf283a6b63e1d55d5af7e814ec6a589d..a2a71a8e2bab6ffa6c3ab9bdb2d52d70d6e2999e 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -15,27 +15,35 @@ function noscrape_init(&$a) {
 
        profile_load($a,$which,$profile);
 
-       if(!$a->profile['net-publish'])
-               killme();
+       if (!$a->profile['net-publish'] OR $a->profile['hidewall']) {
+               header('Content-type: application/json; charset=utf-8');
+               $json_info = array("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 = explode(',', $keywords);
 
+       $r = q("SELECT `photo` FROM `contact` WHERE `self` AND `uid` = %d",
+               intval($a->profile['uid']));
+
        $json_info = array(
                'fn' => $a->profile['name'],
                'addr' => $a->profile['addr'],
+               'nick' => $which,
                'key' => $a->profile['pubkey'],
                'homepage' => $a->get_baseurl()."/profile/{$which}",
                'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
-               'photo' => $a->profile['photo'],
+               'photo' => $r[0]["photo"],
                'tags' => $keywords
        );
 
        if(is_array($a->profile) AND !$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(count($r))
+               if(dbm::is_result($r))
                        $json_info["updated"] =  date("c", strtotime($r[0]['updated']));
 
                $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
@@ -45,7 +53,7 @@ function noscrape_init(&$a) {
                        dbesc(NETWORK_DIASPORA),
                        dbesc(NETWORK_OSTATUS)
                );
-               if(count($r))
+               if(dbm::is_result($r))
                        $json_info["contacts"] = intval($r[0]['total']);
        }