From c0b8e63a3fe600326e0f18c03207ba9fd30c8126 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 18 Jul 2011 18:13:46 -0700
Subject: basic diaspora discovery

---
 mod/register.php |  5 +++--
 mod/xrd.php      | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'mod')

diff --git a/mod/register.php b/mod/register.php
index 549d07a91..94eac7a14 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -198,9 +198,10 @@ function register_post(&$a) {
 	$spkey = openssl_pkey_get_details($sres);
 	$spubkey = $spkey["key"];
 
-	$r = q("INSERT INTO `user` ( `username`, `password`, `email`, `openid`, `nickname`,
+	$r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
 		`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked` )
-		VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+		VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+		dbesc(generate_guid()),
 		dbesc($username),
 		dbesc($new_password_encoded),
 		dbesc($email),
diff --git a/mod/xrd.php b/mod/xrd.php
index de0c20ea5..accc2f68e 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -27,6 +27,20 @@ function xrd_content(&$a) {
 	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(
@@ -34,6 +48,7 @@ function xrd_content(&$a) {
 		'$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
-- 
cgit v1.2.3