bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

add webfinger to poco, if present

Browse source
This commit is contained in:
friendica 2011-12-18 00:14:34 -08:00
parent 22d59350e9
commit 978717a247
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1197' ); define ( 'FRIENDICA_VERSION', '2.3.1198' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1111 ); define ( 'DB_UPDATE_VERSION', 1111 );

4
mod/poco.php
View file

@ -125,8 +125,10 @@ function poco_init(&$a) {
$entry['id'] = $rr['id']; $entry['id'] = $rr['id'];
if($fields_ret['displayName']) if($fields_ret['displayName'])
$entry['displayName'] = $rr['name']; $entry['displayName'] = $rr['name'];
if($fields_ret['urls']) if($fields_ret['urls']) {
$entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile')); $entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile'));
if($rr['addr'] && ($rr['network'] !== NETWORK_MAIL)
$entry['urls'][] = array('value' => 'acct:' . $rr['addr'], 'type' => 'webfinger');
if($fields_ret['preferredUsername']) if($fields_ret['preferredUsername'])
$entry['preferredUsername'] = $rr['nick']; $entry['preferredUsername'] = $rr['nick'];
if($fields_ret['photos']) if($fields_ret['photos'])

6
view/poco_entry_xml.tpl
View file

@ -2,6 +2,10 @@
{{ if $entry.id }}<id>$entry.id</id>{{ endif }} {{ if $entry.id }}<id>$entry.id</id>{{ endif }}
{{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }} {{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }}
{{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }} {{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }}
{{ if $entry.urls }}<urls><value>$entry.urls.value</value><type>$entry.urls.type</type></urls>{{ endif }} {{ if $entry.urls }}
{{for $entry.urls as $url }}
<urls><value>$url.value</value><type>$url.type</type></urls>
{{endfor}}
{{ endif }}
{{ if $entry.photos }}<photos><value>$entry.photos.value</value><type>$entry.photos.type</type></photos>{{ endif }} {{ if $entry.photos }}<photos><value>$entry.photos.value</value><type>$entry.photos.type</type></photos>{{ endif }}
</entry> </entry>