Add Contact Object

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 1b19ad92c459e6bad268224fbf2819fc53a7681d..c8a9709ab2a964991270ed2d902248121d3becb9 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -1,9 +1,20 @@
 <?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');
+/**
+ * @file mod/dirfind.php
+ */
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Model\GlobalContact;
+use Friendica\Network\Probe;
+use Friendica\Object\Contact;
+use Friendica\Protocol\PortableContact;
+
+require_once 'include/contact_widgets.php';
+require_once 'include/Contact.php';
+require_once 'include/contact_selectors.php';
+require_once 'mod/contacts.php';
 
 function dirfind_init(App $a) {
 
@@ -21,23 +32,21 @@ function dirfind_init(App $a) {
        $a->page['aside'] .= follow_widget();
 }
 
-
-
 function dirfind_content(App $a, $prefix = "") {
 
        $community = false;
        $discover_user = false;
 
-       $local = get_config('system','poco_local_search');
+       $local = Config::get('system','poco_local_search');
 
        $search = $prefix.notags(trim($_REQUEST['search']));
 
        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);
+                       $user_data = Probe::uri($search);
                        $discover_user = (in_array($user_data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)));
                }
        }
@@ -73,9 +82,9 @@ function dirfind_content(App $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)) {
+                               GlobalContact::update($user_data);
+                       }
                } elseif ($local) {
 
                        if ($community)
@@ -86,13 +95,13 @@ function dirfind_content(App $a, $prefix = "") {
                        $perpage = 80;
                        $startrec = (($a->pager['page']) * $perpage) - $perpage;
 
-                       if (get_config('system','diaspora_enabled')) {
+                       if (Config::get('system','diaspora_enabled')) {
                                $diaspora = NETWORK_DIASPORA;
                        } else {
                                $diaspora = NETWORK_DFRN;
                        }
 
-                       if (!get_config('system','ostatus_disabled')) {
+                       if (!Config::get('system','ostatus_disabled')) {
                                $ostatus = NETWORK_OSTATUS;
                        } else {
                                $ostatus = NETWORK_DFRN;
@@ -100,7 +109,7 @@ function dirfind_content(App $a, $prefix = "") {
 
                        $search2 = "%".$search."%";
 
-                       /// @TODO These 2 SELECTs are not checked on validity with dbm::is_result()
+                       /// @TODO These 2 SELECTs are not checked on validity with DBM::is_result()
                        $count = q("SELECT count(*) AS `total` FROM `gcontact`
                                        LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
                                                AND `contact`.`network` = `gcontact`.`network`
@@ -137,7 +146,7 @@ function dirfind_content(App $a, $prefix = "") {
                        $j->items_page = $perpage;
                        $j->page = $a->pager['page'];
                        foreach ($results AS $result) {
-                               if (poco_alternate_ostatus_url($result["url"])) {
+                               if (PortableContact::alternateOStatusUrl($result["url"])) {
                                        continue;
                                }
 
@@ -161,12 +170,12 @@ function dirfind_content(App $a, $prefix = "") {
                        }
 
                        // Add found profiles from the global directory to the local directory
-                       proc_run(PRIORITY_LOW, 'include/discover_poco.php', "dirsearch", urlencode($search));
+                       Worker::add(PRIORITY_LOW, 'DiscoverPoCo', "dirsearch", urlencode($search));
                } else {
 
                        $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
 
-                       if(strlen(get_config('system','directory')))
+                       if(strlen(Config::get('system','directory')))
                                $x = fetch_url(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
 
                        $j = json_decode($x);
@@ -203,7 +212,7 @@ function dirfind_content(App $a, $prefix = "") {
                                                $photo_menu = array();
                                        }
                                } else {
-                                       $connlnk = App::get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
+                                       $connlnk = System::baseUrl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
                                        $conntxt = t('Connect');
                                        $photo_menu = array(
                                                'profile' => array(t("View Profile"), zrl($jj->url)),