X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnoscrape.php;h=a269d7369af90b21ff7f518528afb75caf898e43;hb=74479c4020499e6aa7866b5478366932b723c515;hp=f1370167c5eb2815eccd1fb2c8091c800a257c9f;hpb=a020086128e3d903a030cc3b3d403ab9bce02d88;p=friendica.git diff --git a/mod/noscrape.php b/mod/noscrape.php index f1370167c5..a269d7369a 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -1,6 +1,8 @@ argc > 1) $which = $a->argv[1]; @@ -26,26 +28,26 @@ function noscrape_init(App &$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'])); $json_info = array( - 'fn' => $a->profile['name'], - 'addr' => $a->profile['addr'], - 'nick' => $which, - 'key' => $a->profile['pubkey'], + 'fn' => $a->profile['name'], + 'addr' => $a->profile['addr'], + 'nick' => $which, + 'key' => $a->profile['pubkey'], 'homepage' => App::get_baseurl()."/profile/{$which}", - 'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY), - 'photo' => $r[0]["photo"], - 'tags' => $keywords + '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) 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 (dbm::is_result($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 AND `network` IN ('%s', '%s', '%s', '')", @@ -54,20 +56,21 @@ function noscrape_init(App &$a) { dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS) ); - if (dbm::is_result($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])) { + 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) { + foreach ($dfrn_pages as $dfrn) { $json_info["dfrn-{$dfrn}"] = App::get_baseurl()."/dfrn_{$dfrn}/{$which}"; }