From e4aaf8eb161ad8980858aa094066762747acd5c5 Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Wed, 20 Jun 2018 19:32:26 +0200
Subject: [PATCH] port hubzillas OpenWebAuth - fix some code standards
violations
---
mod/xrd.php | 30 +++++++++++++++---------------
src/Module/Magic.php | 14 +++++++-------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/mod/xrd.php b/mod/xrd.php
index 6788d0ebe4..24cb27c28c 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -68,20 +68,20 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
$json = ['subject' => $uri,
'aliases' => [$alias, $profile_url],
'links' => [
- ['rel' => NAMESPACE_DFRN, 'href' => $profile_url],
- ['rel' => NAMESPACE_FEED, 'type' => 'application/atom+xml', 'href' => System::baseUrl().'/dfrn_poll/'.$r['nickname']],
- ['rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => $profile_url],
- ['rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', 'href' => System::baseUrl().'/hcard/'.$r['nickname']],
- ['rel' => NAMESPACE_POCO, 'href' => System::baseUrl().'/poco/'.$r['nickname']],
- ['rel' => 'http://webfinger.net/rel/avatar', 'type' => 'image/jpeg', 'href' => System::baseUrl().'/photo/profile/'.$r['uid'].'.jpg'],
- ['rel' => 'http://joindiaspora.com/seed_location', 'type' => 'text/html', 'href' => System::baseUrl()],
- ['rel' => 'salmon', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
- ['rel' => 'http://salmon-protocol.org/ns/salmon-replies', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
- ['rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => System::baseUrl().'/salmon/'.$r['nickname'].'/mention'],
- ['rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => System::baseUrl().'/follow?url={uri}'],
- ['rel' => 'magic-public-key', 'href' => 'data:application/magic-public-key,'.$salmon_key],
- ['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-dfrn+json', 'href' => System::baseUrl().'/owa']
- ]
+ ['rel' => NAMESPACE_DFRN, 'href' => $profile_url],
+ ['rel' => NAMESPACE_FEED, 'type' => 'application/atom+xml', 'href' => System::baseUrl().'/dfrn_poll/'.$r['nickname']],
+ ['rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => $profile_url],
+ ['rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', 'href' => System::baseUrl().'/hcard/'.$r['nickname']],
+ ['rel' => NAMESPACE_POCO, 'href' => System::baseUrl().'/poco/'.$r['nickname']],
+ ['rel' => 'http://webfinger.net/rel/avatar', 'type' => 'image/jpeg', 'href' => System::baseUrl().'/photo/profile/'.$r['uid'].'.jpg'],
+ ['rel' => 'http://joindiaspora.com/seed_location', 'type' => 'text/html', 'href' => System::baseUrl()],
+ ['rel' => 'salmon', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
+ ['rel' => 'http://salmon-protocol.org/ns/salmon-replies', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
+ ['rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => System::baseUrl().'/salmon/'.$r['nickname'].'/mention'],
+ ['rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => System::baseUrl().'/follow?url={uri}'],
+ ['rel' => 'magic-public-key', 'href' => 'data:application/magic-public-key,'.$salmon_key],
+ ['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-dfrn+json', 'href' => System::baseUrl().'/owa']
+ ]
];
echo json_encode($json);
killme();
@@ -109,7 +109,7 @@ function xrd_xml($a, $uri, $alias, $profile_url, $r)
'$salmon' => System::baseUrl() . '/salmon/' . $r['nickname'],
'$salmen' => System::baseUrl() . '/salmon/' . $r['nickname'] . '/mention',
'$subscribe' => System::baseUrl() . '/follow?url={uri}',
- '$openwebauth' => System::baseUrl() .'/owa',
+ '$openwebauth' => System::baseUrl() . '/owa',
'$modexp' => 'data:application/magic-public-key,' . $salmon_key]
);
diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index aaf0348eda..ce41f228d3 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -77,13 +77,13 @@ class Magic extends BaseModule
// Create a header that is signed with the local users private key.
$headers = HTTPSignature::createSig(
- '',
- $headers,
- $user['prvkey'],
- 'acct:' . $user['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''),
- false,
- true,
- 'sha512'
+ '',
+ $headers,
+ $user['prvkey'],
+ 'acct:' . $user['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''),
+ false,
+ true,
+ 'sha512'
);
// Try to get an authentication token from the other instance.
--
2.39.5