Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 10:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use local search

Browse source
This commit is contained in:
Michael Vogel 2015-07-19 13:23:01 +02:00
parent 93e93f58bd
commit 0bede65a6b
3 changed files with 54 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
mod/dirfind.php
View file

@ -16,11 +16,13 @@ function dirfind_init(&$a) {
function dirfind_content(&$a) { function dirfind_content(&$a) {
$local = true;
$search = notags(trim($_REQUEST['search'])); $search = notags(trim($_REQUEST['search']));
if(strpos($search,'@') === 0) if(strpos($search,'@') === 0)
$search = substr($search,1); $search = substr($search,1);
$o = ''; $o = '';
$o .= replace_macros(get_markup_template("section_title.tpl"),array( $o .= replace_macros(get_markup_template("section_title.tpl"),array(
@ -29,16 +31,53 @@ function dirfind_content(&$a) {
if($search) { if($search) {
$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); if ($local) {
if(strlen(get_config('system','directory_submit_url')))
$x = fetch_url('http://dir.friendica.com/lsearch?f=' . $p . '&search=' . urlencode($search));
//TODO fallback local search if global dir not available. $perpage = 80;
// else $startrec = (($a->pager['page']) * $perpage) - $perpage;
// $x = post_url($a->get_baseurl() . '/lsearch', $params);
$j = json_decode($x); $count = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `network` IN ('%s', '%s', '%s') AND
(`url` REGEXP '%s' OR `name` REGEXP '%s' OR `location` REGEXP '%s' OR
`about` REGEXP '%s' OR `keywords` REGEXP '%s')",
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)));
$results = q("SELECT `url`, `name`, `photo`, `keywords` FROM `gcontact`WHERE `network` IN ('%s', '%s', '%s') AND
(`url` REGEXP '%s' OR `name` REGEXP '%s' OR `location` REGEXP '%s' OR `about` REGEXP '%s' OR
`keywords` REGEXP '%s') ORDER BY `name` ASC LIMIT %d, %d",
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 = new stdClass();
$j->total = $count[0]["total"];
$j->items_page = $perpage;
$j->page = $a->pager['page'];
foreach ($results AS $result) {
if ($result["name"] == "") {
$urlparts = parse_url($result["url"]);
$result["name"] = end(explode("/", $urlparts["path"]));
}
$objresult = new stdClass();
$objresult->name = $result["name"];
$objresult->url = $result["url"];
$objresult->photo = $result["photo"];
$objresult->tags = $result["keywords"];
$j->results[] = $objresult;
}
} else {
$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));
$j = json_decode($x);
}
if($j->total) { if($j->total) {
$a->set_pager_total($j->total); $a->set_pager_total($j->total);
@ -46,21 +85,21 @@ function dirfind_content(&$a) {
} }
if(count($j->results)) { if(count($j->results)) {
$tpl = get_markup_template('match.tpl'); $tpl = get_markup_template('match.tpl');
foreach($j->results as $jj) { foreach($j->results as $jj) {
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$url' => zrl($jj->url), '$url' => zrl($jj->url),
'$name' => $jj->name, '$name' => $jj->name,
'$photo' => $jj->photo, '$photo' => proxy_url($jj->photo),
'$tags' => $jj->tags '$tags' => $jj->tags
)); ));
} }
} }
else { else {
info( t('No matches') . EOL); info( t('No matches') . EOL);
} }
} }

2
view/templates/match.tpl
View file

@ -2,7 +2,7 @@
<div class="profile-match-wrapper"> <div class="profile-match-wrapper">
<div class="profile-match-photo"> <div class="profile-match-photo">
<a href="{{$url}}"> <a href="{{$url}}">
<img src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" /> <img width="80" height="80" src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
</a> </a>
</div> </div>
<div class="profile-match-break"></div> <div class="profile-match-break"></div>

2
view/templates/peoplefind.tpl
View file

@ -2,7 +2,7 @@
<div id="peoplefind-sidebar" class="widget"> <div id="peoplefind-sidebar" class="widget">
<h3>{{$findpeople}}</h3> <h3>{{$findpeople}}</h3>
<div id="peoplefind-desc">{{$desc}}</div> <div id="peoplefind-desc">{{$desc}}</div>
<form action="dirfind" method="post" /> <form action="dirfind" method="get" />
<input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint|escape:'html'}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem|escape:'html'}}" /> <input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint|escape:'html'}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem|escape:'html'}}" />
</form> </form>
<div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div> <div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div>