Merge pull request #9346 from annando/reduce-contact-update

[friendica.git] / src / Module / Directory.php

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index ed1b70252313cbf8a1d80ce0fde510aad6df4e17..93d14cc176d705a895cedaac17cecf9bddef3fc5 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -29,10 +29,9 @@ use Friendica\Core\Hook;
 use Friendica\Core\Session;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Model\Contact;
+use Friendica\Model;
 use Friendica\Model\Profile;
 use Friendica\Network\HTTPException;
-use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
 /**
@@ -70,12 +69,12 @@ class Directory extends BaseModule
                        $gDirPath = Profile::zrl($dirURL, true);
                }
 
-               $pager = new Pager(DI::args()->getQueryString(), 60);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 60);
 
                $profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search);
 
                if ($profiles['total'] === 0) {
-                       info(DI::l10n()->t('No entries (some entries may be hidden).') . EOL);
+                       notice(DI::l10n()->t('No entries (some entries may be hidden).'));
                } else {
                        if (in_array('small', $app->argv)) {
                                $photo = 'thumb';
@@ -84,7 +83,10 @@ class Directory extends BaseModule
                        }
 
                        foreach ($profiles['entries'] as $entry) {
-                               $entries[] = self::formatEntry($entry, $photo);
+                               $contact = Model\Contact::getByURLForUser($entry['url'], local_user());
+                               if (!empty($contact)) {
+                                       $entries[] = Contact::getContactTemplateVars($contact);
+                               }
                        }
                }
 
@@ -120,11 +122,11 @@ class Directory extends BaseModule
         */
        public static function formatEntry(array $contact, $photo_size = 'photo')
        {
-               $itemurl = (($contact['addr'] != "") ? $contact['addr'] : $contact['profile_url']);
+               $itemurl = (($contact['addr'] != "") ? $contact['addr'] : $contact['url']);
 
-               $profile_link = $contact['profile_url'];
+               $profile_link = $contact['url'];
 
-               $pdesc = (($contact['pdesc']) ? $contact['pdesc'] . '<br />' : '');
+               $about = (($contact['about']) ? $contact['about'] . '<br />' : '');
 
                $details = '';
                if (strlen($contact['locality'])) {
@@ -161,22 +163,22 @@ class Directory extends BaseModule
                $location_e = $location;
 
                $photo_menu = [
-                       'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($profile_link)]
+                       'profile' => [DI::l10n()->t("View Profile"), Model\Contact::magicLink($profile_link)]
                ];
 
                $entry = [
                        'id'           => $contact['id'],
-                       'url'          => Contact::magicLink($profile_link),
+                       'url'          => Model\Contact::magicLink($profile_link),
                        'itemurl'      => $itemurl,
-                       'thumb'        => ProxyUtils::proxifyUrl($contact[$photo_size], false, ProxyUtils::SIZE_THUMB),
+                       'thumb'        => Model\Contact::getThumb($contact),
                        'img_hover'    => $contact['name'],
                        'name'         => $contact['name'],
                        'details'      => $details,
-                       'account_type' => Contact::getAccountType($contact),
+                       'account_type' => Model\Contact::getAccountType($contact),
                        'profile'      => $profile,
                        'location'     => $location_e,
                        'tags'         => $contact['pub_keywords'],
-                       'pdesc'        => $pdesc,
+                       'about'        => $about,
                        'homepage'     => $homepage,
                        'photo_menu'   => $photo_menu,