X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fxrd.php;h=fcec74336e4eeda0e27726de34263530d03e9a80;hb=22d9d97d71a94fcfc057c350c4dfad5e36fb6dd0;hp=53985e10c1faf51a68dad545f58ac40be9b18fc0;hpb=013d2604f886bc7cbd2c5263d3577e8cf40f9fcc;p=friendica.git

diff --git a/mod/xrd.php b/mod/xrd.php
index 53985e10c1..fcec74336e 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,15 +1,20 @@
 <?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')
+		$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)
@@ -19,20 +24,39 @@ function xrd_content(&$a) {
 
 	$salmon_key = salmon_key($r[0]['spubkey']);
 
+	header('Access-Control-Allow-Origin: *');
+	header("Content-type: text/xml");
 
+	if(get_config('system','diaspora_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(pemtorsa($r[0]['pubkey']))
+		));
+	}
+	else
+		$dspr = '';
 
-
-	$tpl = load_view_file('view/xrd_person.tpl');
+	$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',
-		'$modexp' => 'data:application/magic-public-key,' . $salmon_key
+		'$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'],
+		'$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
 	));
 
-	echo $o;
+
+	$arr = array('user' => $r[0], 'xml' => $o);
+	call_hooks('personal_xrd', $arr);
+
+	echo $arr['xml'];
 	killme();
 
 }