X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fxrd.php;h=094211360e03b107c23e7d841d385c96253b2ec1;hb=13150c09a56de662677ee17a1614a2ee55931890;hp=47516e8dd50e4af3bbb059bcd6bb1425e75b8cbc;hpb=0f47ac282c30c61dbc13e42c4f53b2fc14d65593;p=friendica.git

diff --git a/mod/xrd.php b/mod/xrd.php
index 47516e8dd5..094211360e 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,15 +1,22 @@
 <?php
 
-require_once('salmon.php');
+require_once('include/crypto.php');
 
-function xrd_content(&$a) {
+function xrd_init(&$a) {
 
 	$uri = urldecode(notags(trim($_GET['uri'])));
-	$local = str_replace('acct:', '', $uri);
-	if(substr($local,0,2) == '//')
-		$local = substr($local,2);
 
-	$name = substr($local,0,strpos($local,'@'));
+	if(substr($uri,0,4) === 'http') {
+		$acct = false;
+		$name = basename($uri);
+	} else {
+		$acct = true;
+		$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)
@@ -19,22 +26,52 @@ function xrd_content(&$a) {
 
 	$salmon_key = salmon_key($r[0]['spubkey']);
 
-
+	header('Access-Control-Allow-Origin: *');
 	header("Content-type: text/xml");
 
-	$tpl = load_view_file('view/xrd_person.tpl');
+	$tpl = get_markup_template('xrd_diaspora.tpl');
+	$dspr = replace_macros($tpl,array(
+		'$baseurl' => $a->get_baseurl(),
+		'$dspr_guid' => $r[0]['guid'],
+		'$dspr_key' => base64_encode(pemtorsa($r[0]['pubkey']))
+	));
+
+	$tpl = get_markup_template('xrd_person.tpl');
+
+	$profile_url = $a->get_baseurl().'/profile/'.$r[0]['nickname'];
+
+	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'])
 	));
 
-	echo $o;
+
+	$arr = array('user' => $r[0], 'xml' => $o);
+	call_hooks('personal_xrd', $arr);
+
+	echo $arr['xml'];
 	killme();
 
 }