Skip to content

Commit

Permalink
[BUGFIX] Fix scoring calculation
Browse files Browse the repository at this point in the history
as a regression with multiclient feature frontend requests with relevant queries may be blocked through the new feature. For example scoring calculation is broken before this commit.
  • Loading branch information
einpraegsam committed Apr 17, 2024
1 parent 408c17d commit 8266b3f
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 16 deletions.
3 changes: 2 additions & 1 deletion Classes/Domain/Model/Company.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion Classes/Domain/Model/Fingerprint.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion Classes/Domain/Model/Log.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion Classes/Domain/Model/Pagevisit.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion Classes/Domain/Model/Visitor.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion Classes/Domain/Service/PermissionTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
27 changes: 27 additions & 0 deletions Classes/Utility/EnvironmentUtility.php
Original file line number Diff line number Diff line change
@@ -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();
}
}
10 changes: 0 additions & 10 deletions Classes/Utility/FrontendUtility.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 8266b3f

Please sign in to comment.