Merge branch 'release/35.0.2'

in2code-de · Apr 17, 2024 · cf5f15a · cf5f15a
2 parents a7d0ad2 + 0beaa38
commit cf5f15a
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 19 deletions.
diff --git a/Classes/Domain/Model/Company.php b/Classes/Domain/Model/Company.php
@@ -12,6 +12,7 @@
 use In2code\Lux\Domain\Service\Image\CompanyImageService;
 use In2code\Lux\Domain\Service\SiteService;
 use In2code\Lux\Utility\BackendUtility;
+use In2code\Lux\Utility\EnvironmentUtility;
 use In2code\Lux\Utility\StringUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
@@ -361,7 +362,7 @@ public function getImageUrl(): string
      */
     public function canBeRead(): bool
     {
-        if (BackendUtility::isAdministrator()) {
+        if (EnvironmentUtility::isBackend() === false || BackendUtility::isAdministrator()) {
             return true;
         }
         $sites = GeneralUtility::makeInstance(SiteService::class)->getAllowedSites();

diff --git a/Classes/Domain/Model/Fingerprint.php b/Classes/Domain/Model/Fingerprint.php
@@ -6,6 +6,7 @@
 use In2code\Lux\Domain\Service\SiteService;
 use In2code\Lux\Exception\FingerprintMustNotBeEmptyException;
 use In2code\Lux\Utility\BackendUtility;
+use In2code\Lux\Utility\EnvironmentUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use WhichBrowser\Parser;
 
@@ -168,7 +169,7 @@ public function getTypeString(): string
      */
     public function canBeRead(): bool
     {
-        if (BackendUtility::isAdministrator() || $this->site === '') {
+        if (EnvironmentUtility::isBackend() === false || BackendUtility::isAdministrator() || $this->site === '') {
             return true;
         }
         $sites = GeneralUtility::makeInstance(SiteService::class)->getAllowedSites();

diff --git a/Classes/Domain/Model/Log.php b/Classes/Domain/Model/Log.php
@@ -9,6 +9,7 @@
 use In2code\Lux\Domain\Repository\UtmRepository;
 use In2code\Lux\Domain\Service\SiteService;
 use In2code\Lux\Utility\BackendUtility;
+use In2code\Lux\Utility\EnvironmentUtility;
 use In2code\Luxenterprise\Domain\Model\AbTestingPage;
 use In2code\Luxenterprise\Domain\Repository\AbTestingPageRepository;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -211,7 +212,7 @@ public static function getIdentifiedStatus(): array
      */
     public function canBeRead(): bool
     {
-        if (BackendUtility::isAdministrator() || $this->site === '') {
+        if (EnvironmentUtility::isBackend() === false || BackendUtility::isAdministrator() || $this->site === '') {
             return true;
         }
         $sites = GeneralUtility::makeInstance(SiteService::class)->getAllowedSites();

diff --git a/Classes/Domain/Model/Pagevisit.php b/Classes/Domain/Model/Pagevisit.php
@@ -8,6 +8,7 @@
 use In2code\Lux\Domain\Service\Referrer\Readable;
 use In2code\Lux\Domain\Service\SiteService;
 use In2code\Lux\Utility\BackendUtility;
+use In2code\Lux\Utility\EnvironmentUtility;
 use In2code\Lux\Utility\FrontendUtility;
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
@@ -203,7 +204,7 @@ public function getNewsvisit(): ?Newsvisit
      */
     public function canBeRead(): bool
     {
-        if (BackendUtility::isAdministrator() || $this->site === '') {
+        if (EnvironmentUtility::isBackend() === false || BackendUtility::isAdministrator() || $this->site === '') {
             return true;
         }
         $sites = GeneralUtility::makeInstance(SiteService::class)->getAllowedSites();

diff --git a/Classes/Domain/Model/Visitor.php b/Classes/Domain/Model/Visitor.php
@@ -18,6 +18,7 @@
 use In2code\Lux\Exception\ConfigurationException;
 use In2code\Lux\Utility\BackendUtility;
 use In2code\Lux\Utility\DatabaseUtility;
+use In2code\Lux\Utility\EnvironmentUtility;
 use In2code\Lux\Utility\LocalizationUtility;
 use In2code\Lux\Utility\ObjectUtility;
 use In2code\Lux\Utility\StringUtility;
@@ -1177,7 +1178,7 @@ public function getLongitude(): string
      */
     public function canBeRead(): bool
     {
-        if (BackendUtility::isAdministrator()) {
+        if (EnvironmentUtility::isBackend() === false || BackendUtility::isAdministrator()) {
             return true;
         }
         $sites = GeneralUtility::makeInstance(SiteService::class)->getAllowedSites();

diff --git a/Classes/Domain/Service/PermissionTrait.php b/Classes/Domain/Service/PermissionTrait.php
@@ -7,6 +7,7 @@
 use In2code\Lux\Exception\ConfigurationException;
 use In2code\Lux\Utility\BackendUtility;
 use In2code\Lux\Utility\DatabaseUtility;
+use In2code\Lux\Utility\EnvironmentUtility;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Type\Bitmask\Permission;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
@@ -65,7 +66,7 @@ protected function getIdentifierFromArrayOrObject($object, $key): int
      */
     private function isAuthenticatedForRecord(int $identifier, string $table): bool
     {
-        if (BackendUtility::isAdministrator()) {
+        if (EnvironmentUtility::isBackend() === false || BackendUtility::isAdministrator()) {
             return true;
         }
 

diff --git a/Classes/Utility/EnvironmentUtility.php b/Classes/Utility/EnvironmentUtility.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+namespace In2code\Lux\Utility;
+
+use TYPO3\CMS\Core\Http\ApplicationType;
+
+class EnvironmentUtility
+{
+    /**
+     * @return bool
+     * @SuppressWarnings(PHPMD.Superglobals)
+     */
+    public static function isFrontend(): bool
+    {
+        return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend();
+    }
+
+    /**
+     * @return bool
+     * @SuppressWarnings(PHPMD.Superglobals)
+     */
+    public static function isBackend(): bool
+    {
+        return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend();
+    }
+}
diff --git a/Classes/Utility/FrontendUtility.php b/Classes/Utility/FrontendUtility.php
@@ -4,7 +4,6 @@
 namespace In2code\Lux\Utility;
 
 use In2code\Lux\Domain\Service\SiteService;
-use TYPO3\CMS\Core\Http\ApplicationType;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
@@ -56,15 +55,6 @@ public static function getPropertyFromLoggedInFrontendUser($propertyName = 'uid'
         return '';
     }
 
-    /**
-     * @return bool
-     * @SuppressWarnings(PHPMD.Superglobals)
-     */
-    public static function isFrontendMode(): bool
-    {
-        return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend();
-    }
-
     /**
      * @return ?TypoScriptFrontendController
      * @SuppressWarnings(PHPMD.Superglobals)

diff --git a/Documentation/Technical/Changelog/Index.md b/Documentation/Technical/Changelog/Index.md
@@ -31,6 +31,7 @@ Double check if you have cleared all caches after installing a new LUX version t
 
 | Version    | Date       | State    | TYPO3          | Description                                                                                                                                                                                           |
 |------------|------------|----------|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 35.0.2     | 2024-04-17 | Bugfix   | `11.5 + 12.4`  | Fix scoring calculation in frontend requests                                                                                                                                                          |
 | 35.0.1     | 2024-04-11 | Bugfix   | `11.5 + 12.4`  | Prevent possible exception when opening A/B Testing module on an empty installation, update disallowed mail provider list                                                                             |
 | 35.0.0 !!! | 2024-03-26 | Feature  | `11.5 + 12.4`  | Support multiclient usage now, small performance improvements, update social media resources, unify filters in backend modules                                                                        |
 | 34.3.3     | 2024-03-04 | Bugfix   | `11.5 + 12.4`  | Harden curl requests against ip services to prevent exceptions                                                                                                                                        |
@@ -85,6 +86,7 @@ Double check if you have cleared all caches after installing a new LUX version t
 | 27.1.1     | 2023-02-17 | Bugfix   | `11.5 + 12.4`  | Fix "Property lastLogin must not be accessed before initialization" in FrontendUser model                                                                                                             |
 | 27.1.0     | 2023-02-15 | Bugfix   | `11.5 + 12.4`  | Updated disallowed mail provider list, Fixed PHP 8.2 issue with package whichbrowser/parser, small code cleanup                                                                                       |
 | 27.0.0 !!! | 2023-02-12 | Task     | `11.5 + 12.4`  | Support TYPO3 11+12 and drop support for TYPO3 10. Add id to anonym names. Track referrer with UTM tracking. A/B testing with a cleanup function now. Make linklisteners selectable in backend again. |
+| 26.8.0     | 2024-04-11 | Feature  | `11.5 + 12.4`  | Extend Lead CSV download with country, last visit and last download                                                                                                                                   |
 | 26.7.0     | 2024-03-19 | Feature  | `11.5 + 12.4`  | Remove all domains from referrer diagram where referrers are from local instance                                                                                                                      |
 | 26.6.0     | 2024-03-18 | Feature  | `11.5 + 12.4`  | Add domain selection for Lead list, use imagegrabber fork to prevent problems while loading images from google search                                                                                 |
 | 26.5.2     | 2024-01-12 | Bugfix   | `11.5 + 12.4`  | Fix module links on some TYPO3 10 installations                                                                                                                                                       |

diff --git a/Resources/Private/Templates/Lead/DownloadCsv.html b/Resources/Private/Templates/Lead/DownloadCsv.html
@@ -1,5 +1,5 @@
 <f:spaceless>
-    <lux:format.quotes>Lead Ident</lux:format.quotes>;<lux:format.quotes>Lead Scoring</lux:format.quotes>;<lux:format.quotes>Email</lux:format.quotes>;<lux:format.quotes>Company</lux:format.quotes>;<lux:format.quotes>Last Visit</lux:format.quotes>;<lux:format.quotes>Number of Visits</lux:format.quotes>
-    <f:for each="{allVisitors}" as="visitor"><lux:format.quotes>{visitor.fullName}</lux:format.quotes>;<lux:format.quotes>{visitor.scoring}</lux:format.quotes>;<lux:format.quotes>{visitor.email}</lux:format.quotes>;<lux:format.quotes>{visitor.company}</lux:format.quotes>;<lux:format.quotes>{f:format.date(date:visitor.dateOfLastVisit,format:'{f:translate(key:\'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:date\')}')}</lux:format.quotes>;<lux:format.quotes>{visitor.visits}</lux:format.quotes>
+    <lux:format.quotes>Lead Ident</lux:format.quotes>;<lux:format.quotes>Lead Scoring</lux:format.quotes>;<lux:format.quotes>Email</lux:format.quotes>;<lux:format.quotes>Company</lux:format.quotes>;<lux:format.quotes>Last Visit</lux:format.quotes>;<lux:format.quotes>Number of Visits</lux:format.quotes>;<lux:format.quotes>Country</lux:format.quotes>;<lux:format.quotes>Last visit</lux:format.quotes>;<lux:format.quotes>Last download</lux:format.quotes>
+    <f:for each="{allVisitors}" as="visitor"><lux:format.quotes>{visitor.fullName}</lux:format.quotes>;<lux:format.quotes>{visitor.scoring}</lux:format.quotes>;<lux:format.quotes>{visitor.email}</lux:format.quotes>;<lux:format.quotes>{visitor.company}</lux:format.quotes>;<lux:format.quotes>{f:format.date(date:visitor.dateOfLastVisit,format:'{f:translate(key:\'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:date\')}')}</lux:format.quotes>;<lux:format.quotes>{visitor.visits}</lux:format.quotes>;<lux:format.quotes>{visitor.country}</lux:format.quotes>;<lux:format.quotes>{visitor.pagevisitLast.crdate -> f:format.date(format:'Y-m-d')}</lux:format.quotes>;<lux:format.quotes>{visitor.lastDownload.crdate -> f:format.date(format:'Y-m-d')}</lux:format.quotes>
     </f:for>
 </f:spaceless>
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -4,7 +4,7 @@
     'description' => 'Living User Experience - LUX - the Marketing Automation tool for TYPO3.
         Turn your visitors to leads. Identification and profiling of your visitors within your TYPO3 website.',
     'category' => 'plugin',
-    'version' => '35.0.1',
+    'version' => '35.0.2',
     'author' => 'Alex Kellner',
     'author_email' => '[email protected]',
     'author_company' => 'in2code.de',