From 343df1b0abc9e5017cdab32163baf2bddde895eb Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Tue, 29 Nov 2016 10:33:17 +0100
Subject: [PATCH] [TASK] Move FE user intialization into constructor
Certain options are set from outside as public property,
however these options are always set and can be set from within
FrontendUserAuthentication itself.
This way, more "logic" is moved from TSFE into the appropriate
objects themselves.
Resolves: #78827
Releases: master
Change-Id: Iba0d0ff805a885895fafb09b8852679f9870dbe9
Reviewed-on: https://review.typo3.org/50799
Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../Classes/Authentication/FrontendUserAuthentication.php | 3 +++
.../Classes/Controller/TypoScriptFrontendController.php | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
index 42b0b1d7c7a2..122936072493 100644
--- a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
+++ b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
@@ -154,6 +154,9 @@ class FrontendUserAuthentication extends AbstractUserAuthentication
$this->sendNoCacheHeaders = false;
$this->getFallBack = true;
$this->getMethodEnabled = true;
+ $this->lockIP = $GLOBALS['TYPO3_CONF_VARS']['FE']['lockIP'];
+ $this->checkPid = $GLOBALS['TYPO3_CONF_VARS']['FE']['checkFeUserPid'];
+ $this->lifetime = (int)$GLOBALS['TYPO3_CONF_VARS']['FE']['lifetime'];
}
/**
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index b976bcf412ee..5e11d85a3e64 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -992,9 +992,6 @@ class TypoScriptFrontendController
public function initFEuser()
{
$this->fe_user = GeneralUtility::makeInstance(FrontendUserAuthentication::class);
- $this->fe_user->lockIP = $GLOBALS['TYPO3_CONF_VARS']['FE']['lockIP'];
- $this->fe_user->checkPid = $GLOBALS['TYPO3_CONF_VARS']['FE']['checkFeUserPid'];
- $this->fe_user->lifetime = (int)$GLOBALS['TYPO3_CONF_VARS']['FE']['lifetime'];
// List of pid's acceptable
$pid = GeneralUtility::_GP('pid');
$this->fe_user->checkPid_value = $pid ? implode(',', GeneralUtility::intExplode(',', $pid)) : 0;
--
GitLab