X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fxrd.php;h=accc2f68ef1f0388f8a9b193aa180dafccc3f311;hb=cfc7f8308f5e1756d1ea7b2fadd317821442d16c;hp=d36b47519be6cb00a9cb152d0b13439c52eee142;hpb=a0ecdd025eadf22142c7ed5018b930127ea10d9f;p=friendica.git

diff --git a/mod/xrd.php b/mod/xrd.php
index d36b47519b..accc2f68ef 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,14 +1,20 @@
 <?php
 
+require_once('salmon.php');
 
 function xrd_content(&$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')
+		$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)
@@ -16,16 +22,43 @@ function xrd_content(&$a) {
 	if(! count($r))
 		killme();
 
-	$tpl = load_view_file('view/xrd_person.tpl');
+	$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');
+		$dspr = replace_macros($tpl,array(
+			'$baseurl' => $a->get_baseurl(),
+			'$dspr_guid' => $r[0]['guid'],
+			'$dspr_key' => base64_encode($r[0]['pubkey'])
+		));
+	}
+	else
+		$dspr = '';
+
+
+	$tpl = file_get_contents('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'],
-		'$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'] . '/mention'
+		'$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',
+		'$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
 	));
 
+
+	$arr = array('user' => $r[0], 'xml' => $o);
+	call_hooks('personal_xrd', $arr);
+
 	echo $o;
 	killme();
 
-}
\ No newline at end of file
+}