friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1338 from annando/1501-global-contacts 

Added "about" to noscrape
This commit is contained in:
Tobias Diekershoff 2015-02-02 21:52:09 +01:00
parent 2efc789aee 04ab875a62
commit 677f46c076
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mod/noscrape.php
View File

@ -1,30 +1,30 @@
<?php <?php
function noscrape_init(&$a) { function noscrape_init(&$a) {
if(get_config('system','disable_noscrape')) if(get_config('system','disable_noscrape'))
killme(); killme();
if($a->argc > 1) if($a->argc > 1)
$which = $a->argv[1]; $which = $a->argv[1];
else else
killme(); killme();
$profile = 0; $profile = 0;
if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) { if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
$which = $a->user['nickname']; $which = $a->user['nickname'];
$profile = $a->argv[1]; $profile = $a->argv[1];
} }
profile_load($a,$which,$profile); profile_load($a,$which,$profile);
if(!$a->profile['net-publish']) if(!$a->profile['net-publish'])
killme(); killme();
$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : ''); $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords); $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
$keywords = explode(',', $keywords); $keywords = explode(',', $keywords);
$json_info = array( $json_info = array(
'fn' => $a->profile['name'], 'fn' => $a->profile['name'],
'key' => $a->profile['pubkey'], 'key' => $a->profile['pubkey'],
@ -33,19 +33,19 @@ function noscrape_init(&$a) {
'photo' => $a->profile['photo'], 'photo' => $a->profile['photo'],
'tags' => $keywords 'tags' => $keywords
); );
//These are optional fields. //These are optional fields.
$profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital'); $profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about');
foreach($profile_fields as $field) foreach($profile_fields as $field)
if(!empty($a->profile[$field])) $json_info["$field"] = $a->profile[$field]; if(!empty($a->profile[$field])) $json_info["$field"] = $a->profile[$field];
$dfrn_pages = array('request', 'confirm', 'notify', 'poll'); $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
foreach($dfrn_pages as $dfrn) foreach($dfrn_pages as $dfrn)
$json_info["dfrn-{$dfrn}"] = $a->get_baseurl()."/dfrn_{$dfrn}/{$which}"; $json_info["dfrn-{$dfrn}"] = $a->get_baseurl()."/dfrn_{$dfrn}/{$which}";
//Output all the JSON! //Output all the JSON!
header('Content-type: application/json; charset=utf-8'); header('Content-type: application/json; charset=utf-8');
echo json_encode($json_info); echo json_encode($json_info);
exit; exit;
} }