Merge pull request #4579 from annando/fix-diaspora-link

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 84fe6f0ff49de8f23af517de565282f7f1161e29..9db4eeb7b61d629f75436dd3856cb88274df014c 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -3,22 +3,25 @@
  * @file mod/dirfind.php
  */
 use Friendica\App;
+use Friendica\Content\ContactSelector;
+use Friendica\Content\Widget;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Model\GlobalContact;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\Network;
 
-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) {
 
        if (! local_user()) {
-               notice( t('Permission denied.') . EOL );
+               notice(L10n::t('Permission denied.') . EOL );
                return;
        }
 
@@ -26,9 +29,9 @@ function dirfind_init(App $a) {
                $a->page['aside'] = '';
        }
 
-       $a->page['aside'] .= findpeople_widget();
+       $a->page['aside'] .= Widget::findPeople();
 
-       $a->page['aside'] .= follow_widget();
+       $a->page['aside'] .= Widget::follow();
 }
 
 function dirfind_content(App $a, $prefix = "") {
@@ -42,18 +45,18 @@ function dirfind_content(App $a, $prefix = "") {
 
        if (strpos($search,'@') === 0) {
                $search = substr($search,1);
-               $header = sprintf( t('People Search - %s'), $search);
-               if ((valid_email($search) && validate_email($search)) ||
+               $header = L10n::t('People Search - %s', $search);
+               if ((valid_email($search) && Network::isEmailDomainValid($search)) ||
                        (substr(normalise_link($search), 0, 7) == "http://")) {
                        $user_data = Probe::uri($search);
-                       $discover_user = (in_array($user_data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)));
+                       $discover_user = (in_array($user_data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA]));
                }
        }
 
        if (strpos($search,'!') === 0) {
                $search = substr($search,1);
                $community = true;
-               $header = sprintf( t('Forum Search - %s'), $search);
+               $header = L10n::t('Forum Search - %s', $search);
        }
 
        $o = '';
@@ -75,14 +78,14 @@ function dirfind_content(App $a, $prefix = "") {
                        $objresult->tags = "";
                        $objresult->network = $user_data["network"];
 
-                       $contact = get_contact_details_by_url($user_data["url"], local_user());
+                       $contact = Contact::getDetailsByURL($user_data["url"], local_user());
                        $objresult->cid = $contact["cid"];
 
                        $j->results[] = $objresult;
 
                        // Add the contact to the global contacts if it isn't already in our system
                        if (($contact["cid"] == 0) && ($contact["zid"] == 0) && ($contact["gid"] == 0)) {
-                               GlobalContact::update($user_data);
+                               GContact::update($user_data);
                        }
                } elseif ($local) {
 
@@ -149,7 +152,7 @@ function dirfind_content(App $a, $prefix = "") {
                                        continue;
                                }
 
-                               $result = get_contact_details_by_url($result["url"], local_user(), $result);
+                               $result = Contact::getDetailsByURL($result["url"], local_user(), $result);
 
                                if ($result["name"] == "") {
                                        $urlparts = parse_url($result["url"]);
@@ -169,13 +172,13 @@ function dirfind_content(App $a, $prefix = "") {
                        }
 
                        // Add found profiles from the global directory to the local directory
-                       Worker::add(PRIORITY_LOW, 'discover_poco', "dirsearch", urlencode($search));
+                       Worker::add(PRIORITY_LOW, 'DiscoverPoCo', "dirsearch", urlencode($search));
                } else {
 
                        $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
 
                        if(strlen(Config::get('system','directory')))
-                               $x = fetch_url(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
+                               $x = Network::fetchUrl(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
 
                        $j = json_decode($x);
                }
@@ -193,7 +196,7 @@ function dirfind_content(App $a, $prefix = "") {
 
                                $alt_text = "";
 
-                               $contact_details = get_contact_details_by_url($jj->url, local_user());
+                               $contact_details = Contact::getDetailsByURL($jj->url, local_user());
 
                                $itemurl = (($contact_details["addr"] != "") ? $contact_details["addr"] : $jj->url);
 
@@ -204,26 +207,26 @@ function dirfind_content(App $a, $prefix = "") {
                                        $contact = q("SELECT * FROM `contact` WHERE `id` = %d",
                                                        intval($jj->cid));
                                        if ($contact) {
-                                               $photo_menu = contact_photo_menu($contact[0]);
+                                               $photo_menu = Contact::photoMenu($contact[0]);
                                                $details = _contact_detail_for_template($contact[0]);
                                                $alt_text = $details['alt_text'];
                                        } else {
-                                               $photo_menu = array();
+                                               $photo_menu = [];
                                        }
                                } else {
                                        $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)),
-                                               'follow' => array(t("Connect/Follow"), $connlnk)
-                                       );
+                                       $conntxt = L10n::t('Connect');
+                                       $photo_menu = [
+                                               'profile' => [L10n::t("View Profile"), Profile::zrl($jj->url)],
+                                               'follow' => [L10n::t("Connect/Follow"), $connlnk]
+                                       ];
                                }
 
                                $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 
-                               $entry = array(
+                               $entry = [
                                        'alt_text' => $alt_text,
-                                       'url' => zrl($jj->url),
+                                       'url' => Profile::zrl($jj->url),
                                        'itemurl' => $itemurl,
                                        'name' => htmlentities($jj->name),
                                        'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
@@ -234,23 +237,23 @@ function dirfind_content(App $a, $prefix = "") {
                                        'details'       => $contact_details['location'],
                                        'tags'          => $contact_details['keywords'],
                                        'about'         => $contact_details['about'],
-                                       'account_type'  => account_type($contact_details),
-                                       'network' => network_to_name($jj->network, $jj->url),
+                                       'account_type'  => Contact::getAccountType($contact_details),
+                                       'network' => ContactSelector::networkToName($jj->network, $jj->url),
                                        'id' => ++$id,
-                               );
+                               ];
                                $entries[] = $entry;
                        }
 
                $tpl = get_markup_template('viewcontact_template.tpl');
 
-               $o .= replace_macros($tpl,array(
+               $o .= replace_macros($tpl,[
                        'title' => $header,
                        '$contacts' => $entries,
                        '$paginate' => paginate($a),
-               ));
+               ]);
 
                } else {
-                       info( t('No matches') . EOL);
+                       info(L10n::t('No matches') . EOL);
                }
 
        }