mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #2105 from rabuzarus/2811_forums_contact_pages

Browse source 
add missing info about if contact is forum to contact related pages
This commit is contained in:
Michael Vogel 2015-11-28 10:14:21 +01:00
commit 9df70a6eed
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mod/dirfind.php
View file

@ -205,6 +205,7 @@ function dirfind_content(&$a, $prefix = "") {
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => (($contact_details['community']) ? t('Forum') : ''),
'network' => network_to_name($jj->network, $jj->url), 'network' => network_to_name($jj->network, $jj->url),
'id' => ++$id, 'id' => ++$id,
); );

1
mod/match.php
View file

@ -79,6 +79,7 @@ function match_content(&$a) {
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => (($contact_details['community']) ? t('Forum') : ''),
'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
'inttxt' => ' ' . t('is interested in:'), 'inttxt' => ' ' . t('is interested in:'),
'conntxt' => t('Connect'), 'conntxt' => t('Connect'),

7
mod/suggest.php
View file

@ -36,7 +36,7 @@ function suggest_init(&$a) {
} }
// Now check how the user responded to the confirmation query // Now check how the user responded to the confirmation query
if(!$_REQUEST['canceled']) { if(!$_REQUEST['canceled']) {
q("insert into gcign ( uid, gcid ) values ( %d, %d ) ", q("INSERT INTO `gcign` ( `uid`, `gcid` ) VALUES ( %d, %d ) ",
intval(local_user()), intval(local_user()),
intval($_GET['ignore']) intval($_GET['ignore'])
); );
@ -90,8 +90,9 @@ function suggest_content(&$a) {
'name' => $rr['name'], 'name' => $rr['name'],
'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB), 'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => (($contact_details['community']) ? t('Forum') : ''),
'ignlnk' => $ignlnk, 'ignlnk' => $ignlnk,
'ignid' => $rr['id'], 'ignid' => $rr['id'],
'conntxt' => t('Connect'), 'conntxt' => t('Connect'),

7
mod/viewcontacts.php
View file

@ -26,7 +26,7 @@ function viewcontacts_content(&$a) {
} }
$r = q("SELECT COUNT(*) as `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ", $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ",
intval($a->profile['uid']) intval($a->profile['uid'])
); );
if(count($r)) if(count($r))
@ -68,8 +68,9 @@ function viewcontacts_content(&$a) {
'name' => htmlentities(substr($rr['name'],0,20)), 'name' => htmlentities(substr($rr['name'],0,20)),
'username' => htmlentities($rr['name']), 'username' => htmlentities($rr['name']),
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => (($contact_details['community']) ? t('Forum') : ''),
'url' => $url, 'url' => $url,
'sparkle' => '', 'sparkle' => '',
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']), 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),