diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-30 16:50:57 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-30 16:50:57 -0700 |
| commit | e48d5383cec4f5e7bd40bbac005819d60f38c970 (patch) | |
| tree | 5ca43bc55ace4e599aa3210cdd259a996e8f761c | |
| parent | 6962bc5147bed48a0fd6ab31580ba9a0f8f75bf7 (diff) | |
| download | volse-hubzilla-e48d5383cec4f5e7bd40bbac005819d60f38c970.tar.gz volse-hubzilla-e48d5383cec4f5e7bd40bbac005819d60f38c970.tar.bz2 volse-hubzilla-e48d5383cec4f5e7bd40bbac005819d60f38c970.zip | |
move disapora xrd stuff to plugin
| -rw-r--r-- | Zotlabs/Module/Xrd.php | 15 | ||||
| -rw-r--r-- | view/tpl/xrd_diaspora.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/xrd_person.tpl | 5 |
3 files changed, 3 insertions, 20 deletions
diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php index 7b36576e0..17c0faa78 100644 --- a/Zotlabs/Module/Xrd.php +++ b/Zotlabs/Module/Xrd.php @@ -30,13 +30,7 @@ class Xrd extends \Zotlabs\Web\Controller { ); if(! $r) 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']); header('Access-Control-Allow-Origin: *'); @@ -49,8 +43,7 @@ class Xrd extends \Zotlabs\Web\Controller { if($aliases[$x] === $resource) unset($aliases[$x]); } - - + $o = replace_macros(get_markup_template('xrd_person.tpl'), array( '$nick' => $r[0]['channel_address'], '$accturi' => $resource, @@ -61,12 +54,8 @@ class Xrd extends \Zotlabs\Web\Controller { '$zot_post' => z_root() . '/post/' . $r[0]['channel_address'], '$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'], '$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, '$subscribe' => z_root() . '/follow?url={uri}', - '$bigkey' => salmon_key($r[0]['channel_pubkey']) )); diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl deleted file mode 100644 index aa0d8c740..000000000 --- a/view/tpl/xrd_diaspora.tpl +++ /dev/null @@ -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}}" /> diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 93fdcb1df..225892d70 100755 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -22,10 +22,7 @@ href="{{$hcard_url}}" /> <Link rel="http://ostatus.org/schema/1.0/subscribe" template="{{$subscribe}}" /> - - <Link rel="magic-public-key" + <Link rel="magic-public-key" href="{{$modexp}}" /> - {{$dspr}} - </XRD> |