forumlist: nodeinfo_plugin_enabled() is now plugin_enabled()

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 492f39d5a60a7d9e832ac498c03f4d8e88a7ec43..3df27e5fb7840da113614a6cabf8715f24f6e271 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -3,6 +3,7 @@ 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) {
 
@@ -51,14 +52,24 @@ function dirfind_content(&$a, $prefix = "") {
                        $perpage = 80;
                        $startrec = (($a->pager['page']) * $perpage) - $perpage;
 
+                       if (get_config('system','diaspora_enabled'))
+                               $diaspora = NETWORK_DIASPORA;
+                       else
+                               $diaspora = NETWORK_DFRN;
+
+                       if (!get_config('system','ostatus_disabled'))
+                               $ostatus = NETWORK_OSTATUS;
+                       else
+                               $ostatus = NETWORK_DFRN;
+
                        $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')".$extra_sql,
-                                       dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA),
+                                       dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
                                        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`.`network` , `gcontact`.`keywords`
+                       $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`
                                        FROM `gcontact`
                                        LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
                                                AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
@@ -70,14 +81,14 @@ function dirfind_content(&$a, $prefix = "") {
                                                GROUP BY `gcontact`.`nurl`
                                                ORDER BY `gcontact`.`updated` DESC LIMIT %d, %d",
                                        intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
-                                       dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA),
+                                       dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($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'];                   
+                       $j->page = $a->pager['page'];
                        foreach ($results AS $result) {
                                if (poco_alternate_ostatus_url($result["url"]))
                                         continue;
@@ -90,6 +101,7 @@ function dirfind_content(&$a, $prefix = "") {
                                $objresult = new stdClass();
                                $objresult->cid = $result["cid"];
                                $objresult->name = $result["name"];
+                               $objresult->addr = $result["addr"];
                                $objresult->url = $result["url"];
                                $objresult->photo = $result["photo"];
                                $objresult->tags = $result["keywords"];
@@ -121,15 +133,23 @@ function dirfind_content(&$a, $prefix = "") {
 
                        foreach($j->results as $jj) {
 
+                               $alt_text = "";
+
+                               $contact_details = get_contact_details_by_url($jj->url, local_user());
+
+                               $itemurl = (($contact_details["addr"] != "") ? $contact_details["addr"] : $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)
+                                       if ($contact) {
                                                $photo_menu = contact_photo_menu($contact[0]);
-                                       else
+                                               $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);
@@ -141,14 +161,18 @@ function dirfind_content(&$a, $prefix = "") {
                                $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 
                                $entry = array(
+                                       'alt_text' => $alt_text,
                                        'url' => zrl($jj->url),
-                                       'itemurl' => $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,
+                                       'details'       => $contact_details['location'],
+                                       'tags'          => $contact_details['keywords'],
+                                       'about'         => $contact_details['about'],
                                        'network' => network_to_name($jj->network, $jj->url),
                                        'id' => ++$id,
                                );