X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fxrd.php;h=dfb188c138197f17bdd00aa2f608aec17df7cb25;hb=ea2b3b2f762a323ca5a7a820857c4bea51d22637;hp=c96c18f3cead5c796563f7733f9f29ad03928b71;hpb=2abcf76ec17a9a7754c399cdde9a4449308a4b02;p=friendica.git

diff --git a/mod/xrd.php b/mod/xrd.php
index c96c18f3ce..dfb188c138 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,9 +1,8 @@
 <?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'])));
 
@@ -23,15 +22,14 @@ 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 = file_get_contents('view/xrd_diaspora.tpl');
+		$tpl = get_markup_template('xrd_diaspora.tpl');
 		$dspr = replace_macros($tpl,array(
 			'$baseurl' => $a->get_baseurl(),
 			'$dspr_guid' => $r[0]['guid'],
@@ -41,25 +39,31 @@ function xrd_content(&$a) {
 	else
 		$dspr = '';
 
-
-	$tpl = file_get_contents('view/xrd_person.tpl');
+	//$tpl = file_get_contents('view/xrd_person.tpl');
+	$tpl = get_markup_template('xrd_person.tpl');
 
 	$o = replace_macros($tpl, array(
+		'$nick'        => $r[0]['nickname'],
 		'$accturi'     => $uri,
 		'$profile_url' => $a->get_baseurl() . '/profile/'       . $r[0]['nickname'],
+		'$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();
 
 }