From e524835463fa0411723d2ec57276d1ac13c3aca6 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 21 Aug 2014 20:31:55 -0700
Subject: the rest of the diaspora local discovery stuff

---
 include/identity.php       | 24 +++++++++++++++++++++---
 view/tpl/profile_vcard.tpl |  3 +++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index 9335673a0..8b742f53e 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -770,9 +770,26 @@ logger('online: ' . $profile['online']);
 		$location = $pdesc = $gender = $marital = $homepage = $online = False;
 	}
 
-	$firstname = ((strpos($profile['name'],' '))
-		? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
-	$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
+	$firstname = ((strpos($profile['channel_name'],' '))
+		? trim(substr($profile['channel_name'],0,strpos($profile['channel_name'],' '))) : $profile['channel_name']);
+	$lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'],strlen($firstname))));
+
+	if(get_config('system','diaspora_enabled')) {
+	    $diaspora = array(
+			'podloc'     => z_root(),
+			'searchable' => (($block) ? 'false' : 'true'),
+			'nickname'   => $profile['channel_address'],
+			'fullname'   => $profile['channel_name'],
+			'firstname'  => $firstname,
+			'lastname'   => $lastname,
+			'photo300'   => z_root() . '/photo/profile/300/' . $profile['uid'] . '.jpg',
+			'photo100'   => z_root() . '/photo/profile/100/' . $profile['uid'] . '.jpg',
+			'photo50'    => z_root() . '/photo/profile/50/'  . $profile['uid'] . '.jpg',
+		);
+	}
+	else
+		$diaspora = null;
+
 
 	$contact_block = contact_block();
 
@@ -802,6 +819,7 @@ logger('online: ' . $profile['online']);
 		'$marital'       => $marital,
 		'$homepage'      => $homepage,
 		'$chanmenu'      => $channel_menu,
+		'$diaspora'      => $diaspora,
 		'$contact_block' => $contact_block,
 	));
 
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index a653dca7d..7dff8fdeb 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -43,6 +43,9 @@
 
 	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" >{{$profile.homepage}}</a></dd></dl>{{/if}}
 
+	{{if $diaspora}}
+	{{include file="diaspora_vcard.tpl"}}
+	{{/if}}
 
 {{if $connect}}
 <a href="{{$connect_url}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a>
-- 
cgit v1.2.3