Merge pull request #1869 from tobiasd/20150830-CS

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 516742c249cf27732e313fbce7362b7a4d35e198..2295b3772fb68cc634f8782f9e22d5bb6afe3deb 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -1,9 +1,9 @@
 <?php
+require_once('include/contact_widgets.php');
+require_once('include/socgraph.php');
 
 function dirfind_init(&$a) {
 
-       require_once('include/contact_widgets.php');
-
        if(! x($a->page,'aside'))
                $a->page['aside'] = '';
 
@@ -14,13 +14,13 @@ function dirfind_init(&$a) {
 
 
 
-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);
@@ -76,6 +76,9 @@ function dirfind_content(&$a) {
                        $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"]));
@@ -98,7 +101,7 @@ function dirfind_content(&$a) {
                        $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));
+                               $x = fetch_url(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
 
                        $j = json_decode($x);
                }