Merge pull request #396 from andersundsehr/phpstan

🐛 fix cookie handling
lochmueller · Jul 25, 2023 · e19d853 · e19d853
2 parents f47b68d + 3e7f147
commit e19d853
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Classes/Hook/DatamapHook.php b/Classes/Hook/DatamapHook.php
@@ -23,15 +23,18 @@ class DatamapHook extends AbstractHook
  */
  public function processDatamap_afterDatabaseOperations($status, $table, $id, $fieldArray, DataHandler $dataHandler): void
  {
- if ('pages' !== $table || !MathUtility::canBeInterpretedAsInteger($id)) {
+ if ('pages' !== $table) {
+ return;
+ }
+ if (!MathUtility::canBeInterpretedAsInteger($id)) {
  return;
  }
 
  $row = BackendUtility::getRecord($table, (int) $id);
  $allowSfc = (bool) $row['tx_staticfilecache_cache'];
  if (!$allowSfc) {
  try {
- // Delete cache
+ // Delete right now!! do not wait until queue is deleting this
  $configuration = GeneralUtility::makeInstance(ConfigurationService::class);
  $configuration->override('boostMode', '0');
  $cacheService = GeneralUtility::makeInstance(CacheService::class);

diff --git a/Classes/Service/CookieService.php b/Classes/Service/CookieService.php
@@ -28,15 +28,18 @@ public function __construct(private DateTimeService $dateTimeService)
  */
  public function setCookie(int $lifetime): void
  {
- setcookie(self::FE_COOKIE_NAME, 'typo_user_logged_in', $lifetime + $this->dateTimeService->getCurrentTime(), '/', $this->getCookieDomain(), GeneralUtility::getIndpEnv('TYPO3_SSL'));
+ if ($lifetime !== self::SESSION_LIFETIME) {
+ $lifetime += $this->dateTimeService->getCurrentTime();
+ }
+ setcookie(self::FE_COOKIE_NAME, 'typo_user_logged_in', $lifetime, '/', $this->getCookieDomain(), GeneralUtility::getIndpEnv('TYPO3_SSL'));
  }
 
  /**
  * Unset the Cookie.
  */
  public function unsetCookie(): void
  {
- $this->setCookie( -3600);
+ $this->setCookie(-3600);
  }
 
  public function hasCookie(): bool