]> git.mxchange.org Git - friendica.git/blobdiff - src/Module/Directory.php
Merge pull request #9346 from annando/reduce-contact-update
[friendica.git] / src / Module / Directory.php
index 69588604db9b3f021463777626775ad6f8d274eb..93d14cc176d705a895cedaac17cecf9bddef3fc5 100644 (file)
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
@@ -7,12 +26,12 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
+use Friendica\Core\Session;
 use Friendica\Core\Renderer;
-use Friendica\Model\Contact;
+use Friendica\DI;
+use Friendica\Model;
 use Friendica\Model\Profile;
 use Friendica\Network\HTTPException;
-use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
 /**
@@ -20,34 +39,19 @@ use Friendica\Util\Strings;
  */
 class Directory extends BaseModule
 {
-       public static function init()
+       public static function content(array $parameters = [])
        {
-               $app = self::getApp();
-
-               if (local_user()) {
-                       $app->page['aside'] .= Widget::findPeople();
-                       $app->page['aside'] .= Widget::follow();
-               } else {
-                       unset($_SESSION['theme']);
-                       unset($_SESSION['mobile-theme']);
-               }
-       }
+               $app = DI::app();
+               $config = DI::config();
 
-       public static function post()
-       {
-               if (!empty($_POST['search'])) {
-                       self::getApp()->data['search'] = $_POST['search'];
+               if (($config->get('system', 'block_public') && !Session::isAuthenticated()) ||
+                       ($config->get('system', 'block_local_dir') && !Session::isAuthenticated())) {
+                       throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
                }
-       }
-
-       public static function content()
-       {
-               $app = self::getApp();
-               $config = $app->getConfig();
 
-               if (($config->get('system', 'block_public') && !local_user() && !remote_user()) ||
-                       ($config->get('system', 'block_local_dir') && !local_user() && !remote_user())) {
-                       throw new HTTPException\ForbiddenException();
+               if (local_user()) {
+                       DI::page()['aside'] .= Widget::findPeople();
+                       DI::page()['aside'] .= Widget::follow();
                }
 
                $output = '';
@@ -65,12 +69,12 @@ class Directory extends BaseModule
                        $gDirPath = Profile::zrl($dirURL, true);
                }
 
-               $pager = new Pager($app->query_string, 60);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 60);
 
                $profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search);
 
                if ($profiles['total'] === 0) {
-                       info(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';
@@ -79,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);
+                               }
                        }
                }
 
@@ -87,15 +94,15 @@ class Directory extends BaseModule
 
                $output .= Renderer::replaceMacros($tpl, [
                        '$search'     => $search,
-                       '$globaldir'  => L10n::t('Global Directory'),
+                       '$globaldir'  => DI::l10n()->t('Global Directory'),
                        '$gDirPath'   => $gDirPath,
-                       '$desc'       => L10n::t('Find on this site'),
-                       '$contacts'   => $profiles['entries'],
-                       '$finding'    => L10n::t('Results for:'),
+                       '$desc'       => DI::l10n()->t('Find on this site'),
+                       '$contacts'   => $entries,
+                       '$finding'    => DI::l10n()->t('Results for:'),
                        '$findterm'   => (strlen($search) ? $search : ""),
-                       '$title'      => L10n::t('Site Directory'),
+                       '$title'      => DI::l10n()->t('Site Directory'),
                        '$search_mod' => 'directory',
-                       '$submit'     => L10n::t('Find'),
+                       '$submit'     => DI::l10n()->t('Find'),
                        '$paginate'   => $pager->renderFull($profiles['total']),
                ]);
 
@@ -115,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'])) {
@@ -146,39 +153,33 @@ class Directory extends BaseModule
                        || !empty($profile['postal-code'])
                        || !empty($profile['country-name'])
                ) {
-                       $location = L10n::t('Location:');
+                       $location = DI::l10n()->t('Location:');
                } else {
                        $location = '';
                }
 
-               $gender = (!empty($profile['gender']) ? L10n::t('Gender:') : false);
-               $marital = (!empty($profile['marital']) ? L10n::t('Status:') : false);
-               $homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false);
-               $about = (!empty($profile['about']) ? L10n::t('About:') : false);
+               $homepage = (!empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false);
 
                $location_e = $location;
 
                $photo_menu = [
-                       'profile' => [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'],
-                       'gender'       => $gender,
-                       'pdesc'        => $pdesc,
-                       'marital'      => $marital,
-                       'homepage'     => $homepage,
                        'about'        => $about,
+                       'homepage'     => $homepage,
                        'photo_menu'   => $photo_menu,
 
                ];