<?php
+require_once('include/contact_widgets.php');
+require_once('include/socgraph.php');
+require_once('include/Contact.php');
function dirfind_init(&$a) {
- require_once('include/contact_widgets.php');
+ if(! local_user()) {
+ notice( t('Permission denied.') . EOL );
+ return;
+ }
if(! x($a->page,'aside'))
$a->page['aside'] = '';
-function dirfind_content(&$a) {
+function dirfind_content(&$a, $prefix = "") {
$community = false;
$local = get_config('system','poco_local_search');
- $search = notags(trim($_REQUEST['search']));
+ $search = $prefix.notags(trim($_REQUEST['search']));
if(strpos($search,'@') === 0)
$search = substr($search,1);
$results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`keywords`
FROM `gcontact`
- LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` AND `contact`.`uid` = %d
+ LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
+ AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
+ AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
WHERE `gcontact`.`network` IN ('%s', '%s', '%s') AND
((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)) AND
(`gcontact`.`url` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`location` REGEXP '%s' OR
`gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql
GROUP BY `gcontact`.`nurl`
ORDER BY `gcontact`.`updated` DESC LIMIT %d, %d",
- intval(local_user()), dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA),
+ intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
+ dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA),
dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)),
dbesc(escape_tags($search)), dbesc(escape_tags($search)),
intval($startrec), intval($perpage));
$j->items_page = $perpage;
$j->page = $a->pager['page'];
foreach ($results AS $result) {
+ if (poco_alternate_ostatus_url($result["url"]))
+ continue;
+
if ($result["name"] == "") {
$urlparts = parse_url($result["url"]);
$result["name"] = end(explode("/", $urlparts["path"]));
$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
- if(strlen(get_config('system','directory_submit_url')))
- $x = fetch_url('http://dir.friendica.com/lsearch?f=' . $p . '&search=' . urlencode($search));
+ if(strlen(get_config('system','directory')))
+ $x = fetch_url(get_server().'/lsearch?f=' . $p . '&search=' . urlencode($search));
$j = json_decode($x);
}
if(count($j->results)) {
+ $id = 0;
+
$tpl = get_markup_template('match.tpl');
foreach($j->results as $jj) {
if ($jj->cid > 0) {
$connlnk = "";
$conntxt = "";
+ $contact = q("SELECT * FROM `contact` WHERE `id` = %d",
+ intval($jj->cid));
+ if ($contact)
+ $photo_menu = contact_photo_menu($contact[0]);
+ else
+ $photo_menu = array();
} else {
$connlnk = $a->get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
$conntxt = t('Connect');
+ $photo_menu = array(array(t("View Profile"), zrl($jj->url)));
+ $photo_menu[] = array(t("Connect/Follow"), $connlnk);
}
+ $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
+
$o .= replace_macros($tpl,array(
'$url' => zrl($jj->url),
- '$name' => $jj->name,
- '$photo' => proxy_url($jj->photo),
+ '$name' => htmlentities($jj->name),
+ '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
'$tags' => $jj->tags,
'$conntxt' => $conntxt,
'$connlnk' => $connlnk,
+ '$photo_menu' => $photo_menu,
+ '$id' => ++$id,
));
}
}