clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1894 from annando/1509-diaspora-federation 

Some changes to stay compatible to Diaspora
This commit is contained in:
Tobias Diekershoff 2015-09-19 15:51:25 +02:00
parent 0a41a8127b 25fc2c9799
commit 303a59f1d0
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/identity.php
View File

@ -285,6 +285,7 @@ if(! function_exists('profile_sidebar')) {
$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
$diaspora = array(
'guid' => $profile['guid'],
'podloc' => $a->get_baseurl(),
'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
'nickname' => $profile['nickname'],

39
view/templates/diaspora_vcard.tpl
View File

@ -1,34 +1,45 @@
<div style="display:none;">
<dl class="entity_uid">
<dt>Uid</dt>
<dd>
<span class="uid">{{$diaspora.guid}}</span>
</dd>
</dl>
<dl class='entity_nickname'>
<dt>Nickname</dt>
<dd>
<a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.nickname}}</a>
<span class="nickname">{{$diaspora.nickname}}</span>
</dd>
</dl>
<dl class='entity_fn'>
<dt>Full name</dt>
<dl class='entity_full_name'>
<dt>Full_name</dt>
<dd>
<span class='fn'>{{$diaspora.fullname}}</span>
</dd>
</dl>
<dl class='entity_given_name'>
<dt>First name</dt>
<dl class="entity_searchable">
<dt>Searchable</dt>
<dd>
<span class="searchable">{{$diaspora.searchable}}</span>
</dd>
</dl>
<dl class='entity_first_name'>
<dt>First_name</dt>
<dd>
<span class='given_name'>{{$diaspora.firstname}}</span>
</dd>
</dl>
<dl class='entity_family_name'>
<dt>Family name</dt>
<dt>Family_name</dt>
<dd>
<span class='family_name'>{{$diaspora.lastname}}</span>
</dd>
</dl>
<dl class="entity_url">
<dt>URL</dt>
<dt>Url</dt>
<dd>
<a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a>
<a id="pod_location" class="url" rel="me" href="{{$diaspora.podloc}}/">{{$diaspora.podloc}}/</a>
</dd>
</dl>
<dl class="entity_photo">
@ -38,21 +49,15 @@
</dd>
</dl>
<dl class="entity_photo_medium">
<dt>Photo</dt>
<dt>Photo_medium</dt>
<dd>
<img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}">
</dd>
</dl>
<dl class="entity_photo_small">
<dt>Photo</dt>
<dt>Photo_small</dt>
<dd>
<img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
</dd>
</dl>
<dl class="entity_searchable">
<dt>Searchable</dt>
<dd>
<span class="searchable">{{$diaspora.searchable}}</span>
</dd>
</dl>
</div>

5
view/templates/xrd_host.tpl
View File

@ -1,11 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
xmlns:hm='http://host-meta.net/xrd/1.0'>
<hm:Host>{{$zhost}}</hm:Host>
<Link rel='lrdd' template='{{$domain}}/xrd/?uri={uri}' />
<Link rel='lrdd' type='application/xrd+xml' template='{{$domain}}/xrd/?uri={uri}' />
<Link rel='acct-mgmt' href='{{$domain}}/amcd' />
<Link rel='http://services.mozilla.com/amcd/0.1' href='{{$domain}}/amcd' />
<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml"
@ -14,6 +13,4 @@
<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
type="http://salmon-protocol.org/ns/magic-key"
mk:key_id="1">{{$bigkey}}</Property>
</XRD>