use /servers instead of /siteinfo for the directory link in invitations

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 0ac82f2817ea05b2ba6a9d2f7a31f92ffc3552ba..884eca9a663d5426b49bd962d672f486352ed652 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -1,11 +1,15 @@
 <?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) {
+use Friendica\App;
+
+require_once 'include/contact_widgets.php';
+require_once 'include/probe.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(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL );
@@ -21,9 +25,7 @@ function dirfind_init(&$a) {
        $a->page['aside'] .= follow_widget();
 }
 
-
-
-function dirfind_content(&$a, $prefix = "") {
+function dirfind_content(App $a, $prefix = "") {
 
        $community = false;
        $discover_user = false;
@@ -35,7 +37,7 @@ function dirfind_content(&$a, $prefix = "") {
        if (strpos($search,'@') === 0) {
                $search = substr($search,1);
                $header = sprintf( t('People Search - %s'), $search);
-               if ((valid_email($search) AND validate_email($search)) OR
+               if ((valid_email($search) && validate_email($search)) ||
                        (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)));
@@ -73,9 +75,9 @@ function dirfind_content(&$a, $prefix = "") {
                        $j->results[] = $objresult;
 
                        // Add the contact to the global contacts if it isn't already in our system
-                       if (($contact["cid"] == 0) AND ($contact["zid"] == 0) AND ($contact["gid"] == 0))
-                               poco_check($user_data["url"], $user_data["name"], $user_data["network"], $user_data["photo"],
-                                       "", "", "", "", "", datetime_convert(), 0);
+                       if (($contact["cid"] == 0) && ($contact["zid"] == 0) && ($contact["gid"] == 0)) {
+                               update_gcontact($user_data);
+                       }
                } elseif ($local) {
 
                        if ($community)