typos in OStatus (re)subscribing

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index d280ec0fc2239fae2f33edc3a877ab90ff2c0569..3f9c82576a3bf02845082e266ba1dfb0e66095cf 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'];
 
@@ -204,6 +205,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,
                                );