Use local search

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 0c6d79480f5fc17ac120451b8c84ef64849885dc..c49d37e48dfcd7d353ce8955443a9a39bebd1305 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -16,11 +16,13 @@ function dirfind_init(&$a) {
 
 function dirfind_content(&$a) {
 
+       $local = true;
+
        $search = notags(trim($_REQUEST['search']));
 
        if(strpos($search,'@') === 0)
                $search = substr($search,1);
-       
+
        $o = '';
 
        $o .= replace_macros(get_markup_template("section_title.tpl"),array(
@@ -29,16 +31,53 @@ function dirfind_content(&$a) {
 
        if($search) {
 
-               $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 ($local) {
+
+                       $perpage = 80;
+                       $startrec = (($a->pager['page']) * $perpage) - $perpage;
+
+                       $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'] : '');
 
-//TODO fallback local search if global dir not available.
-//             else
-//                     $x = post_url($a->get_baseurl() . '/lsearch', $params);
+                       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);
+                       $j = json_decode($x);
+               }
 
                if($j->total) {
                        $a->set_pager_total($j->total);
@@ -46,21 +85,21 @@ function dirfind_content(&$a) {
                }
 
                if(count($j->results)) {
-                       
+
                        $tpl = get_markup_template('match.tpl');
                        foreach($j->results as $jj) {
-                               
+
                                $o .= replace_macros($tpl,array(
                                        '$url' => zrl($jj->url),
                                        '$name' => $jj->name,
-                                       '$photo' => $jj->photo,
+                                       '$photo' => proxy_url($jj->photo),
                                        '$tags' => $jj->tags
                                ));
                        }
                }
                else {
                        info( t('No matches') . EOL);
-               }               
+               }
 
        }
 

diff --git a/view/templates/match.tpl b/view/templates/match.tpl
index f4bbc3c1bb97206f12669ab3bc7ae11fbf73ac20..32f046e6aa88a00f16ab555ccb8d125c9451bec5 100644 (file)
--- a/view/templates/match.tpl
+++ b/view/templates/match.tpl
@@ -2,7 +2,7 @@
 <div class="profile-match-wrapper">
        <div class="profile-match-photo">
                <a href="{{$url}}">
-                       <img src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
+                       <img width="80" height="80" src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
                </a>
        </div>
        <div class="profile-match-break"></div>

diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl
index de8cd011b4b1e1362daa8cd4b05762b93d060afe..45c4c0b6224b401465cf72f811fbcf7c9010a7e2 100644 (file)
--- a/view/templates/peoplefind.tpl
+++ b/view/templates/peoplefind.tpl
@@ -2,7 +2,7 @@
 <div id="peoplefind-sidebar" class="widget">
        <h3>{{$findpeople}}</h3>
        <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'}}" />
        </form>
        <div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div>