X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fxrd.php;h=c23119145ca4d0685f0aab07ed549dd7df997f3d;hb=ed6ada0da571ac88b039a162601ac172c3680710;hp=9021222b748fc898e7b929e3891350dcd1a984be;hpb=7eb7f774131a47212ff9c505d7d497c8c7b76a53;p=friendica.git

diff --git a/mod/xrd.php b/mod/xrd.php
index 9021222b74..c23119145c 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,15 +1,16 @@
 <?php
 
-require_once('salmon.php');
-require_once('certfns.php');
+require_once('include/crypto.php');
 
-function xrd_content(&$a) {
+function xrd_init(&$a) {
 
 	$uri = urldecode(notags(trim($_GET['uri'])));
 
-	if(substr($uri,0,4) === 'http')
+	if(substr($uri,0,4) === 'http') {
+		$acct = false;
 		$name = basename($uri);
-	else {
+	} else {
+		$acct = true;
 		$local = str_replace('acct:', '', $uri);
 		if(substr($local,0,2) == '//')
 			$local = substr($local,2);
@@ -23,15 +24,13 @@ function xrd_content(&$a) {
 	if(! count($r))
 		killme();
 
-	$salmon_key = str_replace('=','',salmon_key($r[0]['spubkey']));
+	$salmon_key = salmon_key($r[0]['spubkey']);
 
 	header('Access-Control-Allow-Origin: *');
 	header("Content-type: text/xml");
 
-	$dspr_enabled = get_config('system','diaspora_enabled');
-
-	if($dspr_enabled) {
-		$tpl = file_get_contents('view/xrd_diaspora.tpl');
+	if(get_config('system','diaspora_enabled')) {
+		$tpl = get_markup_template('xrd_diaspora.tpl');
 		$dspr = replace_macros($tpl,array(
 			'$baseurl' => $a->get_baseurl(),
 			'$dspr_guid' => $r[0]['guid'],
@@ -41,26 +40,42 @@ function xrd_content(&$a) {
 	else
 		$dspr = '';
 
+	$tpl = get_markup_template('xrd_person.tpl');
+
+	$profile_url = $a->get_baseurl().'/profile/'.$r[0]['nickname'];
 
-	$tpl = file_get_contents('view/xrd_person.tpl');
+	if ($acct)
+		$alias = $profile_url;
+	else {
+		$alias = 'acct:'.$r[0]['nickname'].'@'.$a->get_hostname();
+
+		if ($a->get_path())
+			$alias .= '/'.$a->get_path();
+	}
 
 	$o = replace_macros($tpl, array(
+		'$nick'        => $r[0]['nickname'],
 		'$accturi'     => $uri,
-		'$profile_url' => $a->get_baseurl() . '/profile/'       . $r[0]['nickname'],
+		'$alias'       => $alias,
+		'$profile_url' => $profile_url,
 		'$hcard_url'   => $a->get_baseurl() . '/hcard/'         . $r[0]['nickname'],
 		'$atom'        => $a->get_baseurl() . '/dfrn_poll/'     . $r[0]['nickname'],
+		'$zot_post'    => $a->get_baseurl() . '/post/'          . $r[0]['nickname'],
+		'$poco_url'    => $a->get_baseurl() . '/poco/'          . $r[0]['nickname'],
 		'$photo'       => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid']      . '.jpg',
 		'$dspr'        => $dspr,
 		'$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
+		'$subscribe'   => $a->get_baseurl() . '/follow?url={uri}',
+		'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
+		'$bigkey'      =>  salmon_key($r[0]['pubkey'])
 	));
 
 
 	$arr = array('user' => $r[0], 'xml' => $o);
 	call_hooks('personal_xrd', $arr);
 
-	echo $o;
+	echo $arr['xml'];
 	killme();
 
 }