keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge diaspora/friendika vcard formats - not yet complete

Browse source
This commit is contained in:
Friendika 2011-08-01 05:13:59 -07:00
parent 823d7ba42a
commit 326a873082
3 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
boot.php
View file

@ -2396,6 +2396,8 @@ function profile_load(&$a, $nickname, $profile = 0) {
if(! function_exists('profile_sidebar')) { if(! function_exists('profile_sidebar')) {
function profile_sidebar($profile) { function profile_sidebar($profile) {
$a = get_app();
$o = ''; $o = '';
$location = ''; $location = '';
$address = false; $address = false;
@ -2454,6 +2456,41 @@ function profile_sidebar($profile) {
$location = $gender = $marital = $homepage = ''; $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'); $tpl = get_markup_template('profile_vcard.tpl');
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
@ -2466,7 +2503,8 @@ function profile_sidebar($profile) {
'$gender' => $gender, '$gender' => $gender,
'$pubkey' => $pubkey, '$pubkey' => $pubkey,
'$marital' => $marital, '$marital' => $marital,
'$homepage' => $homepage '$homepage' => $homepage,
'$diaspora' => $diaspora_vcard
)); ));

5
include/api.php
View file

@ -114,6 +114,7 @@
load_contact_links(local_user()); load_contact_links(local_user());
logger('API call for ' . $a->user['username'] . ': ' . $a->query_string); logger('API call for ' . $a->user['username'] . ': ' . $a->query_string);
logger('API parameters: ' . print_r($_REQUEST,true));
$type="json"; $type="json";
if (strpos($a->query_string, ".xml")>0) $type="xml"; if (strpos($a->query_string, ".xml")>0) $type="xml";
if (strpos($a->query_string, ".json")>0) $type="json"; if (strpos($a->query_string, ".json")>0) $type="json";
@ -220,7 +221,7 @@
} }
} }
if ($user==='') { if (! $user) {
if (local_user()===false) { if (local_user()===false) {
api_login($a); return False; api_login($a); return False;
} else { } else {
@ -230,7 +231,7 @@
} }
logger('api_user: ' . $extra_query . ' ' , $user);
// user info // user info
$uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `contact` $uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `contact`
WHERE 1 WHERE 1

2
view/profile_vcard.tpl
View file

@ -24,3 +24,5 @@ $marital
$homepage $homepage
$diaspora