Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index d280ec0fc2239fae2f33edc3a877ab90ff2c0569..0dfe4d67a9b61960623d963f0f58718ccbabe2be 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -33,7 +33,8 @@ function dirfind_content(&$a, $prefix = "") {
 
        if(strpos($search,'@') === 0) {
                $search = substr($search,1);
-               if (valid_email($search)) {
+               if ((valid_email($search) AND validate_email($search)) OR
+                       (substr(normalise_link($search), 0, 7) == "http://")) {
                        $user_data = probe_url($search);
                        $discover_user = (in_array($user_data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)));
                }
@@ -50,7 +51,7 @@ function dirfind_content(&$a, $prefix = "") {
 
                if ($discover_user) {
                        $j = new stdClass();
-                       $j->total = $count[0]["total"];
+                       $j->total = 1;
                        $j->items_page = 1;
                        $j->page = $a->pager['page'];
 
@@ -93,9 +94,15 @@ function dirfind_content(&$a, $prefix = "") {
                        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,
+                       $count = q("SELECT count(*) AS `total` FROM `gcontact`
+                                       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 (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `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",
+                                       intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
                                        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)));
@@ -105,8 +112,8 @@ function dirfind_content(&$a, $prefix = "") {
                                        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
+                                       WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `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`
@@ -204,6 +211,7 @@ function dirfind_content(&$a, $prefix = "") {
                                        'details'       => $contact_details['location'],
                                        'tags'          => $contact_details['keywords'],
                                        'about'         => $contact_details['about'],
+                                       'account_type'  => (($contact_details['community']) ? t('Forum') : ''),
                                        'network' => network_to_name($jj->network, $jj->url),
                                        'id' => ++$id,
                                );