X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FDirectory.php;h=19656bb6ad6b3c4343da58c4ece31355210cb8f3;hb=40777d08c198ed5f435a7b029e25ea139de62c16;hp=cc12e9dd211d6d72661a6a37f27a48365d6fc6bd;hpb=1bc4b2e0788ac11d3b377013b410f2250fff68aa;p=friendica.git
diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index cc12e9dd21..19656bb6ad 100644
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -1,4 +1,23 @@
.
+ *
+ */
namespace Friendica\Module;
@@ -7,31 +26,29 @@ use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Widget;
use Friendica\Core\Hook;
-use Friendica\Core\Session;
use Friendica\Core\Renderer;
+use Friendica\Core\Search;
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;
/**
* Shows the local directory of this node
*/
class Directory extends BaseModule
{
- public static function content(array $parameters = [])
+ protected function content(array $request = []): string
{
$app = DI::app();
$config = DI::config();
- if (($config->get('system', 'block_public') && !Session::isAuthenticated()) ||
- ($config->get('system', 'block_local_dir') && !Session::isAuthenticated())) {
+ if (($config->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) ||
+ ($config->get('system', 'block_local_dir') && !DI::userSession()->isAuthenticated())) {
throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
}
- if (local_user()) {
+ if (DI::userSession()->getLocalUserId()) {
DI::page()['aside'] .= Widget::findPeople();
DI::page()['aside'] .= Widget::follow();
}
@@ -41,31 +58,26 @@ class Directory extends BaseModule
Nav::setSelected('directory');
- $search = (!empty($_REQUEST['search']) ?
- Strings::escapeTags(trim(rawurldecode($_REQUEST['search']))) :
- '');
+ $search = trim(rawurldecode($_REQUEST['search'] ?? ''));
$gDirPath = '';
- $dirURL = $config->get('system', 'directory');
+ $dirURL = Search::getGlobalDirectory();
if (strlen($dirURL)) {
$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);
+ DI::sysmsg()->addNotice(DI::l10n()->t('No entries (some entries may be hidden).'));
} else {
- if (in_array('small', $app->argv)) {
- $photo = 'thumb';
- } else {
- $photo = 'photo';
- }
-
foreach ($profiles['entries'] as $entry) {
- $entries[] = self::formatEntry($entry, $photo);
+ $contact = Model\Contact::getByURLForUser($entry['url'], DI::userSession()->getLocalUserId());
+ if (!empty($contact)) {
+ $entries[] = Contact::getContactTemplateVars($contact);
+ }
}
}
@@ -99,13 +111,13 @@ class Directory extends BaseModule
*
* @throws \Exception
*/
- public static function formatEntry(array $contact, $photo_size = 'photo')
+ public static function formatEntry(array $contact, string $photo_size = 'photo'): array
{
- $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'] . '
' : '');
+ $about = (($contact['about']) ? $contact['about'] . '
' : '');
$details = '';
if (strlen($contact['locality'])) {
@@ -137,34 +149,28 @@ class Directory extends BaseModule
$location = '';
}
- $gender = (!empty($profile['gender']) ? DI::l10n()->t('Gender:') : false);
- $marital = (!empty($profile['marital']) ? DI::l10n()->t('Status:') : false);
$homepage = (!empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false);
- $about = (!empty($profile['about']) ? DI::l10n()->t('About:') : false);
$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['contact-type'] ?? 0),
'profile' => $profile,
'location' => $location_e,
'tags' => $contact['pub_keywords'],
- 'gender' => $gender,
- 'pdesc' => $pdesc,
- 'marital' => $marital,
- 'homepage' => $homepage,
'about' => $about,
+ 'homepage' => $homepage,
'photo_menu' => $photo_menu,
];