From 326a873082cd9f31f70bfb703ad2c3e7fde19bb8 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 1 Aug 2011 05:13:59 -0700
Subject: [PATCH] merge diaspora/friendika vcard formats - not yet complete

---
 boot.php               | 40 +++++++++++++++++++++++++++++++++++++++-
 include/api.php        |  5 +++--
 view/profile_vcard.tpl |  2 ++
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/boot.php b/boot.php
index 025f7ef878..4d4b385122 100644
--- a/boot.php
+++ b/boot.php
@@ -2396,6 +2396,8 @@ function profile_load(&$a, $nickname, $profile = 0) {
 if(! function_exists('profile_sidebar')) {
 function profile_sidebar($profile) {
 
+	$a = get_app();
+
 	$o = '';
 	$location = '';
 	$address = false;
@@ -2454,6 +2456,41 @@ function profile_sidebar($profile) {
 		$location = $gender = $marital = $homepage = '';
 	}
 
+	$podloc = $a->get_baseurl();
+	$searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' );
+	$nickname = $profile['nick'];
+	$dphoto = $profile['photo'];
+
+	$diaspora_vcard = <<< EOT
+
+<div style="display:none;">
+<dl class='entity_nickname'>
+<dt>Nickname</dt>
+<dd>
+<a class="nickname url uid" href="$podloc" rel="me">$nickname</a>
+</dd>
+</dl>
+<dl class="entity_url">
+<dt>URL</dt>
+<dd>
+<a class="url" href="$podloc" id="pod_location" rel="me">$podloc</a>
+</dd>
+</dl>
+<dl class="entity_photo">
+<dt>Photo</dt>
+<dd>
+<img class="photo avatar" height="175px" src="$dphoto" width='175px'>
+</dd>
+</dl>
+<dl class='entity_searchable'>
+<dt>Searchable</dt>
+<dd>
+<span class='searchable'>$searchable</span>
+</dd>
+</dl>
+</div>
+EOT;
+
 	$tpl = get_markup_template('profile_vcard.tpl');
 
 	$o .= replace_macros($tpl, array(
@@ -2466,7 +2503,8 @@ function profile_sidebar($profile) {
 		'$gender'   => $gender,
 		'$pubkey'   => $pubkey,
 		'$marital'  => $marital,
-		'$homepage' => $homepage
+		'$homepage' => $homepage,
+		'$diaspora' => $diaspora_vcard
 	));
 
 
diff --git a/include/api.php b/include/api.php
index 7b3dd866ce..c77c55cef4 100644
--- a/include/api.php
+++ b/include/api.php
@@ -114,6 +114,7 @@
 				load_contact_links(local_user());
 
 				logger('API call for ' . $a->user['username'] . ': ' . $a->query_string);		
+				logger('API parameters: ' . print_r($_REQUEST,true));
 				$type="json";		
 				if (strpos($a->query_string, ".xml")>0) $type="xml";
 				if (strpos($a->query_string, ".json")>0) $type="json";
@@ -220,7 +221,7 @@
 			}
 		}
 		
-		if ($user==='') {
+		if (! $user) {
 			if (local_user()===false) {
 				api_login($a); return False;
 			} else {
@@ -230,7 +231,7 @@
 			
 		}
 		
-
+		logger('api_user: ' . $extra_query . ' ' , $user);
 		// user info		
 		$uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `contact`
 				WHERE 1
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 3cd96eabff..86655951de 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -24,3 +24,5 @@ $marital
 
 $homepage
 
+$diaspora
+