X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fxrd.php;h=b4cb60afed68c7b1c80b27a61cc0e84ab8b90a07;hb=73835118550f4bf9c0df510283c905f89224d612;hp=87766ca26e5890d7d33605c82c29d70e517181be;hpb=1afa6523bc6988843c576a5664b393d0d1e80e88;p=friendica.git

diff --git a/mod/xrd.php b/mod/xrd.php
index 87766ca26e..b4cb60afed 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -4,19 +4,21 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
+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') {
 		if (empty($_GET['uri'])) {
-			killme();
+			System::httpExit(404);
 		}
 
-		$uri = urldecode(notags(trim($_GET['uri'])));
+		$uri = urldecode(Strings::escapeTags(trim($_GET['uri'])));
 		if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/jrd+json') {
 			$mode = 'json';
 		} else {
@@ -24,10 +26,10 @@ function xrd_init(App $a)
 		}
 	} else {
 		if (empty($_GET['resource'])) {
-			killme();
+			System::httpExit(404);
 		}
 
-		$uri = urldecode(notags(trim($_GET['resource'])));
+		$uri = urldecode(Strings::escapeTags(trim($_GET['resource'])));
 		if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/xrd+xml') {
 			$mode = 'xml';
 		} else {
@@ -48,26 +50,26 @@ function xrd_init(App $a)
 
 	$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') {
-		xrd_xml($a, $addr, $alias, $profile_url, $user);
+		xrd_xml($addr, $alias, $profile_url, $user);
 	} else {
-		xrd_json($a, $addr, $alias, $profile_url, $user);
+		xrd_json($addr, $alias, $profile_url, $user);
 	}
 }
 
-function xrd_json($a, $uri, $alias, $profile_url, $r)
+function xrd_json($uri, $alias, $profile_url, $r)
 {
 	$salmon_key = Salmon::salmonKey($r['spubkey']);
 
@@ -80,6 +82,7 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
 			['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'],
@@ -89,27 +92,24 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
 			['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']
 		]
 	];
-	if ($r['uid'] == 180) {
-		$json['links'][] = ['rel' => 'self', 'type' => 'application/activity+json', 'href' => $profile_url];
-	}
 
 	echo json_encode($json);
-	killme();
+	exit();
 }
 
-function xrd_xml($a, $uri, $alias, $profile_url, $r)
+function xrd_xml($uri, $alias, $profile_url, $r)
 {
 	$salmon_key = Salmon::salmonKey($r['spubkey']);
 
 	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,
@@ -127,8 +127,8 @@ function xrd_xml($a, $uri, $alias, $profile_url, $r)
 	);
 
 	$arr = ['user' => $r, 'xml' => $o];
-	Addon::callHooks('personal_xrd', $arr);
+	Hook::callAll('personal_xrd', $arr);
 
 	echo $arr['xml'];
-	killme();
+	exit();
 }