harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move disapora xrd stuff to plugin

Browse Source
This commit is contained in:
zotlabs 2017-05-30 16:50:57 -07:00
parent 6962bc5147
commit e48d5383ce
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Module/Xrd.php
View File

@ -31,12 +31,6 @@ class Xrd extends \Zotlabs\Web\Controller {
if(! $r) if(! $r)
killme(); killme();
$dspr = replace_macros(get_markup_template('xrd_diaspora.tpl'),array(
'$baseurl' => z_root(),
'$dspr_guid' => $r[0]['channel_guid'] . str_replace('.','',\App::get_hostname()),
'$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey']))
));
$salmon_key = salmon_key($r[0]['channel_pubkey']); $salmon_key = salmon_key($r[0]['channel_pubkey']);
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
@ -50,7 +44,6 @@ class Xrd extends \Zotlabs\Web\Controller {
unset($aliases[$x]); unset($aliases[$x]);
} }
$o = replace_macros(get_markup_template('xrd_person.tpl'), array( $o = replace_macros(get_markup_template('xrd_person.tpl'), array(
'$nick' => $r[0]['channel_address'], '$nick' => $r[0]['channel_address'],
'$accturi' => $resource, '$accturi' => $resource,
@ -61,12 +54,8 @@ class Xrd extends \Zotlabs\Web\Controller {
'$zot_post' => z_root() . '/post/' . $r[0]['channel_address'], '$zot_post' => z_root() . '/post/' . $r[0]['channel_address'],
'$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'], '$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'],
'$photo' => z_root() . '/photo/profile/l/' . $r[0]['channel_id'], '$photo' => z_root() . '/photo/profile/l/' . $r[0]['channel_id'],
'$dspr' => $dspr,
// '$salmon' => z_root() . '/salmon/' . $r[0]['channel_address'],
// '$salmen' => z_root() . '/salmon/' . $r[0]['channel_address'] . '/mention',
'$modexp' => 'data:application/magic-public-key,' . $salmon_key, '$modexp' => 'data:application/magic-public-key,' . $salmon_key,
'$subscribe' => z_root() . '/follow?url={uri}', '$subscribe' => z_root() . '/follow?url={uri}',
'$bigkey' => salmon_key($r[0]['channel_pubkey'])
)); ));

3
view/tpl/xrd_diaspora.tpl
View File

@ -1,3 +0,0 @@
<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />

3
view/tpl/xrd_person.tpl
View File

@ -22,10 +22,7 @@
href="{{$hcard_url}}" /> href="{{$hcard_url}}" />
<Link rel="http://ostatus.org/schema/1.0/subscribe" <Link rel="http://ostatus.org/schema/1.0/subscribe"
template="{{$subscribe}}" /> template="{{$subscribe}}" />
<Link rel="magic-public-key" <Link rel="magic-public-key"
href="{{$modexp}}" /> href="{{$modexp}}" />
{{$dspr}}
</XRD> </XRD>