Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / mod / noscrape.php

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 2a04605469b845745755b2bce39eb3a5f9472972..f1370167c5eb2815eccd1fb2c8091c800a257c9f 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -1,6 +1,6 @@
 <?php
 
-function noscrape_init(&$a) {
+function noscrape_init(App &$a) {
 
        if($a->argc > 1)
                $which = $a->argv[1];
@@ -26,6 +26,7 @@ function noscrape_init(&$a) {
        $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
        $keywords = explode(',', $keywords);
 
+       /// @TODO This query's result is not being used (see below), maybe old-lost code?
        $r = q("SELECT `photo` FROM `contact` WHERE `self` AND `uid` = %d",
                intval($a->profile['uid']));
 
@@ -34,7 +35,7 @@ function noscrape_init(&$a) {
                'addr' => $a->profile['addr'],
                'nick' => $which,
                'key' => $a->profile['pubkey'],
-               'homepage' => $a->get_baseurl()."/profile/{$which}",
+               'homepage' => App::get_baseurl()."/profile/{$which}",
                'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
                'photo' => $r[0]["photo"],
                'tags' => $keywords
@@ -43,7 +44,7 @@ function noscrape_init(&$a) {
        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
@@ -53,18 +54,22 @@ 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']);
        }
 
        //These are optional fields.
        $profile_fields = array('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];
+       foreach($profile_fields as $field) {
+               if(!empty($a->profile[$field])) {
+                       $json_info["$field"] = $a->profile[$field];
+               }
+       }
 
        $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
-       foreach($dfrn_pages as $dfrn)
-               $json_info["dfrn-{$dfrn}"] = $a->get_baseurl()."/dfrn_{$dfrn}/{$which}";
+       foreach($dfrn_pages as $dfrn) {
+               $json_info["dfrn-{$dfrn}"] = App::get_baseurl()."/dfrn_{$dfrn}/{$which}";
+       }
 
        //Output all the JSON!
        header('Content-type: application/json; charset=utf-8');