adjust fe user fetching

TYPO3incubator · Apr 12, 2024 · 6b95474 · 6b95474
1 parent 633de3f
commit 6b95474
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/local_packages/psi/Classes/ViewHelpers/FetchFrontendUsersViewHelper.php b/local_packages/psi/Classes/ViewHelpers/FetchFrontendUsersViewHelper.php
@@ -5,6 +5,7 @@
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Frontend\Resource\FileCollector;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
@@ -30,29 +31,18 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
 
         $users = $query->fetchAllAssociative();
         $context = GeneralUtility::makeInstance(Context::class);
-        $userId = $context->getPropertyFromAspect('frontend.user', 'id');
+        $userId = (int)$context->getPropertyFromAspect('frontend.user', 'id');
         foreach ($users as $key => $user) {
-            if ($user['uid'] === $userId) {
+            if ((int)$user['uid'] === $userId) {
                 unset($users[$key]);
+                continue;
             }
             if ($user['image'] > 0) {
-                $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_file_reference');
-                $media = $queryBuilder
-                    ->select('file.*')
-                    ->from('sys_file_reference', 'relation')
-                    ->leftJoin('relation', 'sys_file', 'file', 'relation.uid_local = file.uid')
-                    ->where(
-                        $queryBuilder->expr()->eq('relation.uid_foreign', $queryBuilder->createNamedParameter($user['uid']))
-                    )
-                    ->andWhere(
-                        $queryBuilder->expr()->eq('relation.tableNames', $queryBuilder->createNamedParameter('fe_users'))
-                    )
-                    ->andWhere(
-                        $queryBuilder->expr()->eq('relation.deleted', $queryBuilder->createNamedParameter(0))
-                    )
-                    ->executeQuery()
-                    ->fetchAssociative();
-                $users[$key]['media'] = '/fileadmin' . $media['identifier'];
+                $fileCollector = GeneralUtility::makeInstance(FileCollector::class);
+                $fileCollector->addFilesFromRelation('fe_users', 'image', $user);
+                if (count($files = $fileCollector->getFiles()) > 0) {
+                    $users[$key]['media'] = reset($files);
+                }
             }
         }
         return $users;

diff --git a/local_packages/psi/Resources/Private/Templates/Content/EmployeeList.html b/local_packages/psi/Resources/Private/Templates/Content/EmployeeList.html
@@ -7,7 +7,7 @@
                 <f:for each="{psi:fetchFrontendUsers(pid: data.pages)}" as="user" iteration="iterator">
                     <li class="employee__item col-12 col-sm-12 col-md-4">
                         <f:if condition="{user.media}">
-                            <f:image src="{user.media}" class="employee__image"/>
+                            <f:image image="{user.media}" class="employee__image"/>
                         </f:if>
                         <div class="employee__details">
                             <f:if condition="{user.title}">