From 9f4d3bf5672af34d7b12a7d95da912205f3b9789 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 9 Oct 2011 15:49:51 -0700
Subject: [PATCH] add first,last to D* vcard
---
boot.php | 8 +++++++-
view/diaspora_vcard.tpl | 13 +++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/boot.php b/boot.php
index b53dfb531d..c8ec846810 100644
--- a/boot.php
+++ b/boot.php
@@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
-define ( 'FRIENDIKA_VERSION', '2.3.1128' );
+define ( 'FRIENDIKA_VERSION', '2.3.1129' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1094 );
@@ -920,11 +920,17 @@ function profile_sidebar($profile, $block = 0) {
$location = $pdesc = $connect = $gender = $marital = $homepage = 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))));
+
$diaspora = array(
'podloc' => $a->get_baseurl(),
'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
'nickname ' => $profile['nickname'],
'fullname' => $profile['name'],
+ 'firstname' => $firstname,
+ 'lastname' => $lastname,
'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
'photo50' => $a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg',
diff --git a/view/diaspora_vcard.tpl b/view/diaspora_vcard.tpl
index aa2c9eded9..684b1d18de 100644
--- a/view/diaspora_vcard.tpl
+++ b/view/diaspora_vcard.tpl
@@ -11,6 +11,19 @@
<span class='fn'>$diaspora.fullname</span>
</dd>
</dl>
+
+ <dl class='entity_given_name'>
+ <dt>First name</dt>
+ <dd>
+ <span class='given_name'>$diaspora.firstname</span>
+ </dd>
+ </dl>
+ <dl class='entity_family_name'>
+ <dt>Family name</dt>
+ <dd>
+ <span class='family_name'>$diaspora.lastname</span>
+ </dd>
+ </dl>
<dl class="entity_url">
<dt>URL</dt>
<dd>