use Friendica\App;
use Friendica\Core\Addon;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Protocol\Salmon;
+use Friendica\Util\Strings;
function xrd_init(App $a)
{
if ($a->argv[0] == 'xrd') {
- $uri = urldecode(notags(trim($_GET['uri'])));
+ if (empty($_GET['uri'])) {
+ System::httpExit(404);
+ }
+
+ $uri = urldecode(Strings::escapeTags(trim($_GET['uri'])));
if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/jrd+json') {
$mode = 'json';
} else {
$mode = 'xml';
}
} else {
- $uri = urldecode(notags(trim($_GET['resource'])));
+ if (empty($_GET['resource'])) {
+ System::httpExit(404);
+ }
+
+ $uri = urldecode(Strings::escapeTags(trim($_GET['resource'])));
if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/xrd+xml') {
$mode = 'xml';
} else {
$user = DBA::selectFirst('user', [], ['nickname' => $name]);
if (!DBA::isResult($user)) {
- killme();
+ System::httpExit(404);
}
$profile_url = System::baseUrl().'/profile/'.$user['nickname'];
$alias = str_replace('/profile/', '/~', $profile_url);
- $addr = 'acct:'.$user['nickname'].'@'.$a->get_hostname();
- if ($a->get_path()) {
- $addr .= '/'.$a->get_path();
+ $addr = 'acct:'.$user['nickname'].'@'.$a->getHostName();
+ if ($a->getURLPath()) {
+ $addr .= '/'.$a->getURLPath();
}
if ($mode == 'xml') {
['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' => 'self', 'type' => 'application/activity+json', '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://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' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-zot+json', 'href' => System::baseUrl().'/owa']
]
];
+
echo json_encode($json);
killme();
}
header('Access-Control-Allow-Origin: *');
header("Content-type: text/xml");
- $tpl = get_markup_template('xrd_person.tpl');
+ $tpl = Renderer::getMarkupTemplate('xrd_person.tpl');
- $o = replace_macros($tpl, [
+ $o = Renderer::replaceMacros($tpl, [
'$nick' => $r['nickname'],
'$accturi' => $uri,
'$alias' => $alias,