X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fxrd.php;h=0b4bd0d1e7d7a795799759fa5aa0ae6af5a01bf5;hb=a3ddbb5d7c95f36724343a450418b388fff9454d;hp=5d43147a7035fba1e54073ffe9a19c8841ef692f;hpb=89c15cc092048af2180452cbba24df273620aaba;p=friendica.git

diff --git a/mod/xrd.php b/mod/xrd.php
index 5d43147a70..0b4bd0d1e7 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,11 +1,20 @@
 <?php
 
+require_once('salmon.php');
 
 function xrd_content(&$a) {
 
-	$uri = notags(trim($_GET['uri']));
-	$local = str_replace('acct:', '', $uri);
-	$name = substr($local,0,strpos($local,'@'));
+	$uri = urldecode(notags(trim($_GET['uri'])));
+
+	if(substr($uri,0,4) === 'http')
+		$name = basename($uri);
+	else {
+		$local = str_replace('acct:', '', $uri);
+		if(substr($local,0,2) == '//')
+			$local = substr($local,2);
+
+		$name = substr($local,0,strpos($local,'@'));
+	}
 
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
 		dbesc($name)
@@ -13,15 +22,24 @@ function xrd_content(&$a) {
 	if(! count($r))
 		killme();
 
-	$tpl = file_get_contents('view/xrd_person.tpl');
+	$salmon_key = salmon_key($r[0]['spubkey']);
+
+
+	header("Content-type: text/xml");
+
+	$tpl = load_view_file('view/xrd_person.tpl');
 
 	$o = replace_macros($tpl, array(
-		'$accturi' => $uri,
-		'$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'],
-		'$photo' => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid']
+		'$accturi'     => $uri,
+		'$profile_url' => $a->get_baseurl() . '/profile/'       . $r[0]['nickname'],
+		'$atom'        => $a->get_baseurl() . '/dfrn_poll/'     . $r[0]['nickname'],
+		'$photo'       => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid']      . '.jpg',
+		'$salmon'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'],
+		'$salmen'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'] . '/mention',
+		'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key
 	));
 
 	echo $o;
 	killme();
 
-}
\ No newline at end of file
+}