Update function calls

[friendica.git] / mod / suggest.php

diff --git a/mod/suggest.php b/mod/suggest.php
index bb23fc8cba71ae1d26d2de67455e39b7c3a31f66..a3da9a445e624e57549c02fa1cbe45dd29c41250 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -3,9 +3,12 @@
  * @file mod/suggest.php
  */
 use Friendica\App;
+use Friendica\Content\ContactSelector;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
-use Friendica\Model\GlobalContact;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
+use Friendica\Model\Profile;
 
 require_once 'include/contact_widgets.php';
 
@@ -68,29 +71,27 @@ function suggest_content(App $a) {
        $a->page['aside'] .= follow_widget();
 
 
-       $r = GlobalContact::suggestionQuery(local_user());
+       $r = GContact::suggestionQuery(local_user());
 
        if (! DBM::is_result($r)) {
                $o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');
                return $o;
        }
 
-       require_once 'include/contact_selectors.php';
-
        foreach ($r as $rr) {
 
                $connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
                $ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
                $photo_menu = array(
-                       'profile' => array(t("View Profile"), zrl($rr["url"])),
+                       'profile' => array(t("View Profile"), Profile::zrl($rr["url"])),
                        'follow' => array(t("Connect/Follow"), $connlnk),
                        'hide' => array(t('Ignore/Hide'), $ignlnk)
                );
 
-               $contact_details = get_contact_details_by_url($rr["url"], local_user(), $rr);
+               $contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
 
                $entry = array(
-                       'url' => zrl($rr['url']),
+                       'url' => Profile::zrl($rr['url']),
                        'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
                        'img_hover' => $rr['url'],
                        'name' => $contact_details['name'],
@@ -98,14 +99,14 @@ function suggest_content(App $a) {
                        'details'       => $contact_details['location'],
                        'tags'          => $contact_details['keywords'],
                        'about'         => $contact_details['about'],
-                       'account_type'  => account_type($contact_details),
+                       'account_type'  => Contact::getAccountType($contact_details),
                        'ignlnk' => $ignlnk,
                        'ignid' => $rr['id'],
                        'conntxt' => t('Connect'),
                        'connlnk' => $connlnk,
                        'photo_menu' => $photo_menu,
                        'ignore' => t('Ignore/Hide'),
-                       'network' => network_to_name($rr['network'], $rr['url']),
+                       'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
                        'id' => ++$id,
                );
                $entries[] = $entry;