Merge pull request #1994 from tobiasd/20151028-issue1974

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index d5cfcbcab013d015a03e2a99bcbeabfbcec62386..c2b18e3e24143d036d21545c3e3b9664d7f1b7cb 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -1,26 +1,34 @@
 <?php
+require_once('include/contact_widgets.php');
+require_once('include/socgraph.php');
+require_once('include/Contact.php');
+require_once('include/contact_selectors.php');
+require_once('mod/contacts.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'] = '';
 
-       $a->page['aside'] .= follow_widget();
-
        $a->page['aside'] .= findpeople_widget();
+
+       $a->page['aside'] .= follow_widget();
 }
 
 
 
-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);
@@ -32,10 +40,6 @@ function dirfind_content(&$a) {
 
        $o = '';
 
-       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
-               '$title' => sprintf( t('People Search - %s'), $search)
-       ));
-
        if($search) {
 
                if ($local) {
@@ -55,16 +59,19 @@ function dirfind_content(&$a) {
                                        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`
-                                       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));
@@ -73,6 +80,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"]));
@@ -84,6 +94,7 @@ function dirfind_content(&$a) {
                                $objresult->url = $result["url"];
                                $objresult->photo = $result["photo"];
                                $objresult->tags = $result["keywords"];
+                               $objresult->network = $result["network"];
 
                                $j->results[] = $objresult;
                        }
@@ -94,8 +105,8 @@ 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));
+                       if(strlen(get_config('system','directory')))
+                               $x = fetch_url(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
 
                        $j = json_decode($x);
                }
@@ -107,27 +118,59 @@ function dirfind_content(&$a) {
 
                if(count($j->results)) {
 
-                       $tpl = get_markup_template('match.tpl');
+                       $id = 0;
+
                        foreach($j->results as $jj) {
 
+                               $alt_text = "";
+
+                               $itemurl = $jj->url;
+
                                // If We already know this contact then don't show the "connect" button
                                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]);
+                                               $details = _contact_detail_for_template($contact[0]);
+                                               $alt_text = $details['alt_text'];
+                                       } 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);
                                }
 
-                               $o .= replace_macros($tpl,array(
-                                       '$url' => zrl($jj->url),
-                                       '$name' => $jj->name,
-                                       '$photo' => proxy_url($jj->photo),
-                                       '$tags' => $jj->tags,
-                                       '$conntxt' => $conntxt,
-                                       '$connlnk' => $connlnk,
-                               ));
+                               $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
+
+                               $entry = array(
+                                       'alt_text' => $alt_text,
+                                       'url' => zrl($jj->url),
+                                       'itemurl' => $itemurl,
+                                       'name' => htmlentities($jj->name),
+                                       'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+                                       'img_hover' => $jj->tags,
+                                       'conntxt' => $conntxt,
+                                       'connlnk' => $connlnk,
+                                       'photo_menu' => $photo_menu,
+                                       'network' => network_to_name($jj->network, $jj->url),
+                                       'id' => ++$id,
+                               );
+                               $entries[] = $entry;
                        }
+
+               $tpl = get_markup_template('viewcontact_template.tpl');
+
+               $o .= replace_macros($tpl,array(
+                       'title' => sprintf( t('People Search - %s'), $search),
+                       '$contacts' => $entries,
+                       '$paginate' => paginate($a),
+               ));
+
                }
                else {
                        info( t('No matches') . EOL);
@@ -135,7 +178,5 @@ function dirfind_content(&$a) {
 
        }
 
-       $o .= '<div class="clear"></div>';
-       $o .= paginate($a);
        return $o;
 }