MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

template rework: display more infos for match and dirfind

Browse source
This commit is contained in:
rabuzarus 2015-10-23 16:48:32 +02:00
parent b6cceda131
commit eaf5d05030
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mod/dirfind.php
View file

@ -2,6 +2,7 @@
require_once('include/contact_widgets.php'); require_once('include/contact_widgets.php');
require_once('include/socgraph.php'); require_once('include/socgraph.php');
require_once('include/Contact.php'); require_once('include/Contact.php');
require_once('include/contact_selectors.php');
function dirfind_init(&$a) { function dirfind_init(&$a) {
@ -57,7 +58,7 @@ function dirfind_content(&$a, $prefix = "") {
dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)),
dbesc(escape_tags($search)), dbesc(escape_tags($search))); dbesc(escape_tags($search)), dbesc(escape_tags($search)));
$results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`keywords` $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network` , `gcontact`.`keywords`
FROM `gcontact` FROM `gcontact`
LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
AND `contact`.`uid` = %d AND NOT `contact`.`blocked` AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
@ -76,7 +77,7 @@ function dirfind_content(&$a, $prefix = "") {
$j = new stdClass(); $j = new stdClass();
$j->total = $count[0]["total"]; $j->total = $count[0]["total"];
$j->items_page = $perpage; $j->items_page = $perpage;
$j->page = $a->pager['page']; $j->page = $a->pager['page'];
foreach ($results AS $result) { foreach ($results AS $result) {
if (poco_alternate_ostatus_url($result["url"])) if (poco_alternate_ostatus_url($result["url"]))
continue; continue;
@ -92,6 +93,7 @@ function dirfind_content(&$a, $prefix = "") {
$objresult->url = $result["url"]; $objresult->url = $result["url"];
$objresult->photo = $result["photo"]; $objresult->photo = $result["photo"];
$objresult->tags = $result["keywords"]; $objresult->tags = $result["keywords"];
$objresult->network = $result["network"];
$j->results[] = $objresult; $j->results[] = $objresult;
} }
@ -140,12 +142,14 @@ function dirfind_content(&$a, $prefix = "") {
$entry = array( $entry = array(
'url' => zrl($jj->url), 'url' => zrl($jj->url),
'itemurl' => $jj->url,
'name' => htmlentities($jj->name), 'name' => htmlentities($jj->name),
'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
'img_hover' => $jj->tags, 'img_hover' => $jj->tags,
'conntxt' => $conntxt, 'conntxt' => $conntxt,
'connlnk' => $connlnk, 'connlnk' => $connlnk,
'photo_menu' => $photo_menu, 'photo_menu' => $photo_menu,
'network' => network_to_name($jj->network, $jj->url),
'id' => ++$id, 'id' => ++$id,
); );
$entries[] = $entry; $entries[] = $entry;

1
mod/match.php
View file

@ -72,6 +72,7 @@ function match_content(&$a) {
$entry = array( $entry = array(
'url' => zrl($jj->url), 'url' => zrl($jj->url),
'itemurl' => $jj->url,
'name' => $jj->name, 'name' => $jj->name,
'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:'),